refactor(modules): introduce cfg local bindings and submodule option types

45 files changed, 427 insertions, 233 deletions

diff --git a/modules/communication/neomutt/default.nix b/modules/communication/neomutt/default.nix
index 018555f..385c290 100644
--- a/modules/communication/neomutt/default.nix
+++ b/modules/communication/neomutt/default.nix
@@ -6,6 +6,8 @@
   ...
 }:
 let
+  cfg = config.communication.neomutt;
+
   neomuttSyncScript = pkgs.writeShellApplication {
     name = "neomutt-sync";
     runtimeInputs = [
@@ -61,7 +63,7 @@ in
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.communication.neomutt.enable {
+    (lib.mkIf cfg.enable {
       accounts.email.maildirBasePath = "${config.home.homeDirectory}/.local/share/mail";
       home.sessionVariables.MAILDIR = config.accounts.email.maildirBasePath;
 
@@ -93,7 +95,7 @@ in
         );
       };
     })
-    (lib.mkIf (config.communication.neomutt.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries."neomutt" = {
         name = "NeoMutt";
         exec = "${lib.getExe config.terminal.kitty.package} --class neomutt -e ${lib.getExe config.programs.neomutt.package}";
diff --git a/modules/desktop/mako/default.nix b/modules/desktop/mako/default.nix
index 2123b57..a918d02 100644
--- a/modules/desktop/mako/default.nix
+++ b/modules/desktop/mako/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.desktop.mako;
+in
 {
   imports = [ ./colors.nix ];
 
@@ -18,7 +21,7 @@
     };
   };
 
-  config = lib.mkIf config.desktop.mako.enable {
+  config = lib.mkIf cfg.enable {
     services.mako = {
       enable = true;
       settings = {
diff --git a/modules/desktop/niri/default.nix b/modules/desktop/niri/default.nix
index a5de8d8..b17ea12 100644
--- a/modules/desktop/niri/default.nix
+++ b/modules/desktop/niri/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 let
+  cfg = config.desktop;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
@@ -15,19 +16,43 @@ in
   ];
 
   options.desktop = {
-    niri.package = lib.mkOption {
-      type = lib.types.package;
-      readOnly = true;
-      default = config.wayland.windowManager.niri.package;
-      description = "The niri package to use.";
+    niri = lib.mkOption {
+      type = lib.types.submodule {
+        options = {
+          package = lib.mkOption {
+            type = lib.types.package;
+            readOnly = true;
+            default = config.wayland.windowManager.niri.package;
+            description = "The niri package to use.";
+          };
+        };
+      };
+      default = { };
+      description = "Niri window manager configuration.";
     };
     hardware.gpu = {
-      nvidia.enable = lib.mkEnableOption "Nvidia GPU Wayland optimizations";
-      amd.enable = lib.mkEnableOption "AMD GPU Wayland optimizations";
+      nvidia = lib.mkOption {
+        type = lib.types.submodule {
+          options = {
+            enable = lib.mkEnableOption "Nvidia GPU Wayland optimizations";
+          };
+        };
+        default = { };
+        description = "NVIDIA GPU configuration.";
+      };
+      amd = lib.mkOption {
+        type = lib.types.submodule {
+          options = {
+            enable = lib.mkEnableOption "AMD GPU Wayland optimizations";
+          };
+        };
+        default = { };
+        description = "AMD GPU configuration.";
+      };
     };
   };
 
-  config = lib.mkIf config.desktop.enable {
+  config = lib.mkIf cfg.enable {
     home.sessionVariables = lib.mkMerge [
       {
         NIXOS_OZONE_WL = "1";
@@ -38,7 +63,7 @@ in
         QT_SCALE_FACTOR = "1";
       }
 
-      (lib.mkIf config.desktop.hardware.gpu.nvidia.enable {
+      (lib.mkIf cfg.hardware.gpu.nvidia.enable {
         LIBVA_DRIVER_NAME = "nvidia";
         __GLX_VENDOR_LIBRARY_NAME = "nvidia";
         GBM_BACKEND = "nvidia-drm";
@@ -46,7 +71,7 @@ in
         __GL_VRR_ALLOWED = "0";
       })
 
-      (lib.mkIf config.desktop.hardware.gpu.amd.enable {
+      (lib.mkIf cfg.hardware.gpu.amd.enable {
         AMD_VULKAN_ICD = "RADV";
         MESA_VK_DEVICE_SELECT = "1002:";
       })
diff --git a/modules/desktop/swayidle/default.nix b/modules/desktop/swayidle/default.nix
index e1acaa0..e2877b6 100644
--- a/modules/desktop/swayidle/default.nix
+++ b/modules/desktop/swayidle/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.desktop.swayidle;
+in
 {
   options.desktop.swayidle = {
     enable = lib.mkEnableOption "Enables swayidle.";
@@ -16,10 +19,10 @@
     };
   };
 
-  config = lib.mkIf config.desktop.swayidle.enable {
+  config = lib.mkIf cfg.enable {
     services.swayidle = {
       enable = true;
-      package = config.desktop.swayidle.package;
+      package = cfg.package;
       systemdTargets = [ "graphical-session.target" ];
       timeouts = [
         {
diff --git a/modules/desktop/wl-clipboard/default.nix b/modules/desktop/wl-clipboard/default.nix
index 956a792..678e241 100644
--- a/modules/desktop/wl-clipboard/default.nix
+++ b/modules/desktop/wl-clipboard/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.desktop.wl-clipboard;
+in
 {
   options.desktop.wl-clipboard = {
     package = lib.mkOption {
@@ -16,6 +19,6 @@
   };
 
   config = lib.mkIf config.desktop.enable {
-    home.packages = [ config.desktop.wl-clipboard.package ];
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/development/bruno/default.nix b/modules/development/bruno/default.nix
index 7c7afa2..fc08f3c 100644
--- a/modules/development/bruno/default.nix
+++ b/modules/development/bruno/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.development.bruno;
+in
 {
   options.development.bruno = {
     enable = lib.mkEnableOption "Enables bruno.";
@@ -16,8 +19,8 @@
     };
   };
 
-  config = lib.mkIf config.development.bruno.enable {
-    home.packages = [ config.development.bruno.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
 
     xdg.mimeApps.defaultApplications = {
       "x-scheme-handler/bruno" = "bruno.desktop";
diff --git a/modules/development/delta/default.nix b/modules/development/delta/default.nix
index e3daeb3..b4922fe 100644
--- a/modules/development/delta/default.nix
+++ b/modules/development/delta/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.development.delta;
+in
 {
   options.development.delta = {
     enable = lib.mkEnableOption "Enables delta.";
@@ -15,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.development.delta.enable {
+  config = lib.mkIf cfg.enable {
     programs.delta = {
       enable = true;
       options = {
diff --git a/modules/development/direnv/default.nix b/modules/development/direnv/default.nix
index b16258a..db65145 100644
--- a/modules/development/direnv/default.nix
+++ b/modules/development/direnv/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.development.direnv;
+in
 {
   options.development.direnv = {
     enable = lib.mkEnableOption "Enables direnv.";
@@ -15,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.development.direnv.enable {
+  config = lib.mkIf cfg.enable {
     programs.direnv = {
       enable = true;
       enableZshIntegration = lib.mkIf config.terminal.zsh.enable true;
diff --git a/modules/development/lazygit/default.nix b/modules/development/lazygit/default.nix
index c2e6be8..95d2bf1 100644
--- a/modules/development/lazygit/default.nix
+++ b/modules/development/lazygit/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 let
+  cfg = config.development.lazygit;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
@@ -22,7 +23,7 @@ in
     };
   };
   config = lib.mkMerge [
-    (lib.mkIf config.development.lazygit.enable {
+    (lib.mkIf cfg.enable {
       programs.lazygit = {
         enable = true;
         enableBashIntegration = false;
@@ -66,9 +67,9 @@ in
             commitHashLength = 4;
             showBranchCommitHash = true;
             showDivergenceFromBaseBranch = "arrowAndNumber";
-            autoFetch = false;
           };
           git = {
+            autoFetch = false;
             overrideGpg = config.security.gpg.enable;
             diffRenderers = lib.mkIf config.development.delta.enable [
               {
@@ -85,10 +86,10 @@ in
         source = ../../../assets/icons/apps/git.svg;
       };
     })
-    (lib.mkIf (config.development.lazygit.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries."lazygit" = {
         name = "lazygit";
-        exec = "${lib.getExe config.terminal.kitty.package} --class lazygit -e ${lib.getExe config.development.lazygit.package}";
+        exec = "${lib.getExe config.terminal.kitty.package} --class lazygit -e ${lib.getExe cfg.package}";
         icon = "git";
         categories = [ "Development" ];
         comment = "A simple terminal UI for git commands";
diff --git a/modules/development/nixvim/default.nix b/modules/development/nixvim/default.nix
index 00712cc..a294788 100644
--- a/modules/development/nixvim/default.nix
+++ b/modules/development/nixvim/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 let
+  cfg = config.development.nixvim;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
@@ -25,7 +26,7 @@ in
     };
   };
 
-  config = lib.mkIf config.development.nixvim.enable {
+  config = lib.mkIf cfg.enable {
     programs.nixvim = {
       enable = true;
       defaultEditor = true;
diff --git a/modules/development/opencode/default.nix b/modules/development/opencode/default.nix
index 011582e..8b61ff9 100644
--- a/modules/development/opencode/default.nix
+++ b/modules/development/opencode/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.development.opencode;
+in
 {
   options.development.opencode = {
     enable = lib.mkEnableOption "Enables opencode.";
@@ -17,7 +20,7 @@
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.development.opencode.enable {
+    (lib.mkIf cfg.enable {
       home.file.".local/share/icons/hicolor/scalable/apps/opencode.svg" = {
         source = ../../../assets/icons/apps/opencode.svg;
       };
@@ -27,10 +30,10 @@
         package = pkgs.opencode;
       };
     })
-    (lib.mkIf (config.development.opencode.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries."opencode" = {
         name = "opencode";
-        exec = "${lib.getExe config.terminal.kitty.package} --class opencode -e ${lib.getExe config.development.opencode.package}";
+        exec = "${lib.getExe config.terminal.kitty.package} --class opencode -e ${lib.getExe cfg.package}";
         icon = "opencode";
         categories = [ "Development" ];
         comment = "AI-powered coding assistant";
diff --git a/modules/development/qemu/default.nix b/modules/development/qemu/default.nix
index db5f7cf..4dea421 100644
--- a/modules/development/qemu/default.nix
+++ b/modules/development/qemu/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.development.qemu;
+in
 {
   options.development.qemu = {
     enable = lib.mkEnableOption "Enables qemu.";
@@ -23,7 +26,7 @@
     };
   };
 
-  config = lib.mkIf config.development.qemu.enable {
-    home.packages = [ config.development.qemu.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/development/ripgrep/default.nix b/modules/development/ripgrep/default.nix
index 16c70d0..b00f61a 100644
--- a/modules/development/ripgrep/default.nix
+++ b/modules/development/ripgrep/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.development.ripgrep;
+in
 {
   options.development.ripgrep = {
     enable = lib.mkEnableOption "Enables ripgrep.";
@@ -15,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.development.ripgrep.enable {
+  config = lib.mkIf cfg.enable {
     programs.ripgrep = {
       enable = true;
     };
diff --git a/modules/development/vscodium/default.nix b/modules/development/vscodium/default.nix
index b365768..b8de8ca 100644
--- a/modules/development/vscodium/default.nix
+++ b/modules/development/vscodium/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.development.vscodium;
+in
 {
   options.development.vscodium = {
     enable = lib.mkEnableOption "Enables vscodium.";
@@ -16,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.development.vscodium.enable {
+  config = lib.mkIf cfg.enable {
     programs.vscodium = {
       enable = true;
       package = pkgs.vscodium;
diff --git a/modules/file-management/eza/default.nix b/modules/file-management/eza/default.nix
index f22b435..b4f2b3a 100644
--- a/modules/file-management/eza/default.nix
+++ b/modules/file-management/eza/default.nix
@@ -1,5 +1,13 @@
 # Modern ls replacement with icons and colors
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.file-management.eza;
+in
 {
   options.file-management.eza = {
     enable = lib.mkEnableOption "Enables eza.";
@@ -12,7 +20,7 @@
     };
   };
 
-  config = lib.mkIf config.file-management.eza.enable {
+  config = lib.mkIf cfg.enable {
     programs.eza = {
       enable = true;
       icons = "always";
diff --git a/modules/file-management/ouch/default.nix b/modules/file-management/ouch/default.nix
index c8986fe..461e3cf 100644
--- a/modules/file-management/ouch/default.nix
+++ b/modules/file-management/ouch/default.nix
@@ -1,10 +1,13 @@
 # CLI tool for compressing and decompressing various formats
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.file-management.ouch;
+in
 {
   options.file-management.ouch = {
     enable = lib.mkEnableOption "Enables ouch.";
@@ -18,7 +21,7 @@
     };
   };
 
-  config = lib.mkIf config.file-management.ouch.enable {
-    home.packages = [ config.file-management.ouch.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/file-management/usb/default.nix b/modules/file-management/usb/default.nix
index 4b8deb9..4596266 100644
--- a/modules/file-management/usb/default.nix
+++ b/modules/file-management/usb/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.file-management.usb;
+in
 {
   options.file-management.usb = {
     enable = lib.mkEnableOption "Enables USB device mounting tools.";
@@ -22,7 +25,7 @@
     };
   };
 
-  config = lib.mkIf config.file-management.usb.enable {
-    home.packages = [ config.file-management.usb.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/file-management/yazi/default.nix b/modules/file-management/yazi/default.nix
index ba1c020..3ba7045 100644
--- a/modules/file-management/yazi/default.nix
+++ b/modules/file-management/yazi/default.nix
@@ -6,11 +6,13 @@
   ...
 }:
 let
+  cfg = config.file-management.yazi;
+
   yaziFileChooserScript = pkgs.writeShellApplication {
     name = "yazi-file-chooser";
     runtimeInputs = [
       config.terminal.bash.package
-      config.file-management.yazi.package
+      cfg.package
       config.terminal.kitty.package
     ];
     text = builtins.readFile ./file-chooser.sh;
@@ -32,19 +34,25 @@ in
       description = "The yazi package to use. Defaults to the wrapped finalPackage from programs.yazi.";
     };
 
-    file-chooser = {
-      enable = lib.mkEnableOption "Enables the yazi-file-chooser script.";
-      package = lib.mkOption {
-        type = lib.types.package;
-        readOnly = true;
-        default = yaziFileChooserScript;
-        description = "The yazi-file-chooser script package.";
+    file-chooser = lib.mkOption {
+      type = lib.types.submodule {
+        options = {
+          enable = lib.mkEnableOption "Enables the yazi-file-chooser script.";
+          package = lib.mkOption {
+            type = lib.types.package;
+            readOnly = true;
+            default = yaziFileChooserScript;
+            description = "The yazi-file-chooser script package.";
+          };
+        };
       };
+      default = { };
+      description = "File chooser integration configuration.";
     };
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.file-management.yazi.enable {
+    (lib.mkIf cfg.enable {
       programs.yazi = {
         enable = true;
         shellWrapperName = "yy";
@@ -57,17 +65,17 @@ in
       };
 
       home.file.".local/share/icons/hicolor/scalable/apps/yazi.png" = {
-        source = config.lib.file.mkOutOfStoreSymlink "${config.file-management.yazi.package}/share/pixmaps/yazi.png";
+        source = lib.file.mkOutOfStoreSymlink "${cfg.package}/share/pixmaps/yazi.png";
       };
 
       home.sessionVariables = {
         TERMCMD = lib.mkIf config.terminal.kitty.enable "${lib.getExe config.terminal.kitty.package} --class file-explorer --title 'Yazi'";
       };
     })
-    (lib.mkIf (config.file-management.yazi.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries."yazi" = {
         name = "Yazi";
-        exec = "${lib.getExe config.terminal.kitty.package} --class yazi -e ${lib.getExe config.file-management.yazi.package}";
+        exec = "${lib.getExe config.terminal.kitty.package} --class yazi -e ${lib.getExe cfg.package}";
         icon = "yazi";
         categories = [ "Utility" ];
         comment = "Terminal file manager";
@@ -84,9 +92,9 @@ in
         "application/x-rar-compressed" = "yazi.desktop";
       };
     })
-    (lib.mkIf config.file-management.yazi.file-chooser.enable {
+    (lib.mkIf cfg.file-chooser.enable {
       home.file.".config/xdg-desktop-portal-termfilechooser/config" = {
-        source = lib.getExe config.file-management.yazi.file-chooser.package;
+        source = lib.getExe cfg.file-chooser.package;
       };
     })
   ];
diff --git a/modules/gaming/heroic/default.nix b/modules/gaming/heroic/default.nix
index ccdebed..3378932 100644
--- a/modules/gaming/heroic/default.nix
+++ b/modules/gaming/heroic/default.nix
@@ -1,10 +1,13 @@
 # Epic, GOG and Amazon game launcher
 {
   config,
-  pkgs,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.gaming.heroic;
+in
 {
   options.gaming.heroic = {
     enable = lib.mkEnableOption "Enables Heroic Games Launcher.";
@@ -28,12 +31,12 @@
     };
   };
 
-  config = lib.mkIf config.gaming.heroic.enable {
-    home.packages = [ config.gaming.heroic.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
 
     xdg.desktopEntries."heroic" = {
       name = "Heroic Games Launcher";
-      exec = "${lib.getExe' config.gaming.heroic.package "heroic"} %u";
+      exec = "${lib.getExe' cfg.package "heroic"} %u";
       icon = "${pkgs.heroic}/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg";
       comment = "An Open Source Launcher for GOG, Epic Games and Amazon Games";
       categories = [ "Game" ];
diff --git a/modules/gaming/steam/default.nix b/modules/gaming/steam/default.nix
index 5662656..a8f7fbc 100644
--- a/modules/gaming/steam/default.nix
+++ b/modules/gaming/steam/default.nix
@@ -1,10 +1,13 @@
 # Game store
 {
   config,
-  pkgs,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.gaming.steam;
+in
 {
   options.gaming.steam = {
     enable = lib.mkEnableOption "Enables steam.";
@@ -15,7 +18,7 @@
     };
   };
 
-  config = lib.mkIf config.gaming.steam.enable {
-    home.packages = [ config.gaming.steam.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/media/playerctl/default.nix b/modules/media/playerctl/default.nix
index bf71f06..efea754 100644
--- a/modules/media/playerctl/default.nix
+++ b/modules/media/playerctl/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.media.playerctl;
+in
 {
   options.media.playerctl = {
     enable = lib.mkEnableOption "Enables playerctl.";
@@ -16,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.media.playerctl.enable {
-    home.packages = [ config.media.playerctl.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/media/screen-recording/default.nix b/modules/media/screen-recording/default.nix
index d9ae89e..768ec22 100644
--- a/modules/media/screen-recording/default.nix
+++ b/modules/media/screen-recording/default.nix
@@ -6,6 +6,8 @@
   ...
 }:
 let
+  cfg = config.media.screen-recording;
+
   screenRecordingScript = pkgs.writeShellApplication {
     name = "screen-recording";
     runtimeInputs = [
@@ -48,7 +50,7 @@ in
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.media.screen-recording.enable {
+    (lib.mkIf cfg.enable {
       home.packages = [ scriptPkg ];
 
       assertions = import ./assertions.nix { inherit config lib; };
@@ -57,7 +59,7 @@ in
         source = ../../../assets/icons/apps/obs.svg;
       };
     })
-    (lib.mkIf (config.media.screen-recording.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries.screen-recording = {
         name = "Screen Recording";
         exec = "${lib.getExe config.terminal.kitty.package} --class screen-recording -e ${lib.getExe scriptPkg}";
diff --git a/modules/media/slurp/default.nix b/modules/media/slurp/default.nix
index d1d8e32..5996ab3 100644
--- a/modules/media/slurp/default.nix
+++ b/modules/media/slurp/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.media.slurp;
+in
 {
   options.media.slurp = {
     enable = lib.mkEnableOption "Enables slurp.";
@@ -16,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.media.slurp.enable {
-    home.packages = [ config.media.slurp.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/media/swayimg/default.nix b/modules/media/swayimg/default.nix
index 8531fd9..3d53b5f 100644
--- a/modules/media/swayimg/default.nix
+++ b/modules/media/swayimg/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.media.swayimg;
+in
 {
   options.media.swayimg = {
     enable = lib.mkEnableOption "Enables swayimg.";
@@ -15,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.media.swayimg.enable {
+  config = lib.mkIf cfg.enable {
     programs.swayimg = {
       enable = true;
       initLua = builtins.readFile ./init.lua;
diff --git a/modules/media/vlc/default.nix b/modules/media/vlc/default.nix
index 34d8fb8..c661f09 100644
--- a/modules/media/vlc/default.nix
+++ b/modules/media/vlc/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.media.vlc;
+in
 {
   options.media.vlc = {
     enable = lib.mkEnableOption "Enables vlc.";
@@ -16,8 +19,8 @@
     };
   };
 
-  config = lib.mkIf config.media.vlc.enable {
-    home.packages = [ config.media.vlc.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
 
     xdg.mimeApps.defaultApplications = {
       "x-scheme-handler/vlc" = "vlc.desktop";
diff --git a/modules/media/wf-recorder/default.nix b/modules/media/wf-recorder/default.nix
index 5c2cbd6..7d0d3bc 100644
--- a/modules/media/wf-recorder/default.nix
+++ b/modules/media/wf-recorder/default.nix
@@ -1,10 +1,13 @@
 # Screen recording utility for wlroots Wayland compositors
 {
   config,
-  pkgs,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.media.wf-recorder;
+in
 {
   options.media.wf-recorder = {
     enable = lib.mkEnableOption "Enables wf-recorder.";
@@ -16,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.media.wf-recorder.enable {
-    home.packages = [ config.media.wf-recorder.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/networking/bluetui/default.nix b/modules/networking/bluetui/default.nix
index 304ab4d..b715247 100644
--- a/modules/networking/bluetui/default.nix
+++ b/modules/networking/bluetui/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.networking.bluetui;
+in
 {
   imports = [
     ./assertions.nix
@@ -20,14 +23,14 @@
     };
   };
 
-  config = lib.mkIf config.networking.bluetui.enable {
+  config = lib.mkIf cfg.enable {
     home.file.".local/share/icons/hicolor/scalable/apps/bluetooth.svg" = {
       source = ../../../assets/icons/apps/bluetooth.svg;
     };
 
     xdg.desktopEntries."bluetui" = {
       name = "bluetui";
-      exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe config.networking.bluetui.package}";
+      exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe cfg.package}";
       icon = "bluetooth";
       categories = [ "Network" ];
       comment = "Bluetooth TUI client";
@@ -35,7 +38,7 @@
       type = "Application";
     };
     home.packages = [
-      config.networking.bluetui.package
+      cfg.package
     ];
   };
 }
diff --git a/modules/networking/impala/default.nix b/modules/networking/impala/default.nix
index aa62e08..f00ed58 100644
--- a/modules/networking/impala/default.nix
+++ b/modules/networking/impala/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.networking.impala;
+in
 {
   imports = [
     ./assertions.nix
@@ -20,14 +23,14 @@
     };
   };
 
-  config = lib.mkIf config.networking.impala.enable {
+  config = lib.mkIf cfg.enable {
     home.file.".local/share/icons/hicolor/scalable/apps/network-wireless.svg" = {
       source = ../../../assets/icons/apps/network-wireless.svg;
     };
 
     xdg.desktopEntries."impala" = {
       name = "impala";
-      exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe config.networking.impala.package}";
+      exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe cfg.package}";
       icon = "network-wireless";
       categories = [ "Network" ];
       comment = "TUI for managing wifi on Linux";
@@ -35,7 +38,7 @@
       type = "Application";
     };
     home.packages = [
-      config.networking.impala.package
+      cfg.package
     ];
 
     xdg.mimeApps.defaultApplications = {
diff --git a/modules/networking/usque/default.nix b/modules/networking/usque/default.nix
index 93ab7e5..aa3304c 100644
--- a/modules/networking/usque/default.nix
+++ b/modules/networking/usque/default.nix
@@ -1,15 +1,17 @@
 # Open-source reimplementation of the Cloudflare WARP client's MASQUE protocol
 {
   config,
-  pkgs,
   lib,
+  pkgs,
   ...
 }:
 let
+  cfg = config.networking.usque;
+
   usqueWarpScript = pkgs.writeShellApplication {
     name = "usque-warp";
     runtimeInputs = [
-      config.networking.usque.package
+      cfg.package
       config.terminal.bash.package
     ];
     text = builtins.readFile ./usque-warp.sh;
@@ -45,23 +47,29 @@ in
       description = "The usque package to use.";
     };
 
-    warp = {
-      enable = lib.mkEnableOption "Enables the usque-warp script.";
-      package = lib.mkOption {
-        type = lib.types.package;
-        readOnly = true;
-        default = usqueWarpScriptPkg;
-        description = "The usque-warp script package.";
+    warp = lib.mkOption {
+      type = lib.types.submodule {
+        options = {
+          enable = lib.mkEnableOption "Enables the usque-warp script.";
+          package = lib.mkOption {
+            type = lib.types.package;
+            readOnly = true;
+            default = usqueWarpScriptPkg;
+            description = "The usque-warp script package.";
+          };
+        };
       };
+      default = { };
+      description = "WARP script configuration.";
     };
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.networking.usque.enable {
-      home.packages = [ config.networking.usque.package ];
+    (lib.mkIf cfg.enable {
+      home.packages = [ cfg.package ];
     })
-    (lib.mkIf config.networking.usque.warp.enable {
-      home.packages = [ config.networking.usque.warp.package ];
+    (lib.mkIf cfg.warp.enable {
+      home.packages = [ cfg.warp.package ];
     })
   ];
 }
diff --git a/modules/office/zathura/default.nix b/modules/office/zathura/default.nix
index db742ec..dd49c72 100644
--- a/modules/office/zathura/default.nix
+++ b/modules/office/zathura/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.office.zathura;
+in
 {
   options.office.zathura = {
     enable = lib.mkEnableOption "Enables zathura.";
@@ -15,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.office.zathura.enable {
+  config = lib.mkIf cfg.enable {
     programs.zathura = {
       enable = true;
     };
diff --git a/modules/security/gpg-tui/default.nix b/modules/security/gpg-tui/default.nix
index bc4ac4f..2a5e61f 100644
--- a/modules/security/gpg-tui/default.nix
+++ b/modules/security/gpg-tui/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.security.gpg-tui;
+in
 {
   options.security.gpg-tui = {
     enable = lib.mkEnableOption "Enables gpg-tui.";
@@ -17,17 +20,17 @@
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.security.gpg-tui.enable {
+    (lib.mkIf cfg.enable {
       home.file.".local/share/icons/hicolor/scalable/apps/gpg.svg" = {
         source = ../../../assets/icons/apps/gpg.svg;
       };
 
-      home.packages = [ config.security.gpg-tui.package ];
+      home.packages = [ cfg.package ];
     })
-    (lib.mkIf (config.security.gpg-tui.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries."gpg-tui" = {
         name = "gpg-tui";
-        exec = "${lib.getExe config.terminal.kitty.package} --class gpg-tui -e ${lib.getExe config.security.gpg-tui.package}";
+        exec = "${lib.getExe config.terminal.kitty.package} --class gpg-tui -e ${lib.getExe cfg.package}";
         icon = "gpg";
         categories = [ "Security" ];
         comment = "Terminal UI for GnuPG";
diff --git a/modules/security/gpg/default.nix b/modules/security/gpg/default.nix
index 3047f59..8fa7348 100644
--- a/modules/security/gpg/default.nix
+++ b/modules/security/gpg/default.nix
@@ -6,6 +6,8 @@
   ...
 }:
 let
+  cfg = config.security.gpg;
+
   gpgBackupScript = pkgs.writeShellApplication {
     name = "gpg-backup";
     runtimeInputs = [
@@ -51,19 +53,25 @@ in
       description = "The gpg package to use.";
     };
 
-    backup = {
-      enable = lib.mkEnableOption "Enable the gpg-backup script";
-      package = lib.mkOption {
-        type = lib.types.package;
-        readOnly = true;
-        default = gpgBackupScriptPkg;
-        description = "The package for the gpg-backup script";
+    backup = lib.mkOption {
+      type = lib.types.submodule {
+        options = {
+          enable = lib.mkEnableOption "Enable the gpg-backup script";
+          package = lib.mkOption {
+            type = lib.types.package;
+            readOnly = true;
+            default = gpgBackupScriptPkg;
+            description = "The package for the gpg-backup script";
+          };
+        };
       };
+      default = { };
+      description = "GPG backup script configuration.";
     };
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.security.gpg.enable {
+    (lib.mkIf cfg.enable {
       programs.gpg = {
         enable = true;
         homedir = "${config.xdg.dataHome}/gnupg";
@@ -82,8 +90,8 @@ in
         pinentry.package = pkgs.pinentry-rofi;
       };
     })
-    (lib.mkIf config.security.gpg.backup.enable {
-      home.packages = [ config.security.gpg.backup.package ];
+    (lib.mkIf cfg.backup.enable {
+      home.packages = [ cfg.backup.package ];
     })
   ];
 }
diff --git a/modules/system/brightnessctl/default.nix b/modules/system/brightnessctl/default.nix
index af5746a..34e9a24 100644
--- a/modules/system/brightnessctl/default.nix
+++ b/modules/system/brightnessctl/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  cfg = config.system.brightnessctl;
+in
 {
   options.system.brightnessctl = {
     enable = lib.mkEnableOption "Enables brightnessctl.";
@@ -16,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.system.brightnessctl.enable {
-    home.packages = [ config.system.brightnessctl.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/system/btop/default.nix b/modules/system/btop/default.nix
index 4f84036..453bafb 100644
--- a/modules/system/btop/default.nix
+++ b/modules/system/btop/default.nix
@@ -1,39 +1,58 @@
 # Cross-platform graphical process and system monitor
 {
   config,
-  pkgs,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.system.btop;
+in
 {
   imports = [ ./assertions.nix ];
 
   options.system.btop = {
     enable = lib.mkEnableOption "Enables btop.";
-    nvidia.enable = lib.mkEnableOption "Build btop with NVIDIA GPU monitoring support (CUDA).";
-    amd.enable = lib.mkEnableOption "Build btop with AMD GPU monitoring support (ROCm).";
+    nvidia = lib.mkOption {
+      type = lib.types.submodule {
+        options = {
+          enable = lib.mkEnableOption "Build btop with NVIDIA GPU monitoring support (CUDA).";
+        };
+      };
+      default = { };
+      description = "NVIDIA GPU monitoring configuration.";
+    };
+    amd = lib.mkOption {
+      type = lib.types.submodule {
+        options = {
+          enable = lib.mkEnableOption "Build btop with AMD GPU monitoring support (ROCm).";
+        };
+      };
+      default = { };
+      description = "AMD GPU monitoring configuration.";
+    };
     package = lib.mkOption {
       type = lib.types.package;
       readOnly = true;
       default = pkgs.btop.override {
-        cudaSupport = config.system.btop.nvidia.enable;
-        rocmSupport = config.system.btop.amd.enable;
+        cudaSupport = cfg.nvidia.enable;
+        rocmSupport = cfg.amd.enable;
       };
       description = "The btop package to use.";
     };
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.system.btop.enable {
+    (lib.mkIf cfg.enable {
       programs.btop = {
         enable = true;
-        package = config.system.btop.package;
+        package = cfg.package;
       };
     })
-    (lib.mkIf (config.system.btop.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries."btop" = {
         name = "btop++";
-        exec = "${lib.getExe config.terminal.kitty.package} --class btop -e ${lib.getExe config.system.btop.package}";
+        exec = "${lib.getExe config.terminal.kitty.package} --class btop -e ${lib.getExe cfg.package}";
         icon = "btop";
         categories = [
           "System"
diff --git a/modules/system/deep-clean/default.nix b/modules/system/deep-clean/default.nix
index 99b4617..1942837 100644
--- a/modules/system/deep-clean/default.nix
+++ b/modules/system/deep-clean/default.nix
@@ -6,6 +6,8 @@
   ...
 }:
 let
+  cfg = config.system.deep-clean;
+
   deepCleanScript = pkgs.writeShellApplication {
     name = "deep-clean";
     runtimeInputs = [ config.terminal.bash.package ];
@@ -24,7 +26,7 @@ in
     };
   };
 
-  config = lib.mkIf config.system.deep-clean.enable {
-    home.packages = [ config.system.deep-clean.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/system/nix-update/default.nix b/modules/system/nix-update/default.nix
index 9f93a4e..fb9151d 100644
--- a/modules/system/nix-update/default.nix
+++ b/modules/system/nix-update/default.nix
@@ -6,6 +6,8 @@
   ...
 }:
 let
+  cfg = config.system.nix-update;
+
   nixUpdateScript = pkgs.writeShellApplication {
     name = "nix-update";
     runtimeInputs = [
@@ -48,7 +50,7 @@ in
     };
   };
 
-  config = lib.mkIf config.system.nix-update.enable {
-    home.packages = [ config.system.nix-update.package ];
+  config = lib.mkIf cfg.enable {
+    home.packages = [ cfg.package ];
   };
 }
diff --git a/modules/system/systemctl-tui/default.nix b/modules/system/systemctl-tui/default.nix
index 17b7ec4..66b23a6 100644
--- a/modules/system/systemctl-tui/default.nix
+++ b/modules/system/systemctl-tui/default.nix
@@ -1,10 +1,13 @@
 # TUI for systemctl
 {
   config,
-  pkgs,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.system.systemctl-tui;
+in
 {
   options.system.systemctl-tui = {
     enable = lib.mkEnableOption "Enables systemctl-tui.";
@@ -17,17 +20,17 @@
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.system.systemctl-tui.enable {
+    (lib.mkIf cfg.enable {
       home.file.".local/share/icons/hicolor/scalable/apps/systemd.svg" = {
         source = ../../../assets/icons/apps/systemd.svg;
       };
 
-      home.packages = [ config.system.systemctl-tui.package ];
+      home.packages = [ cfg.package ];
     })
-    (lib.mkIf (config.system.systemctl-tui.enable && config.terminal.kitty.enable) {
+    (lib.mkIf (cfg.enable && config.terminal.kitty.enable) {
       xdg.desktopEntries."systemctl-tui" = {
         name = "systemctl-tui";
-        exec = "${lib.getExe config.terminal.kitty.package} --class systemctl-tui -e ${lib.getExe config.system.systemctl-tui.package}";
+        exec = "${lib.getExe config.terminal.kitty.package} --class systemctl-tui -e ${lib.getExe cfg.package}";
         icon = "systemd";
         categories = [ "System" ];
         comment = "TUI for systemctl";
diff --git a/modules/terminal/bat/default.nix b/modules/terminal/bat/default.nix
index 69045bc..735f08f 100644
--- a/modules/terminal/bat/default.nix
+++ b/modules/terminal/bat/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 let
+  cfg = config.terminal.bat;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
@@ -19,7 +20,7 @@ in
     };
   };
 
-  config = lib.mkIf config.terminal.bat.enable {
+  config = lib.mkIf cfg.enable {
     programs.bat = {
       enable = true;
       config = {
diff --git a/modules/terminal/fzf/default.nix b/modules/terminal/fzf/default.nix
index a7cc2f5..080e6a2 100644
--- a/modules/terminal/fzf/default.nix
+++ b/modules/terminal/fzf/default.nix
@@ -6,7 +6,12 @@
   ...
 }:
 let
+  cfg = config.terminal.fzf;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
+
+  shellIntegration = ''
+    ${if config.terminal.zsh.enable then "eval \"$(fzf --zsh)\"" else "eval \"$(fzf --bash)\""}
+  '';
 in
 {
   imports = [ ./assertions.nix ];
@@ -21,48 +26,42 @@ in
     };
   };
 
-  config =
-    let
-      shellIntegration = ''
-        ${if config.terminal.zsh.enable then "eval \"$(fzf --zsh)\"" else "eval \"$(fzf --bash)\""}
-      '';
-    in
-    lib.mkIf config.terminal.fzf.enable {
-      programs.fzf = {
-        enable = true;
-        defaultOptions = [
-          "--height 100%"
-          "--layout=reverse"
-          "--pointer='󰠁 '"
-          "--header=' '"
-          "--prompt='󰎕 '"
-          "--marker='✓ '"
-          "--border=none"
-          "--cycle"
-          "--no-info"
-          "--margin='1,2'"
-        ];
+  config = lib.mkIf cfg.enable {
+    programs.fzf = {
+      enable = true;
+      defaultOptions = [
+        "--height 100%"
+        "--layout=reverse"
+        "--pointer='󰠁 '"
+        "--header=' '"
+        "--prompt='󰎕 '"
+        "--marker='✓ '"
+        "--border=none"
+        "--cycle"
+        "--no-info"
+        "--margin='1,2'"
+      ];
 
-        colors = with base16Colors.colorsWithHashPrefix; {
-          fg = base05;
-          bg = "-1";
-          hl = base0D;
+      colors = with base16Colors.colorsWithHashPrefix; {
+        fg = base05;
+        bg = "-1";
+        hl = base0D;
 
-          "fg+" = base07;
-          "bg+" = "-1";
-          "hl+" = base0D;
+        "fg+" = base07;
+        "bg+" = "-1";
+        "hl+" = base0D;
 
-          gutter = "-1";
+        gutter = "-1";
 
-          info = base0B;
-          border = base03;
-          prompt = base0A;
-          pointer = base0F;
-          marker = base0C;
-          spinner = base0C;
-        };
+        info = base0B;
+        border = base03;
+        prompt = base0A;
+        pointer = base0F;
+        marker = base0C;
+        spinner = base0C;
       };
-
-      programs.zsh.initContent = lib.mkIf config.terminal.zsh.enable (lib.mkAfter shellIntegration);
     };
+
+    programs.zsh.initContent = lib.mkIf config.terminal.zsh.enable (lib.mkAfter shellIntegration);
+  };
 }
diff --git a/modules/terminal/kitty/default.nix b/modules/terminal/kitty/default.nix
index e7a5fbb..7e4c701 100644
--- a/modules/terminal/kitty/default.nix
+++ b/modules/terminal/kitty/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.terminal.kitty;
+in
 {
   imports = [
     ./colors.nix
@@ -20,7 +24,7 @@
     };
   };
 
-  config = lib.mkIf config.terminal.kitty.enable {
+  config = lib.mkIf cfg.enable {
     xdg.mimeApps.defaultApplications = {
       "x-scheme-handler/terminal" = "kitty.desktop";
     };
diff --git a/modules/terminal/less/default.nix b/modules/terminal/less/default.nix
index 66ddce9..d8b0993 100644
--- a/modules/terminal/less/default.nix
+++ b/modules/terminal/less/default.nix
@@ -1,5 +1,13 @@
 # Terminal pager
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.terminal.less;
+in
 {
   options.terminal.less = {
     enable = lib.mkEnableOption "Enables less.";
@@ -11,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.terminal.less.enable {
+  config = lib.mkIf cfg.enable {
     programs.less = {
       enable = true;
       options = [
diff --git a/modules/terminal/starship/default.nix b/modules/terminal/starship/default.nix
index 6aa83d6..3a7d8af 100644
--- a/modules/terminal/starship/default.nix
+++ b/modules/terminal/starship/default.nix
@@ -1,5 +1,15 @@
 # Minimal, blazing-fast shell prompt
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.terminal.starship;
+
+  mkSegment = content: ''[┄\[](red)[${content}]($style)[\]](red)'';
+in
 {
   options.terminal.starship = {
     enable = lib.mkEnableOption "Enables starship.";
@@ -11,63 +21,59 @@
     };
   };
 
-  config = lib.mkIf config.terminal.starship.enable {
+  config = lib.mkIf cfg.enable {
     programs.starship = {
       enable = true;
       enableZshIntegration = config.terminal.zsh.enable;
-      settings =
-        let
-          mkSegment = content: ''[┄\[](red)[${content}]($style)[\]](red)'';
-        in
-        {
-          add_newline = true;
+      settings = {
+        add_newline = true;
 
-          format = ''''\n[╭─\[](red)$username[@](red)$hostname[\]](red)$directory$git_branch$git_status$nix_shell''\n[╰─](red)$status$character ''\n'';
+        format = ''''\n[╭─\[](red)$username[@](red)$hostname[\]](red)$directory$git_branch$git_status$nix_shell''\n[╰─](red)$status$character ''\n'';
 
-          character.format = "[](red)";
+        character.format = "[](red)";
 
-          username = {
-            style_user = "blue";
-            style_root = "red bold";
-            format = "[$user]($style)";
-            show_always = true;
-          };
+        username = {
+          style_user = "blue";
+          style_root = "red bold";
+          format = "[$user]($style)";
+          show_always = true;
+        };
 
-          hostname = {
-            ssh_only = false;
-            style = "green";
-            format = "[$hostname]($style)";
-          };
+        hostname = {
+          ssh_only = false;
+          style = "green";
+          format = "[$hostname]($style)";
+        };
 
-          directory = {
-            style = "purple";
-            truncate_to_repo = false;
-            format = mkSegment "$path";
-          };
+        directory = {
+          style = "purple";
+          truncate_to_repo = false;
+          format = mkSegment "$path";
+        };
 
-          git_branch = {
-            style = "bold yellow";
-            format = ''[┄\[](red)[$symbol$branch(:$remote_branch)]($style)'';
-          };
+        git_branch = {
+          style = "bold yellow";
+          format = ''[┄\[](red)[$symbol$branch(:$remote_branch)]($style)'';
+        };
 
-          git_status = {
-            style = "cyan";
-            format = ''( [$all_status$ahead_behind]($style))[\]](red)'';
-          };
+        git_status = {
+          style = "cyan";
+          format = ''( [$all_status$ahead_behind]($style))[\]](red)'';
+        };
 
-          nix_shell = {
-            format = mkSegment "$symbol $state( \($name\))";
-            symbol = "󱄅";
-            impure_msg = "󰻌";
-            pure_msg = "󰕥";
-          };
+        nix_shell = {
+          format = mkSegment "$symbol $state( \($name\))";
+          symbol = "󱄅";
+          impure_msg = "󰻌";
+          pure_msg = "󰕥";
+        };
 
-          status = {
-            disabled = false;
-            format = "${mkSegment "$symbol $status"}[┄─](red)";
-            style = "white";
-          };
+        status = {
+          disabled = false;
+          format = "${mkSegment "$symbol $status"}[┄─](red)";
+          style = "white";
         };
+      };
     };
   };
 }
diff --git a/modules/terminal/tmux/default.nix b/modules/terminal/tmux/default.nix
index c9ea17b..b122c87 100644
--- a/modules/terminal/tmux/default.nix
+++ b/modules/terminal/tmux/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.terminal.tmux;
+in
 {
   options.terminal.tmux = {
     enable = lib.mkEnableOption "Enables tmux.";
@@ -15,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.terminal.tmux.enable {
+  config = lib.mkIf cfg.enable {
     programs.tmux = {
       enable = true;
     };
diff --git a/modules/terminal/zsh/default.nix b/modules/terminal/zsh/default.nix
index 8b7897c..4764618 100644
--- a/modules/terminal/zsh/default.nix
+++ b/modules/terminal/zsh/default.nix
@@ -2,8 +2,14 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.terminal.zsh;
+
+  nixCommandWrappers = builtins.readFile ./nix-aliases.sh;
+in
 {
   options.terminal.zsh = {
     enable = lib.mkEnableOption "Enables zsh.";
@@ -15,21 +21,17 @@
     };
   };
 
-  config =
-    let
-      nixCommandWrappers = builtins.readFile ./nix-aliases.sh;
-    in
-    lib.mkIf config.terminal.zsh.enable {
-      programs.zsh = {
-        enable = true;
-        dotDir = "${config.xdg.configHome}/zsh";
-        history.path = "${config.xdg.cacheHome}/zsh/history";
-        enableCompletion = true;
-        initContent = builtins.replaceStrings [ "@@NIX_COMMAND_WRAPPERS@@" ] [ nixCommandWrappers ] (
-          builtins.readFile ./init.sh
-        );
-      };
-
-      home.sessionVariables.SHELL = "${lib.getExe config.terminal.zsh.package}";
+  config = lib.mkIf cfg.enable {
+    programs.zsh = {
+      enable = true;
+      dotDir = "${config.xdg.configHome}/zsh";
+      history.path = "${config.xdg.cacheHome}/zsh/history";
+      enableCompletion = true;
+      initContent = builtins.replaceStrings [ "@@NIX_COMMAND_WRAPPERS@@" ] [ nixCommandWrappers ] (
+        builtins.readFile ./init.sh
+      );
     };
+
+    home.sessionVariables.SHELL = "${lib.getExe cfg.package}";
+  };
 }
diff --git a/modules/web/aria2/default.nix b/modules/web/aria2/default.nix
index 800f178..60e92c6 100644
--- a/modules/web/aria2/default.nix
+++ b/modules/web/aria2/default.nix
@@ -1,9 +1,13 @@
 # Command line download manager
 {
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.web.aria2;
+in
 {
   options.web.aria2 = {
     enable = lib.mkEnableOption "Enables aria2.";
@@ -15,7 +19,7 @@
     };
   };
 
-  config = lib.mkIf config.web.aria2.enable {
+  config = lib.mkIf cfg.enable {
     programs.aria2 = {
       enable = true;
       settings = {