From 70f702c6fd33454aebc4a266789fc5bf7e77e960 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Sat, 20 Dec 2025 07:49:56 -0600
Subject: age + other various changes

---
 hosts/ganymede/config.nix |  5 +----
 hosts/jupiter/config.nix  |  5 +----
 hosts/mercury/battery.nix | 34 +++++++++++++++++-----------------
 hosts/mercury/config.nix  | 22 ++++------------------
 hosts/mercury/disks.nix   |  7 +++++++
 hosts/mercury/hjem.nix    |  5 +++++
 hosts/mercury/nixos.nix   |  2 ++
 7 files changed, 37 insertions(+), 43 deletions(-)

(limited to 'hosts')

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index 62abd56..6fa3bd1 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -1,9 +1,6 @@
 {
   collinux = {
-    user = {
-      name = "collin";
-      password = "$y$j9T$08yFysn8jr9K4Wk.hYXbG0$NzY9vIbNknJViA..Jw.vF8wmQtBgEZZU.cdLQOmDvU2";
-    };
+    user.name = "collin";
 
     terminal = {
       programs = {
diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index bc76142..9e3eff2 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -2,10 +2,7 @@
   collinux = {
     theme = "adwaita";
 
-    user = {
-      name = "collin";
-      password = "$y$j9T$08yFysn8jr9K4Wk.hYXbG0$NzY9vIbNknJViA..Jw.vF8wmQtBgEZZU.cdLQOmDvU2";
-    };
+    user.name = "collin";
 
     desktop = {
       gnome.enable = true;
diff --git a/hosts/mercury/battery.nix b/hosts/mercury/battery.nix
index ff7e59e..d3f2e90 100644
--- a/hosts/mercury/battery.nix
+++ b/hosts/mercury/battery.nix
@@ -19,25 +19,25 @@
     };
   };
 
-  # Undervolt
-  services.undervolt = {
-    enable = true;
-    useTimer = false;
-    # power-limit-long
-    p1 = {
-      window = 1; # no clue what this means
-      limit = 40;
-    };
+  # Undervolt (BROKEN)
+  # services.undervolt = {
+  #   enable = true;
+  #   useTimer = false;
+  #   # power-limit-long
+  #   p1 = {
+  #     window = 1; # no clue what this means
+  #     limit = 40;
+  #   };
 
-    # power-limit-short
-    p2 = {
-      window = 1;
-      limit = 50;
-    };
+  #   # power-limit-short
+  #   p2 = {
+  #     window = 1;
+  #     limit = 50;
+  #   };
 
-    coreOffset = -50; # also applied to cache
-    gpuOffset = -10;
-  };
+  #   coreOffset = -50; # also applied to cache
+  #   gpuOffset = -10;
+  # };
 
   # environment.systemPackages = with pkgs; [
   #   undervolt
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 268c767..c5db215 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,17 +1,10 @@
 {pkgs, ...}: {
   collinux = {
-    theme = "kanagawa";
-
-    user = {
-      name = "collin";
-      password = "$y$j9T$08yFysn8jr9K4Wk.hYXbG0$NzY9vIbNknJViA..Jw.vF8wmQtBgEZZU.cdLQOmDvU2";
-    };
+    theme = "catppuccin";
+    user.name = "collin";
 
     desktop = {
-      # wallpaper = ./wallpaper.jpg;
-      # wallpaper = ./hintergrund2.png;
-      # wallpaper = ./kanagawa.jpg;
-      wallpaper = ./riverboats.png;
+      wallpaper = ./wallpaper.jpg;
 
       # gtk.enable = true;
 
@@ -26,10 +19,7 @@
 
       programs = {
         firefox.enable = true;
-        foot = {
-          theme = "kanagawa";
-          enable = true;
-        };
+        foot.enable = true;
 
         research.enable = true;
       };
@@ -53,7 +43,6 @@
       shells.bash.enable = true; # for nix-shells
 
       programs = {
-        # tmux.enable = true;
         lazygit.enable = true;
         starship.enable = true;
 
@@ -67,11 +56,9 @@
           userEmail = "96917990+bluedragon1221@users.noreply.github.com";
         };
 
-        cmus.enable = true;
         nh.enable = true;
 
         helix = {
-          theme = "kanagawa";
           enable = true;
           hardMode = true;
         };
@@ -80,7 +67,6 @@
 
     boot = {
       systemd-boot.enable = true;
-      # plymouth.enable = true;
       secureBoot.enable = true;
     };
   };
diff --git a/hosts/mercury/disks.nix b/hosts/mercury/disks.nix
index af6c161..60187b1 100644
--- a/hosts/mercury/disks.nix
+++ b/hosts/mercury/disks.nix
@@ -9,4 +9,11 @@
     fsType = "vfat";
     options = ["fmask=0022" "dmask=0022"];
   };
+
+  zramSwap = {
+    enable = true;
+    priority = 100;
+    algorithm = "lz4";
+    memoryPercent = 50;
+  };
 }
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 463290c..1db654f 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -6,5 +6,10 @@
     kdePackages.kleopatra
     mpv
     musescore
+
+    kew # music player
+    prismlauncher
+
+    vital
   ];
 }
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 48aa92c..558ae60 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -15,6 +15,8 @@
   systemd.services.systemd-udev-settle.enable = false;
   networking.interfaces.wlp2s0.useDHCP = false;
 
+  services.sshd.enable = true;
+
   facter.reportPath = ./facter.json;
 
   environment.defaultPackages = lib.mkForce []; # im not a noob
-- 
cgit v1.3.1