From 7e7c8947fc2ff5598124c4a4c18bd28432fa017e Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Mon, 8 Sep 2025 14:01:35 -0500
Subject: rework most of config; probably broke jupiter again; working to add
 ganymede (non-nixos) to this repo

---
 hosts/mercury/config.nix | 24 +++++++++---------------
 hosts/mercury/hjem.nix   | 14 ++++++++++++++
 hosts/mercury/home.nix   | 17 -----------------
 hosts/mercury/nixos.nix  | 31 +++++++++++++++++++++++++++++++
 hosts/mercury/system.nix | 30 ------------------------------
 5 files changed, 54 insertions(+), 62 deletions(-)
 create mode 100644 hosts/mercury/hjem.nix
 delete mode 100644 hosts/mercury/home.nix
 create mode 100644 hosts/mercury/nixos.nix
 delete mode 100644 hosts/mercury/system.nix

(limited to 'hosts/mercury')

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 3790951..4b5ac0d 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,10 +8,15 @@
     };
 
     desktop = {
-      sway.enable = true;
       wallpaper = ./wallpaper.jpg;
-      components.fuzzel.enable = true;
-      components.dunst.enable = true;
+
+      greetd.enable = true;
+
+      sway = {
+        enable = true;
+        components.fuzzel.enable = true;
+        components.dunst.enable = true;
+      };
 
       programs = {
         firefox.enable = true;
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
new file mode 100644
index 0000000..b2182e9
--- /dev/null
+++ b/hosts/mercury/hjem.nix
@@ -0,0 +1,14 @@
+{pkgs, ...}: {
+  packages = with pkgs; [
+    # GUI apps
+    tor-browser # don't ask
+    obsidian
+    kdePackages.kleopatra
+    mpv
+    musescore
+    qutebrowser
+
+    zotero
+    zathura
+  ];
+}
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/nixos.nix b/hosts/mercury/nixos.nix
new file mode 100644
index 0000000..5b1b113
--- /dev/null
+++ b/hosts/mercury/nixos.nix
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    ./disks.nix
+    ./battery.nix
+    ./ai.nix
+
+    inputs.nixos-facter-modules.nixosModules.facter
+    {facter.reportPath = ./facter.json;}
+
+    inputs.lanzaboote.nixosModules.lanzaboote
+  ];
+
+  fonts = {
+    enableDefaultPackages = false;
+    packages = with pkgs; [
+      ibm-plex
+      nerd-fonts.iosevka
+    ];
+  };
+
+  networking.firewall.allowedUDPPorts = [445];
+  networking.firewall.allowedTCPPorts = [8000];
+  users.users.collin.packages = [pkgs.cifs-utils];
+  fonts.fontDir.enable = true;
+
+  system.stateVersion = "25.05";
+}
diff --git a/hosts/mercury/system.nix b/hosts/mercury/system.nix
deleted file mode 100644
index 0e982a0..0000000
--- a/hosts/mercury/system.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    ./battery.nix
-    ./ai.nix
-
-    inputs.nixos-facter-modules.nixosModules.facter
-    {facter.reportPath = ./facter.json;}
-
-    inputs.lanzaboote.nixosModules.lanzaboote
-  ];
-
-  fonts = {
-    enableDefaultPackages = false;
-    packages = with pkgs; [
-      ibm-plex
-      nerd-fonts.iosevka
-    ];
-  };
-
-  networking.firewall.allowedUDPPorts = [445];
-  networking.firewall.allowedTCPPorts = [8000];
-  users.users.collin.packages = [pkgs.cifs-utils];
-  fonts.fontDir.enable = true;
-
-  system.stateVersion = "25.05";
-}
-- 
cgit v1.3.1