merge changes from main

12 files changed, 118 insertions, 59 deletions

diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
new file mode 100644
index 0000000..62abd56
--- /dev/null
+++ b/hosts/ganymede/config.nix
@@ -0,0 +1,36 @@
+{
+  collinux = {
+    user = {
+      name = "collin";
+      password = "$y$j9T$08yFysn8jr9K4Wk.hYXbG0$NzY9vIbNknJViA..Jw.vF8wmQtBgEZZU.cdLQOmDvU2";
+    };
+
+    terminal = {
+      programs = {
+        git = {
+          enable = true;
+          userName = "Collin Williams";
+          userEmail = "96917990+bluedragon1221@users.noreply.github.com";
+        };
+      };
+    };
+
+    boot.systemd-boot.enable = true;
+
+    services = {
+      networking = {
+        enable = true;
+        networkmanager.enable = true;
+      };
+
+      audio = {
+        enable = true;
+        pulse.enable = true;
+      };
+
+      selfhost = {
+        navidrome.enable = true;
+      };
+    };
+  };
+}
diff --git a/hosts/ganymede/disks.nix b/hosts/ganymede/disks.nix
new file mode 100644
index 0000000..b701fda
--- /dev/null
+++ b/hosts/ganymede/disks.nix
@@ -0,0 +1,40 @@
+{
+  disko.enableConfig = true;
+  disko.devices = {
+    disk.main = {
+      device = "/dev/nvme0n1";
+      type = "disk";
+      content = {
+        type = "gpt";
+        partitions = {
+          ESP = {
+            type = "EF00";
+            size = "1G";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+              mountOptions = ["umask=0077"];
+            };
+          };
+          media = {
+            size = "100G";
+            content = {
+              type = "filesystem";
+              format = "xfs";
+              mountpoint = "/media";
+            };
+          };
+          root = {
+            size = "100%";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
new file mode 100644
index 0000000..bdede45
--- /dev/null
+++ b/hosts/ganymede/nixos.nix
@@ -0,0 +1,8 @@
+{inputs, ...}: {
+  # imports = [
+  #   inputs.disko.nixosModules.disko
+  #   ./disks.nix
+  # ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+}
diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index 80dd198..ea33143 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -1,15 +1,4 @@
-{inputs, ...}: {
-  nix-furnace = {
-    extraHomeModules = [
-      ./home.nix
-    ];
-
-    extraSystemModules = [
-      ./system.nix
-      inputs.hjem.nixosModules.default
-    ];
-  };
-
+{
   collinux = {
     theme = "adwaita";
 
@@ -21,6 +10,8 @@
     desktop = {
       gnome.enable = true;
 
+      gdm.enable = true;
+
       programs = {
         firefox.enable = true;
         blackbox.enable = true;
diff --git a/hosts/jupiter/home.nix b/hosts/jupiter/hjem.nix
index 137c74a..33d260a 100644
--- a/hosts/jupiter/home.nix
+++ b/hosts/jupiter/hjem.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
-  home.preferXdgDirectories = true;
-  home.packages = with pkgs; [
+  packages = with pkgs; [
     orca-slicer
     freecad-wayland
     gimp
@@ -8,6 +7,4 @@
     bottles
     musescore
   ];
-
-  home.stateVersion = "25.05";
 }
diff --git a/hosts/jupiter/system.nix b/hosts/jupiter/nixos.nix
index b82f70a..268b2bc 100644
--- a/hosts/jupiter/system.nix
+++ b/hosts/jupiter/nixos.nix
@@ -25,4 +25,6 @@
   fonts.packages = [pkgs.nerd-fonts.iosevka];
 
   system.stateVersion = "25.05";
+
+  nixpkgs.hostPlatform = "x86_64-linux";
 }
diff --git a/hosts/mercury/ai.nix b/hosts/mercury/ai.nix
index 1bece4a..42a478a 100644
--- a/hosts/mercury/ai.nix
+++ b/hosts/mercury/ai.nix
@@ -3,4 +3,5 @@
     enable = true;
     loadModels = ["deepseek-r1:1.5b"];
   };
+  environment.systemPackages = [pkgs.mcphost];
 }
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 3790951..d5f0832 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,15 +1,4 @@
-{inputs, ...}: {
-  nix-furnace = {
-    extraSystemModules = [
-      inputs.hjem.nixosModules.default
-      ./system.nix
-      ./disks.nix
-    ];
-    extraHomeModules = [
-      ./home.nix
-    ];
-  };
-
+{
   collinux = {
     theme = "catppuccin";
 
@@ -19,14 +8,23 @@
     };
 
     desktop = {
-      sway.enable = true;
       wallpaper = ./wallpaper.jpg;
-      components.fuzzel.enable = true;
-      components.dunst.enable = true;
+
+      gtk.enable = true;
+
+      greetd.enable = true;
+
+      sway = {
+        enable = true;
+        components.fuzzel.enable = true;
+        components.dunst.enable = true;
+      };
 
       programs = {
         firefox.enable = true;
         foot.enable = true;
+
+        research.enable = true;
       };
     };
 
@@ -73,7 +71,7 @@
 
     boot = {
       systemd-boot.enable = true;
-      plymouth.enable = true;
+      # plymouth.enable = true;
       secureBoot.enable = true;
     };
   };
diff --git a/hosts/mercury/disks.nix b/hosts/mercury/disks.nix
index ffa0871..af6c161 100644
--- a/hosts/mercury/disks.nix
+++ b/hosts/mercury/disks.nix
@@ -1,6 +1,4 @@
 {
-  # TODO: Replace this with disko eventually
-
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/3d80a86b-3268-4209-a833-b531b8bc0ebc";
     fsType = "ext4";
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
new file mode 100644
index 0000000..463290c
--- /dev/null
+++ b/hosts/mercury/hjem.nix
@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  packages = with pkgs; [
+    # GUI apps
+    tor-browser # don't ask
+    obsidian
+    kdePackages.kleopatra
+    mpv
+    musescore
+  ];
+}
diff --git a/hosts/mercury/home.nix b/hosts/mercury/home.nix
deleted file mode 100644
index 5e80d16..0000000
--- a/hosts/mercury/home.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  home.preferXdgDirectories = true;
-  home.packages = with pkgs; [
-    # GUI apps
-    tor-browser # don't ask
-    obsidian
-    kdePackages.kleopatra
-    mpv
-    musescore
-    qutebrowser
-
-    zotero
-    zathura
-  ];
-
-  home.stateVersion = "25.05";
-}
diff --git a/hosts/mercury/system.nix b/hosts/mercury/nixos.nix
index 0e982a0..05e84a7 100644
--- a/hosts/mercury/system.nix
+++ b/hosts/mercury/nixos.nix
@@ -1,9 +1,11 @@
 {
+  lib,
   pkgs,
   inputs,
   ...
 }: {
   imports = [
+    ./disks.nix
     ./battery.nix
     ./ai.nix
 
@@ -13,18 +15,11 @@
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
-  fonts = {
-    enableDefaultPackages = false;
-    packages = with pkgs; [
-      ibm-plex
-      nerd-fonts.iosevka
-    ];
-  };
+  environment.defaultPackages = lib.mkForce []; # im not a noob
 
   networking.firewall.allowedUDPPorts = [445];
   networking.firewall.allowedTCPPorts = [8000];
   users.users.collin.packages = [pkgs.cifs-utils];
-  fonts.fontDir.enable = true;
 
   system.stateVersion = "25.05";
 }