From e25ad7891dad8768b4e9330aec651129a55cc481 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 7 Oct 2025 17:30:46 +0200 Subject: [PATCH 1/9] cleanup --- home-modules/nx-gcal-event.nix | 2 +- nixos-wsl.nix | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/home-modules/nx-gcal-event.nix b/home-modules/nx-gcal-event.nix index 5c14580..f172ed5 100644 --- a/home-modules/nx-gcal-event.nix +++ b/home-modules/nx-gcal-event.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }@all: with all; +{ pkgs, ... }@all: with all; let sep = " "; in { home = { diff --git a/nixos-wsl.nix b/nixos-wsl.nix index 191a2a6..a668140 100644 --- a/nixos-wsl.nix +++ b/nixos-wsl.nix @@ -8,13 +8,9 @@ ./system-modules/gpg.nix ./system-modules/networking.nix ./system-modules/nixd.nix - # ./system-modules/sops.nix - # ./system-modules/sshd.nix - # ./system-modules/syncthing.nix ./system-modules/users.nix ]; system.stateVersion = pkgs.version; - # system.stateVersion = "24.11"; wsl = { defaultUser = hyper.user; enable = true; @@ -31,6 +27,5 @@ ]; }; }; - nixpkgs.hostPlatform = hyper.system; } From 98c0a26209c6616af406ed38dd7293dca751b678 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 7 Oct 2025 17:31:05 +0200 Subject: [PATCH 2/9] no gpg-agent --- system-modules/gpg.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/system-modules/gpg.nix b/system-modules/gpg.nix index 8075bd3..e5cf5b5 100644 --- a/system-modules/gpg.nix +++ b/system-modules/gpg.nix @@ -1,14 +1,8 @@ -{ pkgs, ... }@all: with all; -{ - environment.systemPackages = with pkgs; [ - gnupg - gpg-tui - ]; - +{ pkgs, ... }@all: with all; { programs.gnupg = { dirmngr.enable = true; agent = { - enable = true; + enable = false; enableSSHSupport = true; enableExtraSocket = true; enableBrowserSocket = true; From ffddb4773b0c8e4f41e84f6b605f7518efa0e9f3 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 7 Oct 2025 17:31:27 +0200 Subject: [PATCH 3/9] ssh-agent + port fix --- home-modules/ssh.nix | 45 +++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix index c0b99f4..9d53f31 100644 --- a/home-modules/ssh.nix +++ b/home-modules/ssh.nix @@ -7,7 +7,7 @@ host = name; hostname = "ssh.${hyper.domain}"; user = hyper.user; - port = secrets.ssh.port; + port = 50022; identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}"; }; in { @@ -23,24 +23,31 @@ }; home.packages = with pkgs; [ sshfs ]; - services.gpg-agent = let - min2sec = min: (min * 60); - in { - enable = false; - verbose = true; - sshKeys = [ - "97081264F7FD72D890D496E839AA9A4C7892A7D8" # Keygrip (not Fingerprint!) of [A] Subkey - ]; - enableSshSupport = true; - enableFishIntegration = true; - defaultCacheTtlSsh = min2sec 60; - defaultCacheTtl = min2sec 30; - pinentry = { - package = pkgs.pinentry; - program = "pinentry"; + services = { + ssh-agent = { + enable = true; + # socket = "ssh-agent"; # suffix to $XDG_RUNTIME_DIR + # package = pkgs.openssh; + }; + gpg-agent = let + min2sec = min: (min * 60); + in { + enable = false; + verbose = true; + sshKeys = [ + "97081264F7FD72D890D496E839AA9A4C7892A7D8" # Keygrip (not Fingerprint!) of [A] Subkey + ]; + enableSshSupport = true; + enableFishIntegration = true; + defaultCacheTtlSsh = min2sec 60; + defaultCacheTtl = min2sec 30; + pinentry = { + package = pkgs.pinentry; + program = "pinentry"; + }; + extraConfig = '' + allow-loopback-pinentry + ''; }; - extraConfig = '' - allow-loopback-pinentry - ''; }; } From 812555c467f729aac512b00c58537895b503ca4d Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 7 Oct 2025 17:31:40 +0200 Subject: [PATCH 4/9] more ssh keys allowed --- system-modules/users.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system-modules/users.nix b/system-modules/users.nix index 146a946..b6c11c5 100644 --- a/system-modules/users.nix +++ b/system-modules/users.nix @@ -28,7 +28,9 @@ useDefaultShell = true; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID1RPCcS8DtIf75a2FEW4d8X6WTVeLlmretoLqppvZlJ" # From [A] GPG Sub Key - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5sYVtPLHXatTjrpol46xr9R4TidcB4t8axO6/ReNNR nx2@ssh.nx2.site" # NxXPS + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5sYVtPLHXatTjrpol46xr9R4TidcB4t8axO6/ReNNR nxxps-nx2@nxace" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/zcoYuYbamTPMOZPfsP1yQJ5Y6sDlPfBwui8MQjKWn nxnorth-nx2@nxace" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnbJx7nVeVi5jK1Eybm+jQoopiCTslewuHFLv2yCt4f nxdcs-nx2@nxace" ]; }; }; From 685a34fcbb90de10a8368d8d5f5af2f79636d70f Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 7 Oct 2025 16:35:06 +0000 Subject: [PATCH 5/9] NxWSL -> NxDCS --- flake.lock | 62 +++++++++++++++++------------------ flake.nix | 4 +-- home-modules/fish.nix | 2 +- home-modules/git.nix | 6 ++-- home-modules/xdg.nix | 38 ++++++++++----------- nixos-wsl.nix | 3 +- system-modules/networking.nix | 2 +- 7 files changed, 58 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 2a784f0..dc884a4 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759572648, - "narHash": "sha256-0f1EsUBA64FV14RuNLyo3XDLLgvY+l2X/Bro+T4+AdM=", + "lastModified": 1759705705, + "narHash": "sha256-ckBnfbxbT7VU7ay0c5jkstAZHrC4xDpEHgnQo99OdEw=", "owner": "9001", "repo": "copyparty", - "rev": "38cc80982237e862e538a31f49e8c6aae749f014", + "rev": "20ac117c3272da50ce125795d831ac55f29e766d", "type": "github" }, "original": { @@ -308,11 +308,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1759530922, - "narHash": "sha256-IKNfBuBbuofOVHJujnzBGaSydnmlMBRWl9owIZVVk9k=", + "lastModified": 1759837778, + "narHash": "sha256-K/F/ndJszKrbhhCcQEpLU3jrDSapQCprgNYJscHZYf0=", "ref": "refs/heads/main", - "rev": "76d998743ac10e712238c1016db4d8e8d16f1049", - "revCount": 6476, + "rev": "5ba2d2217b649c4ca2db7e3f383b3f6af6e70d65", + "revCount": 6484, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1758895089, - "narHash": "sha256-HOIITlSwB5iuVEVLmWNGu8bvI83Y2IbN8SzJQmBDwvg=", + "lastModified": 1759748449, + "narHash": "sha256-9I7KVSR7PsSaahM6CbxUyjXSRAY/4+29rFblZDqHPFE=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4d940a10aff16b240533c9b6527a14ff91e5e5ae", + "rev": "7be897d6ae765fab756c0b7e6b91e8c5b39a419e", "type": "github" }, "original": { @@ -576,11 +576,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1759348509, - "narHash": "sha256-at9xMhxMP65JYWlGWYJ412VKbS+tXkTM3f5t9Q8IyMA=", + "lastModified": 1759833546, + "narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "d96dda76c1f1827634ddf28d386feabd2d135d21", + "rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1759574388, - "narHash": "sha256-6Vv/JfG6A6YmlsKYqF88TrisrNWacTCUDX2Ibe8n4yw=", + "lastModified": 1759851983, + "narHash": "sha256-5tYg4TRly5I8LOagO5X0dArUOht023mevqr3qlVghb0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fd1eea9d3114de2acff9b10e67fd0007d2c833", + "rev": "7eb8a3cd795b18e7ac26c9cba411e1f588257a62", "type": "github" }, "original": { @@ -639,11 +639,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1759439645, - "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "type": "github" }, "original": { @@ -846,11 +846,11 @@ ] }, "locked": { - "lastModified": 1759188042, - "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", + "lastModified": 1759635238, + "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", + "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "type": "github" }, "original": { @@ -952,11 +952,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1759502148, - "narHash": "sha256-Yncc0FlzzvsZTAtId/usUKNdJR911mpQcR+ZNjabrio=", + "lastModified": 1759765472, + "narHash": "sha256-YYfXBsw57fH6s/hXR24rv8/nr35oQl1CBH7p4WcK8RA=", "owner": "sxyazi", "repo": "yazi", - "rev": "cd6881c9fe88dfe73d91980829fd371f5eeec242", + "rev": "554cb52cc581df9a41e0778ebd448925cd3aca55", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d5c9240..e04e435 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ NxXPS = make-nixos-system "NxXPS" { enable = true; prime = true; }; NxNORTH = make-nixos-system "NxNORTH" { enable = true; prime = false; }; NxACE = make-nixos-system "NxACE" { enable = false; }; - NxWSL = make-nixos-wsl-system "NxWSL"; + NxDCS = make-nixos-wsl-system "NxDCS"; }; homeConfigurations = let @@ -93,7 +93,7 @@ "${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; }; "${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; }; - "${hyper-base.user}@NxWSL" = make-shell-configuration "NxWSL" hyper-base.user; + "${hyper-base.user}@NxDCS" = make-shell-configuration "NxDCS" hyper-base.user; }; }; } diff --git a/home-modules/fish.nix b/home-modules/fish.nix index 6a4cfeb..422159e 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -112,7 +112,7 @@ ''; nx_backup = let destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/"; - in pkgs.lib.mkIf (hyper.host != "NxACE" && hyper.host != "NxWSL") '' + in pkgs.lib.mkIf (hyper.host != "NxACE" && hyper.host != "NxDCS") '' set RPATH (curl -s https://${hyper.domain}/latest-backup) rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination} ''; diff --git a/home-modules/git.nix b/home-modules/git.nix index 9f9b1c5..1e9d2d5 100644 --- a/home-modules/git.nix +++ b/home-modules/git.nix @@ -21,10 +21,10 @@ }; extraConfig = { credential = { - "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxWSL") "lkurzweg"; - "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxWSL") "Test"; + "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxDCS") "lkurzweg"; + "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxDCS") "Test"; }; - url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxWSL") "https://git.da.dicos.de/"; + url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxDCS") "https://git.da.dicos.de/"; url."ssh://git@github.com/".insteadOf = "https://github.com/"; pull.rebase = false; # true }; diff --git a/home-modules/xdg.nix b/home-modules/xdg.nix index 7286973..64ba151 100644 --- a/home-modules/xdg.nix +++ b/home-modules/xdg.nix @@ -8,25 +8,25 @@ mimeApps = { enable = true; defaultApplications = let - browser = "firefox.desktop"; - image = "imv.desktop"; - in { - "default-web-browser" = [ browser ]; - "text/html" = [ browser ]; - "text/htm" = [ browser ]; - "x-scheme-handler/http" = [ browser ]; - "x-scheme-handler/https" = [ browser ]; - "x-scheme-handler/about" = [ browser ]; - "x-scheme-handler/unknown" = [ browser ]; - "x-scheme-handler/mailto" = "thunderbird.desktop"; - "image/png" = image; - "image/jpg" = image; - "image/jpeg" = image; - "image/webp" = image; - "image/gif" = image; - "application/pdf" = "zathura.desktop"; - "inode/directory" = "thunar.desktop"; - }; + browser = "firefox.desktop"; + image = "imv.desktop"; + in { + "default-web-browser" = [ browser ]; + "text/html" = [ browser ]; + "text/htm" = [ browser ]; + "x-scheme-handler/http" = [ browser ]; + "x-scheme-handler/https" = [ browser ]; + "x-scheme-handler/about" = [ browser ]; + "x-scheme-handler/unknown" = [ browser ]; + "x-scheme-handler/mailto" = "thunderbird.desktop"; + "image/png" = image; + "image/jpg" = image; + "image/jpeg" = image; + "image/webp" = image; + "image/gif" = image; + "application/pdf" = "zathura.desktop"; + "inode/directory" = "thunar.desktop"; + }; }; }; } diff --git a/nixos-wsl.nix b/nixos-wsl.nix index a668140..c6a4ab6 100644 --- a/nixos-wsl.nix +++ b/nixos-wsl.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }@all: with all; -{ +{ pkgs, ... }@all: with all; { imports = [ inputs.nixos-wsl.nixosModules.default ./system-modules/base-packages.nix diff --git a/system-modules/networking.nix b/system-modules/networking.nix index 0b43ad8..c8afe68 100644 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }@all: with all; { networking = { - nameservers = pkgs.lib.mkIf (hyper.host != "NxWSL") [ # wsl manages resolv.conf + nameservers = pkgs.lib.mkIf (hyper.host != "NxDCS") [ # wsl manages resolv.conf "1.1.1.1" "8.8.8.8" ]; From 042e8c7ee7c09fda63e7687ffbf493f836bba79b Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 7 Oct 2025 16:35:42 +0000 Subject: [PATCH 6/9] further gpg-ssh edits --- home-modules/gpg.nix | 30 ++++++++++++++++++++++-------- home-modules/ssh.nix | 34 ++++++---------------------------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/home-modules/gpg.nix b/home-modules/gpg.nix index 127868f..11e62c9 100644 --- a/home-modules/gpg.nix +++ b/home-modules/gpg.nix @@ -1,11 +1,5 @@ -{ pkgs, ... }@all: with all; -{ - # there also is a system module - home.packages = with pkgs; [ - gpg-tui - pinentry-all - ]; - +{ pkgs, ... }@all: with all; { + home.packages = with pkgs; [ pinentry-all ]; programs.gpg = { enable = true; package = pkgs.gnupg; @@ -33,4 +27,24 @@ with-fingerprint = true; }; }; + services.gpg-agent = let + min2sec = min: (min * 60); + in { + enable = false; + verbose = true; + sshKeys = [ + "97081264F7FD72D890D496E839AA9A4C7892A7D8" # Keygrip (not Fingerprint!) of [A] Subkey + ]; + enableSshSupport = true; + enableFishIntegration = true; + defaultCacheTtlSsh = min2sec 60; + defaultCacheTtl = min2sec 30; + pinentry = { + package = pkgs.pinentry; + program = "pinentry"; + }; + extraConfig = '' + allow-loopback-pinentry + ''; + }; } diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix index 9d53f31..6568481 100644 --- a/home-modules/ssh.nix +++ b/home-modules/ssh.nix @@ -1,7 +1,9 @@ { pkgs, ... }@all: with all; { + home.packages = with pkgs; [ sshfs ]; programs.ssh = { enable = true; package = pkgs.openssh; + addKeysToAgent = "yes"; matchBlocks = let nxace = name: { host = name; @@ -21,33 +23,9 @@ }; }; }; - home.packages = with pkgs; [ sshfs ]; - - services = { - ssh-agent = { - enable = true; - # socket = "ssh-agent"; # suffix to $XDG_RUNTIME_DIR - # package = pkgs.openssh; - }; - gpg-agent = let - min2sec = min: (min * 60); - in { - enable = false; - verbose = true; - sshKeys = [ - "97081264F7FD72D890D496E839AA9A4C7892A7D8" # Keygrip (not Fingerprint!) of [A] Subkey - ]; - enableSshSupport = true; - enableFishIntegration = true; - defaultCacheTtlSsh = min2sec 60; - defaultCacheTtl = min2sec 30; - pinentry = { - package = pkgs.pinentry; - program = "pinentry"; - }; - extraConfig = '' - allow-loopback-pinentry - ''; - }; + services.ssh-agent = { + enable = true; + # socket = "ssh-agent"; # suffix to $XDG_RUNTIME_DIR + # package = pkgs.openssh; }; } From 40eefbf9480109f75599b7f5bbff8ac92c63161a Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 9 Oct 2025 15:32:10 +0200 Subject: [PATCH 7/9] fix nxfetch --- home-modules/fish.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/home-modules/fish.nix b/home-modules/fish.nix index 422159e..8d9602b 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -7,20 +7,22 @@ (writeShellScriptBin "nxfetch" /* bash */ '' logo=$(echo -e " - ⠀⠀⠀⠀⠰⣿⣧⠀⠀⠹⣿⣧⠀⣴⣿⠆⠀⠀⠀⠀ OS - ⠀⠀⠀⣀⣀⣹⣿⣧⣀⣀⠘⣿⣿⣿⠏⠀⠀⠀⠀⠀ DE/WM - ⠀⠀⠼⠿⠿⠿⠿⠿⠿⠿⠦⠘⣿⣿⡀⠀⣼⣧⠀⠀ TERM - ⠀⠀⠀⠀⢠⣶⡶⠀⠀⠀⠀⠀⠈⠿⢁⣼⣿⠋⠀⠀ SHELL - ⢾⣿⣿⣿⣿⡿⠁⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⡷ ISHELL - ⠀⠀⣠⣿⡟⢁⣶⡀⠀⠀⠀⠀⠀⠾⠿⠃⠀⠀⠀⠀ KERNEL - ⠀⠀⢻⡟⠀⠈⢿⣿⡄⠲⣶⣶⣶⣶⣶⣶⣶⡖⠀⠀ EDITOR - ⠀⠀⠀⠀⠀⣰⣿⣿⣿⡄⠉⠉⢻⣿⣏⠉⠉⠀⠀⠀ TFM - ⠀⠀⠀⠀⠰⣿⠟⠀⢻⣿⣆⠀⠀⠻⣿⠆⠀⠀⠀⠀ PROMPT + ⠀⠀⠀⠀⠰⣿⣧⠀⠀⠹⣿⣧⠀⣴⣿⠆⠀⠀⠀⠀ OS + ⠀⠀⠀⣀⣀⣹⣿⣧⣀⣀⠘⣿⣿⣿⠏⠀⠀⠀⠀⠀ DE/WM + ⠀⠀⠼⠿⠿⠿⠿⠿⠿⠿⠦⠘⣿⣿⡀⠀⣼⣧⠀⠀ TERM + ⠀⠀⠀⠀⢠⣶⡶⠀⠀⠀⠀⠀⠈⠿⢁⣼⣿⠋⠀⠀ SHELL + ⢾⣿⣿⣿⣿⡿⠁⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⡷ ISHELL + ⠀⠀⣠⣿⡟⢁⣶⡀⠀⠀⠀⠀⠀⠾⠿⠃⠀⠀⠀⠀ KERNEL + ⠀⠀⢻⡟⠀⠈⢿⣿⡄⠲⣶⣶⣶⣶⣶⣶⣶⡖⠀⠀ EDITOR + ⠀⠀⠀⠀⠀⣰⣿⣿⣿⡄⠉⠉⢻⣿⣏⠉⠉⠀⠀⠀ TFM + ⠀⠀⠀⠀⠰⣿⠟⠀⢻⣿⣆⠀⠀⠻⣿⠆⠀⠀⠀⠀ PROMPT " | lolcat --force 2> /dev/null) + release_line=$(cat /etc/*-release 2> /dev/null || echo 'PRETTY_NAME="[No Release]"') + msg=" - $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-releas 2> /dev/null || echo 'PRETTY_NAME="[No Release]"' | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) + $(echo -e "$logo" | sed -n 3p): $(echo "$release_line" | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^} $(echo -e "$logo" | sed -n 5p): ''${TERM^} $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g') From 90c093fcef5a4c1676916b6f98aedd687fe5e45e Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 13 Oct 2025 14:30:34 +0200 Subject: [PATCH 8/9] reddit rice --- home-modules/firefox/userContent.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/home-modules/firefox/userContent.nix b/home-modules/firefox/userContent.nix index b7c8d50..4fa10d9 100644 --- a/home-modules/firefox/userContent.nix +++ b/home-modules/firefox/userContent.nix @@ -33,12 +33,16 @@ in /* css */ '' @-moz-document domain(reddit.com) { header { - background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}) !important; + background-color: rgba(${f background},${builtins.toString rice.transparency}) !important; backdrop-filter: blur(${blur}px); } - body, html, .bg-neutral-background, .threadline, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar, comment-body-header, shreddit-comment-tree{ + body, html, .bg-neutral-background, .threadline, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar, comment-body-header, shreddit-comment-tree, #flex-left-nav-container { background-color: transparent !important; } + #main-content { + background-color: rgba(${f background},0.5)!important; + } + } @-moz-document domain(reddit.com) { From 78975da97023ddc22d37724a0ef5e51987a7086b Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 13 Oct 2025 14:38:06 +0200 Subject: [PATCH 9/9] ssh * identities --- home-modules/ssh.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix index 6568481..87b4d1d 100644 --- a/home-modules/ssh.nix +++ b/home-modules/ssh.nix @@ -13,6 +13,12 @@ identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}"; }; in { + "*" = { + identityFile = [ + "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}" + "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" + ]; + }; "nxace" = nxace "nxace"; "nxacel" = (nxace "nxacel") // { hostname = "10.0.1.1"; }; "nxrpli" = (nxace "nxrpil") // { hostname = "10.0.1.31"; port = 22; };