refactor: standardize file-level comments, drop unused pkgs, and theme lazygit with base16

- Move inline comments to top of file across all modules for consistent
style
- Add descriptive comments to files missing them (aggregators,
assertions, scripts, flake)
- Remove unused `pkgs` parameter from i3/keybindings.nix and
zathura/default.nix
- Drop explicit `package = pkgs.zathura` (home-manager provides the
default)
- Delete stale meli-sync.sh (migrated to neomutt)
- Remove extraneous blank lines for consistent formatting
- Theme lazygit with config.scheme base16 colors instead of hardcoded
names

119 files changed, 133 insertions, 192 deletions

diff --git a/modules/communication/default.nix b/modules/communication/default.nix
index cd8f0d6..ccb7188 100644
--- a/modules/communication/default.nix
+++ b/modules/communication/default.nix
@@ -1,3 +1,4 @@
+# Communication - Email client modules
 { ... }:
 
 {
diff --git a/modules/communication/neomutt/.neomuttrc b/modules/communication/neomutt/.neomuttrc
index 9e0a42f..829951a 100644
--- a/modules/communication/neomutt/.neomuttrc
+++ b/modules/communication/neomutt/.neomuttrc
@@ -42,7 +42,7 @@ color progress    black         yellow      # 󰦖 base0A bg (Progress bar)
 
 # Selected row and status bar
 color status      white         brightblack # base05  on base03
-color indicator   default       brightblack #  default on base03 (Selected email)
+color indicator   default       brightblack # default on base03 (Selected email)
 color tree        magenta       default     # base03  (Thread arrows)
 
 # Whole-line fallback for the index (base for anything not caught below)
diff --git a/modules/communication/neomutt/account/default.nix b/modules/communication/neomutt/account/default.nix
index 183e5ff..0b75c9a 100644
--- a/modules/communication/neomutt/account/default.nix
+++ b/modules/communication/neomutt/account/default.nix
@@ -1,3 +1,4 @@
+# Account - Converts neomutt account options into home-manager email config
 { config, lib, ... }:
 
 with lib;
diff --git a/modules/communication/neomutt/account/flavors/gmail.nix b/modules/communication/neomutt/account/flavors/gmail.nix
index 5ccceed..24035b2 100644
--- a/modules/communication/neomutt/account/flavors/gmail.nix
+++ b/modules/communication/neomutt/account/flavors/gmail.nix
@@ -1,3 +1,4 @@
+# Gmail - Gmail-specific defaults for folder names, mbsync patterns, and mailboxes
 {
   config,
   lib,
diff --git a/modules/communication/neomutt/account/options.nix b/modules/communication/neomutt/account/options.nix
index bb53231..8b34062 100644
--- a/modules/communication/neomutt/account/options.nix
+++ b/modules/communication/neomutt/account/options.nix
@@ -1,3 +1,4 @@
+# Options - Email account option definitions (realName, address, folders, gpg, etc.)
 { lib, ... }:
 
 {
diff --git a/modules/communication/neomutt/assertions.nix b/modules/communication/neomutt/assertions.nix
index b85280e..b7b58ad 100644
--- a/modules/communication/neomutt/assertions.nix
+++ b/modules/communication/neomutt/assertions.nix
@@ -1,3 +1,4 @@
+# Assertions - Validates neomutt dependencies (less, bat, kitty) are enabled
 { config, ... }:
 
 {
diff --git a/modules/communication/neomutt/default.nix b/modules/communication/neomutt/default.nix
index c5cbaf0..96b6f59 100644
--- a/modules/communication/neomutt/default.nix
+++ b/modules/communication/neomutt/default.nix
@@ -1,3 +1,4 @@
+# Neomutt - Email suite entry point (neomutt + mbsync + notmuch)
 { config, lib, ... }:
 
 {
diff --git a/modules/communication/neomutt/keybindings.nix b/modules/communication/neomutt/keybindings.nix
index 949d520..8fde25e 100644
--- a/modules/communication/neomutt/keybindings.nix
+++ b/modules/communication/neomutt/keybindings.nix
@@ -1,5 +1,5 @@
+# Keybindings - Vim-style keyboard shortcuts for neomutt
 { config, lib, ... }:
-
 {
   config.programs.neomutt.binds = lib.mkIf config.communication.neomutt.enable [
     # --- sidebar navigation (vim: k=up, j=down) ---
diff --git a/modules/communication/neomutt/macros.nix b/modules/communication/neomutt/macros.nix
index e1a754e..ae1d84e 100644
--- a/modules/communication/neomutt/macros.nix
+++ b/modules/communication/neomutt/macros.nix
@@ -1,3 +1,4 @@
+# Macros - neomutt macros for sync, URL extraction, flag legend, and quit
 { config, lib, ... }:
 
 {
diff --git a/modules/communication/neomutt/sync/default.nix b/modules/communication/neomutt/sync/default.nix
index 3fd9362..765b22a 100644
--- a/modules/communication/neomutt/sync/default.nix
+++ b/modules/communication/neomutt/sync/default.nix
@@ -1,3 +1,4 @@
+# Sync - Mail synchronization modules (mbsync, notmuch)
 { ... }:
 
 {
diff --git a/modules/communication/neomutt/sync/mbsync.nix b/modules/communication/neomutt/sync/mbsync.nix
index 6d5ad86..71a98a0 100644
--- a/modules/communication/neomutt/sync/mbsync.nix
+++ b/modules/communication/neomutt/sync/mbsync.nix
@@ -1,3 +1,4 @@
+# Mbsync - Mailbox synchronization (isync/mbsync)
 { config, lib, ... }:
 
 with lib;
diff --git a/modules/communication/neomutt/sync/notmuch.nix b/modules/communication/neomutt/sync/notmuch.nix
index 9679bf4..75f4c32 100644
--- a/modules/communication/neomutt/sync/notmuch.nix
+++ b/modules/communication/neomutt/sync/notmuch.nix
@@ -1,3 +1,4 @@
+# Notmuch - Mail indexer for fast email search
 { config, lib, ... }:
 
 with lib;
diff --git a/modules/default.nix b/modules/default.nix
index 01eca6d..ab9b8bc 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,5 +1,5 @@
+# Modules - Top-level module aggregator importing all submodules
 { ... }:
-
 {
   imports = [
     ./communication
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 18dc6a4..76ac223 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,10 +1,9 @@
+# Desktop - Desktop environment configuration (i3, GTK, polybar)
 {
   lib,
   config,
   ...
 }:
-
-# Desktop - Desktop environment configuration (i3, GTK, polybar)
 {
   imports = [
     ./i3
diff --git a/modules/desktop/gtk/default.nix b/modules/desktop/gtk/default.nix
index af33196..776fd3e 100644
--- a/modules/desktop/gtk/default.nix
+++ b/modules/desktop/gtk/default.nix
@@ -1,11 +1,10 @@
+# GTK - GTK3/GTK4 theme configuration (Nightfox dark theme)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# GTK - GTK3/GTK4 theme configuration (Nightfox dark theme)
 {
   config = lib.mkIf config.desktop.enable {
     gtk = {
diff --git a/modules/desktop/i3/default.nix b/modules/desktop/i3/default.nix
index c46123d..cef9cd0 100644
--- a/modules/desktop/i3/default.nix
+++ b/modules/desktop/i3/default.nix
@@ -1,11 +1,10 @@
+# i3 - Window manager configuration (gaps, colors, startup, keybindings)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# i3 - Window manager configuration (gaps, colors, startup, keybindings)
 {
   config = lib.mkIf config.desktop.enable {
     xsession.windowManager.i3 = {
@@ -89,7 +88,6 @@
         keybindings = lib.mkOptionDefault (
           import ./keybindings.nix {
             inherit
-              pkgs
               lib
               config
               ;
diff --git a/modules/desktop/i3/keybindings.nix b/modules/desktop/i3/keybindings.nix
index 600ed86..220fb86 100644
--- a/modules/desktop/i3/keybindings.nix
+++ b/modules/desktop/i3/keybindings.nix
@@ -1,10 +1,8 @@
+# Keybindings - i3 keyboard shortcuts (app launchers, vim directions, workspaces)
 {
-  pkgs,
   lib,
   config,
 }:
-
-# Keybindings - i3 keyboard shortcuts (app launchers, vim directions, workspaces)
 let
   mod = "Mod4";
 in
diff --git a/modules/desktop/polybar/bar/default.nix b/modules/desktop/polybar/bar/default.nix
index 44498c3..3b13420 100644
--- a/modules/desktop/polybar/bar/default.nix
+++ b/modules/desktop/polybar/bar/default.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Bar - Polybar bar definitions (main bar)
+{ config }:
 {
   "bar/main" = import ./main.nix { inherit config; };
 }
diff --git a/modules/desktop/polybar/bar/main.nix b/modules/desktop/polybar/bar/main.nix
index 10afb3e..ed4f1fa 100644
--- a/modules/desktop/polybar/bar/main.nix
+++ b/modules/desktop/polybar/bar/main.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Main - Main polybar bar configuration (dimensions, colors, modules)
+{ config }:
 with config.scheme.withHashtag;
 let
   largerFontSize = toString (builtins.ceil (config.fonts.size * 9.0 / 8.0));
diff --git a/modules/desktop/polybar/default.nix b/modules/desktop/polybar/default.nix
index 22cdc04..0ff7a43 100644
--- a/modules/desktop/polybar/default.nix
+++ b/modules/desktop/polybar/default.nix
@@ -1,11 +1,10 @@
+# Polybar - Status bar configuration (i3 integration, modules)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Polybar - Status bar configuration (i3 integration, modules)
 {
   config = lib.mkIf config.desktop.enable {
     services.polybar.enable = true;
diff --git a/modules/desktop/polybar/module/battery.nix b/modules/desktop/polybar/module/battery.nix
index d392e16..6dafb67 100644
--- a/modules/desktop/polybar/module/battery.nix
+++ b/modules/desktop/polybar/module/battery.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Battery - Battery status module with icons and charging animation
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/battery";
diff --git a/modules/desktop/polybar/module/cpu.nix b/modules/desktop/polybar/module/cpu.nix
index 9d5b859..44ba984 100644
--- a/modules/desktop/polybar/module/cpu.nix
+++ b/modules/desktop/polybar/module/cpu.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # CPU - CPU usage percentage module
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/cpu";
diff --git a/modules/desktop/polybar/module/date.nix b/modules/desktop/polybar/module/date.nix
index 7a9e1ca..45e373b 100644
--- a/modules/desktop/polybar/module/date.nix
+++ b/modules/desktop/polybar/module/date.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Date - Current date display module
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/date";
diff --git a/modules/desktop/polybar/module/default.nix b/modules/desktop/polybar/module/default.nix
index e759d47..785cd6f 100644
--- a/modules/desktop/polybar/module/default.nix
+++ b/modules/desktop/polybar/module/default.nix
@@ -1,10 +1,9 @@
+# Module - Polybar module definitions (battery, cpu, date, i3, memory, volume, wifi, etc.)
 {
   lib,
   config,
   pkgs,
 }:
-
-# Module - Polybar module definitions (battery, cpu, date, i3, memory, volume, wifi, etc.)
 {
   "module/battery" = import ./battery.nix { inherit config; };
   "module/cpu" = import ./cpu.nix { inherit config; };
diff --git a/modules/desktop/polybar/module/ethernet-separator.nix b/modules/desktop/polybar/module/ethernet-separator.nix
index cfdf9e4..3bdcb0e 100644
--- a/modules/desktop/polybar/module/ethernet-separator.nix
+++ b/modules/desktop/polybar/module/ethernet-separator.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Ethernet-separator - Visual separator for ethernet module
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/network";
diff --git a/modules/desktop/polybar/module/ethernet.nix b/modules/desktop/polybar/module/ethernet.nix
index 72f8e0c..4e8dfed 100644
--- a/modules/desktop/polybar/module/ethernet.nix
+++ b/modules/desktop/polybar/module/ethernet.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Ethernet - Wired network module (connection speed)
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/network";
diff --git a/modules/desktop/polybar/module/i3.nix b/modules/desktop/polybar/module/i3.nix
index f910b80..57e83dc 100644
--- a/modules/desktop/polybar/module/i3.nix
+++ b/modules/desktop/polybar/module/i3.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # i3 - i3 workspace display module (focused, occupied, urgent workspaces)
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/i3";
diff --git a/modules/desktop/polybar/module/memory.nix b/modules/desktop/polybar/module/memory.nix
index d032377..b401703 100644
--- a/modules/desktop/polybar/module/memory.nix
+++ b/modules/desktop/polybar/module/memory.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Memory - RAM usage module (displays GB used)
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/memory";
diff --git a/modules/desktop/polybar/module/separator.nix b/modules/desktop/polybar/module/separator.nix
index 23b52b9..f24b975 100644
--- a/modules/desktop/polybar/module/separator.nix
+++ b/modules/desktop/polybar/module/separator.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Separator - Visual separator between modules
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "custom/text";
diff --git a/modules/desktop/polybar/module/time.nix b/modules/desktop/polybar/module/time.nix
index e8dae08..4e6a03d 100644
--- a/modules/desktop/polybar/module/time.nix
+++ b/modules/desktop/polybar/module/time.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Time - Current time display module (12-hour format)
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/date";
diff --git a/modules/desktop/polybar/module/volume.nix b/modules/desktop/polybar/module/volume.nix
index 1d1352a..1dfbb8e 100644
--- a/modules/desktop/polybar/module/volume.nix
+++ b/modules/desktop/polybar/module/volume.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # Volume - PulseAudio volume level module with icons
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/pulseaudio";
diff --git a/modules/desktop/polybar/module/vpn-separator.nix b/modules/desktop/polybar/module/vpn-separator.nix
index 3400298..48122cd 100644
--- a/modules/desktop/polybar/module/vpn-separator.nix
+++ b/modules/desktop/polybar/module/vpn-separator.nix
@@ -1,10 +1,9 @@
+# VPN-separator - Visual separator for VPN module
 {
   pkgs,
   lib,
   config,
 }:
-
-# VPN - Visual separator for VPN module
 with config.scheme.withHashtag;
 {
   type = "custom/script";
diff --git a/modules/desktop/polybar/module/vpn.nix b/modules/desktop/polybar/module/vpn.nix
index be5e54d..6230b8d 100644
--- a/modules/desktop/polybar/module/vpn.nix
+++ b/modules/desktop/polybar/module/vpn.nix
@@ -1,10 +1,9 @@
+# VPN - Just indicates if VPN is connected with openvpn
 {
   pkgs,
   lib,
   config,
 }:
-
-# VPN - Just indicates if VPN is connected with openvpn
 with config.scheme.withHashtag;
 {
   type = "custom/script";
diff --git a/modules/desktop/polybar/module/wifi-separator.nix b/modules/desktop/polybar/module/wifi-separator.nix
index 6bb42cb..0d51b06 100644
--- a/modules/desktop/polybar/module/wifi-separator.nix
+++ b/modules/desktop/polybar/module/wifi-separator.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # WiFi-separator - Visual separator for WiFi module
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/network";
diff --git a/modules/desktop/polybar/module/wifi.nix b/modules/desktop/polybar/module/wifi.nix
index 6ee848f..8836b9e 100644
--- a/modules/desktop/polybar/module/wifi.nix
+++ b/modules/desktop/polybar/module/wifi.nix
@@ -1,6 +1,5 @@
-{ config }:
-
 # WiFi - Wireless network module (signal strength, speed)
+{ config }:
 with config.scheme.withHashtag;
 {
   type = "internal/network";
diff --git a/modules/desktop/polybar/module/xwindow.nix b/modules/desktop/polybar/module/xwindow.nix
index 79c0f95..d36b03c 100644
--- a/modules/desktop/polybar/module/xwindow.nix
+++ b/modules/desktop/polybar/module/xwindow.nix
@@ -1,6 +1,5 @@
-{ }:
-
 # XWindow - Focused window title module
+{ }:
 {
   type = "internal/xwindow";
   label = "%title:0:20:...%";
diff --git a/modules/development/bruno/default.nix b/modules/development/bruno/default.nix
index f7f069c..e43e329 100644
--- a/modules/development/bruno/default.nix
+++ b/modules/development/bruno/default.nix
@@ -1,11 +1,10 @@
+# Bruno - Open-source API client for testing HTTP endpoints
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Bruno - Open-source API client for testing HTTP endpoints
 {
   options.development.bruno = {
     enable = lib.mkEnableOption "Enables bruno.";
diff --git a/modules/development/default.nix b/modules/development/default.nix
index 1e79868..6ae109e 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -1,3 +1,4 @@
+# Development - Development tools module (bruno, delta, git, lazygit, nixvim, opencode, qemu, vscodium)
 { ... }:
 
 {
diff --git a/modules/development/delta/default.nix b/modules/development/delta/default.nix
index 51827d2..b4ec384 100644
--- a/modules/development/delta/default.nix
+++ b/modules/development/delta/default.nix
@@ -1,9 +1,9 @@
+# Delta - A syntax-highlighting pager for git, diff, and grep output
 {
   config,
   lib,
   ...
 }:
-# Delta - A syntax-highlighting pager for git, diff, and grep output
 {
   options.development.delta = {
     enable = lib.mkEnableOption "Enables delta.";
diff --git a/modules/development/git/assertions.nix b/modules/development/git/assertions.nix
index df85c62..d663173 100644
--- a/modules/development/git/assertions.nix
+++ b/modules/development/git/assertions.nix
@@ -1,3 +1,4 @@
+# Assertions - Validates SSH is enabled when git.useSSH is set
 { config, ... }:
 {
   assertions = [
diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index 5d2d89c..587e4bf 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -1,11 +1,10 @@
+# Git - Distributed version control system
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Git - Distributed version control system
 {
   imports = [
     ./assertions.nix
diff --git a/modules/development/lazygit/default.nix b/modules/development/lazygit/default.nix
index e821258..8f5585e 100644
--- a/modules/development/lazygit/default.nix
+++ b/modules/development/lazygit/default.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Lazygit - A simple terminal UI for git commands
+{ config, lib, ... }:
 {
   options.development.lazygit = {
     enable = lib.mkEnableOption "Enables lazygit.";
@@ -14,33 +13,33 @@
       enableZshIntegration = config.terminal.zsh.enable;
       settings = {
         gui = {
-          theme = {
+          theme = with config.scheme.withHashtag; {
             lightTheme = false;
             activeBorderColor = [
-              "blue"
+              base0D
               "bold"
             ];
-            inactiveBorderColor = [ "brightblack" ];
-            optionsTextColor = [ "blue" ];
-            selectedLineBgColor = [ "black" ];
-            selectedRangeBgColor = [ "black" ];
-            cherryPickedCommitBgColor = [ "cyan" ];
-            cherryPickedCommitFgColor = [ "blue" ];
-            markedBaseCommitBgColor = [ "yellow" ];
-            markedBaseCommitFgColor = [ "blue" ];
-            unstagedChangesColor = [ "red" ];
-            defaultFgColor = [ "white" ];
+            inactiveBorderColor = [ base03 ];
+            optionsTextColor = [ base0D ];
+            selectedLineBgColor = [ base01 ];
+            selectedRangeBgColor = [ base01 ];
+            cherryPickedCommitBgColor = [ base0C ];
+            cherryPickedCommitFgColor = [ base0D ];
+            markedBaseCommitBgColor = [ base0A ];
+            markedBaseCommitFgColor = [ base0D ];
+            unstagedChangesColor = [ base08 ];
+            defaultFgColor = [ base05 ];
             searchingActiveBorderColor = [
-              "yellow"
+              base0A
               "bold"
             ];
           };
           authorColors = {
-            "*" = "magenta";
+            "*" = (with config.scheme.withHashtag; base0E);
           };
           branchColors = {
-            "master" = "red";
-            "main" = "red";
+            "master" = (with config.scheme.withHashtag; base08);
+            "main" = (with config.scheme.withHashtag; base08);
           };
           showIcons = true;
           scrollHeight = 2;
diff --git a/modules/development/nixvim/colorscheme.nix b/modules/development/nixvim/colorscheme.nix
index ce2e7cc..00345cf 100644
--- a/modules/development/nixvim/colorscheme.nix
+++ b/modules/development/nixvim/colorscheme.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Colorscheme - Base16 theme configuration for nixvim
+{ config, lib, ... }:
 {
   config.programs.nixvim.colorschemes.base16 = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/default.nix b/modules/development/nixvim/default.nix
index 6cd0957..7f50ed1 100644
--- a/modules/development/nixvim/default.nix
+++ b/modules/development/nixvim/default.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Nixvim - Neovim configured through Nix (home-manager integration)
+{ config, lib, ... }:
 {
   imports = [
     ./colorscheme.nix
diff --git a/modules/development/nixvim/keymaps.nix b/modules/development/nixvim/keymaps.nix
index 941e902..0ac71f5 100644
--- a/modules/development/nixvim/keymaps.nix
+++ b/modules/development/nixvim/keymaps.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Keymaps - Keyboard shortcut configuration for nixvim
+{ config, lib, ... }:
 {
   config.programs.nixvim.keymaps = lib.mkIf config.development.nixvim.enable [
     {
diff --git a/modules/development/nixvim/plugins/cmp.nix b/modules/development/nixvim/plugins/cmp.nix
index 0bf8601..4affdd4 100644
--- a/modules/development/nixvim/plugins/cmp.nix
+++ b/modules/development/nixvim/plugins/cmp.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Cmp - Completion plugin (nvim-cmp) for auto-completion
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.cmp = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/comment.nix b/modules/development/nixvim/plugins/comment.nix
index a14bd10..8170ea4 100644
--- a/modules/development/nixvim/plugins/comment.nix
+++ b/modules/development/nixvim/plugins/comment.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Comment - Comment toggling plugin (comment.nvim)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.comment = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/default.nix b/modules/development/nixvim/plugins/default.nix
index a263c51..f11a2d5 100644
--- a/modules/development/nixvim/plugins/default.nix
+++ b/modules/development/nixvim/plugins/default.nix
@@ -1,6 +1,5 @@
-{ ... }:
-
 # Plugins - Collection of nixvim plugin configurations
+{ ... }:
 {
   imports = [
     ./cmp.nix
diff --git a/modules/development/nixvim/plugins/gitsigns.nix b/modules/development/nixvim/plugins/gitsigns.nix
index a737238..a35a5d8 100644
--- a/modules/development/nixvim/plugins/gitsigns.nix
+++ b/modules/development/nixvim/plugins/gitsigns.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Gitsigns - Git status in the sign column (gitsigns.nvim)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.gitsigns = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/indent-blankline.nix b/modules/development/nixvim/plugins/indent-blankline.nix
index 38e6a91..a07b361 100644
--- a/modules/development/nixvim/plugins/indent-blankline.nix
+++ b/modules/development/nixvim/plugins/indent-blankline.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Indent-blankline - Visual indentation guides (indent-blankline.nvim)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.indent-blankline = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/lsp.nix b/modules/development/nixvim/plugins/lsp.nix
index cac48a2..46bd897 100644
--- a/modules/development/nixvim/plugins/lsp.nix
+++ b/modules/development/nixvim/plugins/lsp.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # LSP - Language Server Protocol configuration (nvim-lspconfig)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.lsp = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/lualine.nix b/modules/development/nixvim/plugins/lualine.nix
index b621b7c..ab46499 100644
--- a/modules/development/nixvim/plugins/lualine.nix
+++ b/modules/development/nixvim/plugins/lualine.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Lualine - Statusline configuration (lualine.nvim)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.lualine = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/luasnip.nix b/modules/development/nixvim/plugins/luasnip.nix
index 6c48c8b..e704435 100644
--- a/modules/development/nixvim/plugins/luasnip.nix
+++ b/modules/development/nixvim/plugins/luasnip.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Luasnip - Snippet engine for Neovim (Lua-based)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.luasnip = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/noice.nix b/modules/development/nixvim/plugins/noice.nix
index ddbe6c8..622f8d5 100644
--- a/modules/development/nixvim/plugins/noice.nix
+++ b/modules/development/nixvim/plugins/noice.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Noice - Modern UI for Neovim (cmdline, popupmenu, messages)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.noice = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/nvim-tree.nix b/modules/development/nixvim/plugins/nvim-tree.nix
index 4eeb8c6..c3b104d 100644
--- a/modules/development/nixvim/plugins/nvim-tree.nix
+++ b/modules/development/nixvim/plugins/nvim-tree.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Nvim-tree - File explorer sidebar (nvim-tree.lua)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.nvim-tree = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/telescope.nix b/modules/development/nixvim/plugins/telescope.nix
index cd8c001..dc873fd 100644
--- a/modules/development/nixvim/plugins/telescope.nix
+++ b/modules/development/nixvim/plugins/telescope.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Telescope - Fuzzy finder
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.telescope = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/treesitter.nix b/modules/development/nixvim/plugins/treesitter.nix
index c983832..d462792 100644
--- a/modules/development/nixvim/plugins/treesitter.nix
+++ b/modules/development/nixvim/plugins/treesitter.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Treesitter - Syntax highlighting and parsing (nvim-treesitter)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.treesitter = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/web-devicons.nix b/modules/development/nixvim/plugins/web-devicons.nix
index 6366af9..d222df4 100644
--- a/modules/development/nixvim/plugins/web-devicons.nix
+++ b/modules/development/nixvim/plugins/web-devicons.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Web-devicons - File icons for various file types (nvim-web-devicons)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.web-devicons = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/nixvim/plugins/which-key.nix b/modules/development/nixvim/plugins/which-key.nix
index 67f2427..ea55615 100644
--- a/modules/development/nixvim/plugins/which-key.nix
+++ b/modules/development/nixvim/plugins/which-key.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Which-key - Popup for keybindings (which-key.nvim)
+{ config, lib, ... }:
 {
   config.programs.nixvim.plugins.which-key = lib.mkIf config.development.nixvim.enable {
     enable = true;
diff --git a/modules/development/opencode/default.nix b/modules/development/opencode/default.nix
index a685894..83c2e79 100644
--- a/modules/development/opencode/default.nix
+++ b/modules/development/opencode/default.nix
@@ -1,11 +1,10 @@
+# Opencode - AI-powered coding assistant (opencode.ai)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Opencode - AI-powered coding assistant (opencode.ai)
 {
   options.development.opencode = {
     enable = lib.mkEnableOption "Enables opencode.";
diff --git a/modules/development/qemu/default.nix b/modules/development/qemu/default.nix
index 5142458..750ff4b 100644
--- a/modules/development/qemu/default.nix
+++ b/modules/development/qemu/default.nix
@@ -1,11 +1,10 @@
+# QEMU - generic and open source machine & userspace emulator and virtualizer.
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# QEMU - generic and open source machine & userspace emulator and virtualizer.
 {
   options.development.qemu = {
     enable = lib.mkEnableOption "Enables qemu.";
diff --git a/modules/development/vscodium/default.nix b/modules/development/vscodium/default.nix
index 7763a94..4027720 100644
--- a/modules/development/vscodium/default.nix
+++ b/modules/development/vscodium/default.nix
@@ -1,11 +1,10 @@
+# VSCodium - Visual Studio Code fork
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# VSCodium - Visual Studio Code fork
 {
   options.development.vscodium = {
     enable = lib.mkEnableOption "Enables vscodium.";
diff --git a/modules/file-management/default.nix b/modules/file-management/default.nix
index 7d75b35..5b30f43 100644
--- a/modules/file-management/default.nix
+++ b/modules/file-management/default.nix
@@ -1,3 +1,4 @@
+# File Management - File manager and utility modules (lf, lsd, ouch)
 { ... }:
 
 {
diff --git a/modules/file-management/lf/default.nix b/modules/file-management/lf/default.nix
index 28955ea..b6cfa22 100644
--- a/modules/file-management/lf/default.nix
+++ b/modules/file-management/lf/default.nix
@@ -1,11 +1,10 @@
+# lf - terminal file manager
 {
   pkgs,
   lib,
   config,
   ...
 }:
-
-# lf - terminal file manager
 {
   options.file-management.lf = {
     enable = lib.mkEnableOption "Enables lf.";
diff --git a/modules/file-management/lsd/default.nix b/modules/file-management/lsd/default.nix
index b51c87e..f9a2e2b 100644
--- a/modules/file-management/lsd/default.nix
+++ b/modules/file-management/lsd/default.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # LSD - Ls alternative with icons and colors (Rust-based)
+{ config, lib, ... }:
 {
   options.file-management.lsd = {
     enable = lib.mkEnableOption "Enables lsd.";
diff --git a/modules/file-management/ouch/default.nix b/modules/file-management/ouch/default.nix
index aafb23d..40f5101 100644
--- a/modules/file-management/ouch/default.nix
+++ b/modules/file-management/ouch/default.nix
@@ -1,11 +1,10 @@
+# Ouch! - CLI tool for compressing and decompressing various formats.
 {
   pkgs,
   lib,
   config,
   ...
 }:
-
-# Ouch! - CLI tool for compressing and decompressing various formats.
 {
   options.file-management.ouch = {
     enable = lib.mkEnableOption "Enables ouch.";
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
index 3f6cade..89e1318 100644
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@@ -1,11 +1,10 @@
+# Fonts - Font configuration (Fira Code Nerd Font)
 {
   lib,
   config,
   pkgs,
   ...
 }:
-
-# Fonts - Font configuration (Fira Code Nerd Font)
 {
   options.fonts = {
     normal = lib.mkOption {
diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix
index f1933bd..a4e5c0f 100644
--- a/modules/gaming/default.nix
+++ b/modules/gaming/default.nix
@@ -1,11 +1,10 @@
+# Gaming - Collection of game launchers and gaming utilities
 {
   config,
   pkgs,
   lib,
   ...
 }:
-
-# Gaming - Collection of game launchers and gaming utilities
 {
   imports = [
     ./steam.nix
diff --git a/modules/gaming/steam.nix b/modules/gaming/steam.nix
index d1944d5..ba3cf0f 100644
--- a/modules/gaming/steam.nix
+++ b/modules/gaming/steam.nix
@@ -1,11 +1,10 @@
+# Steam - game store
 {
   config,
   pkgs,
   lib,
   ...
 }:
-
-# Steam - game store
 {
   options.gaming.steam = {
     enable = lib.mkEnableOption "Enables steam.";
diff --git a/modules/media/default.nix b/modules/media/default.nix
index 5157734..d408b66 100644
--- a/modules/media/default.nix
+++ b/modules/media/default.nix
@@ -1,3 +1,4 @@
+# Media - Multimedia tools (feh, ffmpeg, maim, pamixer, playerctl, slop, vlc)
 { ... }:
 
 {
diff --git a/modules/media/feh/default.nix b/modules/media/feh/default.nix
index f3486e5..6caf96f 100644
--- a/modules/media/feh/default.nix
+++ b/modules/media/feh/default.nix
@@ -1,11 +1,10 @@
+# Feh - Lightweight image viewer and wallpaper setter
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Feh - Lightweight image viewer and wallpaper setter
 {
   options.media.feh = {
     enable = lib.mkEnableOption "Enables feh.";
diff --git a/modules/media/ffmpeg/default.nix b/modules/media/ffmpeg/default.nix
index 9526ff5..b0d5c25 100644
--- a/modules/media/ffmpeg/default.nix
+++ b/modules/media/ffmpeg/default.nix
@@ -1,11 +1,10 @@
+# FFmpeg - Command-line audio/video converter and streaming tool
 {
   config,
   pkgs,
   lib,
   ...
 }:
-
-# FFmpeg - Command-line audio/video converter and streaming tool
 {
   options.media.ffmpeg = {
     enable = lib.mkEnableOption "Enables ffmpeg.";
diff --git a/modules/media/maim/default.nix b/modules/media/maim/default.nix
index fcf53b7..a067935 100644
--- a/modules/media/maim/default.nix
+++ b/modules/media/maim/default.nix
@@ -1,11 +1,10 @@
+# Maim - Screenshot utility (slop-based region selection)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Maim - Screenshot utility (slop-based region selection)
 {
   options.media.maim = {
     enable = lib.mkEnableOption "Enables maim.";
diff --git a/modules/media/pamixer/default.nix b/modules/media/pamixer/default.nix
index 3632ecc..9f47c68 100644
--- a/modules/media/pamixer/default.nix
+++ b/modules/media/pamixer/default.nix
@@ -1,11 +1,10 @@
+# Pamixer - PulseAudio command-line mixer (volume control)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Pamixer - PulseAudio command-line mixer (volume control)
 {
   options.media.pamixer = {
     enable = lib.mkEnableOption "Enables pamixer.";
diff --git a/modules/media/playerctl/default.nix b/modules/media/playerctl/default.nix
index 58619a4..53ac353 100644
--- a/modules/media/playerctl/default.nix
+++ b/modules/media/playerctl/default.nix
@@ -1,11 +1,10 @@
+# Playerctl - CLI for controlling media players (Spotify, MPRIS, etc.)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Playerctl - CLI for controlling media players (Spotify, MPRIS, etc.)
 {
   options.media.playerctl = {
     enable = lib.mkEnableOption "Enables playerctl.";
diff --git a/modules/media/slop/default.nix b/modules/media/slop/default.nix
index 8e2c01d..69af64b 100644
--- a/modules/media/slop/default.nix
+++ b/modules/media/slop/default.nix
@@ -1,11 +1,10 @@
+# Slop - Region selector for screenshots (used by maim/flameshot)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Slop - Region selector for screenshots (used by maim/flameshot)
 {
   options.media.slop = {
     enable = lib.mkEnableOption "Enables slop.";
diff --git a/modules/media/vlc/default.nix b/modules/media/vlc/default.nix
index 7e008fb..7caf93c 100644
--- a/modules/media/vlc/default.nix
+++ b/modules/media/vlc/default.nix
@@ -1,11 +1,10 @@
+# VLC - Versatile multimedia player for audio/video playback
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# VLC - Versatile multimedia player for audio/video playback
 {
   options.media.vlc = {
     enable = lib.mkEnableOption "Enables vlc.";
diff --git a/modules/networking/bluetui/default.nix b/modules/networking/bluetui/default.nix
index 2eb5358..21bed12 100644
--- a/modules/networking/bluetui/default.nix
+++ b/modules/networking/bluetui/default.nix
@@ -1,3 +1,4 @@
+# Bluetui - Bluetooth TUI client
 {
   config,
   lib,
diff --git a/modules/networking/default.nix b/modules/networking/default.nix
index f4ef9de..43751ef 100644
--- a/modules/networking/default.nix
+++ b/modules/networking/default.nix
@@ -1,3 +1,4 @@
+# Networking - Network utility modules (bluetui, impala)
 { ... }:
 
 {
diff --git a/modules/networking/impala/default.nix b/modules/networking/impala/default.nix
index d30ab2f..41fb208 100644
--- a/modules/networking/impala/default.nix
+++ b/modules/networking/impala/default.nix
@@ -1,3 +1,4 @@
+# Impala - TUI for managing wifi on Linux
 {
   config,
   lib,
diff --git a/modules/office/default.nix b/modules/office/default.nix
index 73f837b..1e8fb96 100644
--- a/modules/office/default.nix
+++ b/modules/office/default.nix
@@ -1,3 +1,4 @@
+# Office - Document viewer modules (zathura)
 { ... }:
 
 {
diff --git a/modules/office/zathura/default.nix b/modules/office/zathura/default.nix
index f17a5c3..69dbfcf 100644
--- a/modules/office/zathura/default.nix
+++ b/modules/office/zathura/default.nix
@@ -1,11 +1,9 @@
+# Zathura - Minimalistic document viewer (PDF, DJVU, etc.)
 {
   config,
   lib,
-  pkgs,
   ...
 }:
-
-# Zathura - Minimalistic document viewer (PDF, DJVU, etc.)
 {
   options.office.zathura = {
     enable = lib.mkEnableOption "Enables zathura.";
@@ -14,7 +12,6 @@
   config = lib.mkIf config.office.zathura.enable {
     programs.zathura = {
       enable = true;
-      package = pkgs.zathura;
     };
 
     xdg.mimeApps.defaultApplications = {
diff --git a/modules/private/email.example.nix b/modules/private/email.example.nix
index adf71c3..920db69 100644
--- a/modules/private/email.example.nix
+++ b/modules/private/email.example.nix
@@ -1,5 +1,5 @@
+# Email example - Template for configuring neomutt email accounts
 { ... }:
-
 {
   config.communication.neomutt.accounts = {
     "example" = {
diff --git a/modules/private/git.example.nix b/modules/private/git.example.nix
index 630839b..236687e 100644
--- a/modules/private/git.example.nix
+++ b/modules/private/git.example.nix
@@ -1,5 +1,5 @@
+# Git example - Template for configuring git identity and signing
 { ... }:
-
 {
   config.development.git = {
     username = "Arpit Chakladar";
diff --git a/modules/scripts/aria2-run.sh b/modules/scripts/aria2-run.sh
index 167fc5d..e151b53 100644
--- a/modules/scripts/aria2-run.sh
+++ b/modules/scripts/aria2-run.sh
@@ -1 +1,2 @@
+# Start aria2 RPC daemon
 aria2c --enable-rpc --rpc-listen-all=false --rpc-listen-port=6800
diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix
index 8ad27a3..ffde799 100644
--- a/modules/scripts/default.nix
+++ b/modules/scripts/default.nix
@@ -1,3 +1,4 @@
+# Scripts - Generates wrapped scripts with environment variables and dependencies
 {
   config,
   lib,
diff --git a/modules/scripts/file-preview-clean.sh b/modules/scripts/file-preview-clean.sh
index ee8ca73..006f63c 100644
--- a/modules/scripts/file-preview-clean.sh
+++ b/modules/scripts/file-preview-clean.sh
@@ -1 +1,2 @@
+# Clear kitty icat preview after lf exits
 exec kitten icat --clear --stdin no --transfer-mode file </dev/null >/dev/tty
diff --git a/modules/scripts/fzf-launcher.sh b/modules/scripts/fzf-launcher.sh
index edc39ab..1d7f968 100644
--- a/modules/scripts/fzf-launcher.sh
+++ b/modules/scripts/fzf-launcher.sh
@@ -1,3 +1,4 @@
+# Fzf-launcher - FZF-based application launcher (scans .desktop files)
 DIRS=(
   /run/current-system/sw/share/applications
   "$HOME/.nix-profile/share/applications"
diff --git a/modules/scripts/meli-sync.sh b/modules/scripts/meli-sync.sh
deleted file mode 100644
index 2024562..0000000
--- a/modules/scripts/meli-sync.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-# Sync all accounts and immediately tag with notmuch
-mbsync -a
-notmuch new 2>/dev/null
\ No newline at end of file
diff --git a/modules/scripts/neomutt-sync.sh b/modules/scripts/neomutt-sync.sh
index a28152c..1adbc7f 100644
--- a/modules/scripts/neomutt-sync.sh
+++ b/modules/scripts/neomutt-sync.sh
@@ -1,3 +1,4 @@
+# Neomutt-sync - Interactive mail sync with dialog progress bar
 # 1. Create temporary files for the dark theme and notmuch logs
 export DIALOGRC=$(mktemp)
 NOTMUCH_LOG=$(mktemp)
diff --git a/modules/scripts/vpn-connect.sh b/modules/scripts/vpn-connect.sh
index 4ba8f3d..337fa2e 100644
--- a/modules/scripts/vpn-connect.sh
+++ b/modules/scripts/vpn-connect.sh
@@ -1,3 +1,4 @@
+# VPN-connect - OpenVPN connection script with credential caching and monitoring
 CONF_DIR="$HOME/.config/openvpn"
 CREDS_DIR="$CONF_DIR/credentials"
 SERVERS_DIR="$CONF_DIR/servers"
diff --git a/modules/scripts/vpn-disconnect.sh b/modules/scripts/vpn-disconnect.sh
index ead912c..9a70231 100644
--- a/modules/scripts/vpn-disconnect.sh
+++ b/modules/scripts/vpn-disconnect.sh
@@ -1,3 +1,4 @@
+# VPN-disconnect - Kill VPN process and clean up
 PID_FILE="$HOME/.cache/openvpn/vpn.pid"
 
 if [[ ! -f "$PID_FILE" ]]; then
diff --git a/modules/security/default.nix b/modules/security/default.nix
index e9d7208..3803897 100644
--- a/modules/security/default.nix
+++ b/modules/security/default.nix
@@ -1,3 +1,4 @@
+# Security - Security tools (enteauth, gopass, gpg, openvpn, ssh)
 { ... }:
 
 {
diff --git a/modules/security/enteauth/default.nix b/modules/security/enteauth/default.nix
index 376451a..064f697 100644
--- a/modules/security/enteauth/default.nix
+++ b/modules/security/enteauth/default.nix
@@ -1,11 +1,10 @@
+# Ente Auth - end-to-end encrypted authentication (2FA)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Ente Auth - end-to-end encrypted authentication (2FA)
 let
   enteAuthWithKeyring = pkgs.symlinkJoin {
     name = "ente-auth-wrapped";
diff --git a/modules/security/gopass/default.nix b/modules/security/gopass/default.nix
index f5a037f..19191ff 100644
--- a/modules/security/gopass/default.nix
+++ b/modules/security/gopass/default.nix
@@ -5,7 +5,6 @@
   pkgs,
   ...
 }:
-
 {
   options.security.gopass = {
     enable = lib.mkEnableOption "Enables gopass.";
diff --git a/modules/security/gpg/default.nix b/modules/security/gpg/default.nix
index 9ed3868..01deab6 100644
--- a/modules/security/gpg/default.nix
+++ b/modules/security/gpg/default.nix
@@ -1,11 +1,10 @@
+# gpg - GNU Privacy Guard
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# gpg - GNU Privacy Guard
 {
   options.security.gpg = {
     enable = lib.mkEnableOption "Enables gpg.";
diff --git a/modules/security/openvpn/default.nix b/modules/security/openvpn/default.nix
index 1636081..58e53cf 100644
--- a/modules/security/openvpn/default.nix
+++ b/modules/security/openvpn/default.nix
@@ -1,11 +1,10 @@
+# OpenVPN - Open-source VPN client for secure remote access
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# OpenVPN - Open-source VPN client for secure remote access
 {
   options.security.openvpn = {
     enable = lib.mkEnableOption "Enables openvpn.";
diff --git a/modules/security/ssh/default.nix b/modules/security/ssh/default.nix
index 2224f98..ff684b4 100644
--- a/modules/security/ssh/default.nix
+++ b/modules/security/ssh/default.nix
@@ -1,11 +1,10 @@
+# OpenSSH - Secure shell (SSH) client for encrypted remote connections
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# OpenSSH - Secure shell (SSH) client for encrypted remote connections
 {
   imports = [ ./git.nix ];
 
diff --git a/modules/security/ssh/git.nix b/modules/security/ssh/git.nix
index 2c79d34..88bd713 100644
--- a/modules/security/ssh/git.nix
+++ b/modules/security/ssh/git.nix
@@ -1,5 +1,5 @@
+# Git - SSH host configurations for git platforms (github, gitlab, bitbucket, codeberg, sr.ht)
 { config, lib, ... }:
-
 let
   hosts = [
     {
diff --git a/modules/system/bottom/default.nix b/modules/system/bottom/default.nix
index 59a2a43..113ba51 100644
--- a/modules/system/bottom/default.nix
+++ b/modules/system/bottom/default.nix
@@ -1,11 +1,10 @@
+# Bottom - Cross-platform graphical process/system monitor (Rust-based)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Bottom - Cross-platform graphical process/system monitor (Rust-based)
 {
   options.system.bottom = {
     enable = lib.mkEnableOption "Enables bottom.";
diff --git a/modules/system/brightnessctl/default.nix b/modules/system/brightnessctl/default.nix
index b95ddb4..c686eaf 100644
--- a/modules/system/brightnessctl/default.nix
+++ b/modules/system/brightnessctl/default.nix
@@ -1,11 +1,10 @@
+# brightnessctl - Backlight brightness control tool
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# brightnessctl - Backlight brightness control tool
 {
   options.system.brightnessctl = {
     enable = lib.mkEnableOption "Enables brightnessctl.";
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 3746d2c..afd3c12 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,5 +1,5 @@
+# System - System monitoring tools (bottom, brightnessctl, htop, nvtop, systemctl-tui)
 { ... }:
-
 {
   imports = [
     ./bottom
diff --git a/modules/system/htop/default.nix b/modules/system/htop/default.nix
index cf36f41..a7b9e25 100644
--- a/modules/system/htop/default.nix
+++ b/modules/system/htop/default.nix
@@ -1,11 +1,10 @@
+# Htop - Interactive process viewer (using htop-vim version)
 {
   pkgs,
   lib,
   config,
   ...
 }:
-
-# Htop - Interactive process viewer (using htop-vim version)
 {
   options.system.htop = {
     enable = lib.mkEnableOption "Enables htop.";
diff --git a/modules/system/nvtop/default.nix b/modules/system/nvtop/default.nix
index 8b41978..54b4e44 100644
--- a/modules/system/nvtop/default.nix
+++ b/modules/system/nvtop/default.nix
@@ -1,11 +1,10 @@
+# Nvtop - GPU process monitor (NVIDIA/AMD/Intel GPUs)
 {
   config,
   pkgs,
   lib,
   ...
 }:
-
-# Nvtop - GPU process monitor (NVIDIA/AMD/Intel GPUs)
 {
   options.system.nvtop = {
     enable = lib.mkEnableOption "Enables nvtop.";
diff --git a/modules/system/systemctl-tui/default.nix b/modules/system/systemctl-tui/default.nix
index 1b151cf..e7ccaa9 100644
--- a/modules/system/systemctl-tui/default.nix
+++ b/modules/system/systemctl-tui/default.nix
@@ -1,11 +1,10 @@
+# systemctl-tui - TUI for systemctl (systemd service management)
 {
   config,
   pkgs,
   lib,
   ...
 }:
-
-# systemctl-tui - TUI for systemctl (systemd service management)
 {
   options.system.systemctl-tui = {
     enable = lib.mkEnableOption "Enables systemctl-tui.";
diff --git a/modules/terminal/bash/default.nix b/modules/terminal/bash/default.nix
index 6b53126..dec9a11 100644
--- a/modules/terminal/bash/default.nix
+++ b/modules/terminal/bash/default.nix
@@ -1,6 +1,5 @@
-{ lib, ... }:
-
 # Bash - GNU Bourne Again SHell
+{ lib, ... }:
 {
   options.terminal.bash = {
     enable = lib.mkEnableOption "Enables bash.";
diff --git a/modules/terminal/bat/default.nix b/modules/terminal/bat/default.nix
index e1b4c96..7dcf33c 100644
--- a/modules/terminal/bat/default.nix
+++ b/modules/terminal/bat/default.nix
@@ -1,11 +1,10 @@
+# bat - a cat clone with wings
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# bat - a cat clone with wings
 {
   options.terminal.bat = {
     enable = lib.mkEnableOption "Enables bat.";
diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix
index e02ac47..80992e1 100644
--- a/modules/terminal/default.nix
+++ b/modules/terminal/default.nix
@@ -1,3 +1,4 @@
+# Terminal - Terminal emulator and shell modules (bash, bat, fzf, kitty, less, starship, tmux, zsh)
 { ... }:
 
 {
diff --git a/modules/terminal/fzf/assertions.nix b/modules/terminal/fzf/assertions.nix
index 269af2e..2c0bec9 100644
--- a/modules/terminal/fzf/assertions.nix
+++ b/modules/terminal/fzf/assertions.nix
@@ -1,3 +1,4 @@
+# Assertions - Validates zsh or bash is enabled when fzf is enabled
 { config, ... }:
 {
   assertions = [
diff --git a/modules/terminal/fzf/default.nix b/modules/terminal/fzf/default.nix
index 499bf3c..c056446 100644
--- a/modules/terminal/fzf/default.nix
+++ b/modules/terminal/fzf/default.nix
@@ -1,11 +1,10 @@
+# FZF - Fuzzy finder, CLI fuzzy search tool
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# FZF - Fuzzy finder, CLI fuzzy search tool
 {
   imports = [ ./assertions.nix ];
 
diff --git a/modules/terminal/kitty/default.nix b/modules/terminal/kitty/default.nix
index 9b1836a..2d5faf0 100644
--- a/modules/terminal/kitty/default.nix
+++ b/modules/terminal/kitty/default.nix
@@ -1,11 +1,10 @@
+# Kitty - GPU-accelerated terminal emulator
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Kitty - GPU-accelerated terminal emulator
 {
   options.terminal.kitty = {
     enable = lib.mkEnableOption "Enables kitty.";
diff --git a/modules/terminal/less/default.nix b/modules/terminal/less/default.nix
index 8785498..b2d2ac6 100644
--- a/modules/terminal/less/default.nix
+++ b/modules/terminal/less/default.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # less - terminal pager
+{ config, lib, ... }:
 {
   options.terminal.less = {
     enable = lib.mkEnableOption "Enables less.";
diff --git a/modules/terminal/starship/default.nix b/modules/terminal/starship/default.nix
index 647cef3..7bcc8a0 100644
--- a/modules/terminal/starship/default.nix
+++ b/modules/terminal/starship/default.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
-
 # Starship - Minimal, blazing-fast shell prompt
+{ config, lib, ... }:
 {
   options.terminal.starship = {
     enable = lib.mkEnableOption "Enables starship.";
diff --git a/modules/terminal/tmux/default.nix b/modules/terminal/tmux/default.nix
index fdee9ff..22fba87 100644
--- a/modules/terminal/tmux/default.nix
+++ b/modules/terminal/tmux/default.nix
@@ -1,11 +1,10 @@
+# Tmux - Terminal multiplexer (window/pane management)
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Tmux - Terminal multiplexer (window/pane management)
 {
   options.terminal.tmux = {
     enable = lib.mkEnableOption "Enables tmux.";
diff --git a/modules/terminal/zsh/default.nix b/modules/terminal/zsh/default.nix
index 842556a..95a44ec 100644
--- a/modules/terminal/zsh/default.nix
+++ b/modules/terminal/zsh/default.nix
@@ -1,11 +1,10 @@
+# Zsh - Z shell, extended bash with additional features and plugins
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-# Zsh - Z shell, extended bash with additional features and plugins
 {
   options.terminal.zsh = {
     enable = lib.mkEnableOption "Enables zsh.";
diff --git a/modules/terminal/zsh/nix-aliases.sh b/modules/terminal/zsh/nix-aliases.sh
index 0a2f453..0bcfbe5 100644
--- a/modules/terminal/zsh/nix-aliases.sh
+++ b/modules/terminal/zsh/nix-aliases.sh
@@ -1,3 +1,4 @@
+# Nix aliases - Wrappers for nix-shell and nix develop that auto-start $SHELL
 nix-shell() {
   for arg in "$@"; do
     if [[ "$arg" == "--run" || "$arg" == "--command" ]]; then
diff --git a/modules/web/aria2/default.nix b/modules/web/aria2/default.nix
index efea840..52664d2 100644
--- a/modules/web/aria2/default.nix
+++ b/modules/web/aria2/default.nix
@@ -1,11 +1,10 @@
+# Aria2 - command line download manager
 {
   pkgs,
   lib,
   config,
   ...
 }:
-
-# Aria2 - command line download manager
 {
   options.web.aria2 = {
     enable = lib.mkEnableOption "Enables aria2.";
diff --git a/modules/web/brave/default.nix b/modules/web/brave/default.nix
index e323058..5276f5a 100644
--- a/modules/web/brave/default.nix
+++ b/modules/web/brave/default.nix
@@ -1,10 +1,10 @@
+# Brave - Privacy-focused web browser configuration
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
 {
   options.web.brave = {
     enable = lib.mkEnableOption "Enables brave.";
diff --git a/modules/web/default.nix b/modules/web/default.nix
index fa54cad..a5c2ae6 100644
--- a/modules/web/default.nix
+++ b/modules/web/default.nix
@@ -1,5 +1,5 @@
+# Web - Web browser and downloader modules (aria2, brave)
 { ... }:
-
 {
   imports = [
     ./aria2