diff --git a/flake.nix b/flake.nix index da526e2..88cfd4d 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ ataraxiasjel-nur.url = "github:AtaraxiaSjel/nur"; catppuccin.url = "github:catppuccin/nix"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; @@ -98,6 +99,8 @@ }; systemModules = [ inputs.sops-nix.nixosModules.sops + inputs.chaotic.nixosModules.nyx-cache + inputs.chaotic.nixosModules.nyx-overlay ./modules/nixos ]; homeModules = [ ./modules/home ]; diff --git a/hosts/andromedae/boot.nix b/hosts/andromedae/boot.nix index 34364fd..674dd7e 100644 --- a/hosts/andromedae/boot.nix +++ b/hosts/andromedae/boot.nix @@ -24,8 +24,12 @@ # }; # }; + services.scx.enable = true; + services.scx.scheduler = "scx_rustland"; + boot = { - zfs.package = pkgs.zfs_unstable; + kernelPackages = pkgs.linuxPackages_cachyos; + zfs.package = pkgs.zfs_cachyos; loader = { grub = { diff --git a/modules/nixos/boot/default.nix b/modules/nixos/boot/default.nix index 4856d2f..027ec2e 100644 --- a/modules/nixos/boot/default.nix +++ b/modules/nixos/boot/default.nix @@ -5,7 +5,12 @@ ... }: let - inherit (lib) mkDefault mkEnableOption mkIf; + inherit (lib) + mkDefault + mkEnableOption + mkIf + mkOverride + ; cfg = config.ataraxia.defaults.boot; in @@ -30,7 +35,8 @@ in "zswap.enabled=0" ]; - kernelPackages = pkgs.linuxPackages_xanmod_latest; + kernelPackages = mkOverride 900 pkgs.linuxPackages_xanmod_latest; + zfs.package = mkOverride 900 pkgs.zfs_unstable; consoleLogLevel = 3;