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

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Lennart J. Kurzweg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,46 @@
+# ❄️ NixOS Dotfiles
+
+![Screenshot of my desktop](splash.png)
+
+## Information
+
+- Using stable + unstable via flakes
+- Multi-host config (Desktop, Laptop, Server)
+- Using home-manager for home-configuration
+- Using sops-nix with GPG + git-crypt for secrets 
+
+## Features:
+- The WM Hyperland extended to more or less full a DE with 
+  - automounting
+  - notifications
+  - a bar
+  - gesture control
+  - runner
+  - ...
+- Virtualization support
+  - docker
+  - virt-manager
+- Multilingual typing with Fcitx5
+- Fully functioning Nvidia/Nvidia Prime support
+- Fully customized editor `helix`
+- Locally running LLM-server with tools written around it
+- Fully themed ("riced") via a custom, intentionally semi-automatic, adaptive system responding to wallpaper color 
+  - as can be seen in `flake-modules/rice.nix`
+- Next-Gen shell experience with
+  - fish
+  - starship
+  - zoxide
+  - yazi
+  - direnv
+  - lazygit + lazydocker
+
+## Thanks to
+- [LibrePhoenix](https://www.youtube.com/@librephoenix) for getting me started
+- [VimJoyer](https://www.youtube.com/@vimjoyer) for making quick NixOS tutorials on many topics 
+- Everyone that talks about NixOS in NixOS-forums and rooms instead of politics
+- [Everyone that put up their code on Github](https://github.com/search?type=code&auto_enroll=true&q=language%3Anix) for me to reference
+
+## Licensing
+- The code found in this Repository is Licensed under the MIT-license 
+- I've decided against the GPLv3, since I am not going to sue anyone over this, but 
+- I encourage everyone to open source their work for anyone to at least reference

configuration.nix

@@ -1,34 +1,50 @@
-{ pkgs, pkgs-unstable, lib, inputs, allowed, nvidia, ... }:
+{ pkgs, inputs, lib, host, ... }:
 {
-  imports = [
+  imports = ([
     inputs.sops-nix.nixosModules.sops
+    ./system-modules/adb.nix
+    ./system-modules/auto-mount.nix
     ./system-modules/hardware-configuration.nix
     ./system-modules/fuse.nix
+    ./system-modules/games.nix
     ./system-modules/nvidia.nix 
     ./system-modules/users.nix
     ./system-modules/sound.nix
     ./system-modules/fonts.nix
-    ./system-modules/boot.nix
+    ./system-modules/boot.nix 
     ./system-modules/gc.nix
+    ./system-modules/boot.nix
     ./system-modules/dm.nix
-    ./system-modules/networking.nix
-    # ./system-modules/virtualisation.nix
-    ./system-modules/sshd.nix
-    ./system-modules/gpg.nix
-    ./system-modules/sops.nix
-    ./system-modules/syncthing.nix
-    ./system-modules/hsmw.nix # old
     ./system-modules/docker.nix
+    ./system-modules/fcitx5.nix
+    ./system-modules/fonts.nix
+    ./system-modules/fuse.nix
+    ./system-modules/gc.nix
+    ./system-modules/gpg.nix
+    ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
-    ./system-modules/ydotool.nix
-    ./system-modules/ollama.nix
-    ./system-modules/nx2site.nix
+    ./system-modules/hsmw.nix
+    ./system-modules/kanata.nix
     ./system-modules/kodi.nix
+    ./system-modules/networking.nix
+    ./system-modules/nixd.nix
+    ./system-modules/nvidia.nix 
+    ./system-modules/ollama.nix
     ./system-modules/qmk.nix
-  ];
-
-
-
+    ./system-modules/sops.nix
+    ./system-modules/sound.nix
+    ./system-modules/sshd.nix
+    ./system-modules/syncthing.nix
+    ./system-modules/users.nix
+    ./system-modules/virtualisation.nix
+    ./system-modules/ydotool.nix
+  ]) ++ (if (host == "NxACE") then [ 
+    ./system-modules/nx2site.nix
+    ./system-modules/postgres.nix
+    ./system-modules/nx2site/proxy.nix
+    # ./system-modules/nx2site/gitea.nix
+    # ./system-modules/nx2site/vaultwarden.nix
+  ] else []);
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
@@ -56,35 +72,28 @@
   services.libinput.enable = true;
   hardware.uinput.enable = true;
 
-  hardware.bluetooth.enable = true; # enables support for Bluetooth
-  hardware.bluetooth.powerOnBoot = true; # 
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;  
+    package = pkgs.bluez5-experimental;
+    settings.Policy.AutoEnable = "true";
+    settings.General.Enable = "Source,Sink,Media,Socket";
+   };
   services.blueman.enable = true;
 
-  # nixpkgs.config.allowUnfree = true;
-  nixpkgs.config = {
-    # allowUnfree = true;
-    # allowUnfreePredicate = (pkg: true);
-    allowUnfreePredicate = let 
-      string-list = allowed.unfree-packages ++ (if nvidia.enable == true then nvidia.unfree else []); 
-    in pkg: builtins.elem (lib.getName pkg) string-list;
-    cudaSupport = nvidia.enable;
-    enableParallelBuildingByDefault = true;
-  };
- 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; ([
     git
-    lazygit # home-manager module is bugged
     git-crypt
+    lazygit # home-manager module is bugged
     wget
-    curl
+    curlHTTP3
     zip
     unzip
     p7zip
     unar
     nano
-    micro
     htop
     direnv
     openssl
@@ -109,6 +118,8 @@
 
   system.stateVersion = "24.05";
 
+  nixpkgs.config.allowUnfree = true;
+
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   programs.bash.shellInit = ''

flake-modules/allowed.nix

@@ -0,0 +1,43 @@
+
+{
+  unfree = [
+    "discord"
+    "spotify"
+    "obsidian"
+    "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"
+    "cudatoolkit"
+    "cuda-merged"
+    "cuda_cuobjdump"
+    "cuda_gdb"
+    "cuda_nvcc"
+    "cuda_nvdisasm"
+    "cuda_nvprune"
+    "cuda_cccl"
+    "cuda_cudart"
+    "cuda_cupti"
+    "cuda_cuxxfilt"
+    "cuda_nvml_dev"
+    "cuda_nvrtc"
+    "cuda_nvtx"
+    "cuda_profiler_api"
+    "cuda_sanitizer_api"
+    "libcublas"
+    "libcufft"
+    "libcurand"
+    "libcusolver"
+    "libnvjitlink"
+    "libcusparse"
+    "libnpp"
+  ];
+
+  inecure = [
+    # "electron-25.9.0"
+  ];
+}

flake-modules/colors.json

@@ -0,0 +1,13 @@
+{
+    "base": {
+        "foreground": "#eedce2",
+        "background": "#221016"
+    },
+    "to_alter": {
+        "accent": "#ac5271",
+        "secondary": "#f20c5b",
+        "tertiary": "#d5a287",
+        "special": "#51ac8d",
+        "weird": "#0cf2a3"
+    }
+}

flake-modules/nvidia.nix

@@ -0,0 +1,4 @@
+{
+  enable = false;
+  prime = false;
+}

flake-modules/rice.nix

@@ -0,0 +1,63 @@
+pkgs: rec {
+
+  lib = import ../nxlib/ricelib.nix pkgs.lib;
+
+  transparency = 0.8;
+  rounding = 3;
+  gap-size = 5;
+  border-width = 2;
+  color =
+    let
+      dark = (-0.5);
+      bright = (0.5);  
+      alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
+      alter     = let f = lib.alter-luminace-hex; in             color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
+      # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json));
+      ccolor = builtins.mapAttrs alter-set {
+        black =   "#111111"; # "#111111" "#001100";
+        white =   "#dddddd"; # "#dddddd" "#66dd66";
+        blue =    "#4444dd"; # "#3333dd" "#003300";
+        cyan =    "#44dddd"; # "#11dddd" "#00dd55";
+        green =   "#44dd44"; # "#11dd11" "#11dd11";
+        magenta = "#dd44dd"; # "#dd11dd" "#005500";
+        red =     "#dd4444"; # "#dd1111" "#00aa00";
+        yellow =  "#dddd44"; # "#dddd11" "#ffff00";
+      };
+      facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter;
+      fbcolor =                             (builtins.fromJSON (builtins.readFile ./colors.json)).base;
+      fcolor = facolor // fbcolor;
+      xcolor = with ccolor; with fcolor; rec {
+        background = "#000000";
+        # foreground = "#dddddd";
+        # accent = blue;
+        # secondary = cyan;
+        # tertiary = magenta;
+        # special = yellow;
+        # weird = green;
+        positive = alter "#00dd00";
+        negative = alter "#dd0000";
+        border = accent.base;
+        border2 = secondary.base;
+      };
+    in ccolor // fcolor // xcolor; 
+  font = {
+    code = {
+      name = "JetBrainsMono-NF";
+      name2 = "JetBrainsMono Nerd Font";
+      package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
+      # name = "CascadiaCove-NF";
+      # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
+    };
+    base = {
+      # name = "NewComputerModern08";
+      # package = pkgs.newcomputermodern;
+      name = "Atkinson Hyperlegible";
+      package = pkgs.atkinson-hyperlegible;
+    };
+  };
+  cursor = {
+    name = "Bibata-Original-Classic";
+    package = pkgs.bibata-cursors;
+    size = 24;
+  };
+}

flake.lock

@@ -4,14 +4,15 @@
       "inputs": {
         "hyprland": [
           "hyprland"
-        ]
+        ],
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1718642173,
-        "narHash": "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8=",
+        "lastModified": 1728710667,
+        "narHash": "sha256-9HR9EePhzweUAUPUccByNYxKQzfFAnxfu2BXTLqOLZQ=",
         "owner": "KZDKM",
         "repo": "Hyprspace",
-        "rev": "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7",
+        "rev": "e8406a7708bceb3b5bedf56b67490dbe3d27e6f8",
         "type": "github"
       },
       "original": {
@@ -20,6 +21,39 @@
         "type": "github"
       }
     },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728902391,
+        "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": [
@@ -53,30 +87,23 @@
         "type": "github"
       }
     },
-    "firefox-addons": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
+    "flake-compat": {
+      "flake": false,
       "locked": {
-        "dir": "pkgs/firefox-addons",
-        "lastModified": 1719875691,
-        "narHash": "sha256-DtfpH7yivPHcfXV0EL70NwCKlg6nVTZGNngWkPshQjM=",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "rev": "f2c6c0e41d6c2c82524b9d104bcfd1750a426d1b",
-        "type": "gitlab"
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
       },
       "original": {
-        "dir": "pkgs/firefox-addons",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "type": "gitlab"
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
       }
     },
-    "flake-compat": {
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -97,11 +124,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1719877454,
-        "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -132,23 +159,8 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1629284811,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -164,7 +176,47 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_2": {
       "inputs": {
         "nixpkgs": [
           "lanzaboote",
@@ -193,11 +245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827385,
-        "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
@@ -223,11 +275,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718450675,
-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
+        "lastModified": 1728669738,
+        "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
+        "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
         "type": "github"
       },
       "original": {
@@ -238,20 +290,23 @@
     },
     "hyprland": {
       "inputs": {
+        "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
+        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs",
-        "systems": "systems",
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1719938427,
-        "narHash": "sha256-b0QtvQtFAtuOVBNPEUYf4V2VNGChTukkrLH/JlCQds8=",
+        "lastModified": 1729629261,
+        "narHash": "sha256-IJtor2qFpsZkCm4UMnCHOSosW9GXKZVOm7DILtJJgoM=",
         "ref": "refs/heads/main",
-        "rev": "6247a6b537fd1c05ecf35420529fab1adf83143e",
-        "revCount": 4903,
+        "rev": "29997ef4ba8ef0a80390e80199998d1390177454",
+        "revCount": 5366,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -279,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719784423,
-        "narHash": "sha256-D7O5+nh2Wn9tQPJArWHrDSZeEfBCtj5zTGd86701LPE=",
+        "lastModified": 1729596320,
+        "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "98cb18c6fcfe8196ef4150d09fbae305b7bb2954",
+        "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219",
         "type": "github"
       },
       "original": {
@@ -296,21 +351,19 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "xdph",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
-          "xdph",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1714869498,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "lastModified": 1728345020,
+        "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "a7c183800e74f337753de186522b9017a07a8cee",
         "type": "github"
       },
       "original": {
@@ -335,11 +388,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717881852,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "lastModified": 1728168612,
+        "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
         "type": "github"
       },
       "original": {
@@ -354,11 +407,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1719780938,
-        "narHash": "sha256-YocumFkp3FCgN3UCXp95EV7IvAwhQdlSav8cCB0oHv0=",
+        "lastModified": 1725107917,
+        "narHash": "sha256-6on3nwb3gB4t+P/2IExgGhVLVgAkF6ZiE5x+qcQHEXU=",
         "owner": "h3rmt",
         "repo": "hyprswitch",
-        "rev": "4dbba183fcbaa63de64e973d5dc9bba883765aa3",
+        "rev": "f478c394ad6db5ba268f80052f1eb2366366b21e",
         "type": "github"
       },
       "original": {
@@ -380,11 +433,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719316102,
-        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
+        "lastModified": 1728941256,
+        "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
+        "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
         "type": "github"
       },
       "original": {
@@ -405,11 +458,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719067853,
-        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
+        "lastModified": 1726874836,
+        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
+        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
         "type": "github"
       },
       "original": {
@@ -421,9 +474,9 @@
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_2",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "rust-overlay": "rust-overlay"
@@ -445,11 +498,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719075281,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
         "type": "github"
       },
       "original": {
@@ -459,19 +512,51 @@
         "type": "github"
       }
     },
+    "nixpkgs-latest": {
+      "locked": {
+        "lastModified": 1729631290,
+        "narHash": "sha256-zVL79jvDihxcnq9FKkAoILYWxGmxCw1DGdBnpv/B+3s=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1f9d2cf67508efd9b5e81cdf7af556bbbfe02377",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1719876945,
-        "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
       }
     },
     "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1720386169,
+        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
       "locked": {
         "lastModified": 1678872516,
         "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
@@ -487,29 +572,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
+    "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1719663039,
-        "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
+        "lastModified": 1729357638,
+        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
+        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1719848872,
-        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
+        "lastModified": 1729413321,
+        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
+        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
         "type": "github"
       },
       "original": {
@@ -551,11 +636,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1719838683,
-        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
+        "lastModified": 1729449015,
+        "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
+        "rev": "89172919243df199fe237ba0f776c3e3e3d72367",
         "type": "github"
       },
       "original": {
@@ -564,6 +649,62 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1729265718,
+        "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1728778939,
+        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -574,12 +715,12 @@
           "lanzaboote",
           "flake-utils"
         ],
-        "gitignore": "gitignore",
+        "gitignore": "gitignore_2",
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
         "lastModified": 1681413034,
@@ -598,15 +739,17 @@
     "root": {
       "inputs": {
         "Hyprspace": "Hyprspace",
-        "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "hyprswitch": "hyprswitch",
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs_4",
+        "nixpkgs-latest": "nixpkgs-latest",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "yazi": "yazi",
+        "zen-browser": "zen-browser"
       }
     },
     "rust-overlay": {
@@ -634,19 +777,40 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729391507,
+        "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "784981a9feeba406de38c1c9a3decf966d853cca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1719873517,
-        "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
+        "lastModified": 1729587807,
+        "narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a11224af8d824935f363928074b4717ca2e280db",
+        "rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27",
         "type": "github"
       },
       "original": {
@@ -671,6 +835,36 @@
       }
     },
     "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -687,11 +881,22 @@
     },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
         "hyprlang": [
           "hyprland",
           "hyprlang"
         ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -702,11 +907,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718619174,
-        "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
+        "lastModified": 1728166987,
+        "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
+        "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
         "type": "github"
       },
       "original": {
@@ -714,6 +919,44 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "yazi": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1729473414,
+        "narHash": "sha256-ffiEVFCUMnShcSa4hvCbT1EQeu7c2lVOk6OdaxjiUmU=",
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "rev": "0e118b5b3a5baacf7fe62971e2bfe2b0ad972bab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "type": "github"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1727721329,
+        "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,244 +2,70 @@
   description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05"; 
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nixpkgs =          { url = "nixpkgs/nixos-24.05";                                                                        };
+    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                     };
+    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                            };
+    home-manager =     { url = "github:nix-community/home-manager/release-24.05";      inputs.nixpkgs.follows = "nixpkgs";   };
+    sops-nix =         { url = "github:Mic92/sops-nix";                                inputs.nixpkgs.follows = "nixpkgs";   };
+    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.3.0";                                                     };
 
-    hyprland = {
-      url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-      # url = "github:hyprwm/Hyprland";
-      # inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
-    Hyprspace = {
-      url = "github:KZDKM/Hyprspace";
-      inputs.hyprland.follows = "hyprland";
-    };
-    hyprswitch.url = "github:h3rmt/hyprswitch/release";
+    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                        };
+    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                       inputs.hyprland.follows = "hyprland"; };
+    Hyprspace =        { url = "github:KZDKM/Hyprspace";                               inputs.hyprland.follows = "hyprland"; };
+    hyprswitch =       { url = "github:h3rmt/hyprswitch/release";                                                            };
 
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.3.0";
-      # inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-    #arion = {
-    #  url = "github:hercules-ci/arion";
-    #  inputs.nixpkgs.follows = "nixpkgs";
-    #};
-    firefox-addons = {
-      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    # yazi.url = "github:sxyazi/yazi";
+    # firefox-addons =   { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; };
+    yazi.url = "github:sxyazi/yazi";
+    zen-browser.url = "github:MarceColl/zen-browser-flake";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
-    let
-      system = "x86_64-linux";
-      pkgs-config = {
-        allowUnfree = true;
-        # cudaSupport = nvidia.enable;
-        # enableParallelBuildingByDefault = true;
-      };
-      pkgs = import nixpkgs { 
-        system = system; 
-        config = pkgs-config;
-      };
-      pkgs-unstable = import nixpkgs-unstable {
-        system = system;
-        config = pkgs-config;
-      };
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-latest, home-manager, ... }@inputs: let
+    system = "x86_64-linux";
+    user   = "nx2";
+    domain = "nx2.site";
 
-      user = "nx2";
+    config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
+   
+    pkgs          = import nixpkgs          { inherit system config; };
+    pkgs-unstable = import nixpkgs-unstable { inherit system config; };
+    pkgs-latest   = import nixpkgs-latest   { inherit system config; };
 
-      nvidia = {
-        enable = true;
-        prime = true;
-        # unfree = if enable then [
-        unfree = [
-          "cuda_cccl"
-          "cuda_cudart"
-          "cuda_cuobjdump"
-          "cuda_cupti"
-          "cuda_cuxxfilt"
-          "cuda_gdb"
-          "cuda-merged"
-          "cuda_nvcc"
-          "cuda_nvdisasm"
-          "cuda_nvml_dev"
-          "cuda_nvprune"
-          "cuda_nvrtc"
-          "cuda_nvtx"
-          "cuda_profiler_api"
-          "cuda_sanitizer_api"
-          "cudatoolkit"
-          "libcublas"
-          "libcufft"
-          "libcurand"
-          "libcusolver"
-          "libcusparse"
-          "libnpp"
-          "libnvjitlink"
-          "nviaia-x11"
-          "nvidia-persistenced"
-          "nvidia-settings"
-          "nvidia-x11"
-        ];
-        # ] else [];
-      };
-      allowed = {
-        unfree-packages = [
-          "discord"
-          "obsidian"
-          "spotify"
-          "zoom"
-          "zoom-us"
-        ] ++ nvidia.unfree;
-
-        inecure-packages = [
-          "electron-25.9.0"
-        ];
-      };
-
-      secrets = import ./git-crypt/secrets.nix;
-
-      rice = rec {
-        lib = import ./nxlib/ricelib.nix { lib = nixpkgs.lib; };
-        transparency = 0.8;
-        rounding = 10;
-        gap-size = 10;
-        border-width = 3;
-        color =
-          let
-            dark = (-0.5);
-            bright = (0.5);  
-            alter-set = let f = rice.lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
-            alter     = let f = rice.lib.alter-luminace-hex; in             color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
-            ccolor = builtins.mapAttrs alter-set {
-              black =   "#000022"; # "#111111" "#001100";
-              white =   "#ddddff"; # "#dddddd" "#66dd66";
-              blue =    "#4422ff"; # "#3333dd" "#003300";
-              cyan =    "#11dddd"; # "#11dddd" "#00dd55";
-              green =   "#11dd44"; # "#11dd11" "#11dd11";
-              magenta = "#6622dd"; # "#dd11dd" "#005500";
-              red =     "#dd1166"; # "#dd1111" "#00aa00";
-              yellow =  "#dd6611"; # "#dddd11" "#ffff00";
-            };
-            xcolor = with ccolor; rec {
-              background = black.dark;
-              foreground = white.base;
-              border = cyan.base;
-              border2 = blue.base;
-              accent = blue;
-              secondary = cyan;
-              tertiary = magenta;
-              special = yellow;
-              weird = green;
-              positive = alter "#00dd00";
-              negative = alter "#dd0000";
-            };
-            # ccolor = builtins.mapAttrs alter-set {
-            #   black =   "#112200"; 
-            #   white =   "#ddffdd"; 
-            #   blue =    "#779944"; 
-            #   cyan =    "#11ffcc"; 
-            #   green =   "#00ff00"; 
-            #   magenta = "#449999"; 
-            #   red =     "#dd2200"; 
-            #   yellow =  "#ffff11"; 
-            # };
-            # xcolor = with ccolor; rec {
-            #   background = black.dark;     # black.dark;
-            #   foreground = white.base;     # white.base;
-            #   border = accent.base;        # cyan.base;
-            #   border2 = yellow.base;       # blue.base;
-            #   accent = green;              # blue;
-            #   secondary = red;            # cyan;
-            #   tertiary = yellow;           # magenta;
-            #   special = blue;              # yellow;
-            #   weird = magenta;             # green;
-            #   positive = alter "#00dd00";  # alter "#00dd00";
-            #   negative = alter "#dd0000";  # alter "#dd0000";
-            # };
-          in ccolor // xcolor; 
-        font = {
-          code = {
-            name = "JetBrainsMono-NF";
-            name2 = "JetBrainsMono Nerd Font";
-            package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
-            # name = "CascadiaCove-NF";
-            # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
-          };
-          base = {
-            # name = "NewComputerModern08";
-            # package = pkgs.newcomputermodern;
-            name = "Atkinson Hyperlegible";
-            package = pkgs.atkinson-hyperlegible;
-          };
-        };
-        cursor = {
-          name = "Bibata-Original-Classic";
-          package = pkgs.bibata-cursors;
-          size = 24;
-        };
-      };
-    in
-    {
-      nixosConfigurations = {
-        NxXPS = let host = "NxXPS"; in nixpkgs.lib.nixosSystem {
-            inherit system;
-            modules = [ ./configuration.nix ];
-            specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
-          };
-        NxNORTH = let host = "NxNORTH"; in nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [ ./configuration.nix ];
-          specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
-        };
-        NxACE = let host = "NxACE"; nvidia.enable = false; in nixpkgs.lib.nixosSystem {
-            inherit system;
-            modules = [ ./configuration.nix ];
-            specialArgs = { inherit inputs user host pkgs-unstable allowed secrets rice nvidia; };
-          };
-      };
-
-      homeConfigurations = {
-        "${user}@NxXPS" = let host = "NxXPS"; in home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = [ ./home.nix ];
-          extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-        };
-        "${user}@NxNORTH" = let host = "NxNORTH"; in home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = [ ./home.nix ];
-          extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-        };
-        "${user}@NxACE" = let host = "NxACE"; nvidia.enable = false; in home-manager.lib.homeManagerConfiguration {
-            inherit pkgs;
-            modules = [ ./home.nix ];
-            extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-          };
-        "tv@NxACE" =
-          let
-            host = "NxACE";
-            user = "tv";
-            nvidia.enable = pkgs.kib.mkForce false;
-          in
-          home-manager.lib.homeManagerConfiguration {
-            inherit pkgs;
-            modules = [ ./home.nix ];
-            extraSpecialArgs = { inherit inputs system user host allowed secrets pkgs-unstable rice nvidia; };
-          };
+    nvidia-set    = import ./flake-modules/nvidia.nix;
+    secrets       = import ./git-crypt/secrets.nix;
+    rice          = import ./flake-modules/rice.nix pkgs;
+  in {
+    nixosConfigurations = let
+      make-nixos-system = host: nixpkgs.lib.nixosSystem { 
+        inherit system;
+        modules = [ ./configuration.nix ];
+        specialArgs = let
+          nvidia = nvidia-set // {
+            enable = if (host == "NxXPS" || host == "NxNORTH") then true else false;
+            prime = if (host == "NxXPS") then true else false;
+          }; 
+        in { inherit inputs user host domain pkgs-unstable pkgs-latest secrets rice nvidia; };
       };
