flake bump

lr + dicos description + cleanup

.ignore

@@ -0,0 +1,15 @@
+flake.lock
+*.remmina
+*.pem
+*.env
+*.key
+*.ovpn
+sops-secrets.yaml
+*.png
+*.jpg
+*.webp
+*.gif
+*.mp3
+*.mp4
+
+

.sops.yaml

@@ -1,7 +1,7 @@
 keys:
   - &users:
-    - &nx2backup age1sgzc2jh8af30a3cp6g7l4hyzusqrn3x3xw7frghc4akvjaplwa3stfemxc
     - &nx2 22FB2CC03DC5292AB81CF67D0AF27B383170E634
+    - &nx2_key_13 age1x2lpsennl74n0f5jl60uv2ffjcuqymzf9ap3frlz2quyv0x3hq3scnewwq
   - &hosts:
     - &north age1vkqn2nars5qmpr35tac0x9vshphrq6nnzjfyxwusgn27kt3zualssv0u8e
     - &xps age1jvf2lyrt2dw9jfnwgvnhmj9fmvyq8vvtepqjpkyycc5dqkkd4edqhxsgv6
@@ -13,6 +13,6 @@ creation_rules:
       - *north
       - *xps
       - *ace
-      - *nx2backup
+      - *nx2_key_13
       pgp:
       - *nx2

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,116 +1,68 @@
-{ pkgs, pkgs-unstable, lib, inputs, allowed, nvidia, ... }:
+{ ... }@all: with all; {
-{
   imports = [
     inputs.sops-nix.nixosModules.sops
-    ./system-modules/hardware-configuration.nix
+    ./system-modules/adb.nix
-    ./system-modules/fuse.nix
+    ./system-modules/auto-mount.nix
-    ./system-modules/nvidia.nix 
+    ./system-modules/tz.nix
-    ./system-modules/users.nix
+    ./system-modules/bluetooth.nix
-    ./system-modules/sound.nix
-    ./system-modules/fonts.nix
     ./system-modules/boot.nix
-    ./system-modules/gc.nix
+    ./system-modules/cache.nix
+    ./system-modules/calendar.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/games.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/hsmw.nix
-    ./system-modules/ollama.nix
+    ./system-modules/kanata.nix
-    ./system-modules/nx2site.nix
+    ./system-modules/terminal.nix
     ./system-modules/kodi.nix
+    ./system-modules/networking.nix
+    ./system-modules/nixd.nix
+    ./system-modules/nvidia.nix 
+    ./system-modules/obs.nix
+    ./system-modules/ollama.nix
     ./system-modules/qmk.nix
-  ];
+    ./system-modules/scanning.nix
-
+    ./system-modules/sops.nix
-
+    ./system-modules/sound.nix
-
+    ./system-modules/sshd.nix
-
+    ./system-modules/base-packages.nix
-  # Set your time zone.
+    ./system-modules/input.nix
-  time.timeZone = "Europe/Berlin";
+    ./system-modules/syncthing.nix
-
+    ./system-modules/tuda.nix
-  # Select internationalisation properties.
+    ./system-modules/gui.nix
-  i18n.defaultLocale = "en_US.UTF-8";
+    ./system-modules/editor.nix
-  console.font = "Lat2-Terminus16";
+    ./system-modules/printing.nix
-  console.keyMap = "de";
+    ./system-modules/security.nix
-
+    ./system-modules/users.nix
-  services.xserver = {
+    ./system-modules/virtualisation.nix
-    enable = true;
+    ./system-modules/ydotool.nix
-    xkb = {
+  ] ++ (if (hyper.host == "NxACE") then [ 
-      layout = "de";
+    ./system-modules/nx2site.nix
-      options = "eurosign:e,caps:escape";
+    ./system-modules/hugo.nix
-    };
+    ./system-modules/postgres.nix
-    # lightdm in lightdm.nix
+    ./system-modules/nx2site/proxy.nix
-  };
+    ./system-modules/nx2site/audiobookshelf.nix
-  # Enable CUPS to print documents.
+    ./system-modules/nx2site/gitea.nix
-  services.printing.enable = true;
+    ./system-modules/nx2site/open-web-calendar.nix
-
+    ./system-modules/nx2site/radicale.nix
-  # rtkit is optional but recommended
+    ./system-modules/nx2site/vaultwarden.nix
-  security.rtkit.enable = true;
+    ./system-modules/nx2site/paperless.nix
-
+    ./system-modules/calendar/publish.nix
-  # Enable touchpad support (enabled default in most desktopManager).
+    ./system-modules/calendar/lec.nix
-  services.libinput.enable = true;
+    ./system-modules/calendar/lr.nix
-  hardware.uinput.enable = true;
+    ./system-modules/calendar/dicos.nix
-
+  ] else [
-  hardware.bluetooth.enable = true; # enables support for Bluetooth
-  hardware.bluetooth.powerOnBoot = true; # 
-  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
-    wget
-    curl
-    zip
-    unzip
-    p7zip
-    unar
-    nano
-    micro
-    htop
-    direnv
-    openssl
-    blueman
-    dmidecode
-    file
-  # ]) ++ (with pkgs-unstable; [
-  # # sendme
   ]);
-
+  systemd.extraConfig = "DefaultLimitNOFILE=2048";
-  environment.variables = {
+  system.stateVersion = hyper.pkgs-version;
-    EDITOR = "hx";
-    VISUAL = "hx";  
-  };
-
-
-  programs.hyprland = {
-    # config is done with home-manager
-    enable = true;
-    xwayland.enable = true;
-  };
-
-  system.stateVersion = "24.05";
-
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   programs.bash.shellInit = ''
     source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
   '';

flake-modules/allowed.nix

@@ -0,0 +1,47 @@
+
+{
+  unfree = [
+    "discord"
+    "spotify"
+    "obsidian"
+    "steam"
+    "steam-unwrapped"
+    "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"
+
+    "vscode-extension-mhutchie-git-graph"
+  ];
+
+  inecure = [
+    # "electron-25.9.0"
+  ];
+}

flake-modules/colors.json

@@ -0,0 +1,13 @@
+{
+    "base": {
+        "foreground": "#fefefe",
+        "background": "#020202"
+    },
+    "to_alter": {
+        "accent": "#aaaaff",
+        "secondary": "#aaeeff",
+        "tertiary": "#aaffaa",
+        "special": "#aaffaa",
+        "weird": "#ffffaa"
+    }
+}

flake-modules/nvidia.nix

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

flake-modules/rice.nix

@@ -0,0 +1,59 @@
+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 =   "#040404"; # "#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; {
+      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 Nerd Font";
+      package = pkgs.nerd-fonts.jetbrains-mono;
+    };
+    base = {
+      # name = "NewComputerModern08";
+      # package = pkgs.newcomputermodern;
+      name = "Atkinson Hyperlegible";
+      package = pkgs.atkinson-hyperlegible-next;
+    };
+  };
+  cursor = {
+    name = "Bibata-Original-Classic";
+    package = pkgs.bibata-cursors;
+    size = 24;
+  };
+}

