Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles into nod

nod
cursor
2025-11-11 00:44:25 +01:00 · 2025-11-11 00:43:22 +01:00 · 2025-11-06 19:31:43 +01:00 · 2025-11-02 20:58:02 +01:00 · 2025-11-02 20:57:51 +01:00 · 2025-10-30 09:28:31 +01:00
45 changed files with 691 additions and 433 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -3,6 +3,8 @@ keys:
    - &nx2 22FB2CC03DC5292AB81CF67D0AF27B383170E634
    - &nx2_key_13 age1x2lpsennl74n0f5jl60uv2ffjcuqymzf9ap3frlz2quyv0x3hq3scnewwq
    - &xps-home age1pn4utvwpqdrswn0xurfdexn5nks9cd06jxzwg3m3m6za25ap4vxqxd0p3k
+    - &ace-home age1ur5zpr325cv7w0yn49azz9f48xsxd73w2sytt22yrnw5qs9r34nsv3vl05
+    - &north-home age1jr72q042ccgxpdgdaaev0arzc0vh3r02etv2tzhhsejl0mfaxs3q9hhlaz
  - &hosts:
    - &north age1vkqn2nars5qmpr35tac0x9vshphrq6nnzjfyxwusgn27kt3zualssv0u8e
    - &xps age1jvf2lyrt2dw9jfnwgvnhmj9fmvyq8vvtepqjpkyycc5dqkkd4edqhxsgv6
@@ -16,5 +18,7 @@ creation_rules:
      - *ace
      - *nx2_key_13
      - *xps-home
+      - *ace-home
+      - *north-home
      pgp:
      - *nx2
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,7 +32,6 @@
    ./system-modules/sops.nix
    ./system-modules/sound.nix
    ./system-modules/sshd.nix
-    ./system-modules/base-packages.nix
    ./system-modules/input.nix
    ./system-modules/syncthing.nix
    ./system-modules/tuda.nix
@@ -61,6 +60,8 @@
    ./system-modules/calendar/dicos.nix
  ] else [
  ]);
+  environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
+
  systemd.extraConfig = "DefaultLimitNOFILE=2048";
  system.stateVersion = hyper.pkgs-version;
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
--- a/flake-modules/allowed.nix
+++ b/flake-modules/allowed.nix
@@ -1,6 +1,7 @@

 {
  unfree = [
+    "cursor"
    "discord"
    "spotify"
    "obsidian"
--- a/flake-modules/colors.json
+++ b/flake-modules/colors.json
@@ -1,13 +1,13 @@
 {
    "base": {
-        "foreground": "#fee5cc",
-        "background": "#190c00"
+        "foreground": "#eddbef",
+        "background": "#100711"
    },
    "to_alter": {
-        "accent": "#fc9835",
-        "secondary": "#fc3535",
-        "tertiary": "#e64b73",
-        "special": "#3499fc",
-        "weird": "#56fc34"
+        "accent": "#ba71c0",
+        "secondary": "#3266ff",
+        "tertiary": "#4bb6e6",
+        "special": "#76c071",
+        "weird": "#c08571"
    }
 }
--- a/flake-modules/rice.nix
+++ b/flake-modules/rice.nix
@@ -55,9 +55,10 @@ pkgs: rec {
    };
  in ccolor // fcolor // xcolor; 
  font = {
-    code = {
+    code = rec {
      name = "JetBrainsMono Nerd Font";
      package = pkgs.nerd-fonts.jetbrains-mono;
+      regular-path = "${package}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFont-Regular.ttf";
    };
    base = {
      # name = "NewComputerModern08";
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759499898,
-        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
+        "lastModified": 1760101617,
+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
        "type": "github"
      },
      "original": {
@@ -39,11 +39,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1759572648,
-        "narHash": "sha256-0f1EsUBA64FV14RuNLyo3XDLLgvY+l2X/Bro+T4+AdM=",
+        "lastModified": 1761517857,
+        "narHash": "sha256-1xYv73nGA+Lm/hKRqjiUyuBzabaRwmeDxBCIMve5CWU=",
        "owner": "9001",
        "repo": "copyparty",
-        "rev": "38cc80982237e862e538a31f49e8c6aae749f014",
+        "rev": "e9ab040ce8e72e299a3d8fbd109865b1e218eb57",
        "type": "github"
      },
      "original": {
@@ -153,7 +153,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -234,6 +234,27 @@
        "type": "github"
      }
    },
+    "home-manager24": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs24"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
    "hyprcursor": {
      "inputs": {
        "hyprlang": [
@@ -279,11 +300,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759490292,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "lastModified": 1760445448,
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
        "type": "github"
      },
      "original": {
@@ -308,11 +329,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1759530922,
-        "narHash": "sha256-IKNfBuBbuofOVHJujnzBGaSydnmlMBRWl9owIZVVk9k=",
+        "lastModified": 1761249114,
+        "narHash": "sha256-KDy8Vtlwe+7Z053HtD4fCRqlHBt0Kils0Zea4D77R7o=",
        "ref": "refs/heads/main",
-        "rev": "76d998743ac10e712238c1016db4d8e8d16f1049",
-        "revCount": 6476,
+        "rev": "aa5a239ac92a6bd6947cce2ca3911606df392cb6",
+        "revCount": 6522,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -340,11 +361,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758895089,
-        "narHash": "sha256-HOIITlSwB5iuVEVLmWNGu8bvI83Y2IbN8SzJQmBDwvg=",
+        "lastModified": 1761653710,
+        "narHash": "sha256-MhHSU9m/9HSckJ61OXcom/6F92NQf3s1QfLbRUApalc=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "4d940a10aff16b240533c9b6527a14ff91e5e5ae",
+        "rev": "e689220b1740aa99ca67fa06055792f82fa9ed85",
        "type": "github"
      },
      "original": {
@@ -365,11 +386,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749046714,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "lastModified": 1759610243,
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
        "type": "github"
      },
      "original": {
@@ -475,27 +496,6 @@
        "type": "github"
      }
    },
-    "hyprspace": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ],
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1759033501,
-        "narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=",
-        "owner": "KZDKM",
-        "repo": "Hyprspace",
-        "rev": "e54884da1d6a1af76af9d053887bf3750dd554fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "KZDKM",
-        "repo": "Hyprspace",
-        "type": "github"
-      }
-    },
    "hyprutils": {
      "inputs": {
        "nixpkgs": [
@@ -508,11 +508,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759490926,
-        "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=",
+        "lastModified": 1759619523,
+        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3",
+        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
        "type": "github"
      },
      "original": {
@@ -570,17 +570,68 @@
        "type": "github"
      }
    },
+    "nix-formatter-pack": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1705252799,
+        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "type": "github"
+      }
+    },
+    "nix-on-droid": {
+      "inputs": {
+        "home-manager": [
+          "home-manager24"
+        ],
+        "nix-formatter-pack": "nix-formatter-pack",
+        "nixpkgs": [
+          "nixpkgs24"
+        ],
+        "nixpkgs-docs": "nixpkgs-docs",
+        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
+        "nmd": "nmd_2"
+      },
+      "locked": {
+        "lastModified": 1720396533,
+        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
+        "owner": "nix-community",
+        "repo": "nix-on-droid",
+        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
    "nixos-wsl": {
      "inputs": {
        "flake-compat": "flake-compat_3",
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1759348509,
-        "narHash": "sha256-at9xMhxMP65JYWlGWYJ412VKbS+tXkTM3f5t9Q8IyMA=",
+        "lastModified": 1761563673,
+        "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "d96dda76c1f1827634ddf28d386feabd2d135d21",
+        "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
        "type": "github"
      },
      "original": {
@@ -605,13 +656,45 @@
        "type": "indirect"
      }
    },
+    "nixpkgs-docs": {
+      "locked": {
+        "lastModified": 1705957679,
+        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-for-bootstrap": {
+      "locked": {
+        "lastModified": 1720244366,
+        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      }
+    },
    "nixpkgs-latest": {
      "locked": {
-        "lastModified": 1759574388,
-        "narHash": "sha256-6Vv/JfG6A6YmlsKYqF88TrisrNWacTCUDX2Ibe8n4yw=",
+        "lastModified": 1761810199,
+        "narHash": "sha256-iMLB/90mK7lncjk3GVYlAmN1K+D6/7JVhOSau3O7eK0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "32fd1eea9d3114de2acff9b10e67fd0007d2c833",
+        "rev": "d03f6e8ae73c291f8088abf52ae378c448a2cce3",
        "type": "github"
      },
      "original": {
@@ -639,11 +722,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1761672384,
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
        "type": "github"
      },
      "original": {
@@ -652,13 +735,29 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs24": {
      "locked": {
-        "lastModified": 1759381078,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1761114652,
+        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
        "type": "github"
      },
      "original": {
@@ -686,11 +785,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1759036355,
-        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
        "type": "github"
      },
      "original": {
@@ -702,11 +801,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1759439645,
-        "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=",
+        "lastModified": 1761468971,
+        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633",
+        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
        "type": "github"
      },
      "original": {
@@ -731,6 +830,60 @@
        "type": "github"
      }
    },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmd_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs-docs"
+        ],
+        "scss-reset": "scss-reset"
+      },
+      "locked": {
+        "lastModified": 1705050560,
+        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
    "pre-commit-hooks": {
      "inputs": {
        "flake-compat": "flake-compat",
@@ -741,11 +894,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758108966,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "lastModified": 1760663237,
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
        "type": "github"
      },
      "original": {
@@ -785,14 +938,16 @@
      "inputs": {
        "copyparty": "copyparty",
        "home-manager": "home-manager",
+        "home-manager24": "home-manager24",
        "hyprland": "hyprland",
        "hyprland-plugins": "hyprland-plugins",
-        "hyprspace": "hyprspace",
        "lanzaboote": "lanzaboote",
+        "nix-on-droid": "nix-on-droid",
        "nixos-wsl": "nixos-wsl",
        "nixpkgs": "nixpkgs_5",
        "nixpkgs-latest": "nixpkgs-latest",
        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs24": "nixpkgs24",
        "sops-nix": "sops-nix",
        "yazi": "yazi"
      }
@@ -839,6 +994,22 @@
        "type": "github"
      }
    },
+    "scss-reset": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631450058,
+        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
+        "type": "github"
+      },
+      "original": {
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "type": "github"
+      }
+    },
    "sops-nix": {
      "inputs": {
        "nixpkgs": [
@@ -846,11 +1017,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759188042,
-        "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=",
+        "lastModified": 1760998189,
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
        "type": "github"
      },
      "original": {
@@ -875,21 +1046,6 @@
      }
    },
    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -932,11 +1088,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755354946,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "lastModified": 1760713634,
+        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
        "type": "github"
      },
      "original": {
@@ -952,11 +1108,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1759502148,
-        "narHash": "sha256-Yncc0FlzzvsZTAtId/usUKNdJR911mpQcR+ZNjabrio=",
+        "lastModified": 1761655046,
+        "narHash": "sha256-lG7eQqs8HDmmOl6vFkJ1iDlQBR+jY30uD4YtvWulCZc=",
        "owner": "sxyazi",
        "repo": "yazi",
-        "rev": "cd6881c9fe88dfe73d91980829fd371f5eeec242",
+        "rev": "564b8851961a7545a93ebf04c0f8dd5778d0eccb",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -2,23 +2,44 @@
  description = "Multisystem NixOS Flake of Lennart J. Kurzweg";

  inputs = {
-    nixpkgs =          { url = "nixpkgs/nixos-25.05";                                                                   };
-    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                };
-    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                       };
+    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-latest.url = "github:nixos/nixpkgs?ref=master";
+    nixpkgs24.url = "github:NixOS/nixpkgs/nixos-24.05";

-    home-manager =     { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs";   };
+    home-manager = {
+      url = "github:nix-community/home-manager/release-25.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    home-manager24 ={
+      url = "github:nix-community/home-manager/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs24";
+    };

-    nixos-wsl =        { url = "github:nix-community/NixOS-WSL/main";                                                   };
+    nix-on-droid = {
+      url = "github:nix-community/nix-on-droid/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs24";
+      inputs.home-manager.follows = "home-manager24";
+    };

-    sops-nix =         { url = "github:Mic92/sops-nix";                           inputs.nixpkgs.follows = "nixpkgs";   };
-    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.4.2";                                                };
+    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";

-    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                   };
-    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                  inputs.hyprland.follows = "hyprland"; };
-    hyprspace =        { url = "github:KZDKM/Hyprspace";                          inputs.hyprland.follows = "hyprland"; };
+    sops-nix ={
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

-    yazi =             { url = "github:sxyazi/yazi";                                                                    };
-    copyparty =        { url = "github:9001/copyparty";                                                                 };
+    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
+
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+
+    yazi.url = "github:sxyazi/yazi";
+
+    copyparty.url = "github:9001/copyparty";
  };

  outputs = { ... }@inputs: with inputs; let
