hand7s: upstream

Signed-off-by: s0me1newithhand7s <git+me@hand7s.org>

.re-commit-config.yaml

@@ -0,0 +1 @@
+/nix/store/0nibh6zrkxhh7qc1q6kkq5810iqd0059-pre-commit-config.json

ada/boot/initrd.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+_: {
   boot = {
     initrd = {
       availableKernelModules = [
@@ -14,9 +14,9 @@
       ];
 
       supportedFilesystems = {
+        ntfs = true;
         vfat = true;
         btrfs = true;
-        zfs = lib.mkForce true;
       };
 
       kernelModules = [

ada/boot/kernel.nix

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: {
   boot = {
@@ -17,7 +16,7 @@
       };
     };
 
-    kernelPackages = pkgs.linuxPackages_cachyos-gcc;
+    kernelPackages = pkgs.linuxPackages_latest;
     extraModulePackages = with config.boot.kernelPackages; [
       zenpower
       v4l2loopback
@@ -32,7 +31,6 @@
     ];
 
     kernelParams = [
-      "video=DP-1:2560x1440@165"
       "amd_pstate=guided"
       "udev.log_priority=3"
       "quiet"
@@ -45,6 +43,7 @@
       "page_alloc.shuffle=1"
       "page_poison=1"
       "slab_nomerge"
+      "zswap.enabled=0"
 
       "kernel.watchdog=0"
       "oops=panic"
@@ -68,6 +67,7 @@
       "hfs"
       "hpfs"
       "jfs"
+      "zfs"
       "minix"
       "nilfs2"
       "ntfs"
@@ -81,9 +81,9 @@
     ];
 
     supportedFilesystems = {
+      ntfs = true;
       vfat = true;
       btrfs = true;
-      zfs = lib.mkForce true;
     };
 
     consoleLogLevel = 0;

ada/boot/lanzaboote.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   boot = {
     lanzaboote = {
       enable = true;

ada/boot/loader/systemd-boot.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   boot = {
     loader = {
       systemd-boot = {

ada/boot/tmp.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   boot = {
     tmp = {
       useTmpfs = true;

ada/console/console.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   console = {
     useXkbConfig = true;
   };

ada/default.nix

@@ -0,0 +1,107 @@
+{self, ...}: {
+  imports = [
+    "${self}/ada/boot/initrd.nix"
+    "${self}/ada/boot/kernel.nix"
+    "${self}/ada/boot/lanzaboote.nix"
+    "${self}/ada/boot/plymouth.nix"
+    "${self}/ada/boot/tmp.nix"
+    "${self}/ada/boot/loader/systemd-boot.nix"
+
+    "${self}/ada/disko/disk.nix"
+    "${self}/ada/disko/lvm_vg.nix"
+
+    "${self}/ada/console/console.nix"
+
+    "${self}/ada/environment/systemPackages.nix"
+    "${self}/ada/environment/variables.nix"
+
+    "${self}/ada/hardware/amdgpu.nix"
+    "${self}/ada/hardware/cpu.nix"
+    "${self}/ada/hardware/graphics.nix"
+    "${self}/ada/hardware/qmk.nix"
+    "${self}/ada/hardware/zram.nix"
+    "${self}/ada/hardware/bluetooth.nix"
+    "${self}/ada/hardware/"
+
+    "${self}/ada/home-manager/users.nix"
+
+    "${self}/ada/i18n/locales.nix"
+
+    "${self}/ada/networking/dhcp.nix"
+    "${self}/ada/networking/firewall.nix"
+    "${self}/ada/networking/hostname.nix"
+    "${self}/ada/networking/networkmanager.nix"
+    "${self}/ada/networking/wireguard.nix"
+    "${self}/ada/networking/nameservers.nix"
+    "${self}/ada/networking/hosts.nix"
+    "${self}/ada/networking/hostId.nix"
+
+    "${self}/ada/nix/package.nix"
+    "${self}/ada/nix/settings/allowed-users.nix"
+    "${self}/ada/nix/settings/experimental-features.nix"
+    "${self}/ada/nix/settings/substituters.nix"
+    "${self}/ada/nix/settings/trusted-public-keys.nix"
+    "${self}/ada/nix/settings/trusted-substituters.nix"
+    "${self}/ada/nix/settings/trusted-users.nix"
+    "${self}/ada/nix/settings/auto-optimise-store.nix"
+
+    "${self}/ada/nixpkgs/config.nix"
+    "${self}/ada/nixpkgs/system.nix"
+
+    "${self}/ada/programs/gamescope.nix"
+    "${self}/ada/programs/gamemode.nix"
+    "${self}/ada/programs/nh.nix"
+    "${self}/ada/programs/steam.nix"
+    "${self}/ada/programs/ssh.nix"
+    "${self}/ada/programs/yubikey-touch-detector.nix"
+    "${self}/ada/programs/nekoray.nix"
+
+    "${self}/ada/security/polkit.nix"
+    "${self}/ada/security/rtkit.nix"
+    "${self}/ada/security/sudo.nix"
+    "${self}/ada/security/sudo-rs.nix"
+    "${self}/ada/security/pam/yubico.nix"
+
+    "${self}/ada/services/greetd.nix"
+    "${self}/ada/services/libinput.nix"
+    "${self}/ada/services/openssh.nix"
+    "${self}/ada/services/pipewire.nix"
+    "${self}/ada/services/netbird.nix"
+    "${self}/ada/services/qmk.nix"
+    "${self}/ada/services/scx.nix"
+    "${self}/ada/services/xserver.nix"
+    "${self}/ada/services/sunshine.nix"
+    "${self}/ada/services/usbmuxd.nix"
+    "${self}/ada/services/irqbalance.nix"
+    "${self}/ada/services/yubikey-agent.nix"
+    "${self}/ada/services/resolved.nix"
+    "${self}/ada/services/firewalld.nix"
+
+    "${self}/ada/sops/defaults.nix"
+    "${self}/ada/sops/secrets.nix"
+
+    "${self}/hand7s/stylix/base16Scheme.nix"
+    "${self}/hand7s/stylix/cursor.nix"
+    "${self}/hand7s/stylix/defaults.nix"
+    "${self}/hand7s/stylix/fonts.nix"
+    "${self}/hand7s/stylix/image.nix"
+
+    "${self}/ada/system/name.nix"
+    "${self}/ada/system/stateVersion.nix"
+
+    "${self}/ada/systemd/oomd.nix"
+    "${self}/ada/systemd/slices/system-slice.nix"
+    "${self}/ada/systemd/slices/user-slice.nix"
+    "${self}/ada/systemd/slices/root-slice.nix"
+
+    "${self}/ada/time/timeZone.nix"
+
+    "${self}/ada/users/users/hand7s.nix"
+    "${self}/ada/users/users/root.nix"
+    "${self}/ada/users/mutableUsers.nix"
+
+    "${self}/ada/xdg/icons.nix"
+    "${self}/ada/xdg/mime.nix"
+    "${self}/ada/xdg/portal.nix"
+  ];
+}

ada/disko/disk.nix

@@ -22,6 +22,7 @@
                   ];
                 };
               };
+
               luks = {
                 size = "100%";
                 content = {

ada/environment/variables.nix

@@ -1,7 +1,7 @@
 {config, ...}: {
   environment = {
     variables = {
-      AMD_VULKAN_ICD = "RADV";
+      AMD_VULKAN_ICD = "AMDVLK";
       HOSTNAME = config.networking.hostName;
       QT_QPA_PLATFORM = "wayland";
       SDL_VIDEODRIVER = "wayland";
@@ -13,7 +13,5 @@
       GRIMBLAST_HIDE_CURSOR = "0";
       TERM = "xterm-256color";
     };
-
-    enableAllTerminfo = true;
   };
 }

ada/hardware/amdgpu.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   hardware = {
     amdgpu = {
       initrd = {

ada/hardware/bluetooth.nix

@@ -0,0 +1,7 @@
+_: {
+  hardware = {
+    bluetooth = {
+      enable = true;
+    };
+  };
+}

ada/hardware/cpu.nix

@@ -1,6 +1,5 @@
-{...}: {
+_: {
   hardware = {
-    enableRedistributableFirmware = true;
     cpu = {
       amd = {
         updateMicrocode = true;

ada/hardware/default.nix

@@ -0,0 +1,8 @@
+_: {
+  hardware = {
+    enableAllFirmware = true;
+    enableAllHardware = true;
+    enableRedistributableFirmware = true;
+    firmwareCompression = "zstd";
+  };
+}

ada/hardware/graphics.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   hardware = {
     graphics = {
       enable = true;

ada/hardware/qmk.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   hardware = {
     keyboard = {
       qmk = {

ada/hardware/zram.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   zramSwap = {
     enable = true;
     algorithm = "zstd";

ada/home-manager/users.nix

@@ -0,0 +1,27 @@
+{self, ...}: {
+  home-manager = {
+    users = {
+      "hand7s" = {
+        imports = [
+          "${self}/hand7s/"
+          self.inputs.agenix.homeManagerModules.default
+          self.inputs.spicetify-nix.homeManagerModules.default
+          self.inputs.hyprland.homeManagerModules.default
+          self.inputs.chaotic.homeManagerModules.default
+          self.inputs.sops-nix.homeManagerModules.sops
+
+          self.inputs.nix-index-database.homeModules.nix-index
+          self.inputs.noctalia.homeModules.default
+        ];
+      };
+    };
+
+    backupFileExtension = "force";
+
+    extraSpecialArgs = {
+      inherit
+        self
+        ;
+    };
+  };
+}

ada/i18n/locales.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   i18n = {
     defaultLocale = "en_US.UTF-8";
     supportedLocales = [

ada/networking/firewall.nix

@@ -0,0 +1,14 @@
+_: {
+  networking = {
+    firewall = {
+      allowPing = true;
+      enable = false;
+      checkReversePath = false;
+    };
+
+    nftables = {
+      enable = true;
+      flattenRulesetFile = true;
+    };
+  };
+}

ada/networking/hostId.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   networking = {
     hostId = "5c79d468";
   };

ada/networking/hostname.nix

@@ -0,0 +1,5 @@
+_: {
+  networking = {
+    hostName = "ada";
+  };
+}

ada/networking/hosts.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   networking = {
     hosts = {
       # nope

ada/networking/nameservers.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   networking = {
     nameservers = [
       # cf dns

ada/networking/networkmanager.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   networking = {
     networkmanager = {
       enable = false;

ada/networking/timeServers.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   networking = {
     timeServers = [
       "0.nixos.pool.ntp.org"

ada/networking/wireguard.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   networking = {
     wireguard = {
       enable = true;

ada/nix/settings/allowed-users.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       sandbox = true;

ada/nix/settings/auto-optimise-store.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       auto-optimise-store = true;

ada/nix/settings/experimental-features.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       experimental-features = [

ada/nix/settings/substituters.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       substituters = [
@@ -9,10 +9,10 @@
         # cachix
         "https://nix-community.cachix.org/"
         "https://chaotic-nyx.cachix.org/"
-        "https://ags.cachix.org"
         "https://hyprland.cachix.org"
         "https://chaotic-nyx.cachix.org/"
-        "https://colmena.cachix.org"
+        # nix-community
+        "https://hydra.nix-community.org/"
       ];
     };
   };

ada/nix/settings/trusted-public-keys.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       trusted-public-keys = [

ada/nix/settings/trusted-substituters.nix

@@ -1,7 +1,7 @@
-{...}: {
+_: {
   nix = {
     settings = {
-      substituters = [
+      trusted-substituters = [
         # cache.nixos.org
         "https://nixos-cache-proxy.cofob.dev"
         "https://cache.nixos.org"

ada/nix/settings/trusted-users.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       trusted-users = [

ada/nixpkgs/config.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nixpkgs = {
     config = {
       allowUnfree = true;

ada/nixpkgs/overlays.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nixpkgs = {
     overlays = [
     ];

ada/nixpkgs/system.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nixpkgs = {
     system = "x86_64-linux";
     hostPlatform = "x86_64-linux";

ada/programs/gamemode.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs = {
     gamemode = {
       enable = true;

ada/programs/gamescope.nix

@@ -2,7 +2,7 @@
   programs = {
     gamescope = {
       enable = true;
-      package = pkgs.gamescope_git;
+      package = pkgs.gamescope;
       args = [
         "-e"
       ];

ada/programs/nekoray.nix

@@ -1,6 +1,6 @@
-{...}: {
+_: {
   programs = {
-    nekoray = {
+    throne = {
       enable = true;
       tunMode = {
         enable = true;

ada/programs/nh.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs = {
     nh = {
       enable = true;

ada/programs/ssh.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs = {
     ssh = {
       startAgent = true;

ada/programs/yubikey-touch-detector.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs = {
     yubikey-touch-detector = {
       enable = true;

ada/security/pam/yubico.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   security = {
     pam = {
       yubico = {

ada/security/polkit.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   security = {
     polkit = {
       enable = true;

ada/security/rtkit.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   security = {
     rtkit = {
       enable = true;

ada/security/sudo-rs.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   security = {
     sudo-rs = {
       enable = true;

ada/services/firewalld.nix

@@ -0,0 +1,15 @@
+{...}: {
+  services = {
+    firewalld = {
+      enable = true;
+
+      settings = {
+        # nope
+      };
+
+      zones = {
+        # nope
+      };
+    };
+  };
+}

ada/services/greetd.nix

@@ -9,7 +9,7 @@
       restart = false;
       settings = {
         default_session = {
-          command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.hyprland} --greet-align center";
+          command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe' pkgs.hyprland "start-hyprland"} --greet-align center";
           user = "greeter";
         };
       };

ada/services/irqbalance.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services = {
     irqbalance = {
       enable = true;

ada/services/libinput.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services = {
     libinput = {
       enable = true;

ada/services/netbird.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services = {
     netbird = {
       enable = true;

ada/services/openssh.nix

@@ -5,7 +5,7 @@
       allowSFTP = true;
       openFirewall = true;
       ports = [
-        45734
+        53864
       ];
 
       settings = {

ada/services/pipewire.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services = {
     pipewire = {
       enable = true;
@@ -25,6 +25,7 @@
 
       extraConfig = {
         pipewire = {
+          # PIPEWIRE_PROPS=node.force-rate=0
           "92-low-latency" = {
             "context.properties" = {
               "default.clock.rate" = 48000;

ada/services/resolved.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services = {
     resolved = {
       enable = true;

ada/services/scx.nix

@@ -1,8 +1,7 @@
-{...}: {
+_: {
   services = {
     scx = {
       enable = true;
-      # package = pkgs.scx_git.full;
       scheduler = "scx_cosmos";
     };
   };

ada/services/sunshine.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services = {
     sunshine = {
       enable = true;

ada/services/yggdrasil.nix

@@ -0,0 +1,11 @@
+_: {
+  services = {
+    yggdrasil = {
+      enable = false;
+      persistentKeys = false;
+      settings = {
+        # nope
+      };
+    };
+  };
+}

ada/services/zerotier.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services = {
     zerotierone = {
       enable = true;

ada/systemd/oomd.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   systemd = {
     oomd = {
       enable = true;

ada/systemd/slices/root-slice.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   systemd = {
     slices = {
       root = {

ada/systemd/slices/system-slice.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   systemd = {
     slices = {
       system = {

ada/systemd/slices/user-slice.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   systemd = {
     slices = {
       user = {

ada/time/timeZone.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   time = {
     timeZone = "Europe/Moscow";
     hardwareClockInLocalTime = true;

ada/users/mutableUsers.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   users = {
     mutableUsers = false;
   };

ada/users/users/hand7s.nix

@@ -1,15 +1,13 @@
-{...}: {
+_: {
   users = {
     users = {
-      hand7s = {
+      "hand7s" = {
         description = "me";
         isSystemUser = false;
         isNormalUser = true;
         initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/";
         extraGroups = [
           "wheel"
-          "networkmanager"
-          "docker"
         ];
       };
     };

ada/users/users/root.nix

@@ -1,7 +1,7 @@
-{...}: {
+_: {
   users = {
     users = {
-      root = {
+      "root" = {
         initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0";
       };
     };

ada/xdg/icons.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   xdg = {
     icons = {
       enable = true;

ada/xdg/mime.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   xdg = {
     mime = {
       enable = true;

ada/xdg/portal.nix

@@ -5,12 +5,18 @@
 
       config = {
         common = {
+          "org.freedesktop.impl.portal.FileChooser" = "termfilechooser";
+
           default = [
             "gtk"
           ];
         };
 
         hyprland = {
+          "org.freedesktop.impl.portal.FileChooser" = [
+            "termfilechooser"
+          ];
+
           preferred = [
             "gtk"
             "hyprland"
@@ -22,6 +28,7 @@
         xdg-desktop-portal
         xdg-desktop-portal-gtk
         xdg-desktop-portal-hyprland
+        xdg-desktop-portal-termfilechooser
       ];
     };
   };

flake.lock

@@ -240,6 +240,38 @@
         "type": "github"
       }
     },
+    "cachyos-kernel": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1770408132,
+        "narHash": "sha256-H2J5KHGAfzmr/SBNqWDj52bS76n/IRijOA1A2XerS90=",
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "rev": "94b35b638d970d70a354432d863e5fdf39238e44",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "type": "github"
+      }
+    },
+    "cachyos-kernel-patches": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1770407844,
+        "narHash": "sha256-gDCdcoHtoaEuFP+aVvf43NaJW2RclTVIBZix548BdhQ=",
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "rev": "c031bd5a91990f7eab3d8fb364836cf4e1960f31",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "type": "github"
+      }
+    },
     "chaotic": {
       "inputs": {
         "flake-schemas": "flake-schemas",
@@ -473,6 +505,38 @@
       }
     },
     "flake-compat_10": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_11": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_12": {
       "flake": false,
       "locked": {
         "lastModified": 1765121682,
@@ -587,33 +651,31 @@
     "flake-compat_8": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
     },
     "flake-compat_9": {
-      "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1733328505,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "repo": "flake-compat",
+        "revCount": 69,
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "tarball",
-        "type": "github"
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69"
       },
       "original": {
-        "owner": "edolstra",
+        "type": "tarball",
-        "repo": "flake-compat",
+        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-        "type": "github"
       }
     },
     "flake-parts": {
@@ -637,6 +699,45 @@
         "type": "github"
       }
     },
+    "flake-parts_10": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_6"
+      },
+      "locked": {
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_11": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -735,17 +836,14 @@
     },
     "flake-parts_7": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib_4"
-          "nixos-anywhere",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1748821116,
+        "lastModified": 1769996383,
-        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -756,14 +854,14 @@
     },
     "flake-parts_8": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_4"
+        "nixpkgs-lib": "nixpkgs-lib_5"
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1754487366,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
         "type": "github"
       },
       "original": {
@@ -775,16 +873,16 @@
     "flake-parts_9": {
       "inputs": {
         "nixpkgs-lib": [
-          "stylix",
+          "nixos-anywhere",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1748821116,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
         "type": "github"
       },
       "original": {
@@ -827,7 +925,25 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -1503,6 +1619,34 @@
         "type": "github"
       }
     },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nix-bwrapper",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nix-bwrapper",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1754860581,
+        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.1.1",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "jovian": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
@@ -1567,6 +1711,25 @@
         "type": "github"
       }
     },
+    "ndg": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_16"
+      },
+      "locked": {
+        "lastModified": 1768214250,
+        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
+        "owner": "feel-co",
+        "repo": "ndg",
+        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "feel-co",
+        "ref": "v2.6.0",
+        "repo": "ndg",
+        "type": "github"
+      }
+    },
     "nekoflake": {
       "inputs": {
         "nixpkgs": "nixpkgs_11"
@@ -1625,6 +1788,49 @@
         "type": "github"
       }
     },
+    "nix-bwrapper": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_12",
+        "nuschtosSearch": "nuschtosSearch",
+        "treefmt-nix": "treefmt-nix_2"
+      },
+      "locked": {
+        "lastModified": 1770308099,
+        "narHash": "sha256-VxuIePns4c+qpsHpLXW0CwovpKUx1xnvVIUuJwPO6fQ=",
+        "owner": "Naxdy",
+        "repo": "nix-bwrapper",
+        "rev": "1248b52f2bd4fe5690c1a36836a1798be21d953b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Naxdy",
+        "repo": "nix-bwrapper",
+        "type": "github"
+      }
+    },
+    "nix-cachyos-kernel": {
+      "inputs": {
+        "cachyos-kernel": "cachyos-kernel",
+        "cachyos-kernel-patches": "cachyos-kernel-patches",
+        "flake-compat": "flake-compat_8",
+        "flake-parts": "flake-parts_7",
+        "nixpkgs": "nixpkgs_15"
+      },
+      "locked": {
+        "lastModified": 1770535232,
+        "narHash": "sha256-hTJEqkAynKtjhGgty0ooDhMNvWxG9Dhdwdfz6EgO3Lw=",
+        "owner": "xddxdd",
+        "repo": "nix-cachyos-kernel",
+        "rev": "76f7c893e4ce83d3b488dcb512ba374b11e7197b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xddxdd",
+        "ref": "release",
+        "repo": "nix-cachyos-kernel",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -1747,6 +1953,27 @@
         "type": "github"
       }
     },
+    "nix-mineral": {
+      "inputs": {
+        "flake-compat": "flake-compat_9",
+        "flake-parts": "flake-parts_8",
+        "ndg": "ndg",
+        "nixpkgs": "nixpkgs_17"
+      },
+      "locked": {
+        "lastModified": 1770151228,
+        "narHash": "sha256-4uB6s3xUYcWSTOr+thVPj42hcwS7PtW62my0rn8ZYyg=",
+        "owner": "cynicsketch",
+        "repo": "nix-mineral",
+        "rev": "fa4709e0700f990d46ac3136180ff1641de376f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cynicsketch",
+        "repo": "nix-mineral",
+        "type": "github"
+      }
+    },
     "nix-on-droid": {
       "inputs": {
         "home-manager": [
@@ -1813,12 +2040,12 @@
     "nixos-anywhere": {
       "inputs": {
         "disko": "disko_2",
-        "flake-parts": "flake-parts_7",
+        "flake-parts": "flake-parts_9",
         "nix-vm-test": "nix-vm-test",
         "nixos-images": "nixos-images",
         "nixos-stable": "nixos-stable",
-        "nixpkgs": "nixpkgs_12",
+        "nixpkgs": "nixpkgs_18",
-        "treefmt-nix": "treefmt-nix_2"
+        "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
         "lastModified": 1766503044,
@@ -1836,9 +2063,9 @@
     },
     "nixos-cli": {
       "inputs": {
-        "flake-compat": "flake-compat_8",
+        "flake-compat": "flake-compat_10",
-        "flake-parts": "flake-parts_8",
+        "flake-parts": "flake-parts_10",
-        "nixpkgs": "nixpkgs_13",
+        "nixpkgs": "nixpkgs_19",
         "optnix": "optnix"
       },
       "locked": {
@@ -1919,8 +2146,8 @@
     },
     "nixos-wsl": {
       "inputs": {
-        "flake-compat": "flake-compat_10",
+        "flake-compat": "flake-compat_12",
-        "nixpkgs": "nixpkgs_15"
+        "nixpkgs": "nixpkgs_21"
       },
       "locked": {
         "lastModified": 1765841014,
@@ -2031,6 +2258,36 @@
       }
     },
     "nixpkgs-lib_4": {
+      "locked": {
+        "lastModified": 1769909678,
+        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_5": {
+      "locked": {
+        "lastModified": 1753579242,
+        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_6": {
       "locked": {
         "lastModified": 1761765539,
         "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
@@ -2093,6 +2350,102 @@
       }
     },
     "nixpkgs_12": {
+      "locked": {
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_13": {
+      "locked": {
+        "lastModified": 1767892417,
+        "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_14": {
+      "locked": {
+        "lastModified": 1770107345,
+        "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_15": {
+      "locked": {
+        "lastModified": 1770441824,
+        "narHash": "sha256-9iicOOWBXLKD6Yyph7w3+chmRZHJu2bJInh+PZEPu3o=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "06b4256d6169bdc528ca347f1b14044c4e6c4e86",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_16": {
+      "locked": {
+        "lastModified": 1766070988,
+        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_17": {
+      "locked": {
+        "lastModified": 1755593991,
+        "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_18": {
       "locked": {
         "lastModified": 1749201760,
         "narHash": "sha256-LEZbj+VD/AR/dWL5ns1gMwzMvp4mLlv4WalxmZTKy5Y=",
@@ -2108,7 +2461,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_19": {
       "locked": {
         "lastModified": 1764527385,
         "narHash": "sha256-nA5ywiGKl76atrbdZ5Aucd8SjF/v8ew9b9QsC+MKL14=",
@@ -2124,102 +2477,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_14": {
-      "locked": {
-        "lastModified": 1759070547,
-        "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "647e5c14cbd5067f44ac86b74f014962df460840",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_15": {
-      "locked": {
-        "lastModified": 1765472234,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_16": {
-      "locked": {
-        "lastModified": 1766902085,
-        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_17": {
-      "locked": {
-        "lastModified": 1766840161,
-        "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_18": {
-      "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_19": {
-      "locked": {
-        "lastModified": 1761236834,
-        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1766651565,
@@ -2237,6 +2494,102 @@
       }
     },
     "nixpkgs_20": {
+      "locked": {
+        "lastModified": 1759070547,
+        "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "647e5c14cbd5067f44ac86b74f014962df460840",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_21": {
+      "locked": {
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_22": {
+      "locked": {
+        "lastModified": 1766902085,
+        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_23": {
+      "locked": {
+        "lastModified": 1766840161,
+        "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_24": {
+      "locked": {
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_25": {
+      "locked": {
+        "lastModified": 1761236834,
+        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_26": {
       "locked": {
         "lastModified": 1682134069,
         "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@@ -2445,10 +2798,30 @@
         "type": "github"
       }
     },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "ixx": "ixx",
+        "nixpkgs": "nixpkgs_13"
+      },
+      "locked": {
+        "lastModified": 1768249818,
+        "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "optnix": {
       "inputs": {
-        "flake-compat": "flake-compat_9",
+        "flake-compat": "flake-compat_11",
-        "nixpkgs": "nixpkgs_14"
+        "nixpkgs": "nixpkgs_20"
       },
       "locked": {
         "lastModified": 1765418479,
@@ -2578,22 +2951,25 @@
         "hyprland": "hyprland",
         "lanzaboote": "lanzaboote",
         "nekoflake": "nekoflake",
+        "nix-bwrapper": "nix-bwrapper",
+        "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nix-index-database": "nix-index-database",
+        "nix-mineral": "nix-mineral",
         "nix-on-droid": "nix-on-droid",
         "nixos-anywhere": "nixos-anywhere",
         "nixos-cli": "nixos-cli",
         "nixos-generators": "nixos-generators",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_16",
+        "nixpkgs": "nixpkgs_22",
         "noctalia": "noctalia",
         "quickshell": "quickshell",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
         "stylix": "stylix",
         "system-manager": "system-manager",
-        "treefmt-nix": "treefmt-nix_3",
+        "treefmt-nix": "treefmt-nix_4",
         "vscserver": "vscserver"
       }
     },
@@ -2678,7 +3054,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_17"
+        "nixpkgs": "nixpkgs_23"
       },
       "locked": {
         "lastModified": 1766894905,
@@ -2699,7 +3075,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1766897356,
@@ -2722,11 +3098,11 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_9",
+        "flake-parts": "flake-parts_11",
         "gnome-shell": "gnome-shell",
-        "nixpkgs": "nixpkgs_18",
+        "nixpkgs": "nixpkgs_24",
         "nur": "nur",
-        "systems": "systems_6",
+        "systems": "systems_7",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -2872,6 +3248,21 @@
         "type": "github"
       }
     },
+    "systems_8": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -2975,6 +3366,24 @@
       }
     },
     "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_14"
+      },
+      "locked": {
+        "lastModified": 1770228511,
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_3": {
       "inputs": {
         "nixpkgs": [
           "nixos-anywhere",
@@ -2995,9 +3404,9 @@
         "type": "github"
       }
     },
-    "treefmt-nix_3": {
+    "treefmt-nix_4": {
       "inputs": {
-        "nixpkgs": "nixpkgs_19"
+        "nixpkgs": "nixpkgs_25"
       },
       "locked": {
         "lastModified": 1766000401,
@@ -3033,8 +3442,8 @@
     },
     "vscserver": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_20"
+        "nixpkgs": "nixpkgs_26"
       },
       "locked": {
         "lastModified": 1753541826,

flake.nix

@@ -161,6 +161,13 @@
       repo = "nekoflake";
     };
 
+    nix-bwrapper = {
+      flake = true;
+      type = "github";
+      owner = "Naxdy";
+      repo = "nix-bwrapper";
+    };
+
     nix-darwin = {
       flake = true;
       type = "github";
@@ -174,6 +181,21 @@
       };
     };
 
+    nix-cachyos-kernel = {
+      flake = true;
+      type = "github";
+      owner = "xddxdd";
+      repo = "nix-cachyos-kernel";
+      ref = "release";
+    };
+
+    nix-mineral = {
+      flake = true;
+      type = "github";
+      owner = "cynicsketch";
+      repo = "nix-mineral";
+    };
+
     nix-homebrew = {
       flake = true;
       type = "github";
@@ -394,8 +416,10 @@
         };
 
         # nixos hosts
+
+        # my PC
         nixosConfigurations = {
-          "s0mePC-nix" = inputs.nixpkgs.lib.nixosSystem {
+          "ada" = inputs.nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             specialArgs = {
               inherit
@@ -405,7 +429,8 @@
             };
 
             modules = [
-              "${self}/s0mePC-nix/"
+              "${self}/ada/"
+              inputs.agenix.nixosModules.default
               inputs.chaotic.nixosModules.default
               inputs.stylix.nixosModules.stylix
               inputs.sops-nix.nixosModules.sops
@@ -413,10 +438,13 @@
               inputs.lanzaboote.nixosModules.lanzaboote
               inputs.home-manager.nixosModules.default
               inputs.nix-index-database.nixosModules.nix-index
+              inputs.nix-bwrapper.nixosModules.default
+              inputs.nix-mineral.nixosModules.nix-mineral
             ];
           };
 
-          "s0melapt0p-nix" = inputs.nixpkgs.lib.nixosSystem {
+          # my laptop
+          "isla" = inputs.nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             specialArgs = {
               inherit
@@ -426,7 +454,8 @@
             };
 
             modules = [
-              "${self}/s0melapt0p-nix/"
+              "${self}/isla/"
+              inputs.agenix.nixosModules.default
               inputs.chaotic.nixosModules.default
               inputs.stylix.nixosModules.stylix
               inputs.sops-nix.nixosModules.sops
@@ -434,10 +463,15 @@
               inputs.home-manager.nixosModules.home-manager
               inputs.lanzaboote.nixosModules.lanzaboote
               inputs.nix-index-database.nixosModules.nix-index
+              inputs.nix-bwrapper.nixosModules.default
+              inputs.nix-mineral.nixosModules.nix-mineral
             ];
           };
 
-          "s0mev1rtn0de-nix" = inputs.nixpkgs.lib.nixosSystem {
+          # my VPSes:
+
+          # VPS 1
+          "hazel" = inputs.nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             specialArgs = {
               inherit
@@ -447,15 +481,22 @@
             };
 
             modules = [
-              "${self}/s0mev1rtn0de-nix/"
+              {
+                networking.hostName = inputs.nixpkgs.lib.mkDefault "hazel";
+              }
+
+              "${self}/kyra/"
+              inputs.agenix.nixosModules.default
               inputs.disko.nixosModules.disko
               inputs.home-manager.nixosModules.default
               inputs.sops-nix.nixosModules.sops
               inputs.nix-index-database.nixosModules.nix-index
+              inputs.nix-mineral.nixosModules.nix-mineral
             ];
           };
 
-          "s0meMiniPC-nix" = inputs.nixpkgs.lib.nixosSystem {
+          # VPS 2
+          "lynn" = inputs.nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             specialArgs = {
               inherit
@@ -465,7 +506,83 @@
             };
 
             modules = [
-              "${self}/s0meMiniPC-nix"
+              {
+                networking.hostName = inputs.nixpkgs.lib.mkDefault "lynn";
+              }
+
+              "${self}/kyra/"
+              inputs.agenix.nixosModules.default
+              inputs.disko.nixosModules.disko
+              inputs.home-manager.nixosModules.default
+              inputs.sops-nix.nixosModules.sops
+              inputs.nix-index-database.nixosModules.nix-index
+              inputs.nix-mineral.nixosModules.nix-mineral
+            ];
+          };
+
+          # VPS 3
+          "ivy" = inputs.nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            specialArgs = {
+              inherit
+                inputs
+                self
+                ;
+            };
+
+            modules = [
+              {
+                networking.hostName = inputs.nixpkgs.lib.mkDefault "ivy";
+              }
+
+              "${self}/kyra/"
+              inputs.agenix.nixosModules.default
+              inputs.disko.nixosModules.disko
+              inputs.home-manager.nixosModules.default
+              inputs.sops-nix.nixosModules.sops
+              inputs.nix-index-database.nixosModules.nix-index
+              inputs.nix-mineral.nixosModules.nix-mineral
+            ];
+          };
+
+          # VPS 4
+          "mel" = inputs.nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            specialArgs = {
+              inherit
+                inputs
+                self
+                ;
+            };
+
+            modules = [
+              {
+                networking.hostName = inputs.nixpkgs.lib.mkDefault "mel";
+              }
+
+              "${self}/kyra/"
+              inputs.agenix.nixosModules.default
+              inputs.disko.nixosModules.disko
+              inputs.home-manager.nixosModules.default
+              inputs.sops-nix.nixosModules.sops
+              inputs.nix-index-database.nixosModules.nix-index
+              inputs.nix-mineral.nixosModules.nix-mineral
+            ];
+          };
+
+          # homelab
+          "viola" = inputs.nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            specialArgs = {
+              inherit
+                inputs
+                self
+                ;
+            };
+
+            modules = [
+              "${self}/viola"
+              inputs.agenix.nixosModules.default
               inputs.chaotic.nixosModules.default
               inputs.stylix.nixosModules.stylix
               inputs.sops-nix.nixosModules.sops
@@ -473,42 +590,31 @@
               inputs.lanzaboote.nixosModules.lanzaboote
               inputs.home-manager.nixosModules.default
               inputs.nix-index-database.nixosModules.nix-index
+              inputs.nix-mineral.nixosModules.nix-mineral
             ];
           };
+
+          # WSL2
+          "wanda" = inputs.nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            specialArgs = {
+              inherit
+                inputs
+                self
+                ;
             };
 
-        # deploy-rs
+            modules = [
-        deploy = {
+              "${self}/wanda/"
-          user = "hand7s";
+              inputs.agenix.nixosModules.default
-          interactiveSudo = true;
+              inputs.nixos-wsl.nixosModules.default
-          autoRollback = true;
+              inputs.stylix.nixosModules.stylix
-          magicRollback = true;
+              inputs.home-manager.nixosModules.default
-          remoteBuild = false;
+              inputs.sops-nix.nixosModules.sops
-          sshOpts = [
+              inputs.nix-index-database.nixosModules.nix-index
-            "-p"
+              inputs.nix-bwrapper.nixosModules.default
-            "6969"
+              inputs.nix-mineral.nixosModules.nix-mineral
             ];
-
-          nodes = {
-            "s0mev1rtn0de-nix" = {
-              hostname = "100.109.213.170";
-              profiles = {
-                main = {
-                  path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.s0mev1rtn0de-nix;
-                  profilePath = "/nix/var/nix/profiles/system";
-                };
-              };
-            };
-
-            "s0meMiniPC-nix" = {
-              hostname = "100.109.71.194";
-              profiles = {
-                main = {
-                  path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.s0mev1rtn0de-nix;
-                  profilePath = "/nix/var/nix/profiles/system";
-                };
-              };
-            };
           };
         };
       };

hand7s/default.nix

@@ -4,8 +4,6 @@
     "${self}/hand7s/options/gui.nix"
 
     "${self}/hand7s/wayland/hyprland.nix"
-    "${self}/hand7s/wayland/river.nix"
-    "${self}/hand7s/wayland/sway.nix"
 
     "${self}/hand7s/home/defaults.nix"
     "${self}/hand7s/home/gui.nix"
@@ -17,7 +15,7 @@
     "${self}/hand7s/nixpkgs/overlays.nix"
 
     "${self}/hand7s/services/hypridle.nix"
-    "${self}/hand7s/services/swayidle.nix"
+    "${self}/hand7s/services/hyprsunset.nix"
     "${self}/hand7s/services/kdeconnect.nix"
 
     "${self}/hand7s/systemd/hyprpolkitagent-service.nix"
@@ -33,19 +31,15 @@
     "${self}/hand7s/programs/index.nix"
     "${self}/hand7s/programs/obs-studio.nix"
     "${self}/hand7s/programs/starship.nix"
-    "${self}/hand7s/programs/firefox.nix"
-    "${self}/hand7s/programs/swaylock.nix"
     "${self}/hand7s/programs/yazi.nix"
     "${self}/hand7s/programs/zoxide.nix"
     "${self}/hand7s/programs/chrome.nix"
     "${self}/hand7s/programs/hyprlock.nix"
-    "${self}/hand7s/programs/hyprpanel.nix"
     "${self}/hand7s/programs/spicetify.nix"
     "${self}/hand7s/programs/vscode.nix"
     "${self}/hand7s/programs/zellij.nix"
-    "${self}/hand7s/programs/zed-editor.nix"
     "${self}/hand7s/programs/direnv.nix"
-    "${self}/hand7s/programs/kitty.nix"
     "${self}/hand7s/programs/noctalia.nix"
+    "${self}/hand7s/programs/iamb.nix"
   ];
 }

hand7s/fonts/fonts.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   fonts = {
     fontconfig = {
       enable = true;

hand7s/gtk/gtk.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   gtk = {
     enable = true;
   };

hand7s/home/defaults.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   home = {
     stateVersion = "24.11";
     username = "hand7s";

hand7s/home/gui.nix

@@ -1,5 +1,6 @@
 {
   osConfig,
+  config,
   lib,
   ...
 }: {
@@ -7,27 +8,13 @@
     gui = {
       enable =
         lib.mkIf (
-          osConfig.networking.hostName == "s0mePC-nix" || osConfig.networking.hostName == "s0melapt0p-nix"
+          osConfig.networking.hostName == "ada" || osConfig.networking.hostName == "isla" || osConfig.networking.hostName == "wanda"
         )
         true;
 
       sessionType =
-        if
+        lib.mkIf config.home.gui.enable
-          (
+        "Hyprland";
-            osConfig.networking.hostName == "s0mePC-nix"
-          )
-        then "Hyprland"
-        else if
-          (
-            osConfig.networking.hostName == "s0mew0rkstat1on-nix"
-          )
-        then "Hyprland"
-        else if
-          (
-            osConfig.networking.hostName == "s0melapt0p-nix"
-          )
-        then "Sway"
-        else "None";
     };
   };
 }

hand7s/home/keyboard.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   home = {
     keyboard = {
       variant = "";

hand7s/home/packages.nix

@@ -1,62 +1,32 @@
-{
+{pkgs, ...}: {
-  osConfig,
-  pkgs,
-  lib,
-  ...
-}: {
   home = {
-    packages = with pkgs;
+    packages = with pkgs; [
-      [
       fd
       gh
       sd
       xh
       dua
       nvd
-        gat
       dust
       sops
       rsync
       procs
       sbctl
       gping
-        dconf
-        tokei
       comma
-        ifuse
       trippy
       bottom
-        kubectl
+      ragenix
-        yt-dlp
       ripgrep
+      kubectl
       gitoxide
-        tty-clock
       deploy-rs
-        monero-cli
+      btop-rocm
+      bubblewrap
+      ripgrep-all
       nixos-anywhere
       wireguard-tools
-        yubico-piv-tool
-        yubikey-manager
-        libimobiledevice
       nix-output-monitor
-        yubikey-touch-detector
-        yubikey-personalization
-        netbird-ui
-      ]
-      ++ lib.optionals (
-        osConfig.networking.hostName == "s0mePC-nix"
-      ) [
-        mindustry
-        thunderbird
-        tetrio-desktop
-        min-ed-launcher
-        qbittorrent-enhanced
-      ]
-      ++ lib.optionals (
-        osConfig.networking.hostName == "s0melapt0p-nix"
-      ) [
-        iwgtk
-        brightnessctl
     ];
   };
 }

hand7s/nix/settings/substituters.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       substituters = [
@@ -9,9 +9,10 @@
         # cachix
         "https://nix-community.cachix.org/"
         "https://chaotic-nyx.cachix.org/"
-        "https://ags.cachix.org"
         "https://hyprland.cachix.org"
         "https://chaotic-nyx.cachix.org/"
+        # nix-community
+        "https://hydra.nix-community.org/"
       ];
     };
   };

hand7s/nix/settings/trusted-public-keys.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nix = {
     settings = {
       trusted-public-keys = [

hand7s/nixpkgs/config.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nixpkgs = {
     config = {
       allowBroken = true;

hand7s/nixpkgs/overlays.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   nixpkgs = {
     overlays = [
     ];

hand7s/options/gui.nix

@@ -2,12 +2,12 @@
   lib,
   pkgs,
   config,
-  inputs,
+  self,
   ...
 }: let
   cfg = config.home.gui;
-  ayugram = inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop;
+  ayugram = self.inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop;
-  freesm-launcher = inputs.freesm.packages.${pkgs.system}.freesmlauncher;
+  freesm-launcher = self.inputs.freesm.packages.${pkgs.system}.freesmlauncher;
 in {
   options.home.gui = {
     enable = lib.mkEnableOption ''
@@ -19,6 +19,7 @@ in {
     '';
 
     sessionType = lib.mkOption {
+      default = "None";
       type = lib.types.enum [
         "DWL"
         "Sway"
@@ -26,7 +27,7 @@ in {
         "Hyprland"
         "None"
       ];
-      default = "None";
+
       description = ''
         This option allows to choose current desktop session. All
         three: riverwm, sway and Hyprland has their own config. Almost
@@ -39,49 +40,55 @@ in {
     home = {
       packages = with pkgs;
         [
+          throne
+          heroic
           vesktop
-          nekoray
+          ayugram
           anki-bin
           obsidian
-          playerctl
-          monero-gui
           mindustry
-          bitwarden
           lan-mouse
+          monero-gui
           parsec-bin
+          proton-pass
           pwvucontrol
           easyeffects
-          ayugram
+          thunderbird
-          element-desktop
+          chatterino7
+          tetrio-desktop
           hyprpolkitagent
           freesm-launcher
+          bitwarden-desktop
+          qbittorrent-enhanced
 
           (discord.override {
             withVencord = true;
             withOpenASAR = false;
           })
         ]
-        ++ lib.optionals (
-          cfg.sessionType == "Sway"
-        ) [
-          swaykbdd
-          autotiling-rs
-          sway-audio-idle-inhibit
-          sway-contrib.grimshot
-          sway-contrib.inactive-windows-transparency
-        ]
-        ++ lib.optionals (
-          cfg.sessionType == "River"
-        ) [
-          wayshot
-          waylock
-          wayidle
-        ]
         ++ lib.optionals (
           cfg.sessionType == "Hyprland"
         ) [
-          inputs.noctalia.packages.${system}.default
+          fum
+          timg
+          dconf
+          iwgtk
+          tokei
+          ifuse
+          yt-dlp
+          termusic
+          playerctl
+          tty-clock
           grimblast
+          monero-cli
+          brightnessctl
+          hyprsysteminfo
+          yubico-piv-tool
+          yubikey-manager
+          libimobiledevice
+          yubikey-touch-detector
+          yubikey-personalization
+          self.inputs.noctalia.packages.${system}.default
         ];
     };
 
@@ -89,10 +96,8 @@ in {
       chromium.enable = true;
       spicetify.enable = true;
       vscode.enable = true;
-      fuzzel.enable = true;
       ghostty.enable = true;
-      firefox.enable = true;
+      git.enable = true;
-      alacritty.enable = true;
     };
 
     services = with lib.mkDefault; {

hand7s/programs/direnv.nix

@@ -1,7 +1,9 @@
-{...}: {
+_: {
   programs = {
     direnv = {
       enable = true;
+      silent = true;
+
       nix-direnv = {
         enable = true;
       };

hand7s/programs/eza.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs = {
     eza = {
       enable = true;

hand7s/programs/firefox.nix

@@ -1,28 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: let
-  zen-browser = inputs.zen-browser.packages.${pkgs.system}.default;
-in {
-  programs = {
-    firefox = {
-      package = zen-browser;
-      profiles = rec {
-        default = {
-          userContent = "
-                            --zen-colors-primary: #82aaff !important;
-                            --zen-colors-secondary: #c099ff !important;
-                            --zen-colors-tertiary: #1e2030 !important;
-                            --zen-colors-border: #3b4261 !important;
-                            --zen-dialog-background: #222436 !important;
-
-                            .tab-background[selected=[selected=''] {
-                                background-color: #6c598c !important;
-                        }
-                    ";
-        };
-      };
-    };
-  };
-}