flake.lock

@@ -1,50 +1,45 @@
 {
   "nodes": {
-    "Hyprspace": {
+    "aquamarine": {
       "inputs": {
-        "hyprland": [
+        "hyprutils": [
-          "hyprland"
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1718642173,
+        "lastModified": 1752743471,
-        "narHash": "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8=",
+        "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=",
-        "owner": "KZDKM",
+        "owner": "hyprwm",
-        "repo": "Hyprspace",
+        "repo": "aquamarine",
-        "rev": "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7",
+        "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506",
         "type": "github"
       },
       "original": {
-        "owner": "KZDKM",
+        "owner": "hyprwm",
-        "repo": "Hyprspace",
+        "repo": "aquamarine",
         "type": "github"
       }
     },
     "crane": {
-      "inputs": {
-        "flake-compat": [
-          "lanzaboote",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "lanzaboote",
-          "rust-overlay"
-        ]
-      },
       "locked": {
-        "lastModified": 1681177078,
+        "lastModified": 1731098351,
-        "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
+        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
+        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
         "type": "github"
       },
       "original": {
@@ -53,37 +48,46 @@
         "type": "github"
       }
     },
-    "firefox-addons": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "pkgs/firefox-addons",
-        "lastModified": 1719875691,
-        "narHash": "sha256-DtfpH7yivPHcfXV0EL70NwCKlg6nVTZGNngWkPshQjM=",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "rev": "f2c6c0e41d6c2c82524b9d104bcfd1750a426d1b",
-        "type": "gitlab"
-      },
-      "original": {
-        "dir": "pkgs/firefox-addons",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "type": "gitlab"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1696426674,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -93,24 +97,6 @@
       }
     },
     "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1719877454,
-        "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "lanzaboote",
@@ -118,11 +104,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1680392223,
+        "lastModified": 1730504689,
-        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -132,30 +118,15 @@
       }
     },
     "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,
+        "lastModified": 1731533236,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -165,6 +136,28 @@
       }
     },
     "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",
