s0mePC-nix -> ada: rename

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

ada/default.nix

@@ -0,0 +1,111 @@
+{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/boot/zfs.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/openrazer.nix"
+    "${self}/ada/hardware/qmk.nix"
+    "${self}/ada/hardware/zram.nix"
+
+    "${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/zapret.nix"
+    "${self}/ada/services/zerotier.nix"
+    "${self}/ada/services/yggdrasil.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/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/virtualisation/docker.nix"
+
+    "${self}/ada/xdg/icons.nix"
+    "${self}/ada/xdg/mime.nix"
+    "${self}/ada/xdg/portal.nix"
+  ];
+}

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";
@@ -395,7 +417,7 @@
 
         # nixos hosts
         nixosConfigurations = {
-          "s0mePC-nix" = inputs.nixpkgs.lib.nixosSystem {
+          "ada" = inputs.nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             specialArgs = {
               inherit
@@ -405,7 +427,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,6 +436,8 @@
               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
             ];
           };
 

s0mePC-nix/default.nix

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