move various configs into modules where they belong

3 files changed, 17 insertions, 23 deletions

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 9ee29d0..3fb4753 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,20 +1,19 @@
-{pkgs, ...}: {
+{
   collinux = {
     theme = "catppuccin";
     user.name = "collin";
 
     desktop = {
       wallpaper = ./wallpaper.jpg;
-
-      # gtk.enable = true;
-
+      gtk.enable = true;
       greetd.enable = true;
 
       wm = {
-        # sway.enable = true;
         niri.enable = true;
-        components.fuzzel.enable = true;
-        components.dunst.enable = true;
+        components = {
+          fuzzel.enable = true;
+          dunst.enable = true;
+        };
       };
 
       programs = {
@@ -43,26 +42,23 @@
       shells.bash.enable = true; # for nix-shells
 
       programs = {
-        lazygit.enable = true;
         starship.enable = true;
-
         fzf.enable = true;
         bat.enable = true;
         eza.enable = true;
+        helix = {
+          enable = true;
+          hardMode = true;
+        };
 
+        lazygit.enable = true;
+        nh.enable = true;
         git = {
           enable = true;
           userName = "Collin Williams";
           userEmail = "96917990+bluedragon1221@users.noreply.github.com";
           installKey = true;
         };
-
-        nh.enable = true;
-
-        helix = {
-          enable = true;
-          hardMode = true;
-        };
       };
     };
 
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 6eba4c9..1db654f 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -6,7 +6,6 @@
     kdePackages.kleopatra
     mpv
     musescore
-    zed-editor # experimenting
 
     kew # music player
     prismlauncher
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 558ae60..631a537 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -12,10 +12,11 @@
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
-  systemd.services.systemd-udev-settle.enable = false;
-  networking.interfaces.wlp2s0.useDHCP = false;
-
-  services.sshd.enable = true;
+  services.syncthing = {
+    enable = true;
+    user = "collin";
+    dataDir = "/home/collin/.local/syncthing";
+  };
 
   facter.reportPath = ./facter.json;
 
@@ -25,6 +26,4 @@
     allowedUDPPorts = [445];
     allowedTCPPorts = [8000];
   };
-
-  system.stateVersion = "25.05";
 }