rework most of config; probably broke jupiter again; working to add ganymede (non-nixos) to this repo

3 files changed, 11 insertions, 19 deletions

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/home.nix b/hosts/mercury/hjem.nix
index 5e80d16..b2182e9 100644
--- a/hosts/mercury/home.nix
+++ b/hosts/mercury/hjem.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
-  home.preferXdgDirectories = true;
-  home.packages = with pkgs; [
+  packages = with pkgs; [
     # GUI apps
     tor-browser # don't ask
     obsidian
@@ -12,6 +11,4 @@
     zotero
     zathura
   ];
-
-  home.stateVersion = "25.05";
 }
diff --git a/hosts/mercury/system.nix b/hosts/mercury/nixos.nix
index 0e982a0..5b1b113 100644
--- a/hosts/mercury/system.nix
+++ b/hosts/mercury/nixos.nix
@@ -4,6 +4,7 @@
   ...
 }: {
   imports = [
+    ./disks.nix
     ./battery.nix
     ./ai.nix