diff --git a/config/hosts/imxyy-nix-server/hardware.nix b/config/hosts/imxyy-nix-server/hardware.nix index 913bf50..2472cce 100644 --- a/config/hosts/imxyy-nix-server/hardware.nix +++ b/config/hosts/imxyy-nix-server/hardware.nix @@ -18,13 +18,15 @@ in ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; - boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_zen; + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos; + services.scx.enable = true; boot.extraModulePackages = [ ]; boot.tmp.useTmpfs = true; boot.supportedFilesystems = [ "zfs" ]; boot.zfs = { extraPools = [ "data" ]; forceImportRoot = false; + package = pkgs.zfs_cachyos; }; services.zfs.autoScrub.enable = true; services.btrfs.autoScrub.enable = true; diff --git a/flake.lock b/flake.lock index f139c4e..1486da6 100644 --- a/flake.lock +++ b/flake.lock @@ -81,7 +81,7 @@ "go-musicfox", "devenv" ], - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1728672398, @@ -98,6 +98,29 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "fenix": "fenix", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1750098200, + "narHash": "sha256-BtCFs/Ixxn6mEE2zGA/wIH+tR+psjobxs8SXVUyEiiI=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "0d0115e6b3e2dce6d2260c7bb3fe894b1cc6b9a6", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "darkly": { "inputs": { "nixpkgs": [ @@ -124,7 +147,7 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1738772960, @@ -143,16 +166,38 @@ "fenix": { "inputs": { "nixpkgs": [ + "chaotic", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1749710537, - "narHash": "sha256-Jte1NonRzaKF6UpPL5FujKHVTVvc8CAIj8fK+X/0qVM=", + "lastModified": 1750056063, + "narHash": "sha256-PGQjkjaj8XUa19tGZi0GHbnCzol4YHurA4pyifmhrs0=", "owner": "nix-community", "repo": "fenix", - "rev": "b8fda10da7629d856086bbc1e21164c2d55691e3", + "rev": "879b4b73522a78529778ce2eb6f3374d1016cf8f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1749969540, + "narHash": "sha256-jkSMD64ral4yBW0tiHgcZo6zyGsO0x0Aows0SEmWqPo=", + "owner": "nix-community", + "repo": "fenix", + "rev": "c0491d36bb321bc23021714e73369790e315984d", "type": "github" }, "original": { @@ -321,6 +366,20 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -500,15 +559,36 @@ "home-manager": { "inputs": { "nixpkgs": [ + "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1749821119, - "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", + "lastModified": 1750033262, + "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", "owner": "nix-community", "repo": "home-manager", - "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", + "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749944797, + "narHash": "sha256-1l6ZW+2+LDQhYgE4fo2KsM2Ms3lY3ZXv0n6uKka2yMk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c5f345153397f62170c18ded1ae1f0875201d49a", "type": "github" }, "original": { @@ -518,7 +598,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -539,7 +619,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_4": { "inputs": { "nixpkgs": [ "zen", @@ -591,6 +671,28 @@ "url": "https://codeberg.org/amjoseph/infuse.nix" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749627191, + "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "libgit2": { "flake": false, "locked": { @@ -651,11 +753,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749801447, - "narHash": "sha256-cfrRFN9j340Wlgwe3k2oWB/0LI63JyUZab7apN72xd8=", + "lastModified": 1749890123, + "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fba861e81d6fe8c0a8ba9fb2ed8d5e6df4a6ad78", + "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96", "type": "github" }, "original": { @@ -705,7 +807,7 @@ ], "flake-parts": "flake-parts", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-23-11": [ "go-musicfox", "devenv" @@ -734,6 +836,29 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix2container": { "inputs": { "flake-utils": "flake-utils", @@ -779,11 +904,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -807,11 +932,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1749879625, - "narHash": "sha256-MtqGUE9dPX64saUYudgYxeH2yPSSnNlvPmyiKHISJ3M=", + "lastModified": 1749984179, + "narHash": "sha256-N0GRVSCbIDnrFd+tGP9WkuXA4xt1+MeGRMnMr4JgkqU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f117875f61620e81e0412d3f1d2ab7971d88912d", + "rev": "f706574484e18612c3f08e63836906651e52b55f", "type": "github" }, "original": { @@ -823,27 +948,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749866762, - "narHash": "sha256-WWUjx/6D+xmE6boM31L31nM/8csI79BuLgGytZHByz4=", + "lastModified": 1749984206, + "narHash": "sha256-L4siXsrFIMgVkjd01JVAvzNOxYOq56BEY//IljBfObA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a06b272523a606c55f7bac29477a091c775d89b", + "rev": "f19b0fbf99317dd622b71e96ef6cde564972cd67", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749809936, - "narHash": "sha256-WPGRaj7CKfZukjcpxiacp29uYfMl3S9zFiEsVFv/HWM=", + "lastModified": 1749896453, + "narHash": "sha256-6+AmSZBogyr1zbVc2k4IBcmY/Yt39mC4+cfZi0n/AAA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ec4c48ddcd5718cc1312f432b800fbbfe63ee2fe", + "rev": "ba48a1f6ce571455cb631dee840c6cd401ea4adb", "type": "github" }, "original": { @@ -854,6 +979,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1717432640, "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", @@ -869,7 +1010,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1716977621, "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", @@ -885,13 +1026,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -904,15 +1045,15 @@ "nur": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1749874339, - "narHash": "sha256-QKj0+WJm9LiZulDdQI8duXAckKVmj6952C9gww/flB0=", + "lastModified": 1749983324, + "narHash": "sha256-UCht45QsAY3lARXXoaJ4KaoVMtYUQbXuvaTaD5aN6m8=", "owner": "nix-community", "repo": "NUR", - "rev": "c70ec5f29a4642d6f412186a9f4d68f536089814", + "rev": "783b27b3f6593f7c82d9dce4869b1b83814f378e", "type": "github" }, "original": { @@ -954,11 +1095,11 @@ ] }, "locked": { - "lastModified": 1749772873, - "narHash": "sha256-ZsFQIs3ZpUud1QmR1TyhAW0LGbjHzCkA79YCLBbJ12A=", + "lastModified": 1749982371, + "narHash": "sha256-+lrgH2+Hwmoo13DvztAj6D+a4kiTl08LFFzpXcnPHAw=", "ref": "refs/heads/master", - "rev": "517143adf97fb0df7e9a7584061deecdffb19faf", - "revCount": 576, + "rev": "d9164578a2fc4f0721aaf61c2af8bc6c5cdb11b4", + "revCount": 581, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -969,10 +1110,11 @@ }, "root": { "inputs": { + "chaotic": "chaotic", "darkly": "darkly", - "fenix": "fenix", + "fenix": "fenix_2", "go-musicfox": "go-musicfox", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "impermanence": "impermanence", "infuse": "infuse", "niri": "niri", @@ -993,11 +1135,28 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1749671345, - "narHash": "sha256-ewwoJOGE6sMnfXQkydmmjT6ixo1JetBZO0tDEENjOb8=", + "lastModified": 1750005282, + "narHash": "sha256-VXLDkb1iOw7wWhgOgBMP9hTcpW6Eo399YbBif5hlxS8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5b2c8bc9ae90b4ad92dbeb7e52a7f5cbf5ba4d53", + "rev": "a207299344bf7797e4253c3f6130313e33c2ba6f", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1749877986, + "narHash": "sha256-qEkNilgV6N4J0EhuPE8U4ispuMXgrRHAhi/BirBfC4I=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "fe5a925a74efde7ec6a7d3e388b946f96d36e760", "type": "github" }, "original": { @@ -1038,7 +1197,7 @@ "flake-parts": "flake-parts_4", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ], @@ -1051,11 +1210,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749824792, - "narHash": "sha256-fhEA3GngWkfktSI/7dLdlirgUS9nmXmJGisOs5ozTMw=", + "lastModified": 1749905587, + "narHash": "sha256-sZpQM+InPCYwJQiTxs/PCCupwbYNaSCFi2Hvpl1/pOo=", "owner": "danth", "repo": "stylix", - "rev": "c79ad485612a0277c1e25a0bcc562eea11b563d8", + "rev": "77a8b26520f48305f3b1bacffaa8740dde8afa2a", "type": "github" }, "original": { @@ -1253,17 +1412,17 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1749875058, - "narHash": "sha256-LGeVwJLNJ+QPsuQMGsm5atAkFZgrRG3t62bB0+loOi4=", + "lastModified": 1749982886, + "narHash": "sha256-v64Bz3dJGpoznDK55+6g58P5jjP9dLLPDMSVv6eCsRc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "12fbcbb395776b50a848f87434bb786ef4f09b9d", + "rev": "e3ea161123e576ee049f1c8ec05d877ffbb7014c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 34c68de..41f1657 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,14 @@ inputs = { # Nixpkgs nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; - nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; # nixpkgs.follows = "nixpkgs-stable"; nixpkgs.follows = "nixpkgs-unstable"; + # Nyxpkgs + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + # SOPS sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -152,7 +155,7 @@ }; }; pkgsConf.nixpkgs = { - overlays = lib.mkForce overlays; + inherit overlays; config.allowUnfree = true; flake.setNixPath = false; }; @@ -171,6 +174,7 @@ ./modules ./config/base.nix ./config/hosts/${hostname} + inputs.chaotic.nixosModules.default inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence inputs.home-manager.nixosModules.default