2024-05-25

6 files changed, 17 insertions, 18 deletions

diff --git a/configurations/default.nix b/configurations/default.nix
index 78eb2bc..088060b 100644
--- a/configurations/default.nix
+++ b/configurations/default.nix
@@ -64,12 +64,14 @@ mapAttrs' mkConfiguration (
       nixos-hardware.nixosModules.common-gpu-amd
       nixos-hardware.nixosModules.common-pc-ssd
       nixpkgs.nixosModules.notDetected
+      srvos.nixosModules.common
     ];
 
     melian.modules = with inputs; [
       nixos-hardware.nixosModules.common-pc-laptop-ssd
       nixos-hardware.nixosModules.lenovo-thinkpad-t480
       nixpkgs.nixosModules.notDetected
+      srvos.nixosModules.common
     ];
 
     manwe.modules = with inputs; [
@@ -77,6 +79,7 @@ mapAttrs' mkConfiguration (
       nixos-hardware.nixosModules.common-cpu-amd
       nixos-hardware.nixosModules.common-pc-ssd
       nixpkgs.nixosModules.notDetected
+      srvos.nixosModules.server
     ];
 
     varda.modules = with inputs; [
@@ -84,6 +87,7 @@ mapAttrs' mkConfiguration (
       nixos-hardware.nixosModules.common-cpu-amd
       nixos-hardware.nixosModules.common-pc-ssd
       nixpkgs.nixosModules.notDetected
+      srvos.nixosModules.server
     ];
 
     yavanna.modules = with inputs; [
@@ -91,6 +95,7 @@ mapAttrs' mkConfiguration (
       nixos-hardware.nixosModules.common-cpu-intel
       nixos-hardware.nixosModules.common-pc-hdd
       nixpkgs.nixosModules.notDetected
+      srvos.nixosModules.server
     ];
   }
 )
diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix
index fdff40e..c02a3c3 100644
--- a/configurations/eonwe/default.nix
+++ b/configurations/eonwe/default.nix
@@ -28,7 +28,8 @@ with lib;
 
   hm = {
     home.packages = with pkgs; [
-      # anki # FIXME Broken again.
+      anki
+      gimp
       iaito
       kdenlive
       krita
@@ -293,8 +294,8 @@ with lib;
     };
   };
 
-  # No swap space is declared here because the system already has 128Gb of RAM.
-  # I've only manage to hit around 100Gb mark when running large
-  # computations/compiling something big. Pretty sure that a hefty chunk of it
-  # was just cache and it wouldn't make me get to OOM situations.
+  zramSwap = {
+    enable = true;
+    memoryPercent = 25;
+  };
 }
diff --git a/configurations/manwe/default.nix b/configurations/manwe/default.nix
index 3707440..609d2a8 100644
--- a/configurations/manwe/default.nix
+++ b/configurations/manwe/default.nix
@@ -23,7 +23,6 @@ with lib;
       enable = true;
       domain = "git.${my.domain.azahi}";
     };
-
     matrix.dendrite = {
       enable = true;
       domain = my.domain.azahi;
@@ -71,6 +70,6 @@ with lib;
 
   zramSwap = {
     enable = true;
-    memoryPercent = 25;
+    memoryPercent = 50;
   };
 }
diff --git a/configurations/melian/default.nix b/configurations/melian/default.nix
index 0805b4a..0d50f9f 100644
--- a/configurations/melian/default.nix
+++ b/configurations/melian/default.nix
@@ -6,11 +6,9 @@ with lib;
 
     syncthing.enable = true;
 
+    android.enable = true;
     bluetooth.enable = true;
-
     throttled.enable = true;
-
-    android.enable = true;
   };
 
   hardware.trackpoint = {
@@ -63,7 +61,7 @@ with lib;
             "level disengaged"
             50
             32767
-          ] # This could annoy some people but IDGAF.
+          ]
         ];
       };
     };
@@ -90,8 +88,6 @@ with lib;
     };
   };
 
-  # NOTE This makes hibernation pretty much impossible because the partition is
-  # encrypted.
   swapDevices = [
     {
       device = "/swapfile";
@@ -101,6 +97,6 @@ with lib;
 
   zramSwap = {
     enable = true;
-    memoryPercent = 25;
+    memoryPercent = 100;
   };
 }
diff --git a/configurations/varda/default.nix b/configurations/varda/default.nix
index c8ecef2..76f8daf 100644
--- a/configurations/varda/default.nix
+++ b/configurations/varda/default.nix
@@ -6,8 +6,6 @@ with lib;
   nixfiles.modules = {
     wireguard.client.enable = true;
 
-    acme.enable = true;
-
     k3s.enable = true;
   };
 
@@ -57,6 +55,6 @@ with lib;
 
   zramSwap = {
     enable = true;
-    memoryPercent = 25;
+    memoryPercent = 50;
   };
 }
diff --git a/configurations/yavanna/default.nix b/configurations/yavanna/default.nix
index 2d52f53..b9de05e 100644
--- a/configurations/yavanna/default.nix
+++ b/configurations/yavanna/default.nix
@@ -27,6 +27,6 @@ _: {
 
   zramSwap = {
     enable = true;
-    memoryPercent = 25;
+    memoryPercent = 50;
   };
 }