diff --git a/flake.lock b/flake.lock
index 5e01fd3..8e1531b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,24 +18,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1785627969,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -70,27 +52,6 @@
         "type": "github"
       }
     },
-    "nixcord": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-nixcord": "nixpkgs-nixcord",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1788082709,
-        "narHash": "sha256-NRJUB6pVNqLpX2apWi6fCz5j47ZePRI25f+9H0WYs6Y=",
-        "owner": "4evy",
-        "repo": "nixcord",
-        "rev": "208ae34f932f1ddda36553190169af1ba920481a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "4evy",
-        "repo": "nixcord",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1787209939,
@@ -107,54 +68,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1785031560,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-nixcord": {
-      "locked": {
-        "lastModified": 1786711500,
-        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1786711500,
-        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1788039129,
         "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
@@ -174,46 +88,11 @@
       "inputs": {
         "base16": "base16",
         "home-manager": "home-manager",
-        "nixcord": "nixcord",
-        "nixpkgs": "nixpkgs_3",
-        "tt-discord": "tt-discord",
+        "nixpkgs": "nixpkgs_2",
         "tt-schemes": "tt-schemes",
         "tt-terminal": "tt-terminal"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixcord",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1785945821,
-        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "tt-discord": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-a94aaomwiDeaoFKy3YXGVu6iMuIHtxXoFtGAse8tFz8=",
-        "type": "file",
-        "url": "https://git.lucy.rip/lucy/tinted-discord.git"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://git.lucy.rip/lucy/tinted-discord.git"
-      }
-    },
     "tt-schemes": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index aa3bfda..67f93f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     base16.url = "github:SenchoPens/base16.nix";
     home-manager.url = "github:nix-community/home-manager";
-    nixcord.url = "github:4evy/nixcord";
     tt-schemes = {
       url = "github:tinted-theming/schemes";
       flake = false;
@@ -12,10 +11,6 @@
       url = "github:tinted-theming/tinted-terminal";
       flake = false;
     };
-    tt-discord = {
-      url = "https://git.lucy.rip/lucy/tinted-discord.git";
-      flake = false;
-    };
 
   };
   outputs =
@@ -24,15 +19,20 @@
       nixpkgs,
       base16,
       home-manager,
-      nixcord,
       ...
     }@inputs:
     {
       nixosConfigurations.nerv = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; };
         modules = [
-          # set the theme
-          ./modules/themeing
+          ./theme.nix
+          ({ pkgs, ... }: {
+            config.theming.theme = "gruvbox-dark-hard";
+            config.theming.font = "Iosevka";
+            config.theming.fontPackage = pkgs.iosevka;
+          })
+          base16.nixosModule
+          ({ config, ... }: { scheme = "${config.theming.theme}"; })
           ./modules/hosts/nerv/configuration.nix
           home-manager.nixosModules.home-manager
           {
@@ -40,10 +40,13 @@
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
             imports = [
-              ./modules/themeing
-              ./modules/programs
+              ./modules/hosts/nerv/home.nix
+              ./modules/programs/emacs.nix
+              ./modules/programs/niri.nix
+              ./modules/programs/foot.nix
+              ./modules/programs/quickshell.nix
+              ./modules/programs/fuzzel.nix
             ];
-            home-manager.users.lucy = ./modules/hosts/nerv/home.nix;
           }
         ];
       };