@@ -173,11 +166,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1660459072,
+        "lastModified": 1709087332,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -193,16 +186,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827385,
+        "lastModified": 1753592768,
-        "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -223,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718450675,
+        "lastModified": 1749155331,
-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
+        "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
+        "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
         "type": "github"
       },
       "original": {
@@ -236,22 +229,56 @@
         "type": "github"
       }
     },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752149140,
+        "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
     "hyprland": {
       "inputs": {
+        "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1719938427,
+        "lastModified": 1753634783,
-        "narHash": "sha256-b0QtvQtFAtuOVBNPEUYf4V2VNGChTukkrLH/JlCQds8=",
+        "narHash": "sha256-Rl/voNjvcQH6E1vi4wNt5AY6CWaYkqfnkpm9GxrqKGg=",
         "ref": "refs/heads/main",
-        "rev": "6247a6b537fd1c05ecf35420529fab1adf83143e",
+        "rev": "c63d0003a1e5155248695f19778f815a8ad34c67",
-        "revCount": 4903,
+        "revCount": 6317,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -279,11 +306,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719784423,
+        "lastModified": 1753028264,
-        "narHash": "sha256-D7O5+nh2Wn9tQPJArWHrDSZeEfBCtj5zTGd86701LPE=",
+        "narHash": "sha256-GbfsRZWW5uBAOeddLkmrYV2XmAbI0etVUTBXFH5thcw=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "98cb18c6fcfe8196ef4150d09fbae305b7bb2954",
+        "rev": "14f9a444793d6dd78c29033acf9c3c974ded708d",
         "type": "github"
       },
       "original": {
@@ -296,21 +323,19 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "xdph",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
-          "xdph",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1714869498,
+        "lastModified": 1749046714,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
         "type": "github"
       },
       "original": {
@@ -319,6 +344,74 @@
         "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": 1750371812,
+        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -335,11 +428,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717881852,
+        "lastModified": 1750371198,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
         "type": "github"
       },
       "original": {
@@ -348,23 +441,24 @@
         "type": "github"
       }
     },
-    "hyprswitch": {
+    "hyprspace": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "hyprland": [
-        "nixpkgs": "nixpkgs_2"
+          "hyprland"
+        ],
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1719780938,
+        "lastModified": 1753590784,
-        "narHash": "sha256-YocumFkp3FCgN3UCXp95EV7IvAwhQdlSav8cCB0oHv0=",
+        "narHash": "sha256-Q30DFlPwD1ZK52TD4wSnqDO5gk9Kvifr923siI8AdVQ=",
-        "owner": "h3rmt",
+        "owner": "KZDKM",
-        "repo": "hyprswitch",
+        "repo": "Hyprspace",
-        "rev": "4dbba183fcbaa63de64e973d5dc9bba883765aa3",
+        "rev": "a847f1d6a7326395d17fe9b6b4ab63a10eb152eb",
         "type": "github"
       },
       "original": {
-        "owner": "h3rmt",
+        "owner": "KZDKM",
-        "ref": "release",
+        "repo": "Hyprspace",
-        "repo": "hyprswitch",
         "type": "github"
       }
     },
