diff --git a/flake.lock b/flake.lock index 245bd40..f23eff4 100644 --- a/flake.lock +++ b/flake.lock @@ -68,6 +68,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1773036026, + "narHash": "sha256-hRDSqn5jL0cq4aYTcAS61Jsw2DEqxHkAb01Cyu7jIDc=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "dd72b90988e22422548f65e1ec8e2b52c8c7e35f", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1773035489, + "narHash": "sha256-qsniqHnVIZdhGO6tYyugtWpOtdYofnUcpJAj6YAAvM4=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "d60f37176775b87d3300b333b39ae974adbda381", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" @@ -207,6 +239,22 @@ } }, "flake-compat_2": { + "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_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -256,6 +304,24 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nix-citizen", @@ -276,9 +342,9 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1769996383, @@ -294,9 +360,9 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { "lastModified": 1772408722, @@ -312,7 +378,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -387,7 +453,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nix-gaming", @@ -484,14 +550,37 @@ "type": "github" } }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1773166308, + "narHash": "sha256-fkJEQ1rbt/lqsA0+D3+LWtCok9Ofsz8dKDCnbt1MvOs=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "2396c36f247f4c1e08f3ffd953b7b958d044e224", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "ref": "release", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nix-citizen": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nix-gaming": [ "nix-gaming" ], "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, @@ -527,9 +616,9 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1772764431, @@ -568,9 +657,9 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_5" + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1772641310, @@ -603,6 +692,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1769909678, "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", @@ -617,7 +721,7 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "lastModified": 1772328832, "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", @@ -648,6 +752,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1773148319, + "narHash": "sha256-Yr9ej3uSDycQZHWB5HslVgryLkdSBN2fODAqURv/1wQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8da79c289ee165139257335eab0733d98c4ad458", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1772624091, "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", @@ -663,7 +783,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1772173633, "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", @@ -679,7 +799,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1772465433, "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=", @@ -695,7 +815,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1772615108, "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=", @@ -747,11 +867,12 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "import-tree": "import-tree", + "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-citizen": "nix-citizen", "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-lib": [ "nixpkgs" ], @@ -766,7 +887,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index d3368a9..d70a07f 100644 --- a/flake.nix +++ b/flake.nix @@ -52,5 +52,7 @@ # hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; }; } diff --git a/modules/core/desktop/hevel.nix b/modules/core/desktop/hevel.nix new file mode 100644 index 0000000..0db3279 --- /dev/null +++ b/modules/core/desktop/hevel.nix @@ -0,0 +1,3 @@ +{ + +} diff --git a/modules/core/determinate.nix b/modules/core/determinate.nix new file mode 100644 index 0000000..d409d2a --- /dev/null +++ b/modules/core/determinate.nix @@ -0,0 +1,7 @@ +{ inputs }: { + den.aspects.determinate = { + nixos = { + imports = [ inputs.determinate.nixosModules.default ]; + }; + }; +} diff --git a/modules/core/kernel.nix b/modules/core/kernel.nix index 5a9f665..ae14f10 100644 --- a/modules/core/kernel.nix +++ b/modules/core/kernel.nix @@ -1,7 +1,7 @@ { inputs, ... }: { den.aspects.kernel = { nixos = { pkgs, ... }: { - imports = [ inputs.nix-cachyos-kernel.overlays.default ]; + nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.default ]; boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; }; diff --git a/modules/hosts/common.nix b/modules/hosts/common.nix index fdf1fc9..5a31d04 100644 --- a/modules/hosts/common.nix +++ b/modules/hosts/common.nix @@ -24,6 +24,8 @@ gaming #crab-hole + + kernel ]; }; }