diff --git a/modules/hosts/nerv/home.nix b/modules/hosts/nerv/home.nix
index 77cc7f0..8dd2351 100644
--- a/modules/hosts/nerv/home.nix
+++ b/modules/hosts/nerv/home.nix
@@ -7,77 +7,78 @@ let
   c = config.scheme.withHashtag;
 in
 {
-  home.packages = with pkgs; [
-    nixd
-    nixfmt
-    clang
-    kdePackages.qtdeclarative
-  ];
-
-  home.stateVersion = "26.05";
-  home.pointerCursor = {
-    enable = true;
-    name = "macOS";
-    package = pkgs.apple-cursor;
-    size = 24;
+  home-manager.users.lucy = {
+    home.packages = with pkgs; [
+      nixd
+      nixfmt
+      clang
+      kdePackages.qtdeclarative
+    ];
+    home.stateVersion = "26.05";
+    home.pointerCursor = {
+      enable = true;
+      name = "macOS";
+      package = pkgs.apple-cursor;
+      size = 24;
+    };
+    gtk = {
+      enable = true;
+      colorScheme = "dark";
+      theme = {
+        name = "adw-gtk3-dark";
+        package = pkgs.adw-gtk3;
+      };
+      iconTheme = {
+        name = "Papirus-Dark";
+        package = pkgs.papirus-icon-theme;
+      };
+      font = {
+        name = config.theming.font;
+        package = config.theming.fontPackage;
+        size = 12;
+      };
+      cursorTheme.name = "macOS";
+      cursorTheme.size = 24;
+      gtk3.extraCss = ''
+        @define-color theme_bg_color ${c.base00};
+        @define-color theme_fg_color ${c.base05};
+        @define-color theme_base_color ${c.base00};
+        @define-color theme_text_color ${c.base05};
+        @define-color theme_selected_bg_color ${c.base0D};
+        @define-color theme_selected_fg_color ${c.base00};
+        @define-color insensitive_bg_color ${c.base01};
+        @define-color insensitive_fg_color ${c.base03};
+        @define-color borders ${c.base02};
+        @define-color warning_color ${c.base0A};
+        @define-color error_color ${c.base08};
+        @define-color success_color ${c.base0B};
+      '';
+      gtk4.extraCss = ''
+        @define-color window_bg_color ${c.base00};
+        @define-color window_fg_color ${c.base05};
+        @define-color view_bg_color ${c.base00};
+        @define-color view_fg_color ${c.base05};
+        @define-color headerbar_bg_color ${c.base01};
+        @define-color headerbar_fg_color ${c.base05};
+        @define-color headerbar_border_color ${c.base02};
+        @define-color sidebar_bg_color ${c.base01};
+        @define-color sidebar_fg_color ${c.base05};
+        @define-color card_bg_color ${c.base01};
+        @define-color card_fg_color ${c.base05};
+        @define-color popover_bg_color ${c.base01};
+        @define-color popover_fg_color ${c.base05};
+        @define-color dialog_bg_color ${c.base01};
+        @define-color dialog_fg_color ${c.base05};
+        @define-color accent_bg_color ${c.base0D};
+        @define-color accent_fg_color ${c.base00};
+        @define-color accent_color ${c.base0D};
+        @define-color destructive_bg_color ${c.base08};
+        @define-color destructive_color ${c.base08};
+        @define-color warning_color ${c.base0A};
+        @define-color error_color ${c.base08};
+        @define-color success_color ${c.base0B};
+      '';
+    };
+    dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
   };
-  gtk = {
-    enable = true;
-    colorScheme = "dark";
-    theme = {
-      name = "adw-gtk3-dark";
-      package = pkgs.adw-gtk3;
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    font = {
-      name = config.theming.font;
-      package = config.theming.fontPackage;
-      size = 12;
-    };
-    cursorTheme.name = "macOS";
-    cursorTheme.size = 24;
-    gtk3.extraCss = ''
-      @define-color theme_bg_color ${c.base00};
-      @define-color theme_fg_color ${c.base05};
-      @define-color theme_base_color ${c.base00};
-      @define-color theme_text_color ${c.base05};
-      @define-color theme_selected_bg_color ${c.base0D};
-      @define-color theme_selected_fg_color ${c.base00};
-      @define-color insensitive_bg_color ${c.base01};
-      @define-color insensitive_fg_color ${c.base03};
-      @define-color borders ${c.base02};
-      @define-color warning_color ${c.base0A};
-      @define-color error_color ${c.base08};
-      @define-color success_color ${c.base0B};
-    '';
-    gtk4.extraCss = ''
-      @define-color window_bg_color ${c.base00};
-      @define-color window_fg_color ${c.base05};
-      @define-color view_bg_color ${c.base00};
-      @define-color view_fg_color ${c.base05};
-      @define-color headerbar_bg_color ${c.base01};
-      @define-color headerbar_fg_color ${c.base05};
-      @define-color headerbar_border_color ${c.base02};
-      @define-color sidebar_bg_color ${c.base01};
-      @define-color sidebar_fg_color ${c.base05};
-      @define-color card_bg_color ${c.base01};
-      @define-color card_fg_color ${c.base05};
-      @define-color popover_bg_color ${c.base01};
-      @define-color popover_fg_color ${c.base05};
-      @define-color dialog_bg_color ${c.base01};
-      @define-color dialog_fg_color ${c.base05};
-      @define-color accent_bg_color ${c.base0D};
-      @define-color accent_fg_color ${c.base00};
-      @define-color accent_color ${c.base0D};
-      @define-color destructive_bg_color ${c.base08};
-      @define-color destructive_color ${c.base08};
-      @define-color warning_color ${c.base0A};
-      @define-color error_color ${c.base08};
-      @define-color success_color ${c.base0B};
-    '';
-  };
-  dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
 }
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
deleted file mode 100644
index 455f456..0000000
--- a/modules/programs/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./foot.nix
-    ./niri.nix
-    ./emacs.nix
-    ./fuzzel.nix
-    ./quickshell.nix
-  ];
-}
diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index 93adc89..e79dfe4 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -3,7 +3,7 @@
   ...
 }:
 {
-  programs.emacs = {
+  home-manager.users.lucy.programs.emacs = {
     enable = true;
     extraPackages =
       epkgs: with epkgs.melpaPackages; [
diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix
index 9071f9f..e063b36 100644
--- a/modules/programs/foot.nix
+++ b/modules/programs/foot.nix
@@ -8,7 +8,7 @@ let
   c = config.scheme;
 in
 {
-  programs.foot = {
+  home-manager.users.lucy.programs.foot = {
     enable = true;
     settings = {
       main = {
diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix
index 2c192d0..f490212 100644
--- a/modules/programs/fuzzel.nix
+++ b/modules/programs/fuzzel.nix
@@ -3,22 +3,22 @@ let
   c = config.scheme.withHashtag;
 in
 {
-
-  programs.fuzzel = {
-    enable = true;
-    settings = {
-      main = {
-        font = "${config.theming.font}:size=12";
-      };
-      border.width = 2;
-      colors = {
-        background = "${c.base00}ff";
-        text = "${c.base05}ff";
-        match = "${c.base0D}ff";
-        selection = "${c.base0D}ff";
-        border = "${c.base0D}ff";
+  home-manager.users.lucy = {
+    programs.fuzzel = {
+      enable = true;
+      settings = {
+        main = {
+          font = "${config.theming.font}:size=12";
+        };
+        border.width = 2;
+        colors = {
+          background = "${c.base00}ff";
+          text = "${c.base05}ff";
+          match = "${c.base0D}ff";
+          selection = "${c.base0D}ff";
+          border = "${c.base0D}ff";
+        };
       };
     };
   };
-
 }
diff --git a/modules/programs/niri.nix b/modules/programs/niri.nix
index 1cc4a54..eb117e1 100644
--- a/modules/programs/niri.nix
+++ b/modules/programs/niri.nix
@@ -1,6 +1,6 @@
 { pkgs, config, ... }:
 {
-  wayland.windowManager.niri = {
+  home-manager.users.lucy.wayland.windowManager.niri = {
     enable = true;
     extraConfig = ''
             prefer-no-csd
diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix
deleted file mode 100644
index 4a998d0..0000000
--- a/modules/programs/nixcord.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ inputs, config, lib, ... }: {
-  imports = [ inputs.nixcord.homeModules.nixcord ];
-  programs.nixcord = {
-    enable = true;
-    discord.vencord.enable = true;
-    quickCss = (config.scheme inputs.tt-discord);
-  };
-}
diff --git a/modules/programs/quickshell.nix b/modules/programs/quickshell.nix
index 7a172da..b601367 100644
--- a/modules/programs/quickshell.nix
+++ b/modules/programs/quickshell.nix
@@ -4,31 +4,33 @@ let
 in
 {
 
-  programs.quickshell.enable = true;
-  programs.quickshell.systemd.enable = true;
-  xdg.configFile."quickshell/Colors.js" = {
-    enable = true;
-    text = ''
-      const colors = {
-            base00: "${c.base00}",
-            base01: "${c.base01}",
-            base02: "${c.base02}",
-            base03: "${c.base03}",
-            base04: "${c.base04}",
-            base05: "${c.base05}",
-            base06: "${c.base06}",
-            base07: "${c.base07}",
-            base08: "${c.base08}",
-            base09: "${c.base09}",
-            base0A: "${c.base0A}",
-            base0B: "${c.base0B}",
-            base0C: "${c.base0C}",
-            base0D: "${c.base0D}",
-            base0E: "${c.base0E}",
-            base0F: "${c.base0F}",
-       }
-    '';
-    force = true;
-  };
+  home-manager.users.lucy = {
+    programs.quickshell.enable = true;
+    programs.quickshell.systemd.enable = true;
+    xdg.configFile."quickshell/Colors.js" = {
+      enable = true;
+      text = ''
+        const colors = {
+              base00: "${c.base00}",
+              base01: "${c.base01}",
+              base02: "${c.base02}",
+              base03: "${c.base03}",
+              base04: "${c.base04}",
+              base05: "${c.base05}",
+              base06: "${c.base06}",
+              base07: "${c.base07}",
+              base08: "${c.base08}",
+              base09: "${c.base09}",
+              base0A: "${c.base0A}",
+              base0B: "${c.base0B}",
+              base0C: "${c.base0C}",
+              base0D: "${c.base0D}",
+              base0E: "${c.base0E}",
+              base0F: "${c.base0F}",
+         }
+      '';
+      force = true;
+    };
 
+  };
 }
diff --git a/modules/themeing/default.nix b/theme.nix
similarity index 52%
rename from modules/themeing/default.nix
rename to theme.nix
index fce7560..9d01887 100644
--- a/modules/themeing/default.nix
+++ b/theme.nix
@@ -1,12 +1,4 @@
-{
-  lib,
-  inputs,
-  pkgs,
-  config,
-  ...
-}:
-{
-  imports = [ inputs.base16.nixosModule ];
+{ lib, inputs, ...}: {
   options.theming.theme = lib.mkOption {
     type = lib.types.str;
     apply = name: "${inputs.tt-schemes}/base16/${name}.yaml";
@@ -17,9 +9,4 @@
   options.theming.fontPackage = lib.mkOption {
     type = lib.types.package;
   };
-
-  config.theming.theme = "catppuccin-mocha";
-  config.theming.font = "Iosevka";
-  config.theming.fontPackage = pkgs.iosevka;
-  config.scheme = config.theming.theme;
 }