From f6221f2d8eabaf72b8d28e9f7e7ecec5b4629ec9 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 6 Feb 2023 12:16:45 +0100 Subject: [PATCH] work on load problems by using tmpfs for /tmp --- flake.nix | 4 ++++ nixos/machines/pepe/configuration.nix | 2 +- .../sterni/hardware-configuration.nix | 24 +++++++++++-------- nixos/system/desktop/cachix/all-hies.nix | 1 - 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 2e8e17b..f2b9bd7 100644 --- a/flake.nix +++ b/flake.nix @@ -158,6 +158,10 @@ extraOptions = '' experimental-features = nix-command flakes ''; + settings = { + substituters = [ "https://colmena.cachix.org" ]; + trusted-public-keys = [ "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" ]; + }; }; environment.systemPackages = [ nixpkgs-fmt.defaultPackage.${system} diff --git a/nixos/machines/pepe/configuration.nix b/nixos/machines/pepe/configuration.nix index d296ba2..eb75846 100644 --- a/nixos/machines/pepe/configuration.nix +++ b/nixos/machines/pepe/configuration.nix @@ -22,7 +22,7 @@ #./neo4j.nix ./jellyfin.nix ./wireguard.nix - ./tts.nix + #./tts.nix #./loki.nix diff --git a/nixos/machines/sterni/hardware-configuration.nix b/nixos/machines/sterni/hardware-configuration.nix index 30fb6aa..c5fe15d 100644 --- a/nixos/machines/sterni/hardware-configuration.nix +++ b/nixos/machines/sterni/hardware-configuration.nix @@ -17,12 +17,12 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - zramSwap = { - enable = true; - numDevices = 2; - swapDevices = 1; - memoryPercent = 50; - }; + #zramSwap = { + # enable = true; + # numDevices = 2; + # swapDevices = 1; + # memoryPercent = 50; + #}; fileSystems."/share" = { #device = "/dev/ram1"; @@ -31,13 +31,17 @@ }; fileSystems."/browsers" = { + #options = [ "noatime" "nodiratime" "discard" ]; + #device = "/dev/vg/browser"; + #fsType = "ext4"; + + device = "none"; #device = "/dev/ram2"; - #fsType = "tmpfs"; - options = [ "noatime" "nodiratime" "discard" ]; - device = "/dev/vg/browser"; - fsType = "ext4"; + fsType = "tmpfs"; }; + boot.tmpOnTmpfs = true; + nix.settings.max-jobs = lib.mkDefault 4; # lvm volume group diff --git a/nixos/system/desktop/cachix/all-hies.nix b/nixos/system/desktop/cachix/all-hies.nix index 7c4f824..4875fd3 100644 --- a/nixos/system/desktop/cachix/all-hies.nix +++ b/nixos/system/desktop/cachix/all-hies.nix @@ -2,6 +2,5 @@ nix.settings = { substituters = [ "https://all-hies.cachix.org" ]; trusted-public-keys = [ "all-hies.cachix.org-1:JjrzAOEUsD9ZMt8fdFbzo3jNAyEWlPAwdVuHw4RD43k=" ]; - }; }