@@ -380,11 +474,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719316102,
+        "lastModified": 1752252310,
-        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
+        "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
+        "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82",
         "type": "github"
       },
       "original": {
@@ -405,11 +499,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719067853,
+        "lastModified": 1751897909,
-        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
+        "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
+        "rev": "fcca0c61f988a9d092cbb33e906775014c61579d",
         "type": "github"
       },
       "original": {
@@ -421,35 +515,54 @@
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2",
-        "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1682802423,
+        "lastModified": 1737639419,
-        "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=",
+        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "64b903ca87d18cef2752c19c098af275c6e51d63",
+        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "v0.3.0",
+        "ref": "v0.4.2",
         "repo": "lanzaboote",
         "type": "github"
       }
     },
+    "nixos-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1753642709,
+        "narHash": "sha256-J/xPmOfKRX/4UtBIVa5qkKuwN6FrHQBmo5bIPmcPeck=",
+        "owner": "nix-community",
+        "repo": "NixOS-WSL",
+        "rev": "e1e0999d45ba66d2d66ac061c27ce680814d14b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "main",
+        "repo": "NixOS-WSL",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719075281,
+        "lastModified": 1752687322,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
         "type": "github"
       },
       "original": {
@@ -459,57 +572,45 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
+    "nixpkgs-latest": {
       "locked": {
-        "lastModified": 1719876945,
+        "lastModified": 1753644334,
-        "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
+        "narHash": "sha256-b7OuvvF9XEe5ms/7Uaq3g4fkmbLhQeP2b+weAjnciXE=",
-        "type": "tarball",
+        "owner": "nixos",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "repo": "nixpkgs",
+        "rev": "6a56b14976d469a9f943400698244a4c1a4c1608",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "nixos",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1678872516,
+        "lastModified": 1730741070,
-        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1719663039,
-        "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1719848872,
+        "lastModified": 1753429684,
-        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
+        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
+        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
         "type": "github"
       },
       "original": {
@@ -520,26 +621,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1711588226,
+        "lastModified": 1731919951,
-        "narHash": "sha256-nd7goEu+nH/WZ/uCxvbWzSYqzZZn25kWTeKfANOhCjU=",
+        "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "7232f19f7fb710e3554cafaa9d8e93cff8273b59",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1682741954,
-        "narHash": "sha256-RPZxzRu8XU0YD2WeYUFYzJy5yAvWUsxkuK+zWw+6WVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "373e9eb4c42b2fc0611d794de5ea715a35d72393",
+        "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe",
         "type": "github"
       },
       "original": {
@@ -549,32 +635,83 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1719838683,
+        "lastModified": 1751792365,
-        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1753345091,
+        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-25.05",
         "type": "indirect"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1752596105,
+        "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750779888,
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
           "lanzaboote",
           "flake-compat"
         ],
-        "flake-utils": [
+        "gitignore": "gitignore_2",
-          "lanzaboote",
-          "flake-utils"
-        ],
-        "gitignore": "gitignore",
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
@@ -582,11 +719,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1681413034,
+        "lastModified": 1731363552,
-        "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
         "type": "github"
       },
       "original": {
@@ -597,35 +734,53 @@
     },
     "root": {
       "inputs": {
-        "Hyprspace": "Hyprspace",
-        "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
-        "hyprswitch": "hyprswitch",
+        "hyprspace": "hyprspace",
         "lanzaboote": "lanzaboote",
+        "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_4",
+        "nixpkgs-latest": "nixpkgs-latest",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "yazi": "yazi"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1682129965,
+        "lastModified": 1731897198,
-        "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
+        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2c417c0460b788328220120c698630947547ee83",
+        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "yazi",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752633862,
+        "narHash": "sha256-Bj7ozT1+5P7NmvDcuAXJvj56txcXuAhk3Vd9FdWFQzk=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "8668ca94858206ac3db0860a9dec471de0d995f8",
         "type": "github"
       },
       "original": {
@@ -638,15 +793,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1719873517,
+        "lastModified": 1752544651,
-        "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
+        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a11224af8d824935f363928074b4717ca2e280db",
+        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
         "type": "github"
       },
       "original": {
@@ -671,6 +825,21 @@
       }
     },
     "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=",
@@ -687,11 +856,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 +882,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718619174,
+        "lastModified": 1751300244,
-        "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
+        "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
+        "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
         "type": "github"
       },
       "original": {
@@ -714,6 +894,26 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "yazi": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_5",
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1753610773,
+        "narHash": "sha256-M5SPkMK1ySSXEXEMJEcSgrHZlaBhIJeYMbFdO6q5IFc=",
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "rev": "0e3cd8545c07e79d7cf1f58632c87cc14faa16d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sxyazi",
+        "repo": "yazi",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,244 +2,96 @@
   description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05"; 
+    nixpkgs =          { url = "nixpkgs/nixos-25.05";                                                                       };
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                    };
-    home-manager = {
+    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                           };
-      url = "github:nix-community/home-manager/release-24.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
-    hyprland = {
+    home-manager =     { url = "github:nix-community/home-manager/release-25.05";     inputs.nixpkgs.follows = "nixpkgs";   };
-      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";
 
-    lanzaboote = {
+    nixos-wsl =        { url = "github:nix-community/NixOS-WSL/main";                                                       };
-      url = "github:nix-community/lanzaboote/v0.3.0";
+
-      # inputs.nixpkgs.follows = "nixpkgs-unstable";
+    sops-nix =         { url = "github:Mic92/sops-nix";                               inputs.nixpkgs.follows = "nixpkgs";   };
-    };
+    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.4.2";                                                    };
-    #arion = {
+
-    #  url = "github:hercules-ci/arion";
+    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                       };
-    #  inputs.nixpkgs.follows = "nixpkgs";
+    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                      inputs.hyprland.follows = "hyprland"; };
-    #};
+    hyprspace =        { url = "github:KZDKM/Hyprspace";                              inputs.hyprland.follows = "hyprland"; };
-    firefox-addons = {
+
-      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
+    yazi =             { url = "github:sxyazi/yazi";                                                                        };
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    # yazi.url = "github:sxyazi/yazi";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
+  outputs = { ... }@inputs: with inputs; let
-    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;
-      };
 