@@ -28,20 +49,19 @@
    config = { allowUnfreePredicate = pkg: builtins.elem (simple-pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };

    hyper-base = rec {
-      inherit system;
+      system  = "x86_64-linux";
      user    = "nx2";
      domain  = "nx2.site";
      home    = "/home/${user}";
      webroot = "/var/lib/hugo/nx2site/public";
-      pkgs-version = "25.05";
    };

-    my-pkgs = host: import nixpkgs {
+    get-pkgs = { host, system?system, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs {
      inherit system config;
      overlays = [(final: prev: {
        unstable = import nixpkgs-unstable { inherit system config; };
        latest   = import nixpkgs-latest   { inherit system config; };
-        version  = "25.05";
+        inherit version;
      })] ++ (if host == "NxACE" then [
        copyparty.overlays.default
      ] else []);
@@ -53,36 +73,58 @@
  in {
    nixosConfigurations = let
      make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { 
-        pkgs = my-pkgs host;
+        pkgs = get-pkgs { inherit host; };
        modules = [ ./configuration.nix ];
        specialArgs = let
          hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
        in { inherit inputs hyper rice secrets; };
      };
      make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { 
-        pkgs = my-pkgs host;
-        modules = [ ./nixos-wsl.nix ];
+        pkgs = get-pkgs { inherit host; };
+        modules = [ ./wsl.nix ];
        specialArgs = let
          hyper = hyper-base // { inherit host; };
+          rice = import ./flake-modules/rice.nix pkgs;
        in { inherit inputs hyper rice; };
      };
    in {
      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";
    };

+    nixOnDroidConfigurations = let
+      makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec {
+        pkgs = let
+          options = { inherit host; system = "aarch64-linux"; };
+        in (get-pkgs options) //
+          (get-pkgs (options // { version = "24.05"; nixpkgs = nixpkgs24; } )
+        );
+        modules = [ ./nod.nix ];
+        home-manager-path = home-manager24.outPath;
+        extraSpecialArgs = let
+          hyper = hyper-base // { 
+            inherit host;
+            system = "aarch64-linux";
+            user = "nix-on-droid";
+            home = "/data/data/com.termux.nix/files/home";
+          };
+          rice = import ./flake-modules/rice.nix pkgs;
+        in { inherit inputs hyper rice; };
+      };
+    in { NxS23U = makeNODConfiguration "NxS23U"; };
+
    homeConfigurations = let 
      make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
-        pkgs = my-pkgs host;
+        pkgs = get-pkgs { inherit host; };
        modules = [ ./home.nix ];
        extraSpecialArgs = let
          hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
        in { inherit inputs hyper rice secrets; };
      };
      make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
-        pkgs = my-pkgs host;
+        pkgs = get-pkgs { inherit host; };
        modules = [ ./shell-only.nix ];
        extraSpecialArgs = let
          hyper = hyper-base // { inherit host; };
@@ -93,7 +135,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;
    };
  };
 }
--- a/home-modules/bar/caldav-event.nix
+++ b/home-modules/bar/caldav-event.nix
@@ -120,7 +120,7 @@ if __name__ == "__main__":
    else:
        time_string = "in " + hour_string + "and " + minu_string

-    print(f"{event_dict['event_name']} {action_string} {time_string}")
+    print(f"\'{event_dict['event_name']}\' {action_string} {time_string}")
 '')
  ];
 }
