diff --git a/flake.lock b/flake.lock index d88a6cc..b389782 100644 --- a/flake.lock +++ b/flake.lock @@ -43,6 +43,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1769201405, + "narHash": "sha256-k/KQL7J9ZnLlF28E6ywGpfo5dxkuxCcEtJ/XEZDTw3M=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "ff53672af48a106f52857d62c9275b165cc452ef", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1769199354, + "narHash": "sha256-y1DKMryOr1w4xcZnDkaZjvENIPmr3j/YB4Srtfd3I2Y=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "c8b990198baf3c34b64e4e5c5ffeb7c068eede1a", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1754269165, @@ -91,6 +123,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1767039857, @@ -106,7 +154,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1650374568, @@ -143,6 +191,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -328,9 +394,32 @@ "type": "github" } }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1769363279, + "narHash": "sha256-XJCuB8GWkFLRFBR6GQoxRB9/lobB45ERp0JN0Lo2nvs=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "4aa98db78c1d663c3dad59775e95ad93fe58a844", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "ref": "release", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ] @@ -366,7 +455,38 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1769300497, + "narHash": "sha256-W7NbQnQGqUPRnpHOlLXk3g52TSQDkFVzhax9YNv9K+U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "60f9d776547020ff3be5a2cfbd0a457fddd88ecc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1769170682, "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", @@ -416,8 +536,9 @@ "home-manager": "home-manager", "kwin-effects-forceblur": "kwin-effects-forceblur", "lanzaboote": "lanzaboote", + "nix-cachyos-kernel": "nix-cachyos-kernel", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", "trilium-next-pr": "trilium-next-pr", @@ -465,7 +586,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index d1b861c..1e500d1 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,7 @@ url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; }; outputs = inputs: @@ -88,8 +89,21 @@ lib.mkFlake { inherit inputs; src = ./.; + + overlays = with inputs; [ + # Use the exact kernel versions as defined in this repo. + # Guarantees you have binary cache. + nix-cachyos-kernel.overlays.pinned + # Alternatively, build the kernels on top of nixpkgs version in your flake. + # This might cause version mismatch/build failures! + # nix-cachyos-kernel.overlays.default + + # Only use one of the two overlays! + ]; + nixos = with inputs; [ + # disko.nixosModules.disko # impermanence.nixosModules.impermanence home-manager.nixosModules.home-manager diff --git a/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix b/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix index 6ef6cae..97541ea 100644 --- a/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix @@ -12,7 +12,7 @@ ./acer-monitor-edid.nix ]; # boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; hardware.enableRedistributableFirmware = true; # boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest; # boot.kernelPackages = pkgs.linuxPackages; @@ -35,25 +35,25 @@ }; # Mount ntfs partition - fileSystems."/run/media/627C3BDF7C3BAD23" = { - device = "/dev/disk/by-uuid/627C3BDF7C3BAD23"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; + # fileSystems."/run/media/627C3BDF7C3BAD23" = { + # device = "/dev/disk/by-uuid/627C3BDF7C3BAD23"; + # fsType = "ntfs-3g"; + # options = [ "rw" "uid=1000"]; + # }; - # Mount ntfs oldfiles drive partition - fileSystems."/run/media/oldfiles" = { - device = "/dev/disk/by-uuid/E2E26FFFE26FD677"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; + # # Mount ntfs oldfiles drive partition + # fileSystems."/run/media/oldfiles" = { + # device = "/dev/disk/by-uuid/E2E26FFFE26FD677"; + # fsType = "ntfs-3g"; + # options = [ "rw" "uid=1000"]; + # }; - # Mount The Vault - fileSystems."/run/media/vault" = { - device = "/dev/disk/by-uuid/3470646370642DB4"; - fsType = "ntfs-3g"; - options = [ "rw" "uid=1000"]; - }; + # # Mount The Vault + # fileSystems."/run/media/vault" = { + # device = "/dev/disk/by-uuid/3470646370642DB4"; + # fsType = "ntfs-3g"; + # options = [ "rw" "uid=1000"]; + # };