diff --git a/.envrc b/.envrc index 81e02469..bb6d98dc 100644 --- a/.envrc +++ b/.envrc @@ -3,5 +3,5 @@ watch_file flake.lock # "nix develop" -use flake +use flake . --impure export DIRENV_WARN_TIMEOUT=5m diff --git a/.gitignore b/.gitignore index 057714ce..64c392cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.iso +.devenv .direnv .pre-commit-config.yaml +devenv.local.nix result result/ \ No newline at end of file diff --git a/_typos.toml b/_typos.toml new file mode 100644 index 00000000..979183ff --- /dev/null +++ b/_typos.toml @@ -0,0 +1,13 @@ +[default] +extend-ignore-identifiers-re = [ + "crypted", + "immortalis", + "odf" +] + +[files] +extend-exclude = [ + "CHANGELOG.md", + "global.yaml", + "*.css" +] \ No newline at end of file diff --git a/devenv/packages.nix b/devenv/packages.nix new file mode 100644 index 00000000..42faaf60 --- /dev/null +++ b/devenv/packages.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: { + packages = with pkgs; [ + age + commitizen + gnupg + manix + mdbook + nix-melt + nixos-anywhere + nixos-install-tools + rsync + sops + ]; +} diff --git a/devenv/pre-commit.nix b/devenv/pre-commit.nix new file mode 100644 index 00000000..2eccba10 --- /dev/null +++ b/devenv/pre-commit.nix @@ -0,0 +1,25 @@ +{pkgs, ...}: { + pre-commit.hooks = { + actionlint.enable = true; + alejandra-quiet = { + description = "Run Alejandra in quiet mode"; + enable = true; + entry = '' + ${pkgs.alejandra}/bin/alejandra --quiet + ''; + files = "\\.nix$"; + name = "alejandra"; + }; + commitizen.enable = true; + deadnix.enable = true; + detect-private-keys.enable = true; + # editorconfig-checker.enable = true; + flake-checker.enable = true; + markdownlint.enable = true; + nil.enable = true; + prettier.enable = true; + statix.enable = true; + typos.enable = true; + yamllint.enable = true; + }; +} diff --git a/docs/src/installer/script.md b/docs/src/installer/script.md index eaca7af8..516a2143 100644 --- a/docs/src/installer/script.md +++ b/docs/src/installer/script.md @@ -4,7 +4,7 @@ This is a small script which is serving as installer for this project. It basica - Sets up an environment to install the system from - Asks for basic information such as the disk to be used or the username -- Sets up the partition layout via [disko](https://github.com/nix-community/disko) and mounting the partitons to `/mnt` +- Sets up the partition layout via [disko](https://github.com/nix-community/disko) and mounting the partitions to `/mnt` - Provides a basic, quite generic dr460nixed template and customizes it based on previous choices - Executes the installation diff --git a/flake.lock b/flake.lock index ee556590..0f724466 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1716002440, - "narHash": "sha256-WQ688KRQxnbjkh8rR8m0qt52B/QAVOM0vYFoAd2qxSs=", + "lastModified": 1716252935, + "narHash": "sha256-IuAzSqCtjKzgUCoQ9CcB4Ka8JIWGPzXJiJr8VgHHA18=", "owner": "SamLukeYes", "repo": "archix", - "rev": "25dc44435c672ce93838e2903b56c1072339c833", + "rev": "002f82772c1f8529f8b32b464468530eac896bab", "type": "github" }, "original": { @@ -56,13 +56,43 @@ "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" } }, + "cachix": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { - "lastModified": 1715659881, - "narHash": "sha256-emodPGTXLVqlcOkqbJiOUkf5vo8WWujgzKxms1B+iBs=", + "lastModified": 1716337435, + "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=", "owner": "catppuccin", "repo": "nix", - "rev": "d6344610c04af0f8e315fef45dd3b854014b119e", + "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82", "type": "github" }, "original": { @@ -74,15 +104,17 @@ "catppuccin-vsc": { "inputs": { "nixpkgs": [ + "garuda-nix", + "chaotic-nyx", "nixpkgs" ] }, "locked": { - "lastModified": 1715401925, - "narHash": "sha256-EGZGHCv4OFqzFc9oP82LCKMWfMGsmadOOZ0DZHYSdns=", + "lastModified": 1716179347, + "narHash": "sha256-DPiP4yLRcPgWgrnCC/tRp5vUk9teZIfsCT2r8jr1V8A=", "owner": "catppuccin", "repo": "vscode", - "rev": "f0a6271f62ebb868f32c7ad4ecb31104c26f987a", + "rev": "b7a8806f7532a091b0170f281dbc7f35c3fc7761", "type": "github" }, "original": { @@ -91,34 +123,6 @@ "type": "github" } }, - "catppuccinifier": { - "inputs": { - "crane": [ - "chaotic-nyx", - "crane" - ], - "flake-utils": [ - "chaotic-nyx", - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708613946, - "narHash": "sha256-LNBbU7TeDbNwrIIVMbEkUUkxJjWMrhfATKc4cDyJ/4M=", - "owner": "lighttigerXIV", - "repo": "catppuccinifier", - "rev": "2ab067b375cbd04af76eb26382841adddeb46b8d", - "type": "github" - }, - "original": { - "owner": "lighttigerXIV", - "repo": "catppuccinifier", - "type": "github" - } - }, "chaotic-nyx": { "inputs": { "attic": "attic", @@ -129,7 +133,9 @@ "flake-compat": "flake-compat", "flake-schemas": "flake-schemas", "flake-utils": "flake-utils", - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "jovian": "jovian", "jujutsu": "jujutsu", "niri": "niri", @@ -139,11 +145,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1716140389, - "narHash": "sha256-diwpgSwsr8gw/G8xYl3e399rl7oS8Pt8YlvX2VHLY+I=", + "lastModified": 1716670457, + "narHash": "sha256-wfD7maFs6phUd45ewWZo1lPAHluOS+9Z7IfdMFk0LGo=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "150ba72f9c1510327dab6cdac55cd4cca4ac3968", + "rev": "fef678d1e1dbefdfbbf72eb6ef28b534af0bc403", "type": "github" }, "original": { @@ -207,6 +213,7 @@ "chaotic-nyx", "flake-utils" ], + "liburing": "liburing", "nix-filter": [ "chaotic-nyx", "nix-filter" @@ -218,11 +225,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715931745, - "narHash": "sha256-dKdp4HbNp4Y/S8W7Zx8fI0mHsrZHcRuqIvKGgb+MnRc=", + "lastModified": 1716588782, + "narHash": "sha256-DXJrpcNUkgbsd07fmhq3XmTfybrN6LwSh24lZnvKUSo=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6ef4781050c2fa7fd89bcce0bd1f427b8f864a77", + "rev": "f3427afc7fc7a0e67a8c78be24cba898a6bdba2e", "type": "github" }, "original": { @@ -239,18 +246,78 @@ ] }, "locked": { - "lastModified": 1714842444, - "narHash": "sha256-z4HeSYtEdYxKurrbxCMb8v/I1LYDHR/aFrZtGtgUgHw=", - "rev": "c5ee4371eea1728ef04bb09c79577c84d5e67a48", - "revCount": 557, + "lastModified": 1716156051, + "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", + "rev": "7443df1c478947bf96a2e699209f53b2db26209d", + "revCount": 571, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.6/018f4495-627e-7385-b537-81f1c1d4003b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.1/018f92f7-d079-7a6a-8660-4fa94147552e/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" } }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": [ + "chaotic-nyx", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": [ + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1716484006, + "narHash": "sha256-2gtN5jf21HS9TAZXhf9G+OSUY1TQ/95n6clcuFjYQ58=", + "owner": "cachix", + "repo": "devenv", + "rev": "800f19d1b999f89464fd8e0226abf4b3b444b0fa", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "flake-compat": [ + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, "devshell": { "flake": false, "locked": { @@ -274,11 +341,11 @@ ] }, "locked": { - "lastModified": 1716168343, - "narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=", + "lastModified": 1716431128, + "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", "owner": "nix-community", "repo": "disko", - "rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901", + "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", "type": "github" }, "original": { @@ -323,6 +390,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -377,18 +460,32 @@ "url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "garuda-nix": { "inputs": { "catppuccin": "catppuccin", - "catppuccin-vsc": [ - "catppuccin-vsc" - ], + "catppuccin-vsc": "catppuccin-vsc", "chaotic-nyx": [ "chaotic-nyx" ], - "devshell": [ - "devshell" - ], + "devshell": "devshell", "flake-parts": [ "flake-parts" ], @@ -399,7 +496,6 @@ "nix-index-database" ], "nixpkgs": [ - "chaotic-nyx", "nixpkgs" ], "pre-commit-hooks": [ @@ -407,11 +503,11 @@ ] }, "locked": { - "lastModified": 1716091696, - "narHash": "sha256-fD5OC33S98nHaIXYf1ze0f/mL/nvkbXAb3li8XBVb8s=", + "lastModified": 1716696234, + "narHash": "sha256-smTZFYTmQBBVxiq4Te2kwZv0P5xmMzH1PS6b76MkKNs=", "owner": "garuda-linux", "repo": "garuda-nix-subsystem", - "rev": "03f197ce7d426c1d40ca3c6b820d51209220ef54", + "rev": "121a3cc366687ccd5f2cc4d7d11f45688b8494ec", "type": "gitlab" }, "original": { @@ -444,16 +540,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "chaotic-nyx", "nixpkgs" ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716711219, + "narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a", "type": "github" }, "original": { @@ -469,11 +564,11 @@ ] }, "locked": { - "lastModified": 1716150100, - "narHash": "sha256-66ia+9NiBih/HOUtz04NzBk7U/wza9C+vGi/WY43oiM=", + "lastModified": 1716214890, + "narHash": "sha256-/zk5wn2NC8yOZLd6IxpmiVnnSj8mZUznDTngXvNM/vU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "e07d760324bbfd1aa39c29ce5d96e6c390faad8e", + "rev": "7dc5651e1edcc5268fd72dfb90bd1c5c9fba942d", "type": "github" }, "original": { @@ -506,11 +601,11 @@ ] }, "locked": { - "lastModified": 1715922002, - "narHash": "sha256-FSUrne82MXFzZ7R88ZnJz21kv06GS2TS/Ctsd+RXbP4=", + "lastModified": 1716618639, + "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "23a55d6bb80f6340d0acdb9feef754646b68f895", + "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", "type": "github" }, "original": { @@ -532,11 +627,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1715941270, - "narHash": "sha256-bEGp5SR6NRm5YEXRIJCFb8Cw9mxP1nXQ9RDtofAD9ic=", + "lastModified": 1716613888, + "narHash": "sha256-XqVX42rCdLffurAJWck3KwPhPhin1INp0gd9wV8ETWc=", "owner": "martinvonz", "repo": "jj", - "rev": "0a48ac63cbeab30bb39d14744bf073d138918f5c", + "rev": "b0913342b10d24bb230353af2b6f2e8844be7db6", "type": "github" }, "original": { @@ -613,6 +708,38 @@ "type": "github" } }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1716398759, + "narHash": "sha256-fDlOR13WmwVgMxGUMQXWSZAoy2VhZ5AfZRPF9qmQjSc=", + "owner": "axboe", + "repo": "liburing", + "rev": "49be3cad491ae8b3c40348b8d78ae2b0d3726b78", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, + "mk-shell-bin": { + "locked": { + "lastModified": 1677004959, + "narHash": "sha256-/uEkr1UkJrh11vD02aqufCxtbF5YnhRTIKlx5kyvf+I=", + "owner": "rrbutani", + "repo": "nix-mk-shell-bin", + "rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887", + "type": "github" + }, + "original": { + "owner": "rrbutani", + "repo": "nix-mk-shell-bin", + "type": "github" + } + }, "niri": { "inputs": { "crane": [ @@ -637,11 +764,11 @@ ] }, "locked": { - "lastModified": 1715931180, - "narHash": "sha256-Ll4Sm2hjS1gXCFq0moCjW1kRR+jeK4QnBi/qKwWn3Yc=", + "lastModified": 1716554875, + "narHash": "sha256-BBAiAeWPwoOJyeW9PAnxSxS9kAi2b/T8bh8ChIfAD5Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "4dc7a6ceb80dfa8ac04ee9ca44a599405493f6cb", + "rev": "2ac8d840343dc964981507353c9128c68361cb6f", "type": "github" }, "original": { @@ -650,6 +777,32 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -675,11 +828,11 @@ ] }, "locked": { - "lastModified": 1716167790, - "narHash": "sha256-oPo3lkpXOiixYHyCXLwN3+B2D/wbk1p9wVP3q3EuzSA=", + "lastModified": 1716686274, + "narHash": "sha256-4JiRUWtoEMrfq38jG4O+NP6rcQIhKxEclnSkHvywnf0=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ddf67a243c20d781563d6a4066be164720b32afa", + "rev": "83a47c12d3493f7eb876250d0298d1566a965ce4", "type": "github" }, "original": { @@ -711,6 +864,30 @@ "type": "github" } }, + "nix-github-actions_2": { + "inputs": { + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -718,11 +895,11 @@ ] }, "locked": { - "lastModified": 1716170277, - "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", + "lastModified": 1716692972, + "narHash": "sha256-gz3UiLa5mdd+AoOD/p//sdTty0vWk0BLOieTM+F6dGQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", + "rev": "6e4a2b3b7c60aae5dac8c21117a134a4a56648da", "type": "github" }, "original": { @@ -746,11 +923,11 @@ ] }, "locked": { - "lastModified": 1716168130, - "narHash": "sha256-Oyg6eNhZVsXeOE4iszntTskAuK3vJvHUj2XxXIR+xGc=", + "lastModified": 1716686870, + "narHash": "sha256-i1tXTXMHMEFlzECYn8EL5nGW9oWrENAvDdStd9ZbN0M=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "bd9c8fb22af7f74a63e36c426d16c3890cb2eb9b", + "rev": "4f5676b344338530c104ef929b905cdd467eeb6d", "type": "github" }, "original": { @@ -769,8 +946,8 @@ "flake-parts" ], "libgit2": "libgit2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-regression": "nixpkgs-regression", + "nixpkgs": "nixpkgs_3", + "nixpkgs-regression": "nixpkgs-regression_3", "pre-commit-hooks": [ "pre-commit-hooks" ] @@ -789,6 +966,57 @@ "type": "github" } }, + "nix2container": { + "inputs": { + "flake-utils": [ + "chaotic-nyx", + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712990762, + "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix_2": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1712450863, @@ -812,11 +1040,11 @@ ] }, "locked": { - "lastModified": 1716123454, - "narHash": "sha256-U2o4UPM/UsEyIX2p11+YEQgR9HY3PmjZ2mRl/x5e4xo=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a63e0c83dd83fe28cc571b97129e13373436bd82", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -827,11 +1055,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716715385, + "narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8", "type": "github" }, "original": { @@ -855,11 +1083,11 @@ ] }, "locked": { - "lastModified": 1716028628, - "narHash": "sha256-sjgvUXjDXIA48tq+nbQ+e2BfAJyz865mfOtXTj1c8yQ=", + "lastModified": 1716640344, + "narHash": "sha256-AZKQs+KrL70le0RZH8XqZJMc2SahU4LpfEJ2Vd5SWzM=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "041bad074dbde651c6b9d23dce5ee15b67e98c6c", + "rev": "020cd466170204e448b24b246045599fce69ad91", "type": "github" }, "original": { @@ -870,12 +1098,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", - "revCount": 627788, + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "revCount": 630835, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.627788%2Brev-4a6b83b05df1a8bd7d99095ec4b4d271f2956b64/018f8c96-a80b-77a0-b11b-2eda0b3da428/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.630835%2Brev-bfb7a882678e518398ce9a31a881538679f6f092/018fafb0-ec0d-7254-8082-b09ecc86e5fc/source.tar.gz" }, "original": { "type": "tarball", @@ -898,6 +1126,38 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1711460390, @@ -915,6 +1175,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1709083642, "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", @@ -930,13 +1206,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1716128955, - "narHash": "sha256-3DNg/PV+X2V7yn8b/fUR2ppakw7D9N4sjVBGk6nDwII=", + "lastModified": 1716715802, + "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9256de8281f2ccd04985ac5c30d8f69aefadbe8", + "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", "type": "github" }, "original": { @@ -946,6 +1222,31 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -963,11 +1264,11 @@ ] }, "locked": { - "lastModified": 1715870890, - "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { @@ -996,30 +1297,27 @@ "root": { "inputs": { "archix": "archix", - "catppuccin-vsc": "catppuccin-vsc", - "catppuccinifier": "catppuccinifier", "chaotic-nyx": "chaotic-nyx", - "devshell": "devshell", + "devenv": "devenv", "disko": "disko", "flake-parts": "flake-parts", "garuda-nix": "garuda-nix", "gitignore": "gitignore", - "home-manager": [ - "chaotic-nyx", - "home-manager" - ], + "home-manager": "home-manager", "hosts": "hosts", "impermanence": "impermanence", "keys_nico": "keys_nico", "lanzaboote": "lanzaboote", + "mk-shell-bin": "mk-shell-bin", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", "nix-super": "nix-super", + "nix2container": "nix2container", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", @@ -1105,11 +1403,11 @@ ] }, "locked": { - "lastModified": 1716087663, - "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { @@ -1157,6 +1455,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1196,11 +1509,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716155853, - "narHash": "sha256-E9hrPiTVSBzBsmjw276Gj0B8i7SBgTHT/RowAFzUxIU=", + "lastModified": 1716705216, + "narHash": "sha256-6GFn0DslzLH+YtsE37XO9CDFiJfa4ERmnfVBYjLrVyM=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "0ff287b14ffdea7e0e94be08c211e0303a68d77f", + "rev": "5f449ba04523c50e45d15a52ecfa0a0853f3f495", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0e643c19..b227a761 100755 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,11 @@ nixConfig = { extra-substituters = [ "https://cache.garnix.io" - "https://nix-gaming.cachix.org" + "https://devenv.cachix.org" ]; extra-trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" ]; }; @@ -21,26 +21,17 @@ }; # Chaotic Nyx! - chaotic-nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - - # Beautiful pastel theming - catppuccinifier = { - url = "github:lighttigerXIV/catppuccinifier"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "chaotic-nyx/flake-utils"; - crane.follows = "chaotic-nyx/crane"; - }; - }; - catppuccin-vsc = { - url = "github:catppuccin/vscode"; - inputs.nixpkgs.follows = "nixpkgs"; + chaotic-nyx = { + url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + inputs.home-manager.follows = "home-manager"; }; - # Devshell to set up a development environment - devshell = { - url = "github:numtide/devshell"; - flake = false; + # Devenv to set up a development environment + devenv = { + url = "github:cachix/devenv"; + inputs.flake-compat.follows = "chaotic-nyx/flake-compat"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.pre-commit-hooks.follows = "pre-commit-hooks"; }; # Disko for Nix-managed partition management @@ -59,13 +50,11 @@ garuda-nix = { # url = "/home/nico/Documents/misc/garuda-nix-subsystem"; url = "gitlab:garuda-linux/garuda-nix-subsystem/main"; - inputs.catppuccin-vsc.follows = "catppuccin-vsc"; inputs.chaotic-nyx.follows = "chaotic-nyx"; - inputs.devshell.follows = "devshell"; inputs.flake-parts.follows = "flake-parts"; inputs.home-manager.follows = "home-manager"; inputs.nix-index-database.follows = "nix-index-database"; - inputs.nixpkgs.follows = "chaotic-nyx/nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; inputs.pre-commit-hooks.follows = "pre-commit-hooks"; }; @@ -77,7 +66,7 @@ # Home-manager for managing my home directory home-manager = { - follows = "chaotic-nyx/home-manager"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -107,6 +96,14 @@ inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks"; }; + # Both required for containers in devenv + mk-shell-bin.url = "github:rrbutani/nix-mk-shell-bin"; + nix2container = { + url = "github:nlewo/nix2container"; + inputs.flake-utils.follows = "chaotic-nyx/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Nix gaming-related packages and modules nix-gaming = { url = "github:fufexan/nix-gaming"; @@ -194,101 +191,34 @@ }; outputs = { - devshell, + devenv, flake-parts, - nixpkgs, pre-commit-hooks, - self, ... } @ inp: let inputs = inp; - perSystem = { - pkgs, - system, - ... - }: { - # This basically allows using the devshell as flake app - apps.default = self.outputs.devShells.${system}.default.flakeApp; - - # Pre-commit hooks are set up automatically via nix-shell / nix develop - checks.pre-commit-check = pre-commit-hooks.lib.${system}.run { - hooks = { - actionlint.enable = true; - alejandra-quiet = { - description = "Run Alejandra in quiet mode"; - enable = true; - entry = '' - ${pkgs.alejandra}/bin/alejandra --quiet - ''; - files = "\\.nix$"; - name = "alejandra"; - }; - commitizen.enable = true; - deadnix.enable = true; - nil.enable = true; - prettier.enable = true; - yamllint.enable = true; - statix.enable = true; - }; - src = ./.; - }; - - # Handy devshell for working with this flake - devShells = let - # Import the devshell module as module rather than a flake input - makeDevshell = import "${inp.devshell}/modules" pkgs; - mkShell = config: - (makeDevshell { - configuration = { - inherit config; - imports = []; - }; - }) - .shell; - in rec { - default = dr460nixed-shell; - dr460nixed-shell = mkShell { - devshell.name = "dr460nixed-devshell"; - commands = [ - { - category = "dr460nixed"; - command = "${self.packages.${system}.repl}/bin/dr460nixed-repl"; - help = "Start a repl shell with all flake outputs available"; - name = "repl"; - } - { - category = "dr460nixed"; - command = "nix build .#iso"; - help = "Builds a NixOS ISO with all most important configurations"; - name = "buildiso"; - } - { - category = "dr460nixed"; - command = "${self.packages.${system}.installer}/bin/dr460nixed-installer"; - help = "Allows installing a basic dr460nixed installation"; - name = "installer"; - } - {package = "age";} - {package = "commitizen";} - {package = "gnupg";} - {package = "manix";} - {package = "mdbook";} - {package = "nix-melt";} - {package = "nixos-anywhere";} - {package = "nixos-install-tools";} - {package = "pre-commit";} - {package = "rsync";} - {package = "sops";} - # {package = "yamlfix";} - broken as of 231101 - ]; - devshell.startup.preCommitHooks.text = self.checks.${system}.pre-commit-check.shellHook; - env = [ - { - name = "NIX_PATH"; - value = "${nixpkgs}"; - } + perSystem = {pkgs, ...}: { + devenv.shells.default = { + imports = [ + ./devenv/pre-commit.nix + ./devenv/packages.nix + ]; + cachix = { + enable = true; + pull = [ + "chaotic-nyx" + "dr460nf1r3" + "pre-commit-hooks" ]; }; + enterShell = '' + echo "Welcome to Dr460nixed's ❄️ devenv!" + ''; + languages.nix = { + enable = true; + lsp.package = pkgs.nixd; + }; + name = "Dr460nixed"; }; # By default, alejandra is WAY to verbose @@ -302,6 +232,7 @@ imports = [ ./nixos/flake-module.nix ./packages/flake-module.nix + inputs.devenv.flakeModule inputs.pre-commit-hooks.flakeModule ]; diff --git a/garnix.yaml b/garnix.yaml index 59234b61..c9a8c3cb 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -1,7 +1,10 @@ --- builds: exclude: - - packages.*.vbox + - devShells.*.default - nixosConfigurations.dr460nixed-base - nixosConfigurations.dr460nixed-desktop - nixosConfigurations.dragons-ryzen + - packages.*.container-processes + - packages.*.container-shell + - packages.*.vbox diff --git a/home-manager/common.nix b/home-manager/common.nix index ca467f6d..f9daa075 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - # Invididual terminal app configs + # Individual terminal app configs programs = { # Common Bash aliases & tmux autostart for SSH sessions bash = { @@ -37,13 +37,23 @@ settings = { # A few extra binary caches and their public keys substituters = [ - "https://cache.garnix.io" - "https://nyx.chaotic.cx/" + "https://cache.garnix.io" # extra things here and there + "https://catppuccin.cachix.org" # a cache for Catppuccin-nix + "https://devenv.cachix.org" # Devenv cache + "https://nix-community.cachix.org" # nix-community cache + "https://nix-gaming.cachix.org" # nix-gaming + "https://nixpkgs-unfree.cachix.org" # unfree-package cache + "https://numtide.cachix.org" # another unfree package cache + "https://pre-commit-hooks.cachix.org" # pre-commit hooks ]; trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" + "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" ]; # Enable certain system features diff --git a/home-manager/kde-static/Dr460nized.profile b/home-manager/kde-static/Dr460nized.profile index 4fdc286c..40c03881 100644 --- a/home-manager/kde-static/Dr460nized.profile +++ b/home-manager/kde-static/Dr460nized.profile @@ -1,7 +1,7 @@ [Appearance] ColorScheme=Sweet Font=JetBrains Mono Nerd Font,11,-1,5,50,0,0,0,0,0 -UseFontLineChararacters=true +UseFontLineCharacters=true [Cursor Options] CursorShape=1 diff --git a/nixos/modules/apps.nix b/nixos/modules/apps.nix index 0b772666..88ee8df4 100644 --- a/nixos/modules/apps.nix +++ b/nixos/modules/apps.nix @@ -1,12 +1,10 @@ { config, - inputs, lib, pkgs, ... }: with lib; let - catppuccinifier-cli = inputs.catppuccinifier.packages.x86_64-linux.cli; cfg = config.dr460nixed; in { # These are the packages I always need @@ -99,7 +97,9 @@ in { nixos-generators nixpkgs-lint nixpkgs-review - nodejs_22 # 24 not available + nodePackages_latest.pnpm + nodePackages_latest.node-gyp + nodejs_22 podman-compose podman-tui speedcrunch @@ -143,7 +143,9 @@ in { } ]; }) - yarn + (yarn.override { + nodejs = null; # Use my system nodejs + }) ]) ++ optionals cfg.yubikey (with pkgs; [ yubikey-manager-qt diff --git a/nixos/modules/misc.nix b/nixos/modules/misc.nix index aa20255d..e52b63ff 100644 --- a/nixos/modules/misc.nix +++ b/nixos/modules/misc.nix @@ -185,7 +185,7 @@ in { # Chromium gate (thanks Pedro!) environment.systemPackages = mkIf cfg.chromium-gate [chromium-gate]; - # Enhabce performance tweaks + # Enhance performance tweaks garuda.performance-tweaks.enable = mkIf cfg.performance true; boot.kernelPackages = mkIf cfg.performance pkgs.linuxPackages_cachyos-lto; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index ef1fe3b1..f4412930 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -133,17 +133,24 @@ in { flake-registry = "/etc/nix/registry.json"; substituters = [ - "https://cache.nixos.org/" # official binary cache (yes the trailing slash is really neccacery) + "https://cache.garnix.io" # extra things here and there + "https://catppuccin.cachix.org" # a cache for Catppuccin-nix + "https://devenv.cachix.org" # Devenv cache "https://nix-community.cachix.org" # nix-community cache "https://nix-gaming.cachix.org" # nix-gaming "https://nixpkgs-unfree.cachix.org" # unfree-package cache "https://numtide.cachix.org" # another unfree package cache - "https://catppuccin.cachix.org" # a cache for ctp nix - "https://pre-commit-hooks.cachix.org" # pre commit hooks - "https://cache.garnix.io" # extra things here and there + "https://pre-commit-hooks.cachix.org" # pre-commit hooks + ]; + trusted-public-keys = [ + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" + "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" ]; - - trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; }; }; @@ -157,15 +164,15 @@ in { environment = { etc = with inputs; { # set channels (backwards compatibility) - "nix/flake-channels/system".source = self; - "nix/flake-channels/nixpkgs".source = nixpkgs; "nix/flake-channels/home-manager".source = home-manager; + "nix/flake-channels/nixpkgs".source = nixpkgs; + "nix/flake-channels/system".source = self; # preserve current flake in /etc "nixos/flake".source = self; }; - # Git is reqired for flakes, and cachix for binary substituters + # Git is required for flakes, and cachix for binary substituters systemPackages = with pkgs; [git cachix]; }; diff --git a/nixos/modules/zfs.nix b/nixos/modules/zfs.nix index d0a54bbd..5d6b93b2 100644 --- a/nixos/modules/zfs.nix +++ b/nixos/modules/zfs.nix @@ -24,7 +24,7 @@ in { default = false; type = types.bool; description = mdDoc '' - Enables sending status reports about ZFS maintainance via email. + Enables sending status reports about ZFS maintenance via email. ''; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 64772ae5..875d0785 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,4 @@ -{inputs, ...}: { +_: { # Override applications with useful things I want to have nixpkgs.overlays = let thisConfigsOverlay = final: _prev: { @@ -26,7 +26,6 @@ }; }; in [ - inputs.catppuccin-vsc.overlays.default thisConfigsOverlay ]; } diff --git a/packages/flake-module.nix b/packages/flake-module.nix index 43a137d1..e1427951 100644 --- a/packages/flake-module.nix +++ b/packages/flake-module.nix @@ -1,17 +1,10 @@ { - perSystem = { - inputs', - pkgs, - ... - }: { + perSystem = {pkgs, ...}: { packages = let # Source repl.nix for pre-setup "nix repl" replPath = toString ./.; in with pkgs; { - # Create catppuccin wallpapers - catppuccinifier-cli = inputs'.catppuccinifier.packages.cli; - # Builds the documentation docs = runCommand "dr460nixed-docs" diff --git a/packages/installer.sh b/packages/installer.sh index 1138395e..ad004300 100644 --- a/packages/installer.sh +++ b/packages/installer.sh @@ -57,7 +57,7 @@ disko() { 4) ZFS (recommended) 5) ZFS encrypted" - read -rp "Enter the numer of the partition layout you want to use: " _LAYOUT + read -rp "Enter the number of the partition layout you want to use: " _LAYOUT # https://stackoverflow.com/questions/3601515/how-to-check-if-a-variable-is-set-in-bash while [ -z "${DISKO_MODULE+x}" ]; do @@ -78,7 +78,7 @@ disko() { DISKO_MODULE=zfs ;; *) - read -rp "Invalid input. Enter the numer of the partition layout you want to use: " _LAYOUT + read -rp "Invalid input. Enter the number of the partition layout you want to use: " _LAYOUT ;; esac done diff --git a/template/nixos/modules/desktops.nix b/template/nixos/modules/desktops.nix index 87b59565..658ff230 100644 --- a/template/nixos/modules/desktops.nix +++ b/template/nixos/modules/desktops.nix @@ -28,7 +28,7 @@ in { # Enable the dr460nized desktops settings garuda.dr460nized.enable = true; - # # Kernel paramters & settings + # # Kernel parameters & settings boot.kernelParams = ["mitigations=off"]; # Fancy themed, enhanced Spotify diff --git a/template/nixos/modules/misc.nix b/template/nixos/modules/misc.nix index f783d3c5..6d2e5304 100644 --- a/template/nixos/modules/misc.nix +++ b/template/nixos/modules/misc.nix @@ -178,7 +178,7 @@ in { # SUID Sandbox security.chromiumSuidSandbox.enable = mkIf cfg.chromium true; - # Enhabce performance tweaks + # Enhance performance tweaks garuda.performance-tweaks = lib.mkIf cfg.performance { cachyos-kernel = true; enable = true;