--- a/home-modules/bar/hyprpanel.nix
+++ b/home-modules/bar/hyprpanel.nix
@@ -425,8 +425,8 @@
      "theme.bar.menus.menu.notifications.label" = accent.base;
      "theme.bar.menus.menu.notifications.no_notifications_label" = accent.base;
      "theme.bar.menus.menu.notifications.pager.background" = background;
-      "theme.bar.menus.menu.notifications.pager.button" = accent.dark;
-      "theme.bar.menus.menu.notifications.pager.label" = accent.base;
+      "theme.bar.menus.menu.notifications.pager.button" = accent.base;
+      "theme.bar.menus.menu.notifications.pager.label" = accent.bright;
      "theme.bar.menus.menu.notifications.scrollbar.color" = accent.base;
      "theme.bar.menus.menu.notifications.switch.disabled" = accent.base;
      "theme.bar.menus.menu.notifications.switch_divider" = accent.base;
@@ -492,12 +492,12 @@
      "theme.notification.actions.background" = background;
      "theme.notification.actions.text" = foreground;
      "theme.notification.background" = background;
-      "theme.notification.border" = accent.base;
+      "theme.notification.border" = border;
      "theme.notification.close_button.background" = accent.dark;
      "theme.notification.close_button.label" = accent.base;
-      "theme.notification.label" = accent.base;
+      "theme.notification.label" = accent.bright;
      "theme.notification.labelicon" = accent.base;
-      "theme.notification.opacity" = 1.0;
+      "theme.notification.opacity" = 100;
      "theme.notification.text" = foreground;
      "theme.notification.time" = accent.base;

--- a/home-modules/bash.nix
+++ b/home-modules/bash.nix
@@ -1,6 +1,10 @@
-{ ... }: 
+{ pkgs, ... }: 
 {
-  programs.bash = {
+  programs.bash = let
+    init = /* bash */ ''
+      source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+    '';
+  in {
    enable = true;
    shellAliases = {
      ll = "ls -l"; 
@@ -15,5 +19,10 @@
      "checkjobs"
    ];
    enableCompletion = false;
+    
+  } //  pkgs.lib.mkIf (pkgs.version != "24.05") {
+    shellInit = init;
+  } //  pkgs.lib.mkIf (pkgs.version != "25.05") {
+    profileExtra = init; 
  };
 }
--- a/home-modules/calendar.nix
+++ b/home-modules/calendar.nix
@@ -47,6 +47,13 @@
      read-only = true;
      type = "ics";
    }
+    {
+      name = "Worlds";
+      url = "https://zlypher.github.io/lol-events/cal/league-of-legends-world-championship.ical";
+      color = "#A4C3DE";
+      read-only = true;
+      type = "ics";
+    }
    {
      name = "Feiertage Hessen";
      url = "https://ics.tools/Feiertage/hessen.ics";
@@ -54,13 +61,6 @@
      read-only = true;
      type = "ics";
    }
-    # {
-    #   name = "Handball Männer";
-    #   url = "http://i.cal.to/ical/108/dhb/handball-nationalmannschaft/c687e97f.bc7c3eb6-11a0e356.ics";
-    #   color = "#880023";
-    #   read-only = true;
-    #   type = "ics";
-    # }
  ];
  default_set = {
    # name = 
--- a/home-modules/color-pallete.nix
+++ b/home-modules/color-pallete.nix
@@ -25,6 +25,8 @@
        </div>
      </div>
    '';
+    rgb = rice.lib.hex-to-rgb-comma-string;
+    s = builtins.toString;
  in /* html */ ''
    <!DOCTYPE html>
    <head>
@@ -38,27 +40,26 @@
          padding: 0px;
        }
        html {
-          background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency});
-          padding: auto;
+          background: transparent;
        }
        body {
          font-family: ${rice.font.base.name};
          color: ${foreground};
          width: fit-content;
          margin: 10px auto 10px auto;
-          background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency});
-          border: ${builtins.toString rice.border-width}px solid ${border}; 
-          border-radius: ${builtins.toString rice.rounding}px;
-          padding: ${builtins.toString rice.gap-size}px;
+          background: rgba(${rgb background},${s rice.transparency});
+          border: ${s rice.border-width}px solid ${border}; 
+          border-radius: ${s rice.rounding}px;
+          padding: ${s rice.gap-size}px;
        }
        h1 {
-          margin: ${builtins.toString rice.gap-size}px;
+          margin: ${s rice.gap-size}px;
        }
        .color-container {
          font-family: ${rice.font.code.name};
          display: flex;
-          gap: ${builtins.toString rice.gap-size}px;
-          margin: ${builtins.toString rice.gap-size}px;
+          gap: ${s rice.gap-size}px;
+          margin: ${s rice.gap-size}px;
        }
        .color-box {
          width: 200px;
@@ -66,7 +67,7 @@
          flex-direction: column;
          justify-content: center;
          align-items: center;
-          border-radius: ${builtins.toString rice.rounding}px;
+          border-radius: ${s rice.rounding}px;
        }
      </style>
    </head>
