dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 46c1114b1aedd5983a4e62f3e345c616e738fbf1 parent c509541ec8b635c7b604b582ace4f56087207651 Author: maydayv7 <maydayv7@gmail.com> Date: Fri, 8 Mar 2024 10:58:45 +0530 refactor: Drop unused `inputs` Remove `chaotic` and `nur`
Diffstat:
| M | devices/vortex.nix | | | 2 | +- |
| M | flake.lock | | | 480 | +++++-------------------------------------------------------------------------- |
| M | flake.nix | | | 21 | ++------------------- |
| M | modules/base/default.nix | | | 22 | +++++++++------------- |
| M | modules/base/security.nix | | | 14 | ++++---------- |
| M | packages/flake.nix | | | 2 | -- |
6 files changed, 42 insertions(+), 499 deletions(-)
diff --git a/devices/vortex.nix b/devices/vortex.nix @@ -6,7 +6,7 @@ timezone = "Asia/Kolkata"; locale = "IN"; - kernel = "cachyos"; + kernel = "xanmod_latest"; kernelModules = ["nvme" "thunderbolt"]; imports = [{services.fwupd.enable = true;}]; diff --git a/flake.lock b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1707922053, - "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", - "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", - "revCount": 193, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.193%2Brev-6eabc3f02fae3683bffab483e614bebfcd476b21/018da817-367d-75ac-bd41-470d92844bf2/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -212,108 +179,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "attic": "attic", - "compare-to": "compare-to", - "conduit": "conduit", - "crane": "crane_2", - "fenix": "fenix", - "flake-compat": "flake-compat_2", - "flake-schemas": "flake-schemas", - "flake-utils": [ - "utils", - "flake-utils" - ], - "home-manager": [ - "home-manager" - ], - "jovian": "jovian", - "jujutsu": "jujutsu", - "niri": "niri", - "nix-filter": [ - "filters" - ], - "nixpkgs": "nixpkgs", - "systems": [ - "systems" - ], - "yafas": "yafas" - }, - "locked": { - "lastModified": 1709802317, - "narHash": "sha256-Xi/nghMW2ywH11M/7L9FgoYRXMpy42ODYvdkJ4lARVg=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "ecc8d401f3534069a9f0a5d113df9ca32b468a4a", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, - "compare-to": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" - } - }, - "conduit": { - "inputs": { - "attic": [ - "chaotic", - "attic" - ], - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709522437, - "narHash": "sha256-mS0tYjN3B2cLfF+p8m/0YAMNOEQSx/HJT6BOy/XcOLw=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "b527ec46661a9a5efe22aa83eeb9fbbe37c41850", - "type": "gitlab" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "gitlab" - } - }, "crane": { "inputs": { "flake-compat": [ @@ -347,47 +212,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706473297, - "narHash": "sha256-FbxuYIrHaXpsYCLtI1gCNJhd+qvERjPibXL3ctmVaCs=", - "rev": "fe812ef0dad5bb93a56c599d318be176d080281d", - "revCount": 493, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.1/018d51be-1c17-765e-babc-c9e3bc8a5a14/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1709274179, - "narHash": "sha256-O6EC6QELBLHzhdzBOJj0chx8AOcd4nDRECIagfT5Nd0=", - "rev": "4be608f4f81d351aacca01b21ffd91028c23cc22", - "revCount": 1791, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1791%2Brev-4be608f4f81d351aacca01b21ffd91028c23cc22/018df913-b6d3-756c-b05c-358eca6e487d/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz" - } - }, "filters": { "locked": { "lastModified": 1705332318, @@ -422,21 +246,6 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { "lastModified": 1673956053, "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", @@ -450,7 +259,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -466,7 +275,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -481,7 +290,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -519,20 +328,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1693491534, - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" - } - }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -645,7 +440,7 @@ "flake-parts": [ "framework" ], - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1709168939, @@ -786,7 +581,7 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": [ "systems" ], @@ -912,54 +707,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709744297, - "narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "jujutsu": { - "inputs": { - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1709745623, - "narHash": "sha256-Al56OXS8GuqZUJny6yq1E1XAKEe+rowMOeqJKmnVfOc=", - "owner": "martinvonz", - "repo": "jj", - "rev": "1ee6b595a8a88dea3ead4ab55c224d9380b87375", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "repo": "jj", - "type": "github" - } - }, "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_2", @@ -979,48 +726,11 @@ "type": "github" } }, - "niri": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709744470, - "narHash": "sha256-ZM5dTj+c8HVnn+EBKuGy7aqPY3UOeRVl9R0iwSuRL6k=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "3ee2db71a456f5b009c1ba7c15c5376bb0a3bb0d", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts", - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1040,29 +750,6 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { - "inputs": { - "nixpkgs": [ "wayland", "nix-eval-jobs", "nixpkgs" @@ -1084,16 +771,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", - "revCount": 592007, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.592007%2Brev-9df3e30ce24fd28c7b3e2de0d986769db5d6225d/018e1732-2a3c-7a76-9ec9-7272cb294c13/source.tar.gz" + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -1127,40 +816,8 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1702780907, - "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1708751719, - "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1708807242, "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", @@ -1175,7 +832,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1709793493, "narHash": "sha256-qDUl3GY71RUuj2msMDq7PjhW5SvHexgnaNRCxZjWr/o=", @@ -1191,7 +848,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1703134684, "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", @@ -1207,7 +864,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", @@ -1223,21 +880,6 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 1709265870, - "narHash": "sha256-fBf9k4bYbaKNT/Ma385wCkyPvg3/MGt+tsB7MmXnGiU=", - "owner": "nix-community", - "repo": "NUR", - "rev": "f4be25a071c35bb099d40bc6be7652c1a17fdf2b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1293,7 +935,6 @@ "root": { "inputs": { "boot": "boot", - "chaotic": "chaotic", "filters": "filters", "flatpak": "flatpak", "formatter": "formatter", @@ -1308,8 +949,7 @@ "hyprland-plugins": "hyprland-plugins", "impermanence": "impermanence", "index": "index", - "nixpkgs": "nixpkgs_4", - "nur": "nur", + "nixpkgs": "nixpkgs_3", "proprietary": "proprietary", "sops": "sops", "stylix": "stylix", @@ -1323,23 +963,6 @@ "windows": "windows" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1709219524, - "narHash": "sha256-8HHRXm4kYQLdUohNDUuCC3Rge7fXrtkjBUf0GERxrkM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "9efa23c4dacee88b93540632eb3d88c5dfebfe17", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -1365,33 +988,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "chaotic", - "jujutsu", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "jujutsu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707444620, - "narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "78503e9199010a4df714f29a4f9c00eb2ccae071", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops": { "inputs": { "nixpkgs": [ @@ -1426,7 +1022,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "home-manager": [ "home-manager" ], @@ -1586,7 +1182,7 @@ }, "vscode": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": [ "utils", "flake-utils" @@ -1631,10 +1227,10 @@ }, "wayland": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1709651762, @@ -1672,7 +1268,7 @@ }, "windows": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "nixpkgs": [ "unstable" ] @@ -1742,30 +1338,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "yafas": { - "inputs": { - "flake-schemas": [ - "chaotic", - "flake-schemas" - ], - "systems": [ - "chaotic", - "systems" - ] - }, - "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", - "revCount": 4, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix @@ -43,20 +43,6 @@ # Unstable Packages Repository unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; - # Nix User Repository - nur.url = "github:nix-community/NUR"; - - # Chaotic Packages Repository - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs = { - home-manager.follows = "home-manager"; - systems.follows = "systems"; - flake-utils.follows = "utils/flake-utils"; - nix-filter.follows = "filters"; - }; - }; - # Proprietary Software proprietary = { url = "github:maydayv7/proprietary"; @@ -254,29 +240,26 @@ # Binary Caches trusted-substituters = [ + "https://maydayv7-dotfiles.cachix.org" "https://cache.nixos.org" "https://hyprland.cachix.org" "https://nix-community.cachix.org" "https://nix-gaming.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://nixpkgs-wayland.cachix.org" - "https://nyx.chaotic.cx/" "https://catppuccin.cachix.org" - "https://maydayv7-dotfiles.cachix.org" ]; # Public Keys trusted-public-keys = [ + "maydayv7-dotfiles.cachix.org-1:dpECO0Z2ZMttY6JgWHuAR5M7cqeyfFjUsvHdnMz+j6U=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" - "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU=" - "maydayv7-dotfiles.cachix.org-1:dpECO0Z2ZMttY6JgWHuAR5M7cqeyfFjUsvHdnMz+j6U=" ]; }; } diff --git a/modules/base/default.nix b/modules/base/default.nix @@ -7,21 +7,20 @@ pkgs, ... }: let - inherit (lib) mkOption optionals types; + inherit (builtins) attrNames map; + inherit (lib) removePrefix mkOption optionals types; cfg = config.base; in { - imports = - util.map.modules.list ./. - ++ [ - inputs.chaotic.nixosModules.default - inputs.generators.nixosModules.all-formats - ]; + imports = util.map.modules.list ./. ++ [inputs.generators.nixosModules.all-formats]; options.base = { kernel = mkOption { description = "Linux Kernel Variant to be used"; - type = types.str; default = "zfs"; + type = types.enum ( + ["lts" "zfs"] + ++ (map (name: removePrefix "linux_" name) (attrNames pkgs.linuxKernel.kernels)) + ); }; kernelModules = mkOption { @@ -41,14 +40,11 @@ in { then pkgs.zfs.latestCompatibleLinuxPackages else if (cfg.kernel == "lts") then options.boot.kernelPackages.default - else - pkgs.linuxKernel.packages."${"linux_" + cfg.kernel}" - or pkgs.chaotic."${"linuxPackages_" + cfg.kernel}"; + else pkgs.linuxKernel.packages."${"linux_" + cfg.kernel}"; initrd.availableKernelModules = optionals (cfg.kernelModules != []) - (cfg.kernelModules - ++ ["ahci" "sd_mod" "usbhid" "usb_storage" "xhci_pci"]); + (cfg.kernelModules ++ ["ahci" "sd_mod" "usbhid" "usb_storage" "xhci_pci"]); }; # Documentation diff --git a/modules/base/security.nix b/modules/base/security.nix @@ -1,11 +1,8 @@ { - config, lib, pkgs, ... -}: let - inherit (lib) hasPrefix mkOverride; -in { +}: { ## Security & Hardening Settings ## config = { # Protocols @@ -27,11 +24,12 @@ in { kernel.sysctl = { # Kernel "kernel.ftrace_enabled" = false; - "kernel.kptr_restrict" = mkOverride 500 2; + "kernel.kptr_restrict" = lib.mkOverride 500 2; "kernel.sysrq" = 0; - "kernel.yama.ptrace_scope" = mkOverride 500 1; + "kernel.yama.ptrace_scope" = lib.mkOverride 500 1; # Network + "net.core.bpf_jit_enable" = true; "net.core.default_qdisc" = "cake"; "net.ipv4.conf.all.accept_redirects" = false; "net.ipv4.conf.all.accept_source_route" = 0; @@ -53,10 +51,6 @@ in { "net.ipv6.conf.all.accept_redirects" = false; "net.ipv6.conf.all.accept_source_route" = 0; "net.ipv6.conf.default.accept_redirects" = false; - "net.core.bpf_jit_enable" = - if (hasPrefix "cachyos" config.base.kernel) - then true - else false; }; # Secure Modules diff --git a/packages/flake.nix b/packages/flake.nix @@ -48,7 +48,6 @@ in { inherit system config; overlays = [ - nur.overlay vscode-catppuccin.overlays.default (final: prev: { nixFlakes = prev.nixVersions.nix_2_19; @@ -56,7 +55,6 @@ in { custom = self.packages."${system}"; unstable = import unstable {inherit system config;}; - chaotic = chaotic.packages."${system}"; code = vscode.extensions."${system}"; gaming = gaming.packages."${system}"; wine = windows.packages."${system}";