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

README.md

@@ -1,6 +1,6 @@
 # ❄️ NixOS Dotfiles
 
-![Screenshot of my desktop](splash.png)
+![Screenshot of my desktop](splash.webp)
 
 ## Information
 

configuration.nix

@@ -1,4 +1,4 @@
-{ ... }@all: with all; {
+{ pkgs, ... }@all: with all; {
   imports = [
     inputs.sops-nix.nixosModules.sops
     ./system-modules/adb.nix
@@ -18,7 +18,6 @@
     ./system-modules/gpg.nix
     ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
-    ./system-modules/hsmw.nix
     ./system-modules/kanata.nix
     ./system-modules/terminal.nix
     ./system-modules/kodi.nix
@@ -62,7 +61,6 @@
   ]);
   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" ];
   programs.bash.shellInit = ''

flake-modules/allowed.nix

@@ -1,6 +1,6 @@
-
 {
   unfree = [
+    "antigravity"
     "cursor"
     "discord"
     "spotify"
@@ -10,8 +10,6 @@
     "zoom-us"
     "zoom"
 
-    # since the predicate ist to be set in the flake and not in a module
-    # it is impossible to make the list dynamic and respect nvidia.enable
     "nvidia-x11"
     "nvidia-settings"
     "nvidia-persistenced"
@@ -41,8 +39,5 @@
 
     "vscode-extension-mhutchie-git-graph"
   ];
-
+  insecure = [ ];
-  inecure = [
-    # "electron-25.9.0"
-  ];
 }

flake-modules/colors.json

@@ -1,13 +1,13 @@
 {
     "base": {
-        "foreground": "#eddbef",
+        "foreground": "#eedce1",
-        "background": "#100711"
+        "background": "#11080a"
     },
     "to_alter": {
-        "accent": "#ba71c0",
+        "accent": "#bb768a",
-        "secondary": "#3266ff",
+        "secondary": "#b5ff32",
-        "tertiary": "#4bb6e6",
+        "tertiary": "#918ea3",
-        "special": "#76c071",
+        "special": "#76bba7",
-        "weird": "#c08571"
+        "weird": "#b7bb76"
     }
 }

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760101617,
+        "lastModified": 1767024902,
-        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
+        "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
+        "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1761517857,
+        "lastModified": 1768172937,
-        "narHash": "sha256-1xYv73nGA+Lm/hKRqjiUyuBzabaRwmeDxBCIMve5CWU=",
+        "narHash": "sha256-abU6yVB1dNW3fuUpXb5fakyY3JAWJdJSUbuM+LnqH2A=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "e9ab040ce8e72e299a3d8fbd109865b1e218eb57",
+        "rev": "9d223d6ca7c49f57dc8b31a511f4f3ee975f2653",
         "type": "github"
       },
       "original": {
@@ -70,15 +70,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1767039857,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -102,11 +102,11 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1765121682,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
         "type": "github"
       },
       "original": {
@@ -220,16 +220,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
+        "lastModified": 1767910483,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -300,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760445448,
+        "lastModified": 1766946335,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
+        "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
+        "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
         "type": "github"
       },
       "original": {
@@ -318,22 +318,23 @@
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
         "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
         "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1761249114,
+        "lastModified": 1768144432,
-        "narHash": "sha256-KDy8Vtlwe+7Z053HtD4fCRqlHBt0Kils0Zea4D77R7o=",
+        "narHash": "sha256-lLV0egdN9VF6BjhG6GVEVMviFuM05XCv35YNsfLzS9w=",
         "ref": "refs/heads/main",
-        "rev": "aa5a239ac92a6bd6947cce2ca3911606df392cb6",
+        "rev": "fbf421df889ceff3bac08a9f4b9493def5eecc4d",
-        "revCount": 6522,
+        "revCount": 6805,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -344,33 +345,49 @@
         "url": "https://github.com/hyprwm/Hyprland"
       }
     },
-    "hyprland-plugins": {
+    "hyprland-guiutils": {
       "inputs": {
-        "hyprland": [
+        "aquamarine": [
-          "hyprland"
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
         ],
         "nixpkgs": [
-          "hyprland-plugins",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "hyprland-plugins",
           "hyprland",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1761653710,
+        "lastModified": 1767023960,
-        "narHash": "sha256-MhHSU9m/9HSckJ61OXcom/6F92NQf3s1QfLbRUApalc=",
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
         "owner": "hyprwm",
-        "repo": "hyprland-plugins",
+        "repo": "hyprland-guiutils",
-        "rev": "e689220b1740aa99ca67fa06055792f82fa9ed85",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprland-plugins",
+        "repo": "hyprland-guiutils",
         "type": "github"
       }
     },
@@ -386,11 +403,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759610243,
+        "lastModified": 1765214753,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
         "type": "github"
       },
       "original": {
@@ -399,74 +416,6 @@
         "type": "github"
       }
     },
-    "hyprland-qt-support": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749154592,
-        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "type": "github"
-      }
-    },
-    "hyprland-qtutils": {
-      "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759080228,
-        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "type": "github"
-      }
-    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -483,11 +432,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758927902,
+        "lastModified": 1764612430,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
         "type": "github"
       },
       "original": {
@@ -496,6 +445,58 @@
         "type": "github"
       }
     },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764592794,
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -508,11 +509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759619523,
+        "lastModified": 1766253372,
-        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
         "type": "github"
       },
       "original": {
@@ -533,11 +534,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755184602,
+        "lastModified": 1763640274,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
         "type": "github"
       },
       "original": {
@@ -546,6 +547,35 @@
         "type": "github"
       }
     },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1767473322,
