diff --git a/nix/configurations/hetzner_benchmark/nixos/sane-nix.nix b/nix/configurations/hetzner_benchmark/nixos/sane-nix.nix deleted file mode 100644 index dc4e2f13..00000000 --- a/nix/configurations/hetzner_benchmark/nixos/sane-nix.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Protect my system from running out of storage or memory -{ - # 500GB Storage - nix.settings = { - min-free = 20 * 1024 * 1024 * 1024; - max-free = 50 * 1024 * 1024 * 1024; - }; - - systemd.services.nix-daemon.serviceConfig = { - MemoryAccounting = true; - MemoryMax = "90%"; - OOMScoreAdjust = 500; - }; - - # 12 Cores, 64 GB RAM - # split into 4 jobs with 3C/16G - nix.settings = { - cores = 3; - max-jobs = 4; - }; -} diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 46351801..19b98659 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -172,7 +172,6 @@ settings = { font-size = 12; # sweet spot for framework 13 command = lib.getExe config.programs.fish.package; - mouse-scroll-multiplier = 1; }; }; kitty = { diff --git a/nix/configurations/vanadium/nixos/sane-nix.nix b/nix/configurations/vanadium/nixos/sane-nix.nix index 83088437..83c080d8 100644 --- a/nix/configurations/vanadium/nixos/sane-nix.nix +++ b/nix/configurations/vanadium/nixos/sane-nix.nix @@ -10,11 +10,4 @@ MemoryMax = "90%"; OOMScoreAdjust = 500; }; - - # 16 Cores, 32 GB RAM - # split into 4 jobs with 4C/8G - nix.settings = { - cores = 2; - max-jobs = 4; - }; } diff --git a/nix/homeModules/common/user-nixconf.nix b/nix/homeModules/common/user-nixconf.nix index 5b22060b..9ca3a09e 100644 --- a/nix/homeModules/common/user-nixconf.nix +++ b/nix/homeModules/common/user-nixconf.nix @@ -26,10 +26,10 @@ "flakes" ]; allow-import-from-derivation = true; - keep-build-log = true; - keep-going = true; # Continue even when some fails - keep-outputs = true; # Build time derivations and sources - warn-dirty = false; + keep-outputs = false; # Build time derivations and sources + + http-connections = 50; # default: 25 + max-substitution-jobs = 32; # default: 16 }; }; } diff --git a/nix/nixosModules/common/system-nixconf.nix b/nix/nixosModules/common/system-nixconf.nix index fdfb8d20..9a0d8783 100644 --- a/nix/nixosModules/common/system-nixconf.nix +++ b/nix/nixosModules/common/system-nixconf.nix @@ -8,10 +8,6 @@ package = lib.mkDefault pkgs.nix; settings = { - # Try to have at least 10GB of space by default - min-free = lib.mkDefault (5 * 1024 * 1024 * 1024); - max-free = lib.mkDefault (10 * 1024 * 1024 * 1024); - extra-substituters = [ "https://nix-community.cachix.org" ];