diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix
index f7cd16a..972ac3f 100644
--- a/modules/home/de/hyprland/default.nix
+++ b/modules/home/de/hyprland/default.nix
@@ -1,17 +1,11 @@
 {
   config,
   osConfig,
-  modulesPath,
   pkgs,
   lib,
   ...
 }:
 {
-  imports = [
-    "${modulesPath}/services/window-managers/hyprland.nix"
-    "${modulesPath}/services/dunst.nix"
-  ];
-
   options.custom.de.hyprland.enable = lib.mkEnableOption "" // {
     default = osConfig.custom.de.hyprland.enable;
   };
diff --git a/modules/home/programs/btop.nix b/modules/home/programs/btop.nix
index 481ba0d..41dd253 100644
--- a/modules/home/programs/btop.nix
+++ b/modules/home/programs/btop.nix
@@ -1,12 +1,5 @@
+{ config, lib, ... }:
 {
-  config,
-  modulesPath,
-  lib,
-  ...
-}:
-{
-  imports = [ "${modulesPath}/programs/btop.nix" ];
-
   options.custom.programs.btop.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.btop.enable {
diff --git a/modules/home/programs/firefox.nix b/modules/home/programs/firefox.nix
index 0c21f86..0f78491 100644
--- a/modules/home/programs/firefox.nix
+++ b/modules/home/programs/firefox.nix
@@ -1,6 +1,5 @@
 {
   config,
-  modulesPath,
   inputs,
   pkgs,
   lib,
@@ -28,8 +27,6 @@ let
     };
 in
 {
-  imports = [ "${modulesPath}/programs/firefox" ];
-
   options.custom.programs.firefox = {
     enable = lib.mkEnableOption "";
     extensions = lib.mkOption {
diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix
index edcf3cb..a2488f7 100644
--- a/modules/home/programs/git.nix
+++ b/modules/home/programs/git.nix
@@ -1,22 +1,5 @@
+{ config, lib, ... }:
 {
-  config,
-  modulesPath,
-  lib,
-  ...
-}:
-{
-  imports = [
-    "${modulesPath}/programs/git.nix"
-    "${modulesPath}/programs/lazygit.nix"
-    "${modulesPath}/programs/delta.nix"
-    "${modulesPath}/programs/jujutsu.nix"
-    "${modulesPath}/programs/diff-highlight.nix"
-    "${modulesPath}/programs/diff-so-fancy.nix"
-    "${modulesPath}/programs/difftastic.nix"
-    "${modulesPath}/programs/patdiff.nix"
-    "${modulesPath}/programs/riff.nix"
-  ];
-
   options.custom.programs.git.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.git.enable {
diff --git a/modules/home/programs/hyprlock.nix b/modules/home/programs/hyprlock.nix
index 9930232..a27fcae 100644
--- a/modules/home/programs/hyprlock.nix
+++ b/modules/home/programs/hyprlock.nix
@@ -1,7 +1,6 @@
 {
   config,
   osConfig,
-  modulesPath,
   pkgs-unstable,
   lib,
   ...
@@ -10,8 +9,6 @@ let
   cfg = config.custom.programs.hyprlock;
 in
 {
-  imports = [ "${modulesPath}/programs/hyprlock.nix" ];
-
   options.custom.programs.hyprlock = {
     enable = lib.mkEnableOption "";
     fprintAuth = lib.mkEnableOption "" // {
diff --git a/modules/home/programs/kitty.nix b/modules/home/programs/kitty.nix
index 6e3ce32..50cf79e 100644
--- a/modules/home/programs/kitty.nix
+++ b/modules/home/programs/kitty.nix
@@ -1,13 +1,10 @@
 {
   config,
-  modulesPath,
   pkgs,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/programs/kitty.nix" ];
-
   options.custom.programs.kitty.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.kitty.enable {
diff --git a/modules/home/programs/shell/aliases.nix b/modules/home/programs/shell/aliases.nix
index 3b4a58e..8a3d799 100644
--- a/modules/home/programs/shell/aliases.nix
+++ b/modules/home/programs/shell/aliases.nix
@@ -1,13 +1,10 @@
 {
   config,
-  modulesPath,
   pkgs,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/programs/zoxide.nix" ];
-
   options.custom.programs.shell.aliases.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.shell.aliases.enable {
diff --git a/modules/home/programs/shell/atuin.nix b/modules/home/programs/shell/atuin.nix
index b66ba98..7ca5b03 100644
--- a/modules/home/programs/shell/atuin.nix
+++ b/modules/home/programs/shell/atuin.nix
@@ -1,14 +1,11 @@
 {
   config,
   osConfig,
-  modulesPath,
   pkgs,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/programs/atuin.nix" ];
-
   options.custom.programs.shell.atuin.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.shell.atuin.enable {
diff --git a/modules/home/programs/shell/direnv.nix b/modules/home/programs/shell/direnv.nix
index 5a1ef0c..3c81ad6 100644
--- a/modules/home/programs/shell/direnv.nix
+++ b/modules/home/programs/shell/direnv.nix
@@ -1,12 +1,5 @@
+{ config, lib, ... }:
 {
-  config,
-  modulesPath,
-  lib,
-  ...
-}:
-{
-  imports = [ "${modulesPath}/programs/direnv.nix" ];
-
   options.custom.programs.shell.direnv.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.shell.direnv.enable {
diff --git a/modules/home/programs/shell/zsh/default.nix b/modules/home/programs/shell/zsh/default.nix
index 60f4718..58fbeb7 100644
--- a/modules/home/programs/shell/zsh/default.nix
+++ b/modules/home/programs/shell/zsh/default.nix
@@ -1,16 +1,10 @@
 {
   config,
-  modulesPath,
   pkgs,
   lib,
   ...
 }:
 {
-  imports = [
-    "${modulesPath}/programs/fish.nix"
-    "${modulesPath}/programs/fzf.nix"
-    "${modulesPath}/programs/man.nix"
-  ];
   options.custom.programs.shell.zsh.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.shell.zsh.enable {
diff --git a/modules/home/programs/ssh.nix b/modules/home/programs/ssh.nix
index 5c1ac6c..0592d04 100644
--- a/modules/home/programs/ssh.nix
+++ b/modules/home/programs/ssh.nix
@@ -1,14 +1,11 @@
 {
   config,
   osConfig,
-  modulesPath,
   self,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/programs/ssh.nix" ];
-
   options.custom.programs.ssh = {
     enable = lib.mkEnableOption "";
     publicKeyPath = lib.mkOption {
diff --git a/modules/home/programs/vscode.nix b/modules/home/programs/vscode.nix
index 269fde5..50c8231 100644
--- a/modules/home/programs/vscode.nix
+++ b/modules/home/programs/vscode.nix
@@ -1,14 +1,11 @@
 {
   config,
-  modulesPath,
   inputs,
   pkgs,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/programs/vscode" ];
-
   options.custom.programs.vscode.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.vscode.enable {
diff --git a/modules/home/services/cliphist.nix b/modules/home/services/cliphist.nix
index 05e1715..f12b310 100644
--- a/modules/home/services/cliphist.nix
+++ b/modules/home/services/cliphist.nix
@@ -1,13 +1,10 @@
 {
   config,
-  modulesPath,
   pkgs,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/services/cliphist.nix" ];
-
   options.custom.services.cliphist.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.services.cliphist.enable {
diff --git a/modules/home/services/hypridle.nix b/modules/home/services/hypridle.nix
index 9e67998..8a31c11 100644
--- a/modules/home/services/hypridle.nix
+++ b/modules/home/services/hypridle.nix
@@ -1,13 +1,10 @@
 {
   config,
-  modulesPath,
   pkgs-unstable,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/services/hypridle.nix" ];
-
   options.custom.services.hypridle.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.services.hypridle.enable {
diff --git a/modules/home/services/hyprpaper.nix b/modules/home/services/hyprpaper.nix
index baa8f1f..400f4ae 100644
--- a/modules/home/services/hyprpaper.nix
+++ b/modules/home/services/hyprpaper.nix
@@ -1,12 +1,5 @@
+{ config, lib, ... }:
 {
-  config,
-  modulesPath,
-  lib,
-  ...
-}:
-{
-  imports = [ "${modulesPath}/services/hyprpaper.nix" ];
-
   options.custom.services.hyprpaper.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.services.hyprpaper.enable {
diff --git a/modules/home/services/waybar.nix b/modules/home/services/waybar.nix
index d7ad335..c6847e9 100644
--- a/modules/home/services/waybar.nix
+++ b/modules/home/services/waybar.nix
@@ -1,12 +1,5 @@
+{ config, lib, ... }:
 {
-  config,
-  modulesPath,
-  lib,
-  ...
-}:
-{
-  imports = [ "${modulesPath}/programs/waybar.nix" ];
-
   options.custom.services.waybar.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.services.waybar.enable {
diff --git a/modules/home/services/wpaperd.nix b/modules/home/services/wpaperd.nix
index 5a0dcaa..ad16d31 100644
--- a/modules/home/services/wpaperd.nix
+++ b/modules/home/services/wpaperd.nix
@@ -1,12 +1,5 @@
+{ config, lib, ... }:
 {
-  config,
-  modulesPath,
-  lib,
-  ...
-}:
-{
-  imports = [ "${modulesPath}/services/wpaperd.nix" ];
-
   options.custom.services.wpaperd.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.services.wpaperd.enable {
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index f4356ea..9aac853 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -34,7 +34,6 @@
   users.users.seb.shell = pkgs.zsh;
 
   home-manager = {
-    minimal = true;
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = { inherit inputs self pkgs-unstable; };