+        "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -627,11 +657,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1761563673,
+        "lastModified": 1765841014,
-        "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
+        "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
+        "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b",
         "type": "github"
       },
       "original": {
@@ -690,11 +720,11 @@
     },
     "nixpkgs-latest": {
       "locked": {
-        "lastModified": 1761810199,
+        "lastModified": 1768173486,
-        "narHash": "sha256-iMLB/90mK7lncjk3GVYlAmN1K+D6/7JVhOSau3O7eK0=",
+        "narHash": "sha256-pZhr2gYGPQeL3DaI1oQlqeI7wUE12pf258LLUMgcWSU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d03f6e8ae73c291f8088abf52ae378c448a2cce3",
+        "rev": "cb91fd6650df525625bcf15e7cab3ad50f980c7b",
         "type": "github"
       },
       "original": {
@@ -722,11 +752,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1761672384,
+        "lastModified": 1768127708,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+        "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
         "type": "github"
       },
       "original": {
@@ -753,11 +783,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1761114652,
+        "lastModified": 1767379071,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
         "type": "github"
       },
       "original": {
@@ -785,11 +815,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1761373498,
+        "lastModified": 1765472234,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
         "type": "github"
       },
       "original": {
@@ -801,26 +831,26 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1761468971,
+        "lastModified": 1768028080,
-        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
+        "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
+        "rev": "d03088749a110d52a4739348f39a63f84bb0be14",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "type": "indirect"
       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1756288264,
+        "lastModified": 1763806073,
-        "narHash": "sha256-Om8adB1lfkU7D33VpR+/haZ2gI5r3Q+ZbIPzE5sYnwE=",
+        "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9",
+        "rev": "878e468e02bfabeda08c79250f7ad583037f2227",
         "type": "github"
       },
       "original": {
@@ -894,11 +924,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760663237,
+        "lastModified": 1767281941,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
         "type": "github"
       },
       "original": {
@@ -940,7 +970,6 @@
         "home-manager": "home-manager",
         "home-manager24": "home-manager24",
         "hyprland": "hyprland",
-        "hyprland-plugins": "hyprland-plugins",
         "lanzaboote": "lanzaboote",
         "nix-on-droid": "nix-on-droid",
         "nixos-wsl": "nixos-wsl",
@@ -981,11 +1010,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756348497,
+        "lastModified": 1763952169,
-        "narHash": "sha256-xJp3VnoYh4kpsaKFO/7SsGbwOz7pI1ZmjbqpXEuR2cw=",
+        "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0adf92c70d23fb4f703aea5d3ebb51ac65994f7f",
+        "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
         "type": "github"
       },
       "original": {
@@ -1017,11 +1046,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760998189,
+        "lastModified": 1768104471,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004",
         "type": "github"
       },
       "original": {
@@ -1088,11 +1117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760713634,
+        "lastModified": 1761431178,
-        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
         "type": "github"
       },
       "original": {
@@ -1108,11 +1137,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1761655046,
+        "lastModified": 1768129250,
-        "narHash": "sha256-lG7eQqs8HDmmOl6vFkJ1iDlQBR+jY30uD4YtvWulCZc=",
+        "narHash": "sha256-jsccfsJpyvkZ8dUMR4rS141vnmHT3qh6HtnP+jE2qq4=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "564b8851961a7545a93ebf04c0f8dd5778d0eccb",
+        "rev": "41e5717930141c574442ecc53bd4db5f96188d50",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,13 +2,13 @@
   description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs.url = "nixpkgs/nixos-25.11";
     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";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager24 ={
@@ -32,13 +32,7 @@
     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";
   };
 
@@ -54,14 +48,15 @@
       domain  = "nx2.site";
       home    = "/home/${user}";
       webroot = "/var/lib/hugo/nx2site/public";
+      pkgs-version = "25.11";
     };
 
-    get-pkgs = { host, system?system, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs {
+    get-pkgs = let s = system; in { host, system?s, nixpkgs?inputs.nixpkgs, version?"25.11" }: import nixpkgs {
       inherit system config;
       overlays = [(final: prev: {
         unstable = import nixpkgs-unstable { inherit system config; };
         latest   = import nixpkgs-latest   { inherit system config; };
-        inherit version;
+        pkgs-version = version;
       })] ++ (if host == "NxACE" then [
         copyparty.overlays.default
       ] else []);
@@ -109,6 +104,7 @@
             system = "aarch64-linux";
             user = "nix-on-droid";
             home = "/data/data/com.termux.nix/files/home";
+            pkgs-version = "24.05";
           };
           rice = import ./flake-modules/rice.nix pkgs;
         in { inherit inputs hyper rice; };

home-modules/bar/caldav-event.nix

@@ -73,7 +73,7 @@ def get_ongoing_or_next_event(url, username, password):
         return next_event_dict
 
     except Exception as e:
-        print(f"Error accessing {url}: {e}")
+        print(f"Error accessing {url}: {str(e)[:30]}...")
         return None
 
 def is_expired(event_dict: dict):

home-modules/bash.nix

@@ -22,7 +22,7 @@
     
   } //  pkgs.lib.mkIf (pkgs.version != "24.05") {
     shellInit = init;
-  } //  pkgs.lib.mkIf (pkgs.version != "25.05") {
+  } //  pkgs.lib.mkIf (pkgs.version != "25.11") {
     profileExtra = init; 
   };
 }

home-modules/bitwarden.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }@all: with all;
 {
   home.packages = with pkgs; [
-    bitwarden
+    bitwarden-desktop
   ];
 }

home-modules/calendar.nix

@@ -33,27 +33,13 @@
       read-only = true;
       type = "ics";
     }
-    {
+    # {
-      name = "LEC";
+    #   name = "LEC";
-      url = "https://${domain}/lec.ics";
+    #   url = "https://${domain}/lec.ics";
-      color = "#A87000";
+    #   color = "#A87000";
-      read-only = true;
+    #   read-only = true;
-      type = "ics";
+    #   type = "ics";
-    }
+    # }
-    {
-      name = "LR";
-      url = "https://${domain}/lr.ics";
-      color = "#005040";
-      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";

home-modules/chatterino.nix

@@ -7,18 +7,19 @@ let
     # "Caedrel"
     # "EintrachtSpandau"
     # "GamesDoneQuick"
-    "Odoamne"
+    # "Odoamne"
     "iwdominate"
-    "imls"
+    # "imls"
     "gdolphn"
     "GRONKH"
     "handofblood"
     "HisWattson"
-    "Jankos"
+    # "Jankos"
     # "KuruHS"
     "LEC"
     "lol_nemesis"
     # "NASA"
+    "nattynattlol"
     "NoWay4u_Sir"
     # "OfficialMikeShinoda"
     "Rekkles"
@@ -191,7 +192,7 @@ in {
             },
             "misc": {
                 "askOnTabVisibilityToggle": false,
-                "currentVersion": "2.5.3",
+                "currentVersion": "2.5.4",
                 "lockNotebookLayout": false
             },
             "similarity": {

home-modules/email.nix

@@ -136,36 +136,22 @@ lib.mkIf (hyper.host != "NxACE")
         settings = OAuth2Settings; 
       };
     };
-
+    # pnx-nix = {
-    # hsmw = with secrets.email.hsmw; {
+    #   address = secrets.email.pnx.mail;
-    #   address = "${un}@hs-mittweida.de";
-    #   userName = "${un}@hs-mittweida.de";
     #   realName = "Lennart J. Kurzweg";
-    #   imap = {
+    #   flavor = "outlook.office365.com";
-    #     port = 993;
-    #     host = "xc.hs-mittweida.de";
-    #   };
-    #   smtp = {
-    #     port = 587;
-    #     host = "xc.hs-mittweida.de";
-    #     tls.useStartTls = true;
-    #   };
     #   signature = {
     #     text = ''
-    #       MatNr: ${mnr}
+    #       Phönix Metallbau GmbH
-    #       SemGr: ${semgr}
+    #       Tel: 036374 2270
-    #       About Me: https://nx2.site/about-me
-    #       Contact: https://nx2.site/contact
-    #       GPG: https://nx2.site/gpg
     #     '';
     #     showSignature = "append";
     #   };
-    #   thunderbird = {
+    #   thunderbird = mkIf config.thunderbird.enable {
     #     enable = true;
     #     profiles = [ "nx2" ];
-    #     settings = id: {
+    #     # The id given as argument is an automatically generated account identifier.
-    #       "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
+    #     # settings = OAuth2Settings; 
-    #     };
     #   };
     # };
     tuda = with secrets.email.tuda; {
@@ -205,3 +191,35 @@ lib.mkIf (hyper.host != "NxACE")
 
 
 
+
+# hsmw = with secrets.email.hsmw; {
+#   address = "${un}@hs-mittweida.de";
+#   userName = "${un}@hs-mittweida.de";
+#   realName = "Lennart J. Kurzweg";
+#   imap = {
+#     port = 993;
+#     host = "xc.hs-mittweida.de";
+#   };
+#   smtp = {
+#     port = 587;
+#     host = "xc.hs-mittweida.de";
+#     tls.useStartTls = true;
+#   };
+#   signature = {
+#     text = ''
+#       MatNr: ${mnr}
+#       SemGr: ${semgr}
+#       About Me: https://nx2.site/about-me
+#       Contact: https://nx2.site/contact
+#       GPG: https://nx2.site/gpg
+#     '';
+#     showSignature = "append";
+#   };
+#   thunderbird = {
+#     enable = true;
+#     profiles = [ "nx2" ];
+#     settings = id: {
+#       "mail.server.server_${id}.fcc_folder" = "imap://${un}%40hs-mittweida.de@xc.hs-mittweida.de/Sent";
+#     };
+#   };
+# };

home-modules/firefox/userContent.nix

@@ -122,7 +122,7 @@ in /* css */ ''
       background-color: transparent !important;
     }
     header, footer {
-      background-color: rgba(0,0,0,1) !important; 
+      background-color: rgba(0,0,0,0.5) !important; 
       backdrop-filter: blur(100px);
       border-radius: ${builtins.toString rice.rounding}px;
     }

