merge changes from main

1 files changed, 14 insertions, 16 deletions

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;
     };
   };