diff --git a/config/hosts/imxyy-nix-server/hardware.nix b/config/hosts/imxyy-nix-server/hardware.nix index 2472cce..b964a16 100644 --- a/config/hosts/imxyy-nix-server/hardware.nix +++ b/config/hosts/imxyy-nix-server/hardware.nix @@ -18,15 +18,17 @@ in ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos; - services.scx.enable = true; + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest; + services.scx = { + enable = true; + scheduler = "scx_rusty"; + }; 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/config/hosts/imxyy-nix-x16/hardware.nix b/config/hosts/imxyy-nix-x16/hardware.nix index d26ae2f..6490b98 100644 --- a/config/hosts/imxyy-nix-x16/hardware.nix +++ b/config/hosts/imxyy-nix-x16/hardware.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - username, ... }: let @@ -22,7 +21,7 @@ in verbose = false; }; - kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos; + kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest; kernelModules = [ "kvm-amd" ]; tmp.useTmpfs = true; @@ -30,7 +29,10 @@ in "fs.file-max" = 9223372036854775807; }; }; - services.scx.enable = true; + services.scx = { + enable = true; + scheduler = "scx_rusty"; + }; fileSystems."/" = { device = btrfs; diff --git a/config/hosts/imxyy-nix/hardware.nix b/config/hosts/imxyy-nix/hardware.nix index 16b5fec..dce3bdc 100644 --- a/config/hosts/imxyy-nix/hardware.nix +++ b/config/hosts/imxyy-nix/hardware.nix @@ -23,7 +23,7 @@ in verbose = false; }; - kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos; + kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest; kernelModules = [ "kvm-amd" ]; tmp.useTmpfs = true; @@ -36,7 +36,10 @@ in "resume_offset=6444127" ]; }; - services.scx.enable = true; + services.scx = { + enable = true; + scheduler = "scx_rusty"; + }; fileSystems."/" = { device = btrfs; diff --git a/flake.lock b/flake.lock index 729d65a..841b804 100644 --- a/flake.lock +++ b/flake.lock @@ -106,7 +106,7 @@ "go-musicfox", "devenv" ], - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1728672398, @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1764885363, - "narHash": "sha256-P6UHmw6enwxmP5wP4Lv722+tgpq1PFDAPAdtj7l/16U=", + "lastModified": 1765485905, + "narHash": "sha256-fk6zFzzcwz6su99K7UTxS2497+z/Cdk3FzNsacsmZKA=", "owner": "catppuccin", "repo": "nix", - "rev": "95042630028d613080393e0f03c694b77883c7db", + "rev": "b49c675acd80931fc8b54290920a90189b461dcf", "type": "github" }, "original": { @@ -143,29 +143,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1764847736, - "narHash": "sha256-FMYnfCH2TMNnTJvbc/mraZpRszIL7nc5YI6w/pWNyNs=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "e3f8349d60d5daf58951b9ccd089fecb79ea5443", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "darkly": { "inputs": { "nixpkgs": [ @@ -173,11 +150,11 @@ ] }, "locked": { - "lastModified": 1764899339, - "narHash": "sha256-enE/y2J/9d7K7eUBgTd1hT+YhATvk0FAu+cHkFakLBk=", + "lastModified": 1765222869, + "narHash": "sha256-LUYJ9Qgp0nELw3V2NyfMgAZnE+rx8eHbHgBKCNt5NWY=", "owner": "Bali10050", "repo": "Darkly", - "rev": "b0d952271ce19572b377ceb675940cbde5b1b764", + "rev": "f000d5a198d87ea2cb7fcb0a9906dcf0837dcdf8", "type": "github" }, "original": { @@ -192,7 +169,7 @@ "flake-compat": "flake-compat_2", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1738772960, @@ -216,11 +193,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1764915802, - "narHash": "sha256-eHTucU43sRCpvvTt5eey9htcWipS7ZN3B7ts6MiXLxo=", + "lastModified": 1765435813, + "narHash": "sha256-C6tT7K1Lx6VsYw1BY5S3OavtapUvEnDQtmQB5DSgbCc=", "owner": "nix-community", "repo": "fenix", - "rev": "a83a78fd3587d9f3388f0b459ad9c2bbd6d1b6d8", + "rev": "6399553b7a300c77e7f07342904eb696a5b6bf9d", "type": "github" }, "original": { @@ -280,11 +257,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", "type": "github" }, "original": { @@ -390,20 +367,6 @@ "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" @@ -557,36 +520,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1764788330, - "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", + "lastModified": 1765480374, + "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", "owner": "nix-community", "repo": "home-manager", - "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764912896, - "narHash": "sha256-ftxQocr098v5ngqB3SXa9tW6aqovBSBOEdIRcLEj44c=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "6bcb2395ab9ed05616052262da526cd7c5b4b123", + "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", "type": "github" }, "original": { @@ -596,7 +538,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_2": { "inputs": { "nixpkgs": [ "zen", @@ -648,28 +590,6 @@ "url": "https://codeberg.org/amjoseph/infuse.nix" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764746434, - "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "libgit2": { "flake": false, "locked": { @@ -720,17 +640,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764796736, - "narHash": "sha256-JMSsWdmmzLtwVV8Z9x2mDjgA5i7DkJYnYQwkJWeHE40=", + "lastModified": 1765528203, + "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a482ee6c7423ff90771958cd4bab95e4410b0381", + "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3", "type": "github" }, "original": { @@ -759,11 +679,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764678181, - "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", + "lastModified": 1765524373, + "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=", "owner": "YaLTeR", "repo": "niri", - "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", + "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743", "type": "github" }, "original": { @@ -780,7 +700,7 @@ ], "flake-parts": "flake-parts_2", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-23-11": [ "go-musicfox", "devenv" @@ -830,29 +750,6 @@ "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", @@ -883,11 +780,11 @@ ] }, "locked": { - "lastModified": 1764730608, - "narHash": "sha256-FxKIa3OCSRVC23qrk7VT68vExUcmSruJ8OobVlSWOxc=", + "lastModified": 1765483419, + "narHash": "sha256-w6wznH1lBzlSH3+pWDkE+L6xA0F02drFAzu2E7PD/Jo=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "10124c58674360765adcb38c9a8b081fb72904e4", + "rev": "0c040f28b44b18e0d4240e027096078e34dbb029", "type": "github" }, "original": { @@ -898,11 +795,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -926,11 +823,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1764931785, - "narHash": "sha256-LOFaRPkvo4/zGDmEJ4wDDfln/UpvJTGwde9bVIZGF+M=", + "lastModified": 1765536405, + "narHash": "sha256-HTHfcqG8WsrJG0aW3edXF5nQJK3VjPWcUTEi/r0LV7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06817be72892c139d60af21fd9bbf86c7bf9c747", + "rev": "27225de9f2030213246e0d8d62957c43d5229368", "type": "github" }, "original": { @@ -942,27 +839,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "lastModified": 1765311797, + "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1765002077, - "narHash": "sha256-b5s8cSpCVcez2B7/KAgTsOxe9U7+9ijU/pb2xi77UZk=", + "lastModified": 1765534439, + "narHash": "sha256-4gmRI9d5OCXKu6z2XeuLaBnnf9hzLZbXrl9Lgb0KMXQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5bebdb81e36019d0cdf94f6f07107775be71e980", + "rev": "44379cc241b3d3e90cc7c3e01d7719918f5d6fe0", "type": "github" }, "original": { @@ -974,11 +871,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -1005,22 +902,6 @@ } }, "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=", @@ -1036,7 +917,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1716977621, "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", @@ -1052,13 +933,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -1068,7 +949,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1761236834, "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", @@ -1151,12 +1032,11 @@ "inputs": { "angrr": "angrr", "catppuccin": "catppuccin", - "chaotic": "chaotic", "darkly": "darkly", "fenix": "fenix", "go-musicfox": "go-musicfox", "haumea": "haumea", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "impermanence": "impermanence", "infuse": "infuse", "niri": "niri", @@ -1179,11 +1059,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1764778537, - "narHash": "sha256-SNL+Fj1ZWiBqCrHJT1S9vMZujrWxCOmf3zkT66XSnhE=", + "lastModified": 1765400135, + "narHash": "sha256-D3+4hfNwUhG0fdCpDhOASLwEQ1jKuHi4mV72up4kLQM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "633cff25206d5108043d87617a43c9d04aa42c88", + "rev": "fface27171988b3d605ef45cf986c25533116f7e", "type": "github" }, "original": { @@ -1193,27 +1073,6 @@ "type": "github" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764729618, - "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1221,11 +1080,11 @@ ] }, "locked": { - "lastModified": 1764535106, - "narHash": "sha256-2UwoSach1SMSm+G0HEKwjgT3AH50BSLIW338naOCGrs=", + "lastModified": 1765231721, + "narHash": "sha256-VAVN68eE8UrXL5fBnXh7sy7EfIW34xhbKwdyftDFzZo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "82d3ab5456df2adceef96f0e16bd8aa025a836ad", + "rev": "83930bf82f59aec1f58d9685a50cbcd7e426a687", "type": "github" }, "original": { @@ -1256,11 +1115,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764860352, - "narHash": "sha256-bWrh2T6EPiiZC7jY0jK5cWRwkG0hltnPT1etfHIHiXM=", + "lastModified": 1765474444, + "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", "owner": "danth", "repo": "stylix", - "rev": "61a01b75f0a7e58dac486ddf022c628a71528399", + "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", "type": "github" }, "original": { @@ -1382,7 +1241,7 @@ }, "treefmt": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1762938485, @@ -1439,11 +1298,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764721075, - "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", + "lastModified": 1765343581, + "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", + "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", "type": "github" }, "original": { @@ -1454,17 +1313,17 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1764912088, - "narHash": "sha256-RMcl9USd+aChPZs1nEDAnFdQS/Z73ukGt2lDtjZJIsA=", + "lastModified": 1765514052, + "narHash": "sha256-YdwI+u4exAo0nRZsC9arapchD4Urt5Oeo+wZIrvlMa4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d1820b31fd89aee884336589f92477b40a8d1cb8", + "rev": "3f55518bd994195cfdd835e86c41e984ac1241e8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5eacc0c..535ac6c 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,6 @@ nixpkgs.follows = "nixpkgs-unstable"; # nixpkgs.follows = "nixpkgs-master"; - # Nyxpkgs - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - # TODO: sops-nix: remove pr patch once merged # https://github.com/Mic92/sops-nix/pull/779 sops-nix = { @@ -241,7 +238,6 @@ (lib.mkAliasOptionModule [ "my" "hm" ] [ "home-manager" "users" vars.username ]) ./config/base.nix ./config/hosts/${hostname} - inputs.chaotic.nixosModules.default inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence inputs.home-manager.nixosModules.default diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix index e5f0f4a..d16c025 100644 --- a/modules/desktop/wine.nix +++ b/modules/desktop/wine.nix @@ -14,7 +14,6 @@ lib.my.makeSwitch { config' = { my.hm.home.packages = with pkgs; [ wine-wayland - proton-ge-custom bottles ]; my.persist.homeDirs = [