-      user = "nx2";
+    system = "x86_64-linux";
+    config = { allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
 
-      nvidia = {
+    hyper-base = rec {
-        enable = true;
+      inherit system;
-        prime = true;
+      user    = "nx2";
-        # unfree = if enable then [
+      domain  = "nx2.site";
-        unfree = [
+      home    = "/home/${user}/";
-          "cuda_cccl"
+      webroot = "/var/lib/hugo/nx2site/public";
-          "cuda_cudart"
+      pkgs-version = "25.05";
-          "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; };
-          };
-      };
     };
+
+    pkgs = import nixpkgs {
+      inherit system config;
+      overlays = [
+        (final: prev: {
+          unstable = import nixpkgs-unstable { inherit system config; };
+          latest   = import nixpkgs-latest   { inherit system config; };
+          version  = "25.05";
+        })
+      ];
+    };
+
+    nvidia-base = 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: nvidia-settings: nixpkgs.lib.nixosSystem { 
+        inherit pkgs;
+        modules = [ ./configuration.nix ];
+        specialArgs = let
+          hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
+        in { inherit inputs hyper rice secrets; };
+      };
+      make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { 
+        inherit pkgs;
+        modules = [ ./nixos-wsl.nix ];
+        specialArgs = let
+          hyper = hyper-base // { inherit host; };
+        in { inherit inputs hyper rice; };
+      };
+    in {
+      NxXPS = make-nixos-system "NxXPS" { enable = true; prime = true; }; 
+      NxNORTH = make-nixos-system "NxNORTH" { enable = true; prime = false; }; 
+      NxACE = make-nixos-system "NxACE" { enable = false; };
+      NxWSL = make-nixos-wsl-system "NxWSL";
+    };
+
+    homeConfigurations = let 
+      make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = [ ./home.nix ];
+        extraSpecialArgs = let
+          hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
+        in { inherit pkgs inputs hyper rice secrets; };
+      };
+      make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = [ ./shell-only.nix ];
+        extraSpecialArgs = let
+          hyper = hyper-base // { inherit host; };
+        in { inherit pkgs inputs hyper rice secrets; };
+      };
+    in {
+      "${hyper-base.user}@NxXPS" = make-home-configuration "NxXPS" hyper-base.user { enable = true; prime = true; }; 
+      "${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; }; 
+      "${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; }; 
+
+      "${hyper-base.user}@NxWSL" = make-shell-configuration "NxWSL" hyper-base.user;
+    };
+  };
 }

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"