home-modules/fish.nix

@@ -25,11 +25,11 @@
       $(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')
-      $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\&/')
       $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g')
-      $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
       $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g')
-      $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
       "
       echo -e "$msg"
     '')

home-modules/games.nix

@@ -1,20 +1,19 @@
-{ pkgs, ... }@all: with all;
+{ pkgs, ... }@all: with all; {
-lib.mkIf (hyper.host == "NxNORTH")
-{
   home = {
-    packages = (with pkgs.unstable; [
+    packages = (with pkgs; [
-      protonup-ng
+      unstable.protonup-ng
-      mangohud
+      unstable.mangohud
-
+    ]) ++ (if hyper.host == "NxNORTH" then (with pkgs; [
-      prismlauncher
+      unstable.prismlauncher
-
+      heroic
-      # heroic
-
       # mindustry-wayland 
-    ]) ++ [ pkgs.heroic ];
+    ]) else if hyper.host == "NxXPS" then (with pkgs; [
-    sessionVariables = {
+      heroic
-      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
+    ]) else if hyper.host == "NxACE" then (with pkgs; [
-    };
+      heroic
+    ]) else []);
+
+    sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
   };
 }
 

home-modules/gimp.nix

@@ -4,7 +4,7 @@
     # (gimp-with-plugins.override {
     #   plugins = with gimpPlugins; [ bimp ];
     # })
-    gimp
+    unstable.gimp
   ];
 }
 

home-modules/git.nix

@@ -5,21 +5,15 @@
     (writeShellScriptBin "gst" "awk -vOFS='' 'NR==FNR {all[i++] = $0; difffiles[$1] = $0; next;} ! ($2 in difffiles) {print; next;} {gsub($2, difffiles[$2]); print;} END {if (NR != FNR) {exit;} for (i in all) {print all[i];}}' <(git diff --color --stat=$(($(tput cols) - 3)) HEAD | sed '$d; s/^ //') <(git -c color.status=always status -sb)")
   ];
 
-  programs.git = {
+  programs = {
+    git = {
       enable = true;
       package = pkgs.gitFull;
-    userName = ''Lennart J. Kurzweg (Nx2)'';
+      settings = {
-    userEmail = "git@${hyper.domain}";
+        user = {
-    delta = {
+          Name = ''Lennart J. Kurzweg (Nx2)'';
-      enable = true;
+          Email = "git@${hyper.domain}";
-      options = {
-        line-numbers = true;
-        side-by-side = false;
-        features = "unobtrusive-line-numbers decorations";
-        whitespace-error-style = "22 reverse";
         };
-    };
-    extraConfig = {
         credential = {
           "https://git.da.dicos.de".username = lib.mkIf (hyper.host == "NxDCS") "lkurzweg";
           "https://git.da.dicos.de".password = lib.mkIf (hyper.host == "NxDCS") "Test";
@@ -29,7 +23,17 @@
         pull.rebase = false; # true
       };
     };
-  programs.lazygit = {
+    delta = {
+      enable = true;
+      enableGitIntegration = true;
+      options = {
+        line-numbers = true;
+        side-by-side = false;
+        features = "unobtrusive-line-numbers decorations";
+        whitespace-error-style = "22 reverse";
+      };
+    };
+    lazygit = {
       enable = true;
       package = pkgs.lazygit;
       settings = {
@@ -52,4 +56,5 @@
         };
       };
     };
+  };
 }

home-modules/gpg.nix

@@ -1,5 +1,10 @@
 { pkgs, ... }@all: with all; {
-  home.packages = with pkgs; [ pinentry-all ];
+  home.packages = with pkgs; [
+    # pinentry-all
+    # pinentry-curses
+    pinentry-gtk2
+    # pinentry-tty
+  ];
   programs.gpg = {
     enable = true;
     package = pkgs.gnupg;

home-modules/helix.nix

@@ -212,7 +212,8 @@
         }
         {
           name = "typst";
-          language-servers = [ "language-tool" "tinymist" ]; 
+          language-servers = [ "tinymist" ]; 
+          # language-servers = [ "language-tool" "tinymist" ]; 
         }
         {
           name = "markdown";
@@ -298,7 +299,7 @@
       base16 = with rice.color; {
         "attributes" = foreground; 
         "comment" = {
-          fg = black.bright;
+          fg = subtle.base;
           modifiers = [ "italic" ];
         };
         "constant" = accent.bright; 
@@ -307,7 +308,7 @@
         "constructor" = weird.base;
         "debug" = yellow.base;
         "diagnostic.modifiers" = [ "underline" ];
-        "diff.delta" = blue.bright; 
+        "diff.delta" = subtle.bright; 
         "diff.minus" = negative.bright; 
         "diff.plus" = positive.bright; 
         "error" = red.base; 
@@ -404,13 +405,13 @@
           bg = black.base;
         };
         "ui.selection" = {
-          bg = white.dark;
+          bg = accent.dark;
         };
         "ui.selection.primary" = {
-          bg = black.bright;
+          bg = accent.dark;
         };
         "ui.statusline" = {
-          fg = blue.bright;
+          fg = accent.bright;
           bg = black.base;
         };
         "ui.statusline.inactive" = {

home-modules/hyprland.nix

@@ -6,6 +6,7 @@
   monitors = {
     xps = {
       main   = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1080"; scale = "1.0"; };
+      # main   = { name = "eDP-1"; resolution = "1920x1080"; position = "1920x1080"; scale = "1.0"; };
       second = { name = "desc:Sony SONY TV 0x01010101";  resolution = "1920x1080"; position = "1920x0";    scale = "1.0"; };
       third = { name = "DP-6";   resolution = "1920x1080"; position = "0x0";    scale = "1.0"; };
     };
@@ -51,6 +52,7 @@ in {
           "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
           "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}"
           "${third.name}, ${third.resolution}, ${third.position}, ${third.scale}"
+          " ,preferred, auto, 1, mirror, eDP-1"
         ]) else (if hyper.host == "NxNORTH" then (with monitors.north; [
           "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
           "${left.name}, ${left.resolution}, ${left.position}, ${left.scale}"
@@ -161,8 +163,8 @@ in {
 
         blur = {
           enabled = true;
-          size = "10";
+          size = "2";
-          passes = "2";
+          passes = "4";
           xray = false;
           vibrancy = 0.5;
           ignore_opacity = true;
@@ -183,19 +185,27 @@ in {
         ];
       };
 
-      gestures = {
+      # gestures = {
-        workspace_swipe = true;
+      #   workspace_swipe = true;
-        workspace_swipe_fingers = "4";
+      #   workspace_swipe_fingers = "4";
-        workspace_swipe_distance = "300";
+      #   workspace_swipe_distance = "300";
-        workspace_swipe_invert = true;
+      #   workspace_swipe_invert = true;
-        workspace_swipe_min_speed_to_force = "30";
+      #   workspace_swipe_min_speed_to_force = "30";
-        workspace_swipe_cancel_ratio = "0.5";
+      #   workspace_swipe_cancel_ratio = "0.5";
-        workspace_swipe_create_new = false;
+      #   workspace_swipe_create_new = false;
-        workspace_swipe_direction_lock = false;
+      #   workspace_swipe_direction_lock = false;
-        workspace_swipe_direction_lock_threshold = "10";
+      #   workspace_swipe_direction_lock_threshold = "10";
-        workspace_swipe_forever = true;
+      #   workspace_swipe_forever = true;
-        workspace_swipe_use_r = false;
+      #   workspace_swipe_use_r = false;
-      };
+      # };
+
+
+      gesture = [
+        "4, horizontal, workspace"
+        # "3, down, mod: ALT, close"
+        # "3, up, mod: SUPER, scale: 1.5, fullscreen"
+        # "3, left, scale: 1.5, float"
+      ];
 
       dwindle = {
         preserve_split = true; # you probably want this
@@ -213,7 +223,7 @@ in {
       exec-once = [
         "waybar"
         "swww-daemon"
-        "hyprland-autoname-workspaces"
+        # "hyprland-autoname-workspaces"
         "/usr/lib/polkit-kde-authentication-agent-1 "
         "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
         "syncthing -no-browser"
@@ -276,7 +286,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)$"
+        "size 30% 30%, initialTitle:^(Select Calendar)$"
       ];
 
 
@@ -354,7 +364,7 @@ in {
         ## ROW 2:
 
         # "SUPER,       TAB, hycov:toggleoverview"
-        "SUPER,       TAB, overview:toggle"
+        # "SUPER,       TAB, overview:toggle"
         # "SUPER,       TAB, hyprexpo:expo, toggle"
         "ALT,         TAB, focuscurrentorlast"
         # "SUPER,       TAB, exec, hyprswitch --daemon"
@@ -601,7 +611,9 @@ in {
       submap = screenshot
       ${action_simple { key = "W"; cmd = ''exec,hyprshot -m window''; }}
       ${action_simple { key = "M"; cmd = ''exec,hyprshot -m output''; }}
+      ${action_simple { key = "S"; cmd = ''exec,hyprshot -m output''; }}
       ${action_simple { key = "R"; cmd = ''exec,hyprshot -m region''; }}
+      ${action_simple { key = "A"; cmd = ''exec,hyprshot -m region''; }}
       bind = , Escape, execr, submap_indicator unset
       bind = , Escape, submap, reset
       submap = reset

home-modules/mpv.nix

@@ -32,9 +32,11 @@
       thumbfast # thumbnails on timeline hover
       # uosc # custom ui
       sponsorblock
+      # visualizer
     ];
     bindings = {
       "O"           = ''no-osd cycle-values glsl-shaders "~~/shaders/invert.glsl" ""; show-text "Invert Shader"'';
+      "F5"          = ''set contrast 0;set brightness 0;set gamma 0;set saturation 0;set hue 0;set sub-pos 100;set sub-scale 1;set panscan 0;set zoom 0;show-text default'';
       # "tab"         = ''script-binding uosc/toggle-ui'';
       # "space"       = ''cycle pause; script-binding uosc/flash-pause-indicator'';
       # "right"       = ''seek  5'';

home-modules/opencode.nix

@@ -1,29 +1,60 @@
 { pkgs, ... }@all: with all; {
-  home = {
+	programs.opencode = {
-    packages = with pkgs; [
+		enable = true;
-      opencode
+		package = pkgs.opencode;
-    ];
+	  themes.theme = with rice.color; let
-    file.".config/opencode/opencode.json".text = let
+	    dl = color: { dark = color; light = color; };
-      model = "qwen2.5-coder:7b";
+	  in {
-    in builtins.toJSON {
+	    accent = dl accent.base;
-      "$schema" = "https://opencode.ai/config.json";
+      background = dl background;
-      model = "ollama/${model}";
+      backgroundElement = dl subtle.dark;
-      theme = "matrix";
+      backgroundPanel = dl subtle.darker;
-      provider = {
+      border = dl subtle.base;
-        ollama = {
+      borderActive = dl border;
-          name = "Ollama (local)";
+      borderSubtle = dl subtle.dark;
-          npm = "@ai-sdk/openai-compatible";
+      diffAdded = dl positive.base;
-          options = {
+      diffAddedBg = dl positive.darker;
-            baseURL = "http://localhost:11434/v1";
+      diffAddedLineNumberBg = dl positive.dark;
-          };
+      diffContext = dl foreground;
-          models = {
+      diffContextBg = dl subtle.dark;
-            "${model}" = {
+      diffHighlightAdded = dl positive.bright;
-              tools = true;
+      diffHighlightRemoved = dl negative.bright;
-            };
+      diffHunkHeader = dl foreground;
-          };
+      diffLineNumber = dl subtle.base;
-        };
+      diffRemoved = dl negative.base;
-      };
+      diffRemovedBg = dl negative.darker;
+      diffRemovedLineNumberBg = dl negative.dark;
+      error = dl negative.dark;
+      info = dl special.base;
+      markdownBlockQuote = dl accent.base;
+      markdownCode = dl secondary.base;
+      markdownCodeBlock = dl secondary.base;
+      markdownEmph = dl accent.base;
+      markdownHeading = dl accent.base;
+      markdownHorizontalRule = dl border;
+      markdownImage = dl accent.base;
+      markdownImageText = dl accent.bright;
+      markdownLink = dl accent.base;
+      markdownLinkText = dl accent.bright;
+      markdownListEnumeration = dl foreground;
+      markdownListItem = dl foreground;
+      markdownStrong = dl accent.base;
+      markdownText = dl foreground;
+      primary = dl accent.base;
+      secondary = dl secondary.base;
+      success = dl positive.base;
+      syntaxComment = dl subtle.base;
+      syntaxFunction = dl accent.base;
+      syntaxKeyword = dl special.base;
+      syntaxNumber = dl tertiary.base;
+      syntaxOperator = dl accent.base;
+      syntaxPunctuation = dl foreground;
+      syntaxString = dl accent.base;
+      syntaxType = dl tertiary.base;
+      syntaxVariable = dl accent.base;
+      text = dl foreground;
+      textMuted = dl subtle.bright;
+      warning = dl weird.base;
     };
   };
 }
-

home-modules/pkgs-list/desktop.nix

@@ -14,5 +14,6 @@
     wl-clipboard
     xclip
     wlr-randr
+    cava
   ];
 }

home-modules/pkgs-list/programs.nix

@@ -12,9 +12,12 @@
   ] ++ (if (hyper.host != "NxACE") then [
     signal-desktop
     unstable.code-cursor-fhs
+    latest.antigravity
     obsidian
     zoom-us
     inkscape
     audacity
+    gemini-cli
+    libreoffice
   ] else []);
 }

home-modules/pkgs-list/shell.nix

@@ -4,7 +4,7 @@
     cmake
     cmatrix
     dig
-    du-dust
+    dust
     dysk
     exiftool
     eza

home-modules/programming/go.nix

@@ -2,6 +2,6 @@
   programs.go = {
     enable = true;
     package = pkgs.go;
-    goPath = "${config.xdg.dataHome}/go";
+    env.goPath = "${config.xdg.dataHome}/go";
   };
 }

home-modules/programming/python.nix

@@ -4,7 +4,7 @@
     python-with-packages = pkgs.python3.withPackages (pp: with pp; [
       ipython
       requests
-      debugpy
+      # debugpy
       black
     ]);
   in {

home-modules/programming/rust.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }@all: with all; {
   home = {
     packages = with pkgs; [
+      gdb
       cargo
       clippy
       rustc

home-modules/rofi.nix

@@ -1,114 +1,46 @@
-{ pkgs, ... }@all: with all;
+{ pkgs, ... }@all: with all; {
-{
+  home = {
-  home.packages = with pkgs; [
+    packages = with pkgs; [ rofi ];
-    rofi-wayland
+    file = let # the home-manager module sucks
-  ];
-  home.file = let 
       trdr = "${rice.lib.float-to-drune rice.transparency}";
+      ts = builtins.toString;
     in with rice.color; {
       ".config/rofi/config.rasi".text = ''
         configuration {
           show-icons: false;
           display-drun: "";
           disable-history: false;
-        drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>] [<span weight='light' size='small'><i>({exec})</i></span>]";
         }
-
         * {
           font: "${rice.font.code.name} 12";
           foreground: ${foreground};
-        background-color: ${background}${trdr};
+          text-color: ${foreground};
+          background-color: transparent;
           padding: 0px;
           margin: 0px;
           spacing: 0px;
           border-width: 0px;
         }
-
+        window {
-      #window {
           background-color: ${background}${trdr};
-        border: ${builtins.toString rice.border-width}px;
+          border: ${ts rice.border-width}px;
-        border-radius: ${builtins.toString rice.rounding};
+          border-radius: ${ts rice.rounding}px;
-        border-color: ${border};
+          border-color: ${ts rice.color.border};
         }
-      #mainbox {
+        listview { scrollbar: false; }
-        border: 0;
+        element { border-radius: ${ts rice.rounding}px; }
-        padding: 0;
+        element.normal.normal    { background-color: ${accent.darker}; text-color: ${accent.base}; }
-      }
+        element.selected.normal  { background-color: ${accent.base}; text-color: ${accent.darker}; }
-      #message {
+        element.alternate.normal { background-color: ${secondary.darker}; text-color: ${secondary.base}; }
-        border: 0px;
+        inputbar { children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; }
-      }
+        prompt { }
-      #textbox {
+        textbox-prompt-colon {
-        text-color: ${foreground};
-      }
-      #listview {
-        fixed-height: 0;
-        border: 0px;
-        spacing: 0px ;
-        scrollbar: false;
-        padding: 0px;
-      }
-
-
-
-      #element {
-        border: 0;
-        padding: 0px;
-        border-radius: ${if rice.rounding > 0 then "2" else "0"}px;
-      }
-
-      #element.normal.normal    { background-color: ${background}${trdr};    text-color: ${accent.base}; }
-      #element.selected.normal  { background-color: ${tertiary.base}${trdr}; text-color: ${background}; }
-      #element.alternate.normal { background-color: ${background}${trdr};    text-color: ${secondary.base}; }
-
-
-      #scrollbar {
-        width: ${builtins.toString rice.border-width}px ;
-        border: 0;
-        handle-width: 8px ;
-        padding: 0;
-      }
-      #sidebar {
-        border: ${builtins.toString rice.border-width}px dash;
-      }
-      #button.selected {
-        text-color: ${foreground};
-      }
-      #inputbar {
-        spacing: 0;
-        text-color: ${background};
-        background-color: ${accent.base}${trdr};
-        padding: 0;
-        margine-bottom: 2px;
-        children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
-      }
-      #prompt {
-        spacing: 0;
-        background-color: transparent;
-        text-color: ${foreground};
-      }
-      #textbox-prompt-colon {
           expand: false;
           str: ">";
-        margin: 0px 0.3em 0em 0em ;
-        text-color: ${background};
-        background-color: transparent;
-      }
-      #case-indicator {
-        spacing: 0;
-        text-color: ${foreground};
-        background-color: transparent;
-      }
-      #entry {
-        spacing: 0;
-        text-color: ${background};
-        background-color: transparent;
-        placeholder: "";
-      }
-
-      element-text, element-icon {
-        background-color: inherit;
-        text-color: inherit;
         }
+        case-indicator { }
+        entry { placeholder: ""; }
       '';
     };
+  };
 }

home-modules/ssh.nix

@@ -3,30 +3,39 @@
   programs.ssh = {
     enable = true;
     package = pkgs.openssh;
-    addKeysToAgent = "yes";
+    enableDefaultConfig = false;
     matchBlocks = let
-      nxace = name: {
+      default = {
+        addKeysToAgent = "yes";
+        forwardAgent = false;
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
+      nxace = name: default // {
         host = name;
         hostname = "ssh.${hyper.domain}";
         user = "nx2";
         port = 50022;
-        identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}";
+        identityFile = [ "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}" ];
       };
     in {
-      "*".identityFile = [
+      "*" = default;
+      "ssh.nx2.site" = default // { identityFile = [
         "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}"
-        "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}"
+        "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}"
-        "${hyper.home}/vault/ssh/tg-dm-informatik-tuda"
+      ]; };
-      ];
+      "tg.dm.informatik.tu-darmstadt.de" = default // { identityFile = [ "${hyper.home}/vault/ssh/tg-dm-informatik-tuda"           ]; };
-      "github.com".identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ];
+      "git.da.dicos.de"                  = default // { identityFile = [ "${hyper.home}/vault/ssh/dcsgit-lkurzweg-${hyper.host}"   ]; };
-      "nxace" = nxace "nxace";
+      "github.com"                       = default // { 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 = "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}";
-        # addKeysToAgent = "1h";
-      };
     };
   };
   services.ssh-agent = {

home-modules/yazi.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }@all: with all; let
-  nox-var = (pkgs.version != "24.05");
+  nox-var = (pkgs.pkgs-version != "24.05");
   tfc = pkgs.unstable.xdg-desktop-portal-termfilechooser;
 in {
   home.packages = [
@@ -30,24 +30,24 @@ in {
       	{ on = "<C-f>";           run = "arrow 100%";       desc = "Move cursor down one page";                 }
       	{ on = "<PageUp>";        run = "arrow -100%";      desc = "Move cursor up one page";                   }
       	{ on = "<PageDown>";      run = "arrow 100%";       desc = "Move cursor down one page";                 }
-      	{ on = [ "g" "g" ];       run = "arrow top";        desc = "Move cursor to the top";                    }
-      	{ on = [ "g" "e" ];       run = "arrow bot";        desc = "Move cursor to the end";                    }
-      	{ on = [ "g" "h" ];       run = "cd ~";             desc = "Go to the home directory";                  }
-      	{ on = [ "g" "n" ];       run = "cd ~/nix-dots";    desc = "Go to the Nix-Dotfiles directory";          }
-      	(pkgs.lib.mkIf (hyper.host == "NxACE") { on = [ "g" "s" ];       run = "cd /var/lib/hugo/nx2site";    desc = "Go to the Hugo Nx2.Site directory"; })
-      	{ on = [ "g" "n" ];       run = "cd /nix/store";    desc = "Go to the Nix-Store";                       }
-      	{ on = [ "g" "c" ];       run = "cd ~/.config";     desc = "Go to the config directory";                }
-      	{ on = [ "g" "l" ];       run = "cd ~/.locale";     desc = "Go to the .locale directory";               }
       	{ on = [ "g" "C" ];       run = "cd ~/.cache";      desc = "Go to the .cache directory";                }
-      	{ on = [ "g" "m" ];       run = "cd ~/media";       desc = "Go to the media (udiskie mount) directory"; }
+      	{ on = [ "g" "c" ];       run = "cd ~/.config";     desc = "Go to the config directory";                }
-      	{ on = [ "g" "v" ];       run = "cd ~/Videos";      desc = "Go to the Videos directory";                }
-      	{ on = [ "g" "t" ];       run = "cd /tmp";          desc = "Go to the /tmp directory";                  }
-      	{ on = [ "g" "d" ];       run = "cd ~/Downloads";   desc = "Go to the downloads directory";             }
       	{ on = [ "g" "D" ];       run = "cd ~/Documents";   desc = "Go to the Documents directory";             }
-      	{ on = [ "g" "r" ];       run = "cd /";             desc = "Go to the root (/) directory";              }
+      	{ on = [ "g" "d" ];       run = "cd ~/Downloads";   desc = "Go to the downloads directory";             }
+      	{ on = [ "g" "e" ];       run = "arrow bot";        desc = "Move cursor to the end";                    }
+      	{ on = [ "g" "g" ];       run = "arrow top";        desc = "Move cursor to the top";                    }
+      	{ on = [ "g" "h" ];       run = "cd ~";             desc = "Go to the home directory";                  }
+      	{ on = [ "g" "l" ];       run = "cd ~/.locale";     desc = "Go to the .locale directory";               }
+      	{ on = [ "g" "m" ];       run = "cd ~/media";       desc = "Go to the media (udiskie mount) directory"; }
+      	{ on = [ "g" "n" ];       run = "cd ~/nix-dots";    desc = "Go to the Nix-Dotfiles directory";          }
+      	{ on = [ "g" "N" ];       run = "cd /nix/store";    desc = "Go to the Nix-Store";                       }
       	{ on = [ "g" "p" ];       run = "cd ~/projects";    desc = "Go to the projects directory";              }
+      	{ on = [ "g" "r" ];       run = "cd /";             desc = "Go to the root (/) directory";              }
       	{ on = [ "g" "/" ];       run = "cd /";             desc = "Go to the root (/) directory";              }
+      	{ on = [ "g" "t" ];       run = "cd /tmp";          desc = "Go to the /tmp directory";                  }
+      	{ on = [ "g" "v" ];       run = "cd ~/Videos";      desc = "Go to the Videos directory";                }
       	{ on = [ "g" "<Space>" ]; run = "cd --interactive"; desc = "Go to a directory interactively";           }
+      	(pkgs.lib.mkIf (hyper.host == "NxACE") { on = [ "g" "s" ]; run = "cd /var/lib/hugo/nx2site"; desc = "Go to the Hugo Nx2.Site directory"; })
       	# Navigation
       	{ on = "h";       run = "leave";   desc = "Go back to the parent directory";   }
       	{ on = "l";       run = "enter";   desc = "Enter the child directory";         }
@@ -70,8 +70,7 @@ in {
       	{ on = "O";         run = "open --interactive";          desc = "Open selected files interactively";              }
       	{ on = "<Enter>";   run = "open";                        desc = "Open selected files";                            }
       	{ on = "<S-Enter>"; run = "open --interactive";          desc = "Open selected files interactively";              }
-      	{ on = "y";         run = [ ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list''
+      	{ on = "y";         run = [ ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list'' "yank" ];  desc = "Yank selected files (copy)";                     }
-                                                      "yank" ];  desc = "Yank selected files (copy)";                     }
       	{ on = "y";         run = "yank";                        desc = "Yank selected files (copy)";                     }
       	{ on = "x";         run = "yank --cut";                  desc = "Yank selected files (cut)";                      }
       	{ on = "p";         run = "paste";                       desc = "Paste yanked ";                                  }
@@ -158,6 +157,7 @@ in {
       	{ on = "{";     run = "tab_swap -1";              desc = "Swap current tab with previous tab";    }
       	{ on = "{";     run = "tab_swap -1";              desc = "Swap current tab wittab";               }
       	{ on = "}";     run = "tab_swap 1";               desc = "Swap current tab with next tab";        }
+      	{ on = "<Tab>"; run = "spot";                     desc = "Show Spot View";                        }
         # Tasks
       	{ on = "w";     run = "tasks:show";    desc = "Show Task View";     }
       ];
@@ -168,8 +168,8 @@ in {
       	{ on = "<Esc>"; run = "close";    desc = "Close Task View";     }
       	{ on = "c";     run = "cancel";   desc = "Cancel Task";         }
       	{ on = "i";     run = "inspect";  desc = "Inspect Task";        }
-      	{ on = "j";     run = "arrow -1"; desc = "Up in list";          }
+      	{ on = "k";     run = "arrow -1"; desc = "Up in list";          }
-      	{ on = "k";     run = "arrow 1";  desc = "Down in list";        }
+      	{ on = "j";     run = "arrow 1";  desc = "Down in list";        }
       	{ on = "u";     run = "arrow -5"; desc = "Up in list (fast)";   }
       	{ on = "d";     run = "arrow 5";  desc = "Down in list (fast)"; }
       ];
@@ -179,6 +179,19 @@ in {
       	{ on = "?";    run = "help"; desc = "Open help"; }
       	{ on = "<F1>"; run = "help"; desc = "Open help"; }
       ];
+      spot.keymap = [
+        # Spot
+      	{ on = "<Tab>"; run = "close";    desc = "Close Spot View";     }
+      	{ on = "q";     run = "close";    desc = "Close Spot View";     }
+      	{ on = "<Esc>"; run = "close";    desc = "Close Spot View";     }
+      	{ on = "k";     run = "arrow -1"; desc = "Up in list";          }
+      	{ on = "j";     run = "arrow 1";  desc = "Down in list";        }
+      	{ on = "u";     run = "arrow -5"; desc = "Up in list (fast)";   }
+      	{ on = "d";     run = "arrow 5";  desc = "Down in list (fast)"; }
+      	{ on = [ "g" "g" ]; run = "arrow top"; desc = "Move cursor to the top"; }
+      	{ on = [ "g" "e" ]; run = "arrow bot"; desc = "Move cursor to the end"; }
+      	{ on = "c";     run = "copy cell";     desc = "Copy Selected Cell"; }
+      ]; 
     };
     settings = {
       mgr = {
@@ -193,74 +206,74 @@ in {
       };
       opener = {
         "edit" = [
-	        { run = ''hx "$@"''; desc = "helix"; block = true; }
+	        { run = ''hx "$@"''; desc = "Helix"; block = true; }
-	        { run = ''codium "$@"''; desc = "code"; orphan = true; }
+	        { run = ''codium "$@"''; desc = "VS Code"; orphan = true; }
+	        { run = ''cat "$@" | wl-copy''; desc = "Copy Contents"; }
         ];
         "play" = [
-          { run = ''mpv "$@"''; desc = "mpv"; orphan = true; }
+          { run = ''mpv "$@"''; desc = "MPV"; orphan = true; }
-          { run = ''mpv --vf=negate "$@"''; desc = "mpv inverted"; orphan = true; }
+          { run = ''mpv --vf=negate "$@"''; desc = "MPV inverted"; orphan = true; }
-          { run = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo"; }
+          { run = ''mediainfo "$1"; echo "Press enter to return to yazi"; read''; block = true; desc = "Show mediainfo"; }
         ];
         "archive" = [
-          { run = ''unar "$1"''; desc = "Extract here"; }
+          { run = ''unar "$@"''; desc = "Extract here"; }
-          { run = ''tar -x "$1"''; desc = "tar -x"; }
+          { run = ''tar -x "$@"''; desc = "tar -x"; }
-          { run = ''unzip "$1"''; desc = "unzip"; }
+          { run = ''unzip "$@"''; desc = "unzip"; }
         ];
         "image" = [
-          { run = ''imv "$@"''; desc = "imv"; orphan = true; }
+          { run = ''imv "$@"''; desc = "IMV"; orphan = true; }
-          { run = ''gimp "$@"''; desc = "gimp"; orphan = true; }
+          { run = ''gimp "$@"''; desc = "Gimp"; orphan = true; }
-          { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper"; }
+          { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$1"''; desc = "swww wallpaper"; }
-          { run = ''exiftool "$@"; echo "Press enter to exit"; read''; desc = "View Exif Data"; }
+          { run = ''exiftool "$1"; echo "Press enter to return to yazi"; read''; desc = "View Exif Data"; }
-          { run = ''for f in "$@"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; }
+          { run = ''for f in "$1"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; }
         ];
         "svg" = [
-          { run = ''inkscape "$@"''; desc = "inkscape"; orphan = true; }
+          { run = ''inkscape "$@"''; desc = "Inkscape"; orphan = true; }
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
+          { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
         ];
         "font" = [
-          { run = ''fontpreview "$@"''; desc = "fontpreview"; orphan = true; }
+          { run = ''fontpreview "$@"''; desc = "Fontpreview"; orphan = true; }
-          { run = ''fontforge "$@"''; desc = "fortforge"; orphan = true; }
+          { run = ''fontforge "$@"''; desc = "Fortforge"; orphan = true; }
         ];
         "document" = [
-          { run = ''zathura "$@"''; desc = "zathura"; orphan = true; }
+          { run = ''zathura "$@"''; desc = "Zathura"; orphan = true; }
-          { run = ''xournal "$@"''; desc = "xournal"; orphan = true; }
+          { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
           { run = ''nxgs flip "$@"''; desc = "nxgs flip"; }
           { run = ''nxgs rotate "$@"''; desc = "nxgs rotate"; }
           { run = ''nxgs interactive-merge "$@"''; block = true; desc = "nxgs merge"; }
         ];
         "browser" = [
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
+          { run = ''firefox "$@"''; desc = "Firefox"; orphan = true; }
-          { run = ''zen "$@"''; desc = "zen"; orphan = true; }
+          { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "Chromium"; orphan = true; }
-          { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "chromium"; orphan = true; }
           { run = ''w3m "$@"''; desc = "w3m"; }
-          { run = ''lynx "$@"''; desc = "lynx"; }
+          { run = ''lynx "$@"''; desc = "Lynx"; }
         ];
         "office" = [
-          { run = ''libreoffice "$@"''; desc = "libreoffice"; orphan = true; }
+          { run = ''libreoffice "$@"''; desc = "LibreOffice"; orphan = true; }
-          { run = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; orphan = true; }
+          { run = ''libreoffice --view "$@"''; desc = "LibreOffice read-only"; orphan = true; }
         ];
         "shell" = [
-          { run = ''bash -c "$@"''; desc = "bash -c"; }
+          { run = ''bash -c "$1"; echo "Press enter to return to yazi"; read''; desc = "bash -c"; }
-          { run = ''fish -c "$@"''; desc = "fish -c"; }
+          { run = ''fish -c "$1"; echo "Press enter to return to yazi"; read''; desc = "fish -c"; }
-          { run = ''sh -c "$@"'';   desc = "sh -c"; }
+          { run = ''sh -c "$1"; echo "Press enter to return to yazi"; read'';   desc = "sh -c"; }
         ];
         "python" = [
-          { run = ''python "$@"''; desc = "python"; }
+          { run = ''python "$@"; echo "Press enter to return to yazi"; read''; desc = "Python"; block = true; }
         ];
         "directory" = [
-          { run = ''lazygit "$@"''; desc = "python"; }
+          { run = ''lazygit "$1"''; desc = "LazyGit"; }
         ];
       };
       open.rules = [
         { mime = "text/html";                                       use = [ "edit" "browser" ]; }
         { mime = "text/htm";                                        use = [ "edit" "browser" ]; }
-        { mime = "text/x-python";                                   use = "python"; }
+        { mime = "text/x-script.python";                            use = [ "edit" "python" ]; }
+        { mime = "text/script.python";                              use = [ "edit" "python" ]; }
         { mime = "text/*";                                          use = "edit"; }
         { mime = "text";                                            use = "edit"; }
 
-        { mine = "inode/x-empty";                                   use = "edit"; }
+        { mine = "inode/x-empty";                                   use = "directory"; }
-        { mine = "inode/directory";                                 use = "edit"; }
+        { mine = "inode/directory";                                 use = "directory"; }
 
         { mime = "image/*";                                         use = "image"; }
         { mime = "image/svg";                                       use = [ "image" "edit" ]; }
@@ -311,8 +324,6 @@ in {
       tabs = {
         active    = { fg = secondary.dark; bg = secondary.base; };
         inactive  = { fg = secondary.base; bg = secondary.dark; };
-        # sep_inner = 
-        # sep_outer = 
       };
       status = {
         separator_open  = " "; #"";

home.nix

@@ -34,7 +34,7 @@
     ./home-modules/nvidia.nix
     ./home-modules/nxgs.nix
     ./home-modules/obs.nix
-    ./home-modules/office.nix
+    # ./home-modules/office.nix
     ./home-modules/ollama.nix
     ./home-modules/opencode.nix
     ./home-modules/pandoc.nix

shell-only.nix

@@ -30,7 +30,7 @@
   home = {
     username = hyper.user;    
     homeDirectory = hyper.home;
-    stateVersion = pkgs.version;
+    stateVersion = hyper.pkgs-version;
   };
   xdg = {
     enable = true;

system-modules/base-packages.nix

@@ -5,7 +5,7 @@ pkgs: with pkgs; [
   git-crypt
 
   wget
-  curlHTTP3
+  curl
   zip
   unzip
   p7zip

system-modules/calendar/lec.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }@all: with all;
 {
   systemd.timers."nx_cal_lec" = {
-    enable = true;
+    enable = false;
     wantedBy = [ "timers.target" ];
     timerConfig = {
       OnBootSec = "40m";

system-modules/dm.nix

@@ -3,7 +3,7 @@
     enable = true;
     settings = rec {
       hyprland = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5";
+        command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5";
         user = hyper.user;
       };
       default_session = hyprland;

system-modules/fcitx5.nix

@@ -1,88 +1,14 @@
-{ pkgs, ... }@all: with all;
+{ pkgs, ... }@all: with all; {
-{
-  # i18n.inputMethod = {
-  #   type = "fcitx5";
-  #   enable = true;
-  #   fcitx5.addons = with pkgs; [
-  #     fcitx5-gtk             # alternatively, kdePackages.fcitx5-qt
-  #     fcitx5-chinese-addons  # table input method support
-  #     fcitx5-nord            # a color theme
-  #   ];
-  # };
   i18n.inputMethod = {
     enable = true;
     type = "fcitx5";
-    fcitx5.waylandFrontend = true;
+    fcitx5 = {
-    fcitx5.addons = with pkgs; [
+      waylandFrontend = true;
-      fcitx5-gtk             # alternatively, kdePackages.fcitx5-qt
+      addons = with pkgs; [
-      fcitx5-chinese-addons  # table input method support
+        fcitx5-gtk        
-      fcitx5-nord            # a color theme
+        kdePackages.fcitx5-chinese-addons  
+        fcitx5-nord        
       ];
     };
-  # i18n.inputMethod = {
+  };
-  #   enabled = "fcitx5";
-  #   ignoreUserConfig = true;
-  #   waylandFrontend = true;
-  #   fcitx5 = {
-  #     addons = with pkgs-unstable; [
-  #       rime-data
-  #       fcitx5-rime
-
-  #       # Chinese
-  #       fcitx5-chinese-addons
-  #       fcitx5-table-extra
-  #       fcitx5-pinyin-moegirl
-  #       fcitx5-pinyin-zhwiki
-
-  #       # Japanese
-  #       # fcitx5-mozc
-  #     ];
-  #     settings = {
-        # globalOptions = {
-        #   Hotkey = {
-        #     # Enumerate when press trigger key repeatedly
-        #     EnumerateWithTriggerKeys = "True";
-        #     # Skip first input method while enumerating
-        #     EnumerateSkipFirst = "False";
-        #   };
-        #   "Hotkey/EnumerateForwardKeys"  = { "0" = "Control+space";       };
-        #   "Hotkey/EnumerateBackwardKeys" = { "0" = "Control+Shift+space"; };
-        #   "Hotkey/PrevPage"              = { "0" = "Up";                  };
-        #   "Hotkey/NextPage"              = { "0" = "Down";                };
-        #   "Hotkey/PrevCandidate"         = { "0" = "Shift+Tab";           };
-        #   "Hotkey/NextCandidate"         = { "0" = "Tab";                 };
-        #   Behavior = {
-        #     ActiveByDefault = "False";                       # Active By Default
-        #     ShareInputState = "No";                          # Share Input State
-        #     PreeditEnabledByDefault = "True";                # Show preedit in application
-        #     ShowInputMethodInformation = "True";             # Show Input Method Information when switch input method
-        #     showInputMethodInformationWhenFocusIn = "False"; # Show Input Method Information when changing focus
-        #     CompactInputMethodInformation = "True";          # Show compact input method information
-        #     ShowFirstInputMethodInformation = "True";        # Show first input method information
-        #     DefaultPageSize = "5";                           # Default page size
-        #     OverrideXkbOption = "False";                     # Override Xkb Option
-        #     PreloadInputMethod = "True";                     # Preload input method to be used by default
-        #   };
-        # };
-        # inputMethod = {
-        #   "Groups/0" = {
-        #     "Name" = "Default";
-        #     "Default Layout" = "us";
-        #     "DefaultIM" = "mozc";
-        #   };
-        #   "Groups/0/Items/0" = {
-        #     "Name" = "keyboard-us";
-        #     "Layout" = null;
-        #   };
-        #   "Groups/0/Items/1" = {
-        #     "Name" = "mozc";
-        #     "Layout" = null;
-        #   };
-        #   "GroupOrder" = {
-        #     "0" = "Default";
-        #   };
-        # };
-      # };
-    # };
-  # };
 }

system-modules/fonts.nix

@@ -4,7 +4,7 @@
     noto-fonts
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
-    noto-fonts-emoji
+    noto-fonts-color-emoji
     newcomputermodern
     atkinson-hyperlegible
     nerd-fonts.jetbrains-mono

system-modules/games.nix

@@ -1,15 +1,7 @@
-{ pkgs, ... }@all: with all;
+{ pkgs, ... }@all: with all; {
-lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE")
-{
   programs = {
-    steam = {
+    steam.enable = true;
-      enable = true;
+    gamemode.enable = true;
-    };
+    gamescope.enable = true;
-    gamemode = {
-      enable = true;
-    };
-    gamescope = {
-      enable = true;
-    };
   };
 }

system-modules/hsmw.nix

@@ -27,8 +27,6 @@
     "hsmw-vpn-secret" = { path = "/etc/ipsec.d/hsmw.secret"; mode = "600"; };
   };
   
-  networking.networkmanager.enableStrongSwan = true;
-
   services.strongswan = {
     enable = true;
     setup = {

system-modules/nvidia.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }@all: with all; lib.mkIf hyper.nvidia.enable  {
   environment.systemPackages = with pkgs; [
     lshw
-    glxinfo
+    mesa-demos
     (pkgs.writeShellScriptBin "nvidia-offload" ''
       export __NV_PRIME_RENDER_OFFLOAD=1
       export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0

system-modules/nx2site/gitea.nix

@@ -26,7 +26,7 @@ let git-user = "git"; in
     user = git-user; 
     appName = "NxGit";
     stateDir = "/var/lib/gitea"; # default
-    useWizard = false; # default
+    # useWizard = false; # default
     # camoHmacKeyFile = ;
     database = {
       createDatabase = false; # default

system-modules/nx2site/proxy.nix

@@ -50,7 +50,7 @@
     defaultSSLListenPort = 443;
     enableQuicBPF = true;
     enableReload = true;
-    package = pkgs.nginxQuic;
+    package = pkgs.nginx;
     proxyResolveWhileRunning = false;
     proxyTimeout = "20s";
     recommendedBrotliSettings = true;
@@ -58,7 +58,7 @@
     recommendedOptimisation = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
-    recommendedZstdSettings = true;
+    # recommendedZstdSettings = true;
     serverTokens = false;
     sslDhparam = config.sops.secrets."nx2site/dhparams.pem".path;
     sslProtocols = "TLSv1.2 TLSv1.3";

system-modules/qmk.nix

@@ -2,12 +2,9 @@
 {
   hardware.keyboard.qmk.enable = true;
 
-  # home.packages = with pkgs; [
-  #   via
-  # ];
   environment.systemPackages = with pkgs; [
-    via
+    # via
     qmk
   ];
-  services.udev.packages = [ pkgs.via ];
+  # services.udev.packages = [ pkgs.via ];
 }

system-modules/users.nix

@@ -31,6 +31,7 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5sYVtPLHXatTjrpol46xr9R4TidcB4t8axO6/ReNNR nxxps-nx2@nxace"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/zcoYuYbamTPMOZPfsP1yQJ5Y6sDlPfBwui8MQjKWn nxnorth-nx2@nxace"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnbJx7nVeVi5jK1Eybm+jQoopiCTslewuHFLv2yCt4f nxdcs-nx2@nxace"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOWa0xeARLSGbliVCqloGRvF7KlM6TcJSFhd+BxcvRt nxs23u-nx2@ssh.nx2.site"
       ];
     };
   };

wsl.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }@all: with all; {
   imports = [
     inputs.nixos-wsl.nixosModules.default
-    ./system-modules/base-packages.nix
     ./system-modules/docker.nix
     ./system-modules/gc.nix
     ./system-modules/gpg.nix
@@ -9,7 +8,8 @@
     ./system-modules/nixd.nix
     ./system-modules/users.nix
   ];
-  system.stateVersion = pkgs.version;
+  environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
+  system.stateVersion = hypr.pkgs-version;
   wsl = {
     defaultUser = hyper.user;
     enable = true;