+    in {
+      NxXPS = make-nixos-system "NxXPS";
+      NxNORTH = make-nixos-system "NxNORTH"; 
+      NxACE = make-nixos-system "NxACE"; 
     };
+
+    homeConfigurations = let 
+      make-home-configuration = host: user: home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = [ ./home.nix ];
+        extraSpecialArgs = let
+          nvidia = nvidia-set // {
+            enable = if (host == "NxXPS" || host == "NxNORTH") then true else false;
+            prime = if (host == "NxXPS") then true else false;
+          }; 
+        in { inherit inputs system user host domain pkgs-unstable pkgs-latest rice secrets nvidia; };
+      };
+    in {
+      "${user}@NxXPS" = make-home-configuration "NxXPS" user; 
+      "${user}@NxNORTH" = make-home-configuration "NxNORTH" user; 
+      "${user}@NxACE" = make-home-configuration "NxACE" user; 
+    };
+  };
 }

home-modules/assets/gtk-2.0/apps.rc

@@ -1,92 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-  # Spin background
-  bg[NORMAL] = @base_color
-
-  engine "pixmap" {
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up-alt.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/pan-up-alt-disabled.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down-alt.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/pan-down-alt-disabled.png"
-      overlay_stretch = FALSE
-    }
-  }
-}
-
-style "chrome_gtk_frame" {
-  ChromeGtkFrame::frame-color                    = @titlebar_bg_color
-  ChromeGtkFrame::inactive-frame-color           = @titlebar_bg_color
-  ChromeGtkFrame::incognito-frame-color          = @titlebar_bg_color
-  ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-  ChromeGtkFrame::frame-gradient-size = 0
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"