move various configs into modules where they belong

1 files changed, 12 insertions, 16 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;
-        };
       };
     };