diff options
| -rw-r--r-- | flake.lock | 190 | ||||
| -rw-r--r-- | hosts/base.nix | 10 | ||||
| -rw-r--r-- | hosts/dev.nix | 18 | ||||
| -rw-r--r-- | hosts/local/gui.nix | 3 | ||||
| -rw-r--r-- | hosts/local/master/configuration.nix | 21 | ||||
| -rw-r--r-- | hosts/local/nvidia.nix | 7 |
6 files changed, 123 insertions, 126 deletions
@@ -159,11 +159,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1760510123, - "narHash": "sha256-qmSiRRfso1w4GFxyUGPuuUVcV5xmbLvTL3/fPDgzkkE=", + "lastModified": 1760890764, + "narHash": "sha256-hCO8y2iJwlVTx6UKUpFY3doqHG5W0znV00mCAneX+FE=", "owner": "cachix", "repo": "devenv", - "rev": "f94c3f27fadb7450191ba7c84e1f78c3ce140a6f", + "rev": "8bd9769602d769d427450f64fbd02c80871a186c", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -368,11 +368,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -507,24 +507,6 @@ "type": "github" } }, - "flake-utils_7": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gemini-cli": { "inputs": { "nixpkgs": [ @@ -575,11 +557,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1760392170, - "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -729,11 +711,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1760482717, - "narHash": "sha256-YfSxP/haYHOiLZSL8EYzdARixpXy3pNJZZE/ibn1VLU=", + "lastModified": 1760832569, + "narHash": "sha256-wg925OdUZdhjJub5XfpBTWQ3EOJYH7JnaBWHfh849J4=", "owner": "helix-editor", "repo": "helix", - "rev": "4547133b95dbae0084db4f651bc08956710f1309", + "rev": "97aee4950fd9a08a78415cd8992354ae5cf3aaf0", "type": "github" }, "original": { @@ -803,11 +785,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1759056911, - "narHash": "sha256-as91wURxvgfgdrym+gN6W0H1DLlA7IhHlt0ALwbjmxQ=", + "lastModified": 1760515095, + "narHash": "sha256-6MD0hkLbVjH8ncegL1cBLUmw9cwIJJBBXVBr8i4j3Ps=", "owner": "kmonad", "repo": "kmonad", - "rev": "5a763290de4aa8de90d132f11c33327a14856b91", + "rev": "646b05994b9f0f62cd9458d8356fdae5061951ea", "type": "github" }, "original": { @@ -866,11 +848,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1760452571, - "narHash": "sha256-hIR+64P8kOFAWWqvismsoSCTMQbCAU0bX7sef3boNBY=", + "lastModified": 1760574296, + "narHash": "sha256-S3gIp6Wd9vQ2RYDxcbHM2CIYgDtogbwzSdu38WABKaQ=", "owner": "astro", "repo": "microvm.nix", - "rev": "caebc2da4de266cca6023a8776538893b11dd32f", + "rev": "42628f7c61b02d385ce2cb1f66f9be333ac20140", "type": "github" }, "original": { @@ -926,11 +908,11 @@ ] }, "locked": { - "lastModified": 1760338583, - "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", + "lastModified": 1760721282, + "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf", + "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168", "type": "github" }, "original": { @@ -945,11 +927,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1760493063, - "narHash": "sha256-yYqrMI9jg7vTjHu4wOiER9HmqE+NvOqOjfYzuMsTo3Y=", + "lastModified": 1760839259, + "narHash": "sha256-9KYm1Oh3jB2Xf0LiFxIBFgOuqRN4FNW4PKfrxXDV418=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d7f6ab23b939e6e1247321a0e63a89cacb98c03c", + "rev": "6aa0613ecf363840e011006b05aefa094b78b053", "type": "github" }, "original": { @@ -1119,11 +1101,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1760454217, - "narHash": "sha256-qG4cQaYRKrAMj4OjISYYoWqJc+xcoJnLx2jsws7EdGg=", + "lastModified": 1760536587, + "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a8209ae46721f2a70214d0a70388a812ec7740da", + "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea", "type": "github" }, "original": { @@ -1167,11 +1149,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1760309387, - "narHash": "sha256-e0lvQ7+B1Y8zjykYHAj9tBv10ggLqK0nmxwvMU3J0Eo=", + "lastModified": 1760794584, + "narHash": "sha256-6IKtYFTwVORisw6DkhUXo6VHscpIBvuCcSUmquFYoG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6cd95994a9c8f7c6f8c1f1161be94119afdcb305", + "rev": "434ace593ed7defee962d36793bfa17ebd4555ce", "type": "github" }, "original": { @@ -1244,11 +1226,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760423683, - "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", + "lastModified": 1760725957, + "narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", + "rev": "81b927b14b7b3988334d5282ef9cba802e193fe1", "type": "github" }, "original": { @@ -1263,11 +1245,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1760451826, - "narHash": "sha256-v8h7sR4YDBIVp3GZsz7gMole2z+HavLl0kXLSmaXmJI=", + "lastModified": 1760624622, + "narHash": "sha256-46hcvFR35pO20unutRtW6zMFMqWWs/sdkJhxbpNgLUQ=", "owner": "numtide", "repo": "nixpkgs-unfree", - "rev": "47acd5f9ed3e424febb1a2d10ee701b44ef2d6f0", + "rev": "20715f574d65864d5f8a4634978dc2f971d0ce33", "type": "github" }, "original": { @@ -1286,11 +1268,11 @@ ] }, "locked": { - "lastModified": 1760407932, - "narHash": "sha256-zmsb21trMZ2N1OQoVa9h0PVjSRbYME3CkfV7vRF34vE=", + "lastModified": 1760706459, + "narHash": "sha256-fX8jI4nSckpBemnmk5jFcaGxXSnNWBUw2840OTamxYI=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ed8e74536c2d3f460a3590925b0e1c65754a9c40", + "rev": "900a3dcea87f5bc937da5675217686dd71cccc55", "type": "github" }, "original": { @@ -1317,11 +1299,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -1333,11 +1315,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -1347,11 +1329,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -1459,11 +1441,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1760103332, - "narHash": "sha256-BMsGVfKl4Q80Pr9T1AkCRljO1bpwCmY8rTBVj8XGuhA=", + "lastModified": 1760596604, + "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "870493f9a8cb0b074ae5b411b2f232015db19a65", + "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", "type": "github" }, "original": { @@ -1495,11 +1477,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1760513628, - "narHash": "sha256-IjSzvPoEeNkWud1ng4Uip0bAIaYv8SIaNax1WZOVQYE=", + "lastModified": 1760901178, + "narHash": "sha256-Aigo3XUHrJDsbwlT6sptlSiqIbubPnCbi4+K8mNRTTQ=", "owner": "nix-community", "repo": "NUR", - "rev": "fc1ae67cfc8e2601ab349e9d408d82fb93f23d01", + "rev": "f767ba32a14c42ce78da68cbbe0b410168f14096", "type": "github" }, "original": { @@ -1510,18 +1492,16 @@ }, "openai-codex": { "inputs": { - "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" - ], - "rust-overlay": "rust-overlay_4" + ] }, "locked": { - "lastModified": 1760484542, - "narHash": "sha256-NZC8ENwAvLr2ZVh9AeOs/o/rMQBTYfNc3hzdY/nsmlA=", + "lastModified": 1760850833, + "narHash": "sha256-XqCx+9nafjYx7+84IXhuCGMk0wGfxsECBWblDcZTd3o=", "owner": "openai", "repo": "codex", - "rev": "00debb6399eb51c4b9273f0bc012912c42fe6c91", + "rev": "4f46360aa493b04eae12045ac8c34a4e42441734", "type": "github" }, "original": { @@ -1707,27 +1687,6 @@ "type": "github" } }, - "rust-overlay_4": { - "inputs": { - "nixpkgs": [ - "openai-codex", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746844454, - "narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "be092436d4c0c303b654e4007453b69c0e33009e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "spectrum": { "flake": false, "locked": { @@ -1834,21 +1793,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "waybar": { "inputs": { "flake-compat": "flake-compat_7", @@ -1857,11 +1801,11 @@ ] }, "locked": { - "lastModified": 1759654584, - "narHash": "sha256-ttmz2FOvDXNgvOMBXwvYY91yfc1v6n+LOfXCj56QdLo=", + "lastModified": 1760873938, + "narHash": "sha256-oKmQUUqprJNFZfSNFtYu9pOmLXMkP7M51kF1lX8WPp4=", "owner": "alexays", "repo": "waybar", - "rev": "559079e9a6afda77754afaf7c8d3f588c1d6206d", + "rev": "84ec25bbebef8a9ce0720675214a078808e73c39", "type": "github" }, "original": { diff --git a/hosts/base.nix b/hosts/base.nix index 5a65df7..054a967 100644 --- a/hosts/base.nix +++ b/hosts/base.nix @@ -39,7 +39,17 @@ keep-outputs = true; keep-derivations = true; trusted-users = ["root" "y"]; + max-jobs = 2; + cores = 16; }; + # buildMachines = [{ + # hostName = "builder.lan"; + # system = "x86_64-linux"; + # protocol = "ssh"; + # supportedFeatures = ["kvm" "big-parallel" "cuda"]; + + # }]; + # distributedBuilds = true; }; programs.nh = { enable = true; diff --git a/hosts/dev.nix b/hosts/dev.nix new file mode 100644 index 0000000..ef6c761 --- /dev/null +++ b/hosts/dev.nix @@ -0,0 +1,18 @@ +{ + inputs, + pkgs, + lib, + config, + ... +}: { + # https://nixos.wiki/wiki/CCache + + programs.ccache = { + enable = true; + }; + nix.settings.extra-sandbox-paths = [config.programs.ccache.cacheDir]; + + # environment.systemPackages = with pkgs; + # [ + # ]; +} diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix index b22f5bc..59676c1 100644 --- a/hosts/local/gui.nix +++ b/hosts/local/gui.nix @@ -51,5 +51,8 @@ signal-desktop telegram-desktop electrum + # xdg whatever bs + glib # gio + desktop-file-utils ]; } diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix index 7b883d3..cad65c8 100644 --- a/hosts/local/master/configuration.nix +++ b/hosts/local/master/configuration.nix @@ -13,8 +13,8 @@ in { ../../linux.nix ../../unfree.nix #../../android.nix - # ../gui.nix - # ../i3.nix + ../gui.nix + ../i3.nix # ../gnome.nix # ../wayland.nix ../nvidia.nix @@ -56,7 +56,8 @@ in { zramSwap = { enable = true; - # algorithm = "zstd"; + memoryPercent = 100; + algorithm = "zstd"; # memoryPercent = 30; }; @@ -114,4 +115,18 @@ in { # }; # }; # }; + # stop fucking crashing + + systemd.services.nix-daemon.serviceConfig = { + MemoryHigh = "22G"; # throttle above this + MemoryMax = "28G"; # hard kill above this + # optional niceties: + CPUWeight = 50; + IOWeight = 50; + TasksMax = 4096; + # Let systemd-oomd preferentially kill these if needed: + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "50%"; + }; + systemd.oomd.enable = true; } diff --git a/hosts/local/nvidia.nix b/hosts/local/nvidia.nix index 3d6f603..b8b335a 100644 --- a/hosts/local/nvidia.nix +++ b/hosts/local/nvidia.nix @@ -28,10 +28,17 @@ in { nix.settings.substituters = [ "https://cuda-maintainers.cachix.org" "https://nix-community.cachix.org" + "https://huggingface.cachix.org" + + "https://nix-ai-stuff.cachix.org" + "https://ai.cachix.org" ]; nix.settings.trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + "huggingface.cachix.org-1:ynTPbLS0W8ofXd9fDjk1KvoFky9K2jhxe6r4nXAkc/o=" + "nix-ai-stuff.cachix.org-1:WlUGeVCs26w9xF0/rjyg32PujDqbVMlSHufpj1fqix8=" + "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" ]; services.xserver = { |