--- 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) {
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
-    fish
    any-nix-shell

    (writeShellScriptBin "nxfetch" /* bash */ ''
@@ -19,8 +18,10 @@

      " | 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')
@@ -38,6 +39,7 @@

  programs.fish = {
    enable = true;
+    package = pkgs.fish;
    shellAliases = let
      base-eza = "eza --icons --git --smart-group --group-directories-first";
    in {
@@ -85,6 +87,7 @@
      d = "docker";
      dcmp = "docker compose";
      stui = "sudo systemctl-tui";
+      wlc = "wl-copy";
      # nxsent = ''sent -c \${rice.color.foreground} -b \${rice.color.background}'';

      # ya = "yazi"; # function
@@ -112,7 +115,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 == "NxXPS" || hyper.host == "NxNORTH") ''
        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}
      '';
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -3,7 +3,7 @@ lib.mkIf (hyper.host == "NxNORTH")
 {
  home = {
    packages = (with pkgs.unstable; [
-      protonup
+      protonup-ng
      mangohud

      prismlauncher
--- 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
    };
--- a/home-modules/gpg.nix
+++ b/home-modules/gpg.nix
@@ -1,15 +1,9 @@
-{ 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;
-    homedir = if hyper.host == "NxXPS" then "${hyper.home}/vault/gnupg" else "${hyper.home}/.gnupg";
+    homedir = "${hyper.home}/vault/gnupg";
    settings = {
      armor = true;
      cert-digest-algo = "SHA512";
@@ -33,4 +27,20 @@
      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;
+    extraConfig = ''
+      allow-loopback-pinentry
+    '';
+  };
 }
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
  home = {
    packages = with pkgs; [
      # nixfmt-classic # nix formater
@@ -205,18 +204,18 @@
      language = [
        {
          name = "nix";
-          language-servers = [
-            "nixd"
-            # "llm"
-          ]; 
+          language-servers = [ "nixd" ]; 
        }
        {
          name = "latex";
          language-servers = [ "texlab" "language-tool" ]; 
        }
+        {
+          name = "typst";
+          language-servers = [ "language-tool" "tinymist" ]; 
+        }
        {
          name = "markdown";
-          # language-servers = [ "marksman" "style-check" "language-tool" ];
          language-servers = [ "language-tool" "marksman" ];
          file-types = [ "md" "MD" ];
          scope = "text.<name>";
@@ -436,8 +435,8 @@
          fg = black.bright;
        };
        "ui.virtual.inlay-hint" = {
-          fg = background;
-          bg = tertiary.dark;
+          fg = subtle.base;
+          bg = subtle.dark;
        };
        "ui.virtual.ruler" = {
          bg = background;
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -41,7 +41,7 @@ in {
      # inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
      # inputs.hyprfocus.packages.${pkgs.system}.hyprfocus
      # inputs.hycov.packages.${pkgs.system}.hycov
-      pkgs.hyprlandPlugins.hyprspace
+      # pkgs.hyprlandPlugins.hyprspace
      # inputs.hyprspace.packages.${pkgs.system}.Hyprspace
    ];

@@ -224,7 +224,7 @@ in {
      ];

      windowrulev2 = [
-        "bordercolor rgba(${rice.lib.nohash rice.color.magenta.bright}ff), pinned:1"
+        "bordercolor rgba(${rice.lib.nohash rice.color.special.bright}ff), pinned:1"

        "bordersize 0, floating:0, onworkspace:w[tv1]"
        "rounding 0, floating:0, onworkspace:w[tv1]"
@@ -263,7 +263,6 @@ in {
        # "opacity ${transparency}, class:^(obsidian)$"
        "opacity ${transparency}, class:^(VSCodium)$"
        "opacity ${transparency}, title:^(wlogout)$"
-
        "opaque, title:^(GNU Image Manipulation Program)$"
        "opaque, fullscreen:1"
        
@@ -277,6 +276,7 @@ in {
        "dimaround, title:^(terminal-file-picker)$"
        "center, title:^(terminal-file-picker)$"
        "size 80% 80%, title:^(terminal-file-picker)$"
+        "size: 30% 30%, initialTitle:^(Select Calendar)$"
      ];


@@ -372,7 +372,7 @@ in {
        "SUPER,       I, exec, ${terminal-exec}'hx ~/nix-dots/ && fish'"
        "SUPER SHIFT, I, exec, ${terminal-exec}'nh home switch || read'"
        "SUPER CTRL,  I, exec, ${terminal-exec}'nh os switch || read'"
-        "SUPER,       O, exec, obsidian "
+        # "SUPER,       O, exec, obsidian "
        "SUPER,       P, pin "
        # "SUPER,       Ü,"
        # "SUPER,       +,"
@@ -408,7 +408,7 @@ in {
        "SUPER,       C, exec, chatterino"
        "SUPER SHIFT, C, exec, hyprpicker -n -a"
        "SUPER,       V, togglefloating, "
-        "SUPER,       B, exec, bitwarden"
+        # "SUPER,       B, exec, bitwarden"
        "SUPER,       N, togglesplit"
        # "SUPER,       M, exec, /home/nx2/scripts/meme-full-screen/meme-full-screen.sh "
        # "SUPER,       comma, exec, /home/nx2/scripts/change-language.sh"
--- a/home-modules/mako.nix
+++ b/home-modules/mako.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, ... }@all: with all;
-{
+{ config, pkgs, ... }@all: with all; {
  home.packages = with pkgs; [ libnotify ];
  services.mako = with rice; {
    enable = if config.programs.hyprpanel.enable then false else true;
--- 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 = {
--- a/home-modules/pkgs-list/desktop.nix
+++ b/home-modules/pkgs-list/desktop.nix
@@ -13,5 +13,6 @@
    wev
    wl-clipboard
    xclip
+    wlr-randr
  ];
 }
--- a/home-modules/pkgs-list/programs.nix
+++ b/home-modules/pkgs-list/programs.nix
@@ -11,8 +11,10 @@
    xfce.thunar
  ] ++ (if (hyper.host != "NxACE") then [
    signal-desktop
+    unstable.code-cursor-fhs
    obsidian
    zoom-us
    inkscape
+    audacity
  ] else []);
 }
--- a/home-modules/pkgs-list/shell.nix
+++ b/home-modules/pkgs-list/shell.nix
@@ -2,6 +2,7 @@
  home.packages = with pkgs; [
    bat
    cmake
+    cmatrix
    dig
    du-dust
    dysk
@@ -33,6 +34,7 @@
    systemctl-tui
    tldr
    w3m
+    which
    yt-dlp
  ];
 }
--- a/home-modules/programming.nix
+++ b/home-modules/programming.nix
@@ -0,0 +1,12 @@
+{ ... }: {
+	imports = [
+	  ./programming/c.nix
+	  ./programming/gleam.nix
+	  ./programming/glsl.nix
+	  ./programming/go.nix
+	  ./programming/java.nix
+	  ./programming/js.nix
+	  ./programming/python.nix
+	  ./programming/rust.nix
+	];
+}
--- a/home-modules/programming/go.nix
+++ b/home-modules/programming/go.nix
@@ -1,8 +1,7 @@
-{ pkgs, ... }@all: with all;
-{
-  home = {
-    packages = with pkgs; [
-      go
-    ];
+{ pkgs, ... }@all: with all; {
+  programs.go = {
+    enable = true;
+    package = pkgs.go;
+    goPath = "${config.xdg.dataHome}/go";
  };
 }
--- a/home-modules/programming/rust.nix
+++ b/home-modules/programming/rust.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }@all: with all; {
+  home = {
+    packages = with pkgs; [
+      cargo
+      clippy
+      rustc
+      rustfmt
+      rust-analyzer
+    ];
+  };
+}
--- a/home-modules/sops.nix
+++ b/home-modules/sops.nix
@@ -1,18 +1,7 @@
 { pkgs, ... }@all: with all; {
  imports = [ inputs.sops-nix.homeManagerModules.sops ];
  sops = {
-    age.keyFile = if (hyper.host == "NxXPS") then
-      "${hyper.home}/vault/age/sops-xps-home.key"
-    else if (hyper.host == "NxACE") then
-      "${hyper.home}/.age_nx2_key_13.txt"
-    else if (hyper.host == "NxNORTH") then
-      "${hyper.home}/.age_nx2_key_13.txt"
-    else "unkown host in sops.nix";
+    age.keyFile = "${hyper.home}/vault/age/sopsnix-${hyper.host}-home.key";
    defaultSopsFile = ../sops-secrets.yaml;
-    secrets = {
-      "example" = {
-        path = "%r/secrets/example"; 
-      };
-    };
  };
 }
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -1,47 +1,37 @@
 { pkgs, ... }@all: with all; {
+  home.packages = with pkgs; [ sshfs ];
  programs.ssh = {
    enable = true;
    package = pkgs.openssh;
+    addKeysToAgent = "yes";
    matchBlocks = let
      nxace = name: {
        host = name;
        hostname = "ssh.${hyper.domain}";
-        user = hyper.user;
-        port = secrets.ssh.port;
+        user = "nx2";
+        port = 50022;
        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}"
+        "${hyper.home}/vault/ssh/tg-dm-informatik-tuda"
+      ];
+      "github.com".identityFile = [ "${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; };
      "nxgit" = (nxace "nxgit") // {
        user = "git";
-        identityFile = builtins.trace config.programs.ssh.matchBlocks.nxgit
-        "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}";
+        identityFile = "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}";
        # addKeysToAgent = "1h";
      };
    };
  };
-  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";
-    };
-    extraConfig = ''
-      allow-loopback-pinentry
-    '';
+  services.ssh-agent = {
+    enable = true;
+    # socket = "ssh-agent"; # suffix to $XDG_RUNTIME_DIR
+    # package = pkgs.openssh;
  };
 }
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -1,39 +1,17 @@
 { pkgs, ... }@all: with all; let
-  tfc = pkgs.xdg-desktop-portal-termfilechooser;
+  nox-var = (pkgs.version != "24.05");
+  tfc = pkgs.unstable.xdg-desktop-portal-termfilechooser;
 in {
  home.packages = [
    pkgs.unar
    tfc
  ];
-  
  programs.yazi = {
    enable = true;
    # package = pkgs.yazi;
    package = inputs.yazi.packages.${hyper.system}.default;
    enableFishIntegration = true;
-    shellWrapperName = "ya";
-    initLua = /* lua */ ''
-      require("zoxide"):setup {
-      	update_db = true,
-      }
-      Status:children_add(function()
-      	local h = cx.active.current.hovered
-      	if not h or ya.target_family() ~= "unix" then
-      		return ""
-      	end
-
-      	return ui.Line {
-      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
-      		":",
-      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
-      		" ",
-      	}
-      end, 500, Status.RIGHT)
-    '';
-    plugins = with pkgs; {
-      inherit glow git;
-    };
-    # initLua = /* lua */  '' '';
+    # initLua = /* lua */  '' ''; # down
    keymap = {
      mgr.keymap = [
      	{ on = "<Esc>"; run = "escape";             desc = "Exit visual mode, clear selected, or cancel search"; }
@@ -403,15 +381,39 @@ in {
        ];
      };
    };
+  } // (if nox-var then {
+    shellWrapperName = "ya";
+    initLua = /* lua */ ''
+      require("zoxide"):setup {
+      	update_db = true,
+      }
+      Status:children_add(function()
+      	local h = cx.active.current.hovered
+      	if not h or ya.target_family() ~= "unix" then
+      		return ""
+      	end
+
+      	return ui.Line {
+      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
+      		":",
+      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
+      		" ",
+      	}
+      end, 500, Status.RIGHT)
+    '';
+    plugins = with pkgs; {
+      inherit glow git;
    };
+  } else {});
+  
  xdg = {
    configFile."xdg-desktop-portal-termfilechooser/config" = {
      force = true;
      text = ''
        [filechooser]
        cmd=${tfc}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
-        env=TERMCMD=ghostty --title="terminal-file-picker -e"
        default_dir=$HOME
+        env=TERMCMD=ghostty --title="terminal-file-picker -e"
        open_mode=suggested
        save_mode=last
      '';
--- a/home.nix
+++ b/home.nix
@@ -42,13 +42,7 @@
    ./home-modules/pkgs-list/programs.nix
    ./home-modules/pkgs-list/shell.nix
    ./home-modules/pnx.nix
-    ./home-modules/programming/c.nix
-    ./home-modules/programming/gleam.nix
-    ./home-modules/programming/glsl.nix
-    ./home-modules/programming/go.nix
-    ./home-modules/programming/java.nix
-    ./home-modules/programming/js.nix
-    ./home-modules/programming/python.nix
+    ./home-modules/programming.nix
    ./home-modules/qt.nix
    ./home-modules/rclone.nix
    ./home-modules/rofi.nix
--- a/nix-on-droid.nix
+++ b/nix-on-droid.nix
@@ -1,24 +0,0 @@
-{ pkgs, ... }@all: with all;
-{
-  # Simply install just the packages
-  environment.packages = with pkgs; [
-    helix
-    git
-    lazygit
-    yazi
-  ];
-
-  # Backup etc files instead of failing to activate generation if a file already exists in /etc
-  environment.etcBackupExtension = ".bak";
-
-  # Read the changelog before changing this value
-  system.stateVersion = pkgs.version;
-
-  # Set up nix for flakes
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
-  # Set your time zone
-  time.timeZone = "Europe/Berlin";
-}
--- a/nod.nix
+++ b/nod.nix
@@ -0,0 +1,32 @@
+{ pkgs, ... }@all: with all; {
+  environment = {
+    packages = import ./system-modules/base-packages.nix pkgs;
+    etcBackupExtension = ".bak";
+    motd = "";
+  };
+  terminal = {
+    font = rice.font.code.regular-path;
+  };
+  android-integration = {
+    termux-setup-storage.enable = true;
+  };
+  system.stateVersion = pkgs.version;
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+  user ={
+    shell = "${pkgs.fish}/bin/fish";
+    # userName = pkgs.lib.mkForce hyper.user; if its read-only, whats the point of this option???
+  };
+
+
+  # Set your time zone
+  time.timeZone = "Europe/Berlin";
+
+  home-manager = {
+    config = import ./shell-only.nix;
+    useGlobalPkgs = true;
+    backupFileExtension = "backup";
+    extraSpecialArgs = { inherit (all) inputs hyper rice; };
+  };
+}
--- a/shell-only.nix
+++ b/shell-only.nix
@@ -12,7 +12,7 @@
    ./home-modules/nixd.nix
    ./home-modules/nxgs.nix
    ./home-modules/pandoc.nix
-    ./home-modules/programming/c.nix
+    # ./home-modules/programming/c.nix
    ./home-modules/programming/gleam.nix
    ./home-modules/programming/go.nix
    ./home-modules/programming/java.nix
@@ -30,7 +30,7 @@
  home = {
    username = hyper.user;    
    homeDirectory = hyper.home;
-    stateVersion = hyper.pkgs-version;
+    stateVersion = pkgs.version;
  };
  xdg = {
    enable = true;
--- a/sops-secrets.yaml
+++ b/sops-secrets.yaml
@@ -58,60 +58,78 @@ sops:
        - recipient: age1vkqn2nars5qmpr35tac0x9vshphrq6nnzjfyxwusgn27kt3zualssv0u8e
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUSW9RSEE1aGV1RVUzZXh0
-            M3FhS01jYU90S3pOUzhKMUFndXVzSk8wYkZrCnhRdkE4cnNxWHJWYjVzUGZVMmNQ
-            N1kxM240OC9oOEloUjhEUmx3c3RTQzQKLS0tIGIwNUhjOURaVXNIeHR5SjNEQmly
-            QUFHYUxTSWREcU9GT2JUSXNBNndkMkEKCIPVu8VbDjsdDaePoivW0jMvzD/GZpHk
-            9P1zJ0fN1NPCTi7spAyiyDWpJa6sfwAVj7Bs2zzFZoJZUxvE054YPw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6U0NCaG16bGl4Uy9JdkpV
+            alRjakVGQkM4ZzdsWDlJWTFQdlJ3dHB5dm1vCmtHSE9oS1dhc0ZvemVTTFJ3TWJ2
+            YlZZd3VLaXM1dllPVTR1TElQdXIvMHcKLS0tIFoxbnlMVFVWaWp0R1RvSmpNcC9s
+            UDREUnEweDY1UU5QTjEySUdERjEwMkkKCt6wGWglsfmTfnR+qesaxfb0/lKizXjd
+            QnXb7ynqAx+0/mg5QXEE6S9nzfN/Shm84aR98VRptyYeDHk4jZhZxw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1jvf2lyrt2dw9jfnwgvnhmj9fmvyq8vvtepqjpkyycc5dqkkd4edqhxsgv6
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjb3R0bFhqZzg3MC9rZFVi
-            elJCTHdjVlpTVUtaUzcwQklmbVd6TXJsSUNRClk0VExaYVFkaE5KYWtGYmU1bGk4
-            OHJYQUpKZ1gzUnQyaVpudVdiZ0RYb1UKLS0tIGNINzBHRHE3YkhMNVY4dVVlUVBs
-            TzhkWmxYU016TXN5Z0JDUVFZeG1QMWsKiukK/zVn6WEr1E5qKPULsyJQX8qDgQoY
-            JIeoG+OehtZ33VIXJfiNw60taM4XJb+bv/u9dzCY9ahW8M5VthpIlg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEbDhLenZ5cTF2RmU3aWFR
+            TDN3VXZJamN2WXVGejNqdWZzR1Frb0sxeG0wCk1OaVF4UGJ2elZ3eHBhOU1McjhG
+            TWZqVFZLbW1wVDlhKy9DeU5XQURMT2cKLS0tIHdNQTJkZFg1cS9sdERjZkhYbDJy
+            RWVkczdGZlFQRENkbEdlb1c5bHA4ZEEKPS2AB8yyJ3An7PkWDJQj135MT7NGeOPj
+            dpalfnbvDw6uK9APGGkM35xIKYTy+kal4Qx4U5BAmaH57EWqL22Rpg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1jj7kfjw3e7rf9kwg5f87zf4ns6yr5465wcasanr9gcgwrq7c6dmq6gprgk
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCOStIUnJVVU5YRFg0T0dF
-            ZjBMVThZSFlRa0lCZ2RFZ1R4Mjk0Zjd4b0RRCkwveXN2SmIwajd6R1NScXpQS0FH
-            S25rOFRKRzd2SFRlZHYxMnZPY3Q3QUEKLS0tIDZRVU54UlFiSWJlWW9LWVRqcGpD
-            RXIxSVA3T0RwZEJDTk1JWHZVT09neUUKX7QgyC+yJ+eDvKX2dW9XU2UA8WPC5Tsm
-            fzlmjPWR/E2Gdnoi0k2+HLWo46SUeMYdpZfx3gK+UmDFUags+SCHpg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLT0I0MDdUZWRXaFNJN2FK
+            bm40a1QwdFdpQ3RManhXYWxmMkZXRGhiaTN3CnRqdmZ1bHhCTXh2c3gxeGJOYS9i
+            VDNDZWRhT0FYczQ3Q2ExQXBacURZaGsKLS0tIHdwbU5SbVk1YVdqd0l1dUg1bC9v
+            eEcydGlvNGcvTGI4OE1jek1WVE5jajQKhgxCDgmRbokbcHG+8OlJYms4NgVaHPqO
+            feXp9tvnTPpFcGIcN8pBE3ZRRJDshyubR9FyHmfUmSNJTtFOEjhR7g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1x2lpsennl74n0f5jl60uv2ffjcuqymzf9ap3frlz2quyv0x3hq3scnewwq
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzMUw1OXpCN0F6WkdBWFVM
-            M0VWdGlVcllTQlJKQUpKTG9wQ2NqVGEzVFJzCjE4UU92MlljSEIrZENFdVZpQUcx
-            SUh3SUh4bnZFVFpJOThQdG8wM24xZVkKLS0tIGJsUUl1QmJiRUFFRERrWWlMK1Fk
-            V2ZCS0tFUHNKckY1YXNRa3lwS3dVYW8KzrtAPlNuWQxSR2PEqFyqI5yv8jD2ZE3j
-            CT1SFmY9vf++WiOt1epby2MNpYdgyNrvlcaNUiE8Pt5ce0Y21pbq5A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxTkV0MEhqL2NJYTdRWDRl
+            aHpJeFNsMjNJUUYxRklIVmZDRHd6NkVrTTBJCnUwMFA5RWxCTTdxcGJSQVExdjcy
+            Zjg4NW9UQW5BWTI4TzRVS2t4K21oN28KLS0tIDhpUmF2OHlTUnpGVnUrbWNIV3RQ
+            eUZ2OC9Za2lJdjdmdWo3UzV3VHVldU0K2txL8P3NxMaTzjo+geMeBZr8fr3iuf6o
+            m6L3vbAx/PMgfSVFpV6jZ6lyNfQkyEtP5BIUIWbdX5qdGscfb+Gr4g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1pn4utvwpqdrswn0xurfdexn5nks9cd06jxzwg3m3m6za25ap4vxqxd0p3k
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3MHZlREs5OGxqTkZadmx1
-            R2hwMmc1YlZTd3owOHRIajJQMnVCbTFPOWtrCndMQ2Evc09VazNGVktrMXVHR2Vw
-            dFZWMm9rdi9iQWh3Y1lQT1g2SDJqNjQKLS0tIHYwVmVLeWQvc2ZWUzkxZzdKSnZt
-            TE44bHh2SFBMNldkdWZGcXc0c05LVWsK7LfqdRED2NkJxAxq+48MlLyIV30ihe0+
-            t269ote4qHDBx0RCZd5/hYUph/8Xf/fPa7Q6JYl6fkKiWUA3uWdbFQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlVktxTmx4QXQrOEhNTCtq
+            R3FML2ZubHovblU2OTBBQXB1Mkw0OTVqaTNJCkNmeEw2OW9DNm1qcUJFeUYycE15
+            dmxsYnRyTnp5UkVnWWMzTU1yZTFBZTAKLS0tIGRjK1hrMVBUOTNxSGZ0WmsyRUEy
+            dWZjOEFQc2lUMnFQNnVLd3NDcjh4NWsKUFIzHvms3UCwDGvWT527vzE1sKPfdmD6
+            jXw6KUc/AhkVzVndbLxO1pyvP//oj5uPmhF6BwSYOhL/ZBnRtTF2JQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1ur5zpr325cv7w0yn49azz9f48xsxd73w2sytt22yrnw5qs9r34nsv3vl05
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUdjlZeFVnR1k3QzZXUnR5
+            UVdvTGlYNDdYY0pqV3dZeDFKUnY2Y1E3RUhBCm1UeEVpTEl5a2ExdnVKTllRbndQ
+            V244Z2FseVJrU3ZsV2k0RGdGWm5NZmsKLS0tIDVVOXU3b1ZMaFhoYXRja0VVNnM4
+            ZUs5KzQ0QXhCM2dtU29BaEtUUkRIV00KTmwcQmY3nZSNa305kwcKf4RcHMb9CSHr
+            N59taRkc81uKsMf/Tma5WasrnaHEtE2vd6Kl8rpPw3HcfnpcLjXBPA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1jr72q042ccgxpdgdaaev0arzc0vh3r02etv2tzhhsejl0mfaxs3q9hhlaz
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrcVlEQU5WcXVpMTdlUjU5
+            V2U1cXNwdkh6WjNLQVpIUGErZE9QeTIvM25FCmprU1Q3OVBBNFp6MTRZMkZWMjlQ
+            ZXdQemlXQWlIZk1WUFBZM090NlJ3OTAKLS0tIGtYZHYzZ0t6SmFQV3JoUEp6N2kr
+            MkZGai9DZ3ZzT0I2MmMwRzVkcFhXdlEKLbM/9kCpiXLW8Me4MDq+JFifG7FhwPZS
+            5t4zNtuLttY3NUwT9KK4g4P+Yl10oNsjcCbGNYTxlIARFEU+X6zwUQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2025-09-07T21:03:20Z"
    mac: ENC[AES256_GCM,data:x8eIqQQGxtB5ukScesN1Lf4cFicTOi3VSOr/hFxKzccgwW7HLLEqwjai6e67KUFC2otaN9TR7ft0tUsTVwWRVRCHnpEoQ5KshLHy2zsk+CmPIpWTLCZJBpe154z3rRLlc10DCM7yhqArzepw0HgE4j1knADqLVwC7e0k+o/OmE8=,iv:uXeIv19J3LmYg7gtA2SGUSoMe9uccrvvztlDFSSs1V8=,tag:YTJpZdw1K+7//EARR+MviA==,type:str]
    pgp:
-        - created_at: "2025-10-04T19:49:10Z"
+        - created_at: "2025-10-06T11:16:18Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hF4DCvJ7ODFw5jQSAQdA2lEw0/JamW2LbvTLg0PhRxyNFbBunqhNa0/Bgv9riF8w
-            4MIL+i7o3KOAGF4h3NQpQNkG1rgMImzlXbSOzLJJV/uEMkew6VASKENAa+4FFo7t
-            0l4B3QpXdQzCWe07HXhqG+YetjR8tM9Rtk5XZuw4XTyca49BZezXPCbqgstoSW+U
-            TSjvpKr4FeE3tA3ePo4Jo7HYa1qotJe97pgDqziWIqEIJNwNhwROv9aLagWX9cVd
-            =dhDw
+            hF4DCvJ7ODFw5jQSAQdAebf7Ev93A/xdNTsw9ioAQTAehE14ZrIZiA9qNv9SjwIw
+            zT17RspkPejqo1K54zO3UkkocBZ30gzUkoIdxfISqd58QDHTNEsnoI7mVf8mod/c
+            0l4BUCEcibdn1XyQ9y55TbLhn/N6b+BxV9TKpRiFSLXSFIgHTe0PCSBxJkYgckFH
+            ZD0A4PtsylyuVYKKD5/2ZwAKLeAfY6nWBxoQrI6ZpT6i9040Rv2f8s5jJxrStLyx
+            =9nNP
            -----END PGP MESSAGE-----
          fp: 22FB2CC03DC5292AB81CF67D0AF27B383170E634
    unencrypted_suffix: _unencrypted
--- a/system-modules/base-packages.nix
+++ b/system-modules/base-packages.nix
@@ -1,8 +1,9 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; ([
-    git
+pkgs: with pkgs; [
+  busybox
+  # coreutils-full
+  gitFull
  git-crypt
-    lazygit # home-manager module is bugged
+
  wget
  curlHTTP3
  zip
@@ -14,6 +15,4 @@
  openssl
  dmidecode
  file
-  ]);
-
-}
+]
--- a/system-modules/boot.nix
+++ b/system-modules/boot.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }@all: with all;
-let 
+{ pkgs, ... }@all: with all; let 
  grub-theme-ascii-diana = (pkgs.fetchFromGitea {
    domain = "git.${hyper.domain}";
    owner = "nx2";
@@ -9,6 +8,10 @@ let
   });
  device-boot = if hyper.host == "NxNORTH" then {
    kernelPackages = pkgs.linuxPackages_zen;
+    kernelParams = [
+      "fbcon=margin:1"
+      "fbcon=nodefer"
+    ];
    lanzaboote = {
      enable = true;
      pkiBundle = "/var/lib/sbctl";
@@ -19,7 +22,7 @@ let
      configurationLimit = 10;
    };
  } else if hyper.host == "NxXPS" then {
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages;
    extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
    kernelModules = [ "v4l2loopback" ];
    extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1'';
@@ -62,8 +65,6 @@ in {
  ] else [];
  config = {
    environment.systemPackages = with pkgs; lib.mkIf ( host == "NxNORTH" ) [ sbctl ];
-    boot ={
-      tmp.useTmpfs = false; 
-    } // device-boot;
+    boot = { tmp.useTmpfs = false; } // device-boot;
  };
 }
--- a/system-modules/dm.nix
+++ b/system-modules/dm.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
  services.greetd = {
    enable = true;
    settings = rec {
@@ -10,15 +9,23 @@
      default_session = hyprland;
      vt = 2;
    };  
+    # useTextGreeter = true;
  };
-  systemd.services.greetd.serviceConfig = {
-    Type = "idle";
-    StandardInput = "tty";
-    StandardOutput = "tty";
-    Standarderror = "journal"; # Without this errors will spam on screen
-    # Without these bootlogs will spam on screen
-    TTYReset = true;
-    TTYVHangup = true;
-    TTYVTDisallocate = true;
-  };
+  # services.displayManager.ly = {
+  #   enable = true;
+  #   package = pkgs.ly;
+  #   settings = {
+  #     # animation = "matrix";
+  #     # clear_password = true;
+  #     clock = "%c";
+  #     lang = "de";
+  #     load = true;
+  #     # numlock = false;
+  #     save = true;
+  #   };
+  # };
+
+  # environment.systemPackages = with pkgs; [
+  #   cmatrix    
+  # ];
 }
--- 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;
--- a/system-modules/hardware-configuration.nix
+++ b/system-modules/hardware-configuration.nix
@@ -9,7 +9,9 @@
  boot = {
    initrd = {
      availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-      luks.devices.cryptroot.device = pkgs.lib.mkIf (hyper.host == "NxXPS") "/dev/nvme0n1p7";
+      luks.devices = pkgs.lib.mkIf (hyper.host == "NxXPS") {
+        "vault".device = "/dev/nvme0n1p7";
+      };
      kernelModules = pkgs.lib.mkIf (hyper.host == "NxXPS") [ "i915" "cryptd" ];
    };
    kernelModules = [ "kvm-intel" ];
@@ -28,7 +30,7 @@
    "${hyper.home}/vault"  = { device = "/dev/disk/by-label/vault"; fsType = "ext4"; };
  } else if hyper.host == "NxNORTH" then {
    "${hyper.home}/shared" = { device = "/dev/disk/by-label/shared"; } // ntfs;
-  } else if hyper.host == "NxXPS" then { 
+  } else if hyper.host == "NxACE" then { 
    "/vault" =               { device = "/dev/disk/by-label/vault"; fsType = "ext4"; };
  } else {});
  hardware = {
--- a/system-modules/health_reminder.nix
+++ b/system-modules/health_reminder.nix
@@ -2,7 +2,7 @@
 lib.mkIf (hyper.host != "NxACE")
 {
  systemd.timers."health_reminder" = {
-    enable = true;
+    enable = false;
    wantedBy = [ "timers.target" ];
    timerConfig = {
      OnBootSec = "30m";
--- 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"
    ];
--- a/system-modules/users.nix
+++ b/system-modules/users.nix
@@ -1,36 +1,39 @@
-{ pkgs, ... }@all: with all;
-{
-  users.defaultUserShell = pkgs.bash; # if interactive, itll switch to fish
-
-  users.users."${hyper.user}" = {
+{ pkgs, ... }@all: with all; {
+  users = {
+    defaultUserShell = pkgs.bash; # if interactive, itll switch to fish
+    users."${hyper.user}" = {
      isNormalUser = true;
      extraGroups = [ 
        # TODO: actually put the groups into the relevant files
-      "networkmanager" 
-      "wheel" 
-      "audio" 
-      "video" 
-      "lp"
-      "scanner"
-      "docker" 
-      "libvirtd" 
-      "uinput" 
-      "input" 
-      "ydotool" 
        "acme" 
-      "nginx" 
        "adbusers" 
+        "audio" 
+        "audiobookshelf"
+        "copyparty" 
+        "docker" 
+        "input" 
+        "libvirtd" 
+        "lp"
+        "networkmanager" 
+        "nextcloud"
+        "nginx" 
        "postgres"
        "radicale"
-      "audiobookshelf"
-      "nextcloud"
+        "scanner"
+        "uinput" 
+        "video" 
+        "wheel" 
+        "ydotool" 
      ];
      useDefaultShell = true;
      openssh.authorizedKeys.keys = [
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID1RPCcS8DtIf75a2FEW4d8X6WTVeLlmretoLqppvZlJ" # From [A] GPG Sub Key
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5sYVtPLHXatTjrpol46xr9R4TidcB4t8axO6/ReNNR nxxps-nx2@nxace"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/zcoYuYbamTPMOZPfsP1yQJ5Y6sDlPfBwui8MQjKWn nxnorth-nx2@nxace"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnbJx7nVeVi5jK1Eybm+jQoopiCTslewuHFLv2yCt4f nxdcs-nx2@nxace"
      ];
    };
-
+  };
  programs = {
    bash = {
      interactiveShellInit = ''
--- 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
@@ -8,13 +7,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 +26,5 @@
      ];
    };
  };
-
  nixpkgs.hostPlatform = hyper.system;
 }
Author	SHA1	Message	Date
Lennart J. Kurzweg (Nx2)	e73b7333fc	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles into nod	2025-11-11 00:44:25 +01:00
Lennart J. Kurzweg (Nx2)	fcfc125373	nod	2025-11-11 00:43:22 +01:00
Lennart J. Kurzweg (Nx2)	3418cfd8f3	cursor	2025-11-06 19:31:43 +01:00
Lennart J. Kurzweg (Nx2)	2585c76039	audacity	2025-11-02 20:58:02 +01:00
Lennart J. Kurzweg (Nx2)	04f10a4afd	thunderbird paste event window dimensions	2025-11-02 20:57:51 +01:00
Lennart J. Kurzweg (Nx2)	651458875c	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2025-10-30 09:28:31 +01:00
Lennart J. Kurzweg (Nx2)	9d04a09de8	fix xdg-desktop-portal-termfile-chooser	2025-10-30 09:28:25 +01:00
Lennart J. Kurzweg (Nx2)	0eaa052cd5	pinned special border	2025-10-27 13:45:31 +01:00
Lennart J. Kurzweg (Nx2)	64a54b2cd6	switch to lts on xps	2025-10-27 13:43:26 +01:00
Lennart J. Kurzweg (Nx2)	55a22804c5	disable health remonder	2025-10-27 13:43:14 +01:00
Lennart J. Kurzweg (Nx2)	d85386bf9c	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2025-10-24 12:40:16 +02:00
Lennart J. Kurzweg (Nx2)	1698d0f851	flake bump	2025-10-24 12:39:30 +02:00
Lennart J. Kurzweg (Nx2)	18d93e6b0c	dedicated github ssh config host	2025-10-24 12:39:26 +02:00
Lennart J. Kurzweg (Nx2)	91020c0072	trying out other dms	2025-10-24 12:26:05 +02:00
Lennart J. Kurzweg (Nx2)	e6c5cd5ead	trying to get boot resolution full screen	2025-10-24 12:25:31 +02:00
Lennart J. Kurzweg (Nx2)	068fd19353	no unused hotkeys	2025-10-24 12:24:53 +02:00
Lennart J. Kurzweg (Nx2)	6f7449839d	typst swap lsps	2025-10-24 12:24:40 +02:00
Lennart J. Kurzweg (Nx2)	9e2eb410ab	go home-manager module	2025-10-24 12:24:29 +02:00
Lennart J. Kurzweg (Nx2)	fb974329e7	some packages	2025-10-24 12:24:15 +02:00
Lennart J. Kurzweg (Nx2)	7a70d7dae3	caldavevent ''	2025-10-24 12:24:01 +02:00
Lennart J. Kurzweg (Nx2)	e7c1c255bc	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles into nod	2025-10-21 23:51:00 +02:00
Lennart J. Kurzweg (Nx2)	52fe355b0a	cleanup color pallete	2025-10-21 15:23:59 +02:00
Lennart J. Kurzweg (Nx2)	29a917ed37	worlds calendar	2025-10-21 15:23:22 +02:00
Lennart J. Kurzweg (Nx2)	7655e7b3bd	helix hints	2025-10-21 15:23:12 +02:00
Lennart J. Kurzweg (Nx2)	858a8b77ec	tuda rust labs	2025-10-21 15:22:55 +02:00
Lennart J. Kurzweg (Nx2)	ba199f9568	rust	2025-10-21 15:22:31 +02:00
Lennart J. Kurzweg (Nx2)	5f3a3a6f30	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2025-10-17 12:48:02 +02:00
Lennart J. Kurzweg (Nx2)	9472550aaa	north sops	2025-10-17 12:45:01 +02:00
Lennart J. Kurzweg (Nx2)	1b7fe7f7ca	random changes	2025-10-17 12:44:51 +02:00
Lennart J. Kurzweg (Nx2)	b64abba7e5	typst	2025-10-17 12:44:14 +02:00
Lennart J. Kurzweg (Nx2)	df06425803	fish nxf indent	2025-10-17 12:43:51 +02:00
Lennart J. Kurzweg (Nx2)	6befb22a59	worlds calendar	2025-10-17 12:43:44 +02:00
Lennart J. Kurzweg (Nx2)	b4cd70b5f6	fix hyprpanel notifications	2025-10-17 12:43:36 +02:00
Lennart J. Kurzweg (Nx2)	78975da970	ssh * identities	2025-10-13 14:38:06 +02:00
Lennart J. Kurzweg (Nx2)	90c093fcef	reddit rice	2025-10-13 14:30:34 +02:00
Lennart J. Kurzweg (Nx2)	40eefbf948	fix nxfetch	2025-10-09 15:32:10 +02:00
Lennart J. Kurzweg (Nx2)	042e8c7ee7	further gpg-ssh edits	2025-10-07 16:35:42 +00:00
Lennart J. Kurzweg (Nx2)	685a34fcbb	NxWSL -> NxDCS	2025-10-07 16:35:06 +00:00
Lennart J. Kurzweg (Nx2)	812555c467	more ssh keys allowed	2025-10-07 17:31:40 +02:00
Lennart J. Kurzweg (Nx2)	ffddb4773b	ssh-agent + port fix	2025-10-07 17:31:27 +02:00
Lennart J. Kurzweg (Nx2)	98c0a26209	no gpg-agent	2025-10-07 17:31:05 +02:00
Lennart J. Kurzweg (Nx2)	e25ad7891d	cleanup	2025-10-07 17:30:46 +02:00
Lennart J. Kurzweg (Nx2)	470922dce2	ace colors	2025-10-05 01:51:11 +02:00
Lennart J. Kurzweg (Nx2)	b0cb61f05e	hw ace fix	2025-10-05 01:51:05 +02:00
Lennart J. Kurzweg (Nx2)	e8373d6293	no trace	2025-10-05 01:50:49 +02:00
Lennart J. Kurzweg (Nx2)	ff5de39a19	all use vault sops age	2025-10-05 01:50:43 +02:00
Lennart J. Kurzweg (Nx2)	1fc8b2a7cb	all use vault gpg	2025-10-05 01:48:18 +02:00
Lennart J. Kurzweg (Nx2)	e19ed3ece1	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2025-10-05 01:21:38 +02:00
Lennart J. Kurzweg (Nx2)	f7de7f740d	user accept xps ssh + refactor	2025-10-05 00:20:27 +02:00
Lennart J. Kurzweg (Nx2)	d81aa406a4	nod	2025-09-03 19:46:44 +02:00