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

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.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760101617,
+        "lastModified": 1762356719,
-        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
+        "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
+        "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1761517857,
+        "lastModified": 1763901903,
-        "narHash": "sha256-1xYv73nGA+Lm/hKRqjiUyuBzabaRwmeDxBCIMve5CWU=",
+        "narHash": "sha256-w7YsxTjldwhUBP5ypbcZvWyZgRQqp3NBfyk5BAfrFjQ=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "e9ab040ce8e72e299a3d8fbd109865b1e218eb57",
+        "rev": "fb9f0441c99833ab7bc035d76b9a89021270675a",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1761588595,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760445448,
+        "lastModified": 1762462052,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
+        "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
+        "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
         "type": "github"
       },
       "original": {
@@ -318,8 +318,8 @@
         "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",
@@ -329,11 +329,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1761249114,
+        "lastModified": 1763912895,
-        "narHash": "sha256-KDy8Vtlwe+7Z053HtD4fCRqlHBt0Kils0Zea4D77R7o=",
+        "narHash": "sha256-1mdM539nkqTWVHTHPCGHGrLu/UwsxeYWnrnHQaUh1qQ=",
         "ref": "refs/heads/main",
-        "rev": "aa5a239ac92a6bd6947cce2ca3911606df392cb6",
+        "rev": "2b0fd417d32278159d0ca1d23fb997588c37995b",
-        "revCount": 6522,
+        "revCount": 6643,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -344,33 +344,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": 1762755186,
-        "narHash": "sha256-MhHSU9m/9HSckJ61OXcom/6F92NQf3s1QfLbRUApalc=",
+        "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=",
         "owner": "hyprwm",
-        "repo": "hyprland-plugins",
+        "repo": "hyprland-guiutils",
-        "rev": "e689220b1740aa99ca67fa06055792f82fa9ed85",
+        "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprland-plugins",
+        "repo": "hyprland-guiutils",
         "type": "github"
       }
     },
@@ -399,74 +415,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 +431,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758927902,
+        "lastModified": 1763254292,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b",
         "type": "github"
       },
       "original": {
@@ -496,6 +444,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": 1762463729,
+        "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -508,11 +508,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759619523,
+        "lastModified": 1763323331,
-        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "rev": "0c6411851cc779d551edc89b83966696201611aa",
         "type": "github"
       },
       "original": {
@@ -627,11 +627,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1761563673,
+        "lastModified": 1763738061,
-        "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
+        "narHash": "sha256-VpNRcInaj1MOya8NmcqhFmdO7KGO7SSZelJQmPl6HoQ=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
+        "rev": "3bcc267c4e0efa023b98b9c5cfbe11b88ec2dc8f",
         "type": "github"
       },
       "original": {
@@ -690,11 +690,11 @@
     },
     "nixpkgs-latest": {
       "locked": {
-        "lastModified": 1761810199,
+        "lastModified": 1763929585,
-        "narHash": "sha256-iMLB/90mK7lncjk3GVYlAmN1K+D6/7JVhOSau3O7eK0=",
+        "narHash": "sha256-uxJ8vJoupgc3oJYOK3UV/kbi1f4mXFsh1BuuozhZpfw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d03f6e8ae73c291f8088abf52ae378c448a2cce3",
+        "rev": "a5f13fe8d33e5dd3585980b288366665d35ed379",
         "type": "github"
       },
       "original": {
@@ -722,11 +722,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1761672384,
+        "lastModified": 1763678758,
-        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+        "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
         "type": "github"
       },
       "original": {
@@ -753,11 +753,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1761114652,
+        "lastModified": 1763283776,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
         "type": "github"
       },
       "original": {
@@ -785,11 +785,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1761373498,
+        "lastModified": 1762977756,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {
@@ -801,11 +801,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1761468971,
+        "lastModified": 1763622513,
-        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
+        "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
+        "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
         "type": "github"
       },
       "original": {
@@ -816,11 +816,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1756288264,
+        "lastModified": 1762286042,
-        "narHash": "sha256-Om8adB1lfkU7D33VpR+/haZ2gI5r3Q+ZbIPzE5sYnwE=",
+        "narHash": "sha256-OD5HsZ+sN7VvNucbrjiCz7CHF5zf9gP51YVJvPwYIH8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9",
+        "rev": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24",
         "type": "github"
       },
       "original": {
@@ -894,11 +894,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760663237,
+        "lastModified": 1763319842,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
         "type": "github"
       },
       "original": {
@@ -940,7 +940,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 +980,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756348497,
+        "lastModified": 1762396738,
-        "narHash": "sha256-xJp3VnoYh4kpsaKFO/7SsGbwOz7pI1ZmjbqpXEuR2cw=",
+        "narHash": "sha256-BarSecuxtzp1boERdABLkkoxQTi6s/V33lJwUbWLrLY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0adf92c70d23fb4f703aea5d3ebb51ac65994f7f",
+        "rev": "c63598992afd54d215d54f2b764adc0484c2b159",
         "type": "github"
       },
       "original": {
@@ -1017,11 +1016,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760998189,
+        "lastModified": 1763870012,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3",
         "type": "github"
       },
       "original": {
@@ -1088,11 +1087,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 +1107,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1761655046,
+        "lastModified": 1763600401,
-        "narHash": "sha256-lG7eQqs8HDmmOl6vFkJ1iDlQBR+jY30uD4YtvWulCZc=",
+        "narHash": "sha256-druDd9HC3UxZSzCY+qaFp9QDCGfzrhv+Zrytia6lJUE=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "564b8851961a7545a93ebf04c0f8dd5778d0eccb",
+        "rev": "a08b345a02c6b4c65239a0522f67e77a0132e88b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -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,9 +48,10 @@
       domain  = "nx2.site";
       home    = "/home/${user}";
       webroot = "/var/lib/hugo/nx2site/public";
+      pkgs-version = "25.05";
     };
 
-    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.05" }: import nixpkgs {
       inherit system config;
       overlays = [(final: prev: {
         unstable = import nixpkgs-unstable { inherit system config; };
@@ -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/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/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/git.nix

@@ -21,10 +21,10 @@
     };
     extraConfig = {
       credential = {
-        "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxDCS") "lkurzweg";
+        "https://git.da.dicos.de".username = lib.mkIf (hyper.host == "NxDCS") "lkurzweg";
-        "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxDCS") "Test";
+        "https://git.da.dicos.de".password = lib.mkIf (hyper.host == "NxDCS") "Test";
       };
-      url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxDCS") "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
     };

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;
@@ -213,7 +215,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"
@@ -354,7 +356,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 +603,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/opencode.nix

@@ -1,29 +1,29 @@
 { pkgs, ... }@all: with all; {
   home = {
     packages = with pkgs; [
-      opencode
+      unstable.opencode
     ];
-    file.".config/opencode/opencode.json".text = let
+    # file.".config/opencode/opencode.json".text = let
-      model = "qwen2.5-coder:7b";
+    #   model = "qwen2.5-coder:7b";
-    in builtins.toJSON {
+    # in builtins.toJSON {
-      "$schema" = "https://opencode.ai/config.json";
+    #   "$schema" = "https://opencode.ai/config.json";
-      model = "ollama/${model}";
+    #   model = "ollama/${model}";
-      theme = "matrix";
+    #   theme = "matrix";
-      provider = {
+    #   provider = {
-        ollama = {
+    #     ollama = {
-          name = "Ollama (local)";
+    #       name = "Ollama (local)";
-          npm = "@ai-sdk/openai-compatible";
+    #       npm = "@ai-sdk/openai-compatible";
-          options = {
+    #       options = {
-            baseURL = "http://localhost:11434/v1";
+    #         baseURL = "http://localhost:11434/v1";
-          };
+    #       };
-          models = {
+    #       models = {
-            "${model}" = {
+    #         "${model}" = {
-              tools = true;
+    #           tools = true;
-            };
+    #         };
-          };
+    #       };
-        };
+    #     };
-      };
+    # };
-    };
+    # };
   }; 
 }
 

home-modules/pkgs-list/programs.nix

@@ -12,6 +12,7 @@
   ] ++ (if (hyper.host != "NxACE") then [
     signal-desktop
     unstable.code-cursor-fhs
+    latest.antigravity
     obsidian
     zoom-us
     inkscape

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-wayland ];
-    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

@@ -17,6 +17,7 @@
         "${hyper.home}/vault/ssh/nxgit-nx2-${hyper.host}"
         "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}"
         "${hyper.home}/vault/ssh/tg-dm-informatik-tuda"
+        (pkgs.lib.mkIf (hyper.host == "NxDCS") "${hyper.home}/vault/ssh/dcsgit-lkurzweg-${hyper.host}")
       ];
       "github.com".identityFile = [ "${hyper.home}/vault/ssh/github-noggynoggy-${hyper.host}" ];
       "nxace" = nxace "nxace";

home-modules/yazi.nix

@@ -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,76 @@ in {
       };
       opener = {
         "edit" = [
-	        { run = ''hx "$@"''; desc = "helix"; block = true; }
+	        { run = ''hx "$0" "$@"''; desc = "Helix"; block = true; }
-	        { run = ''codium "$@"''; desc = "code"; orphan = true; }
+	        { run = ''codium "$0" "$@"''; desc = "VS Code"; orphan = true; }
+	        { run = ''antigravity "$0" "$0"''; desc = "Antigravity"; orphan = true; }
+	        { run = ''cat "$0" "$@" | wl-copy''; desc = "Copy Contents"; }
         ];
         "play" = [
-          { run = ''mpv "$@"''; desc = "mpv"; orphan = true; }
+          { run = ''mpv "$0" "$@"''; desc = "mpv"; orphan = true; }
-          { run = ''mpv --vf=negate "$@"''; desc = "mpv inverted"; orphan = true; }
+          { run = ''mpv --vf=negate "$0" "$@"''; desc = "mpv inverted"; orphan = true; }
-          { run = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo"; }
+          { run = ''mediainfo "$0"; echo "Press enter to return to yazi"; read''; block = true; desc = "Show mediainfo"; }
         ];
         "archive" = [
-          { run = ''unar "$1"''; desc = "Extract here"; }
+          { run = ''unar "$0" "$@"''; desc = "Extract here"; }
-          { run = ''tar -x "$1"''; desc = "tar -x"; }
+          { run = ''tar -x "$0" "$@"''; desc = "tar -x"; }
-          { run = ''unzip "$1"''; desc = "unzip"; }
+          { run = ''unzip "$0" "$@"''; desc = "unzip"; }
         ];
         "image" = [
-          { run = ''imv "$@"''; desc = "imv"; orphan = true; }
+          { run = ''imv "$0" "$@"''; desc = "imv"; orphan = true; }
-          { run = ''gimp "$@"''; desc = "gimp"; orphan = true; }
+          { run = ''gimp "$0" "$@"''; desc = "gimp"; orphan = true; }
           { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper"; }
-          { run = ''exiftool "$@"; echo "Press enter to exit"; read''; desc = "View Exif Data"; }
+          { run = ''exiftool "$0"; 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 "$0"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; }
         ];
         "svg" = [
-          { run = ''inkscape "$@"''; desc = "inkscape"; orphan = true; }
+          { run = ''inkscape "$0" "$@"''; desc = "inkscape"; orphan = true; }
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
+          { run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; }
         ];
         "font" = [
-          { run = ''fontpreview "$@"''; desc = "fontpreview"; orphan = true; }
+          { run = ''fontpreview "$0" "$@"''; desc = "fontpreview"; orphan = true; }
-          { run = ''fontforge "$@"''; desc = "fortforge"; orphan = true; }
+          { run = ''fontforge "$0" "$@"''; desc = "fortforge"; orphan = true; }
         ];
         "document" = [
-          { run = ''zathura "$@"''; desc = "zathura"; orphan = true; }
+          { run = ''zathura "$0" "$@"''; desc = "zathura"; orphan = true; }
-          { run = ''xournal "$@"''; desc = "xournal"; orphan = true; }
+          { run = ''xournal "$0" "$@"''; desc = "xournal"; orphan = true; }
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
+          { run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; }
-          { run = ''nxgs flip "$@"''; desc = "nxgs flip"; }
+          { run = ''nxgs flip "$0" "$@"''; desc = "nxgs flip"; }
-          { run = ''nxgs rotate "$@"''; desc = "nxgs rotate"; }
+          { run = ''nxgs rotate "$0" "$@"''; desc = "nxgs rotate"; }
-          { run = ''nxgs interactive-merge "$@"''; block = true; desc = "nxgs merge"; }
+          { run = ''nxgs interactive-merge "$0" "$@"''; block = true; desc = "nxgs merge"; }
         ];
         "browser" = [
-          { run = ''firefox "$@"''; desc = "firefox"; orphan = true; }
+          { run = ''firefox "$0" "$@"''; desc = "firefox"; orphan = true; }
-          { run = ''zen "$@"''; desc = "zen"; orphan = true; }
+          { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$0" "$@"''; desc = "chromium"; orphan = true; }
-          { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "chromium"; orphan = true; }
+          { run = ''w3m "$0" "$@"''; desc = "w3m"; }
-          { run = ''w3m "$@"''; desc = "w3m"; }
+          { run = ''lynx "$0" "$@"''; desc = "lynx"; }
-          { run = ''lynx "$@"''; desc = "lynx"; }
         ];
         "office" = [
-          { run = ''libreoffice "$@"''; desc = "libreoffice"; orphan = true; }
+          { run = ''libreoffice "$0" "$@"''; desc = "libreoffice"; orphan = true; }
-          { run = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; orphan = true; }
+          { run = ''libreoffice --view "$0" "$@"''; desc = "libreoffice read-only"; orphan = true; }
         ];
         "shell" = [
-          { run = ''bash -c "$@"''; desc = "bash -c"; }
+          { run = ''bash -c "$0"; echo "Press enter to return to yazi"; read''; desc = "bash -c"; }
-          { run = ''fish -c "$@"''; desc = "fish -c"; }
+          { run = ''fish -c "$0"; echo "Press enter to return to yazi"; read''; desc = "fish -c"; }
-          { run = ''sh -c "$@"'';   desc = "sh -c"; }
+          { run = ''sh -c "$0"; 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 "$0"''; 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 +326,6 @@ in {
       tabs = {
         active    = { fg = secondary.dark; bg = secondary.base; };
         inactive  = { fg = secondary.base; bg = secondary.dark; };
-        # sep_inner = 
-        # sep_outer = 
       };
       status = {
         separator_open  = " "; #"";

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/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/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/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;