diff --git a/modules/desktop/hyprland/cursor.nix b/modules/desktop/hyprland/cursor.nix
index a0e8fd4..a7427b5 100644
--- a/modules/desktop/hyprland/cursor.nix
+++ b/modules/desktop/hyprland/cursor.nix
@@ -9,7 +9,6 @@
   }: let
     inherit (lib) mkForce;
   in {
-    # Install and export the Hyprcursor theme selected by Stylix.
     home = {
       # Hyprcursor variant of the configured Bibata cursor package.
       packages = [pkgs.nur.repos.adam0.bibata-modern-cursors-gruvbox-dark-hyprcursor];
@@ -18,7 +17,6 @@
       sessionVariables.HYPRCURSOR_THEME = mkForce "${config.stylix.cursor.name}-hyprcursor";
     };
 
-    # Let Home Manager link Hyprcursor assets.
     home.pointerCursor.hyprcursor.enable = true;
   };
 }
diff --git a/modules/desktop/hyprland/general.nix b/modules/desktop/hyprland/general.nix
index cea4f58..8ddb0d2 100644
--- a/modules/desktop/hyprland/general.nix
+++ b/modules/desktop/hyprland/general.nix
@@ -28,7 +28,7 @@
         enforce_permissions = true;
       };
 
-      # Don't show a cursor icon when hovering over borders
+      # Hide the cursor icon over borders.
       general.hover_icon_on_border = false;
 
       # Input preferences for mouse and touch.
@@ -46,7 +46,7 @@
 
       # Misc toggles for branding, performance, and dpms.
       misc = {
-        # Disable Hyprland branding visuals
+        # Disable Hyprland branding visuals.
         # keep-sorted start
         disable_hyprland_logo = true;
         disable_splash_rendering = true;
@@ -59,7 +59,7 @@
         vrr = 1;
         # keep-sorted end
 
-        # Lockscreen monitor wakeup
+        # Wake monitors from the lockscreen.
         # keep-sorted start
         key_press_enables_dpms = true;
         mouse_move_enables_dpms = true;
@@ -70,10 +70,10 @@
         swallow_regex = "^com\\.mitchellh\\.ghostty$";
         # keep-sorted end
 
-        # Open windows on the workspace they were invoked on
+        # Open windows on the workspace they were invoked on.
         initial_workspace_tracking = 2;
 
-        # Wait longer until app not responding popup
+        # Wait longer before showing the app-not-responding popup.
         anr_missed_pings = 8;
       };
 
diff --git a/modules/desktop/noctalia/calendar.nix b/modules/desktop/noctalia/calendar.nix
index 5db8184..c4fada8 100644
--- a/modules/desktop/noctalia/calendar.nix
+++ b/modules/desktop/noctalia/calendar.nix
@@ -1,7 +1,6 @@
 {
   flake.modules.homeManager.noctalia = {
     programs.noctalia-shell = {
-      # Enable calendar support in the flake-provided Noctalia build.
       packageOverrides.calendarSupport = true;
 
       settings.calendar.cards = [
diff --git a/modules/desktop/noctalia/controlcenter.nix b/modules/desktop/noctalia/controlcenter.nix
index 32f63e3..8091d33 100644
--- a/modules/desktop/noctalia/controlcenter.nix
+++ b/modules/desktop/noctalia/controlcenter.nix
@@ -11,7 +11,6 @@
     cfgBluetooth = osConfig.capabilities.bluetooth;
     cfgWifi = osConfig.capabilities.wifi;
   in {
-    # Control center tiles and shortcuts surfaced from the bar.
     programs.noctalia-shell.settings.controlCenter = {
       # keep-sorted start block=yes newline_separated=yes
       cards = [
diff --git a/modules/desktop/noctalia/default.nix b/modules/desktop/noctalia/default.nix
index 9f21964..7144d33 100644
--- a/modules/desktop/noctalia/default.nix
+++ b/modules/desktop/noctalia/default.nix
@@ -39,19 +39,15 @@
   in {
     imports = [inputs.noctalia.homeModules.default];
 
-    # Expose an enable toggle for battery widgets.
     options.programs.noctalia-shell.battery.enable = mkEnableOption "Enable the battery service & widgets.";
 
-    # Enable the Noctalia shell and wire up its package.
     config.programs.noctalia-shell = {
       enable = true;
       systemd.enable = true;
 
       # keep-sorted start block=yes newline_separated=yes
-      # Enable calendar support in the flake-provided Noctalia build.
       packageOverrides.calendarSupport = true;
 
-      # Use the current theming schema.
       settings.templates.enableUserTheming = false;
       # keep-sorted end
     };
diff --git a/modules/desktop/noctalia/systemmonitor.nix b/modules/desktop/noctalia/systemmonitor.nix
index 3655c28..eb7aedb 100644
--- a/modules/desktop/noctalia/systemmonitor.nix
+++ b/modules/desktop/noctalia/systemmonitor.nix
@@ -13,7 +13,6 @@
     # Expose a GPU toggle for Noctalia system monitor widgets.
     options.programs.noctalia-shell.systemMonitor.enableGpu = mkEnableOption "Enable dGPU monitoring and GPU temperature widgets.";
 
-    # Set polling for the system monitor.
     config.programs.noctalia-shell.settings.systemMonitor = let
       # Reuse a shared 4s interval for slower sensors.
       generalInterval = 4000;
diff --git a/modules/desktop/noctalia/theme.nix b/modules/desktop/noctalia/theme.nix
index 46c181c..5a39e4e 100644
--- a/modules/desktop/noctalia/theme.nix
+++ b/modules/desktop/noctalia/theme.nix
@@ -20,7 +20,6 @@
 
     programs.noctalia-shell = {
       # keep-sorted start block=yes newline_separated=yes
-      # System monitor colors from stylix.
       settings = {
         # keep-sorted start block=yes newline_separated=yes
         bar = {
diff --git a/modules/desktop/noctalia/wallpaper.nix b/modules/desktop/noctalia/wallpaper.nix
index c3974bf..1b23be2 100644
--- a/modules/desktop/noctalia/wallpaper.nix
+++ b/modules/desktop/noctalia/wallpaper.nix
@@ -2,7 +2,6 @@
   flake.modules.homeManager.noctalia = {config, ...}: let
     picturesDir = config.xdg.userDirs.pictures;
   in {
-    # Wallpaper directory and rotation settings.
     programs.noctalia-shell.settings.wallpaper = {
       # keep-sorted start block=yes
       automationEnabled = true;
diff --git a/modules/desktop/tuigreet.nix b/modules/desktop/tuigreet.nix
index 4c2abdb..aeb452a 100644
--- a/modules/desktop/tuigreet.nix
+++ b/modules/desktop/tuigreet.nix
@@ -33,7 +33,6 @@
   in {
     # keep-sorted start block=yes newline_separated=yes
     environment = {
-      # Generate tuigreet configuration.
       etc."tuigreet/config.toml".source = let
         # keep-sorted start
         hyprland = getExe' config.programs.hyprland.package "start-hyprland";
diff --git a/modules/desktop/xdg/applications/protocols.nix b/modules/desktop/xdg/applications/protocols.nix
index 5b668ec..ad42ce8 100644
--- a/modules/desktop/xdg/applications/protocols.nix
+++ b/modules/desktop/xdg/applications/protocols.nix
@@ -8,7 +8,6 @@
       # keep-sorted end
       ;
   in {
-    # Register handlers for URL schemes.
     xdg.mimeApps.defaultApplications = mimeAppDefaults (
       # keep-sorted start block=yes
       (mimeAppEntries "x-scheme-handler" "zen-beta.desktop" [
diff --git a/modules/desktop/xdg/cleanup.nix b/modules/desktop/xdg/cleanup.nix
index c59ffb1..982f97b 100644
--- a/modules/desktop/xdg/cleanup.nix
+++ b/modules/desktop/xdg/cleanup.nix
@@ -41,7 +41,7 @@
       NODE_REPL_HISTORY = "${dataHome}/node_repl_history";
       # keep-sorted end
 
-      # Java toolschains.
+      # Java toolchains.
       # keep-sorted start
       GRADLE_USER_HOME = "${dataHome}/gradle";
       MAVEN_ARGS = "--settings ${configHome}/maven/settings.xml";
diff --git a/modules/desktop/xdg/portal.nix b/modules/desktop/xdg/portal.nix
index c342bcb..b803daa 100644
--- a/modules/desktop/xdg/portal.nix
+++ b/modules/desktop/xdg/portal.nix
@@ -84,7 +84,6 @@
           };
         };
 
-        # Provide the gtk and terminal file chooser portals.
         extraPortals = with pkgs; [
           # keep-sorted start
           xdg-desktop-portal-gtk
diff --git a/modules/desktop/xdg/terminal.nix b/modules/desktop/xdg/terminal.nix
index 1fb5877..a30da41 100644
--- a/modules/desktop/xdg/terminal.nix
+++ b/modules/desktop/xdg/terminal.nix
@@ -3,7 +3,6 @@
     xdg.terminal-exec = {
       enable = true;
 
-      # Register Ghostty as the terminal for terminal-exec.
       settings.default = ["com.mitchellh.ghostty.desktop"];
     };
   };
diff --git a/modules/hosts/default.nix b/modules/hosts/default.nix
index 685dde0..2c07a66 100644
--- a/modules/hosts/default.nix
+++ b/modules/hosts/default.nix
@@ -1,5 +1,5 @@
 {
-  #keep-sorted start
+  # keep-sorted start
   inputs,
   lib,
   self,
diff --git a/modules/hosts/desktop/default.nix b/modules/hosts/desktop/default.nix
index 5461dec..a0205be 100644
--- a/modules/hosts/desktop/default.nix
+++ b/modules/hosts/desktop/default.nix
@@ -19,7 +19,6 @@
     # Primary nvme disk for disko partitioning.
     disko.selectedDisk = "/dev/nvme0n1";
 
-    # Enable amd rocm support for gpu.
     nixpkgs.config.rocmSupport = true;
 
     # Use x86-64-v3 CachyOS LTO kernel.
diff --git a/modules/hosts/desktop/hardware.nix b/modules/hosts/desktop/hardware.nix
index 1d7f028..649f9f2 100644
--- a/modules/hosts/desktop/hardware.nix
+++ b/modules/hosts/desktop/hardware.nix
@@ -22,7 +22,6 @@
       # keep-sorted end
     ];
 
-    # Enable intel virtualization support.
     boot.kernelModules = ["kvm-intel"];
 
     # Enable intel microcode updates when firmware is available.
diff --git a/modules/hosts/euclid/default.nix b/modules/hosts/euclid/default.nix
index 674b509..51f9261 100644
--- a/modules/hosts/euclid/default.nix
+++ b/modules/hosts/euclid/default.nix
@@ -68,7 +68,6 @@
       # keep-sorted end
     ];
 
-    # Wireguard stuff.
     services.homelabWireguard = {
       enable = true;
       address = "10.100.0.1/24";
@@ -97,7 +96,7 @@
 
     # extra data mounts.
     fileSystems = let
-      # helper for btrfs mounts with shared options.
+      # Btrfs mounts with shared options.
       mkBtrfsMount = device: subvol: {
         inherit device;
         fsType = "btrfs";
diff --git a/modules/hosts/laptop/default.nix b/modules/hosts/laptop/default.nix
index 90a0dd8..3912b5d 100644
--- a/modules/hosts/laptop/default.nix
+++ b/modules/hosts/laptop/default.nix
@@ -32,7 +32,6 @@
 
     services.timezone = "automatic-timezoned";
 
-    # Enable rcu lazy mode for better battery life.
     tweaks.rcuLazy.enable = true;
 
     # Use x86-64-v4 CachyOS LTO kernel.
@@ -75,7 +74,6 @@
         MEM_SLEEP_ON_BAT = "s2idle";
         # keep-sorted end
 
-        # Storage device for power management.
         DISK_DEVICES = "nvme-Samsung_SSD_980_PRO_500GB_S5GYNX0W331360B";
 
         # Intel gpu frequency limits: high performance on ac, reduced on battery.
diff --git a/modules/hosts/laptop/hardware.nix b/modules/hosts/laptop/hardware.nix
index 6d4e0ad..acb8ed8 100644
--- a/modules/hosts/laptop/hardware.nix
+++ b/modules/hosts/laptop/hardware.nix
@@ -21,7 +21,6 @@
       # keep-sorted end
     ];
 
-    # Enable intel virtualization support.
     boot.kernelModules = ["kvm-intel"];
 
     # Enable intel microcode updates when firmware is available.
diff --git a/modules/hosts/laptop/home.nix b/modules/hosts/laptop/home.nix
index 44ab9b0..e5165f0 100644
--- a/modules/hosts/laptop/home.nix
+++ b/modules/hosts/laptop/home.nix
@@ -25,7 +25,7 @@
 
       programs = {
         # keep-sorted start block=yes newline_separated=yes
-        # Enable laptop-specific hyprland features.
+        # Laptop display and touch controls.
         hylix = {
           # keep-sorted start block=yes newline_separated=yes
           monitors = [
@@ -41,10 +41,9 @@
           # keep-sorted end
         };
 
-        # Enable laptop hardware features.
         nixcord.equibop.camera.enable = true;
 
-        # Enable laptop-specific noctalia features.
+        # Laptop battery and idle controls.
         noctalia-shell = {
           battery.enable = true;
           idle = {
diff --git a/modules/pkgs/preview/text.nix b/modules/pkgs/preview/text.nix
index 5dc3208..9438ee7 100644
--- a/modules/pkgs/preview/text.nix
+++ b/modules/pkgs/preview/text.nix
@@ -1,7 +1,6 @@
 {
   perSystem = {pkgs, ...}: {
     packages.text-preview = pkgs.writeShellApplication {
-      # SPDX-License-Identifier: AGPL-3.0-or-later
       name = "text-preview";
       runtimeInputs = with pkgs; [
         file
diff --git a/modules/profiles/common/face.nix b/modules/profiles/common/face.nix
index 2fb96a4..f23e8d9 100644
--- a/modules/profiles/common/face.nix
+++ b/modules/profiles/common/face.nix
@@ -1,6 +1,5 @@
 {self, ...}: {
   flake.modules.homeManager.face = {
-    # Copy user avatar for display managers.
     home.file.".face".source = "${self}/assets/face.png";
   };
 }
diff --git a/modules/profiles/common/tweaks.nix b/modules/profiles/common/tweaks.nix
index 0e61652..d0c7757 100644
--- a/modules/profiles/common/tweaks.nix
+++ b/modules/profiles/common/tweaks.nix
@@ -21,9 +21,7 @@
 
     config = {
       # keep-sorted start block=yes newline_separated=yes
-      # Kernel parameters aimed at low latency desktops.
       boot = {
-        # Audio power management: disable power saving for continuous audio availability.
         extraModprobeConfig = ''
           options snd_hda_intel power_save=0
 
@@ -35,7 +33,6 @@
         # Enable nt sync for better wine/proton performance.
         kernelModules.ntsync = true;
 
-        # Memory and system tuning for desktop responsiveness.
         kernel.sysctl = {
           # keep-sorted start
           "vm.swappiness" = 100;
@@ -72,7 +69,6 @@
           "kernel.sched_rt_runtime_us" = -1;
         };
 
-        # Kernel boot parameters for additional tuning.
         kernelParams =
           [
             # Enable lru page generation for better memory management.
@@ -82,7 +78,6 @@
           ++ optional config.tweaks.rcuLazy.enable "rcutree.enable_rcu_lazy=1";
       };
 
-      # Assorted low-level tweaks and helper tools.
       environment.systemPackages = with pkgs; [
         # keep-sorted start
         bash
@@ -91,7 +86,6 @@
         # keep-sorted end
       ];
 
-      # Systemd limits and tmpfiles overrides.
       systemd = {
         coredump.settings.Coredump.Storage = "journal";
 
diff --git a/modules/profiles/partitioning/ext4.nix b/modules/profiles/partitioning/ext4.nix
index fecdf55..499284f 100644
--- a/modules/profiles/partitioning/ext4.nix
+++ b/modules/profiles/partitioning/ext4.nix
@@ -30,7 +30,7 @@
                     format = "ext4";
                     mountpoint = "/";
                     mountOptions = [
-                      # #keep-sorted start
+                      # keep-sorted start
                       "defaults"
                       "errors=remount-ro"
                       "noatime"
diff --git a/modules/programs/cli/bandwhich.nix b/modules/programs/cli/bandwhich.nix
index 20c4af4..ad77023 100644
--- a/modules/programs/cli/bandwhich.nix
+++ b/modules/programs/cli/bandwhich.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.nixos.bandwhich = {
-    # Show per-process bandwidth usage from the tui.
     programs.bandwhich.enable = true;
   };
 }
diff --git a/modules/programs/cli/bun.nix b/modules/programs/cli/bun.nix
index 3c798e3..413a3ce 100644
--- a/modules/programs/cli/bun.nix
+++ b/modules/programs/cli/bun.nix
@@ -22,7 +22,7 @@
     programs.bun = {
       enable = true;
 
-      # Why the fuck would javascript need telementry.
+      # Why the fuck would javascript need telemetry.
       settings.telementry = false;
     };
 
diff --git a/modules/programs/cli/direnv.nix b/modules/programs/cli/direnv.nix
index fa8a74b..1f24aa5 100644
--- a/modules/programs/cli/direnv.nix
+++ b/modules/programs/cli/direnv.nix
@@ -3,7 +3,6 @@
     programs.direnv = {
       enable = true;
 
-      # Use nix-direnv for fast, cached shell hooks.
       nix-direnv.enable = true;
     };
   };
diff --git a/modules/programs/cli/fastfetch.nix b/modules/programs/cli/fastfetch.nix
index 85c9b5f..32b1e3b 100644
--- a/modules/programs/cli/fastfetch.nix
+++ b/modules/programs/cli/fastfetch.nix
@@ -17,7 +17,6 @@
       enable = true;
 
       settings = {
-        # Use custom logo and kitty terminal image display.
         logo = {
           source = "${self}/assets/nix.png";
           type = "kitty";
@@ -29,13 +28,11 @@
           # keep-sorted end
         };
 
-        # Configure display formatting and binary prefix standards.
         display = {
           separator = " ";
           size.binaryPrefix = "jedec";
         };
 
-        # Define information modules to show in system overview.
         modules = [
           "break"
 
@@ -70,7 +67,6 @@
             key = "│ ├󰅐 OS-AGE";
             keyColor = "34";
 
-            # Calculate system installation age from root filesystem birth time.
             text = getExe pkgs.os-age;
           }
 
diff --git a/modules/programs/cli/fish/default.nix b/modules/programs/cli/fish/default.nix
index 456f18a..cf37b14 100644
--- a/modules/programs/cli/fish/default.nix
+++ b/modules/programs/cli/fish/default.nix
@@ -32,7 +32,6 @@
         interactiveShellInit = concatStringsSep "\n" cfg.interactiveShellInitSnippets;
 
         binds = {
-          # Remove conflicting default bindings.
           # keep-sorted start
           "alt-d".erase = true;
           "alt-e".erase = true;
@@ -41,7 +40,6 @@
         };
       };
 
-      # Tools used by many things.
       home.packages = [pkgs.file];
     };
   };
diff --git a/modules/programs/cli/nh.nix b/modules/programs/cli/nh.nix
index f44a8ca..a330596 100644
--- a/modules/programs/cli/nh.nix
+++ b/modules/programs/cli/nh.nix
@@ -5,7 +5,6 @@
     programs.nh = {
       enable = true;
 
-      # Set flake root.
       flake = "/home/${username}/Infra";
     };
   };
diff --git a/modules/programs/cli/rumdl.nix b/modules/programs/cli/rumdl.nix
index a905b1a..f1e5839 100644
--- a/modules/programs/cli/rumdl.nix
+++ b/modules/programs/cli/rumdl.nix
@@ -8,7 +8,6 @@
   }: let
     tomlFormat = pkgs.formats.toml {};
   in {
-    # Generate rumdl settings.
     xdg.configFile."rumdl/rumdl.toml".source = tomlFormat.generate "rumdl-config.toml" {
       global.cache_dir = "${config.xdg.cacheHome}/rumdl";
     };
diff --git a/modules/programs/cli/tlrc.nix b/modules/programs/cli/tlrc.nix
index 772f6cd..d5e4a35 100644
--- a/modules/programs/cli/tlrc.nix
+++ b/modules/programs/cli/tlrc.nix
@@ -5,7 +5,6 @@
     # keep-sorted start block=yes newline_separated=yes
     home.packages = [pkgs.tlrc];
 
-    # Generate systeroid settings.
     xdg.configFile."tlrc/config.toml".source = tomlFormat.generate "tlrc-config.toml" {
       cache.auto_update = false;
 
diff --git a/modules/programs/gpg.nix b/modules/programs/gpg.nix
index e44ea1c..275e5b5 100644
--- a/modules/programs/gpg.nix
+++ b/modules/programs/gpg.nix
@@ -20,8 +20,7 @@
     services.gpg-agent = {
       enable = true;
 
-      # Expose an ssh agent socket from gpg-agent so ssh can use
-      # Keys stored on smartcards or in the gpg keyring.
+      # Expose an ssh agent socket for smartcard and gpg keyring keys.
       enableSshSupport = true;
 
       # Use the gnome pinentry for passphrase prompts.
diff --git a/modules/programs/gui/discord/plugins/interface.nix b/modules/programs/gui/discord/plugins/interface.nix
index f6bb36e..1b04f12 100644
--- a/modules/programs/gui/discord/plugins/interface.nix
+++ b/modules/programs/gui/discord/plugins/interface.nix
@@ -6,134 +6,133 @@
     ...
   }: let
     inherit (lib) mkEnableOption;
-  in
-    # Interface and layout related plugins.
-    {
-      # User option to toggle camera features in plugins.
-      options.programs.nixcord.equibop.camera.enable = mkEnableOption "Enable camera functionality for Equibop plugins.";
-
-      config.programs.nixcord.config.plugins = {
-        # keep-sorted start block=yes newline_separated=yes
-        accountPanelServerProfile = {
-          enable = true;
-          prioritizeServerProfile = true;
-        };
+  in {
+    # Toggle camera features in plugins.
+    options.programs.nixcord.equibop.camera.enable = mkEnableOption "Enable camera functionality for Equibop plugins.";
 
-        betterActivities = {
-          enable = true;
-          # keep-sorted start
-          memberList = false;
-          removeGameActivityStatus = true;
-          renderGifs = false;
-          # keep-sorted end
-        };
+    # Interface and layout related plugins.
+    config.programs.nixcord.config.plugins = {
+      # keep-sorted start block=yes newline_separated=yes
+      accountPanelServerProfile = {
+        enable = true;
+        prioritizeServerProfile = true;
+      };
 
-        betterSettings = {
-          enable = true;
-          disableFade = false;
-        };
+      betterActivities = {
+        enable = true;
+        # keep-sorted start
+        memberList = false;
+        removeGameActivityStatus = true;
+        renderGifs = false;
+        # keep-sorted end
+      };
 
-        betterUploadButton.enable = true;
+      betterSettings = {
+        enable = true;
+        disableFade = false;
+      };
 
-        cleanerChannelGroups.enable = true;
+      betterUploadButton.enable = true;
 
-        clickableRoles.enable = true;
+      cleanerChannelGroups.enable = true;
 
-        customIdle = {
-          enable = true;
-          remainInIdle = false;
-          idleTimeout = 5.0;
-        };
+      clickableRoles.enable = true;
 
-        dearrow = {
-          enable = true;
-          replaceElements = 1;
-        };
+      customIdle = {
+        enable = true;
+        remainInIdle = false;
+        idleTimeout = 5.0;
+      };
 
-        decor.enable = true;
+      dearrow = {
+        enable = true;
+        replaceElements = 1;
+      };
 
-        fakeNitro = {
-          enable = true;
-          transformCompoundSentence = true;
-        };
+      decor.enable = true;
 
-        fakeProfileThemes.enable = true;
+      fakeNitro = {
+        enable = true;
+        transformCompoundSentence = true;
+      };
 
-        fullSearchContext.enable = true;
+      fakeProfileThemes.enable = true;
 
-        fullUserInChatbox.enable = true;
+      fullSearchContext.enable = true;
 
-        fullVcpfp.enable = true;
+      fullUserInChatbox.enable = true;
 
-        gameActivityToggle.enable = true;
+      fullVcpfp.enable = true;
 
-        globalBadges.enable = true;
+      gameActivityToggle.enable = true;
 
-        greetStickerPicker.enable = true;
+      globalBadges.enable = true;
 
-        mentionAvatars.enable = true;
+      greetStickerPicker.enable = true;
 
-        micLoopbackTester.enable = true;
+      mentionAvatars.enable = true;
 
-        neverPausePreviews.enable = true;
+      micLoopbackTester.enable = true;
 
-        noNitroUpsell.enable = true;
+      neverPausePreviews.enable = true;
 
-        noPendingCount = {
-          enable = true;
-          # keep-sorted start
-          hideFriendRequestsCount = false;
-          hideMessageRequestsCount = false;
-          # keep-sorted end
-        };
+      noNitroUpsell.enable = true;
 
-        noUnblockToJump.enable = true;
+      noPendingCount = {
+        enable = true;
+        # keep-sorted start
+        hideFriendRequestsCount = false;
+        hideMessageRequestsCount = false;
+        # keep-sorted end
+      };
 
-        platformIndicators.enable = true;
+      noUnblockToJump.enable = true;
 
-        platformSpoofer.enable = true;
+      platformIndicators.enable = true;
 
-        previewMessage.enable = true;
+      platformSpoofer.enable = true;
 
-        readAllNotificationsButton.enable = true;
+      previewMessage.enable = true;
 
-        roleColorEverywhere.enable = true;
+      readAllNotificationsButton.enable = true;
 
-        serverListIndicators = {
-          enable = true;
-          mode = 3;
-        };
+      roleColorEverywhere.enable = true;
 
-        showAllMessageButtons.enable = true;
+      serverListIndicators = {
+        enable = true;
+        mode = 3;
+      };
 
-        showBadgesInChat.enable = true;
+      showAllMessageButtons.enable = true;
 
-        showHiddenThings = {
-          enable = true;
-        };
+      showBadgesInChat.enable = true;
 
-        statusWhileActive.enable = true;
+      showHiddenThings = {
+        enable = true;
+      };
 
-        themeAttributes.enable = true;
+      statusWhileActive.enable = true;
 
-        title = {
-          enable = true;
-          title = "Equibop";
-        };
+      themeAttributes.enable = true;
 
-        unlockedAvatarZoom.enable = true;
+      title = {
+        enable = true;
+        title = "Equibop";
+      };
 
-        userPfp.enable = true;
+      unlockedAvatarZoom.enable = true;
 
-        userVoiceShow.enable = true;
+      userPfp.enable = true;
 
-        usrbg = {
-          enable = true;
-          voiceBackground = true;
-        };
+      userVoiceShow.enable = true;
 
-        viewIcons.enable = true;
-        # keep-sorted end
+      usrbg = {
+        enable = true;
+        voiceBackground = true;
       };
+
+      viewIcons.enable = true;
+      # keep-sorted end
     };
+  };
 }
diff --git a/modules/programs/gui/discord/settings.nix b/modules/programs/gui/discord/settings.nix
index d6e01ac..1574a84 100644
--- a/modules/programs/gui/discord/settings.nix
+++ b/modules/programs/gui/discord/settings.nix
@@ -1,7 +1,6 @@
 {
   flake.modules.homeManager.discord = {
     programs.nixcord = {
-      # Write main equibop configuration.
       config = {
         # keep-sorted start
         autoUpdate = true;
diff --git a/modules/programs/gui/discord/themes/default.nix b/modules/programs/gui/discord/themes/default.nix
index 9479fa3..afb25ed 100644
--- a/modules/programs/gui/discord/themes/default.nix
+++ b/modules/programs/gui/discord/themes/default.nix
@@ -33,7 +33,6 @@
     ];
   in {
     programs.nixcord.config = {
-      # Enable custom css themes.
       enabledThemes = [
         # keep-sorted start
         "snippets.css"
@@ -41,14 +40,11 @@
         # keep-sorted end
       ];
 
-      # Load external theme links for enhanced styling.
       themeLinks = externalThemeLinks;
 
-      # Enable external theme links after adding them to the theme list.
       enabledThemeLinks = externalThemeLinks;
     };
 
-    # Add snippets stylesheet for additional styling.
     xdg.configFile."equibop/themes/snippets.css".source = ./snippets.css;
 
     # Install themed css with fonts and palette from Stylix.
diff --git a/modules/programs/gui/lsfg.nix b/modules/programs/gui/lsfg.nix
index a5053ab..2930a65 100644
--- a/modules/programs/gui/lsfg.nix
+++ b/modules/programs/gui/lsfg.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.nixos.lsfg = {pkgs, ...}: {
-    # Add lossless scaling linux packages.
     environment.systemPackages = with pkgs; [
       # keep-sorted start
       lsfg-vk
diff --git a/modules/programs/gui/onlyoffice.nix b/modules/programs/gui/onlyoffice.nix
index f61273f..b565f39 100644
--- a/modules/programs/gui/onlyoffice.nix
+++ b/modules/programs/gui/onlyoffice.nix
@@ -6,7 +6,6 @@
       # keep-sorted start block=yes newline_separated=yes
       enable = true;
 
-      # Set ui preferences.
       settings = {
         # keep-sorted start
         UITheme = "theme-dark";
diff --git a/modules/programs/gui/spotify/default.nix b/modules/programs/gui/spotify/default.nix
index e2ac316..efc8234 100644
--- a/modules/programs/gui/spotify/default.nix
+++ b/modules/programs/gui/spotify/default.nix
@@ -23,7 +23,6 @@
       # keep-sorted end
 
       # keep-sorted start block=yes newline_separated=yes
-      # Enable extensions.
       enabledExtensions =
         # Extensions from spicetify-nix.
         (with spicePkgs.extensions; [
@@ -51,7 +50,6 @@
           # keep-sorted end
         ]);
 
-      # Enable CSS snippets.
       enabledSnippets = with spicePkgs.snippets; [
         # keep-sorted start
         pointer
diff --git a/modules/programs/gui/spotify/theme.nix b/modules/programs/gui/spotify/theme.nix
index e2bc6d3..27efd64 100644
--- a/modules/programs/gui/spotify/theme.nix
+++ b/modules/programs/gui/spotify/theme.nix
@@ -20,7 +20,6 @@
         inherit (spicePkgs.themes.text) src;
         sidebarConfig = false;
 
-        # Set font to stylix font.
         # Force the text theme to show all images.
         # Disable border highlight animations and fades.
         # Remove rounded corners from all elements for consistent styling.
diff --git a/modules/programs/gui/zathura.nix b/modules/programs/gui/zathura.nix
index bd5247b..b1b2a10 100644
--- a/modules/programs/gui/zathura.nix
+++ b/modules/programs/gui/zathura.nix
@@ -13,7 +13,6 @@
         # keep-sorted end
 
         # keep-sorted start block=yes newline_separated=yes
-        # Keep zathura fonts consistent.
         font = sansSerifFont;
 
         # Use the system clipboard for text selection.
diff --git a/modules/programs/gui/zen/chrome.nix b/modules/programs/gui/zen/chrome.nix
index 0dbd3ab..f4ad992 100644
--- a/modules/programs/gui/zen/chrome.nix
+++ b/modules/programs/gui/zen/chrome.nix
@@ -31,7 +31,7 @@
     # Convert the stylix base16 scheme into a format accepted by nix-userstyles.
     palette = stylixPalette config;
   in {
-    # Remove rounded corners in zen browser interface.
+    # Remove rounded corners in Zen Browser interface.
     programs.zen-browser.profiles.default = {
       userChrome = ''
         *,
@@ -46,7 +46,6 @@
         readFile (inputs.nix-userstyles.lib.mkUserContent system {
           inherit palette;
 
-          # Apply nix-userstyles themes.
           userStyles = [
             # keep-sorted start
             "advent-of-code"
diff --git a/modules/programs/gui/zen/extensions.nix b/modules/programs/gui/zen/extensions.nix
index dc562e6..5146788 100644
--- a/modules/programs/gui/zen/extensions.nix
+++ b/modules/programs/gui/zen/extensions.nix
@@ -2,9 +2,8 @@
   flake.modules.homeManager.zen = {pkgs, ...}: let
     inherit (builtins) mapAttrs;
   in {
-    # Add extensions in nur.
+    # Add extensions packaged in NUR.
     programs.zen-browser.profiles.default.extensions = {
-      # Force extensions to be enabled.
       force = true;
       packages = with pkgs.nur.repos.rycee.firefox-addons; [
         # Content blocking.
@@ -35,7 +34,7 @@
       ];
     };
 
-    # Add extensions not in nur.
+    # Force-install extensions missing from NUR.
     programs.zen-browser.policies.ExtensionSettings = let
       mkExtensionSettings = mapAttrs (
         _: pluginId: {
diff --git a/modules/programs/tui/bluetui.nix b/modules/programs/tui/bluetui.nix
index 8e76a7c..c55ba5b 100644
--- a/modules/programs/tui/bluetui.nix
+++ b/modules/programs/tui/bluetui.nix
@@ -20,34 +20,31 @@
     cfgBluetooth = osConfig.capabilities.bluetooth;
     pkg = pkgs.bluetui;
   in {
-    config =
-      # Only install when bluetooth is enabled.
-      mkIf cfgBluetooth {
-        # keep-sorted start block=yes newline_separated=yes
-        home.packages = [pkg];
+    config = mkIf cfgBluetooth {
+      # keep-sorted start block=yes newline_separated=yes
+      home.packages = [pkg];
 
-        # Create desktop entry to allow launching via launcher.
-        xdg.desktopEntries.bluetui = {
-          name = "Bluetui";
-          genericName = "Terminal Bluetooth Manager";
-          icon = "bluetooth";
+      xdg.desktopEntries.bluetui = {
+        name = "Bluetui";
+        genericName = "Terminal Bluetooth Manager";
+        icon = "bluetooth";
 
-          exec = let
-            # keep-sorted start
-            bluetui = getExe' pkg "bluetui";
-            terminalCommand = getExe config.xdg.terminal-exec.package;
-            # keep-sorted end
-          in "${terminalCommand} --title=Bluetui ${bluetui}";
+        exec = let
+          # keep-sorted start
+          bluetui = getExe' pkg "bluetui";
+          terminalCommand = getExe config.xdg.terminal-exec.package;
+          # keep-sorted end
+        in "${terminalCommand} --title=Bluetui ${bluetui}";
 
-          categories = [
-            # keep-sorted start
-            "ConsoleOnly"
-            "HardwareSettings"
-            "Settings"
-            # keep-sorted end
-          ];
-        };
-        # keep-sorted end
+        categories = [
+          # keep-sorted start
+          "ConsoleOnly"
+          "HardwareSettings"
+          "Settings"
+          # keep-sorted end
+        ];
       };
+      # keep-sorted end
+    };
   };
 }
diff --git a/modules/programs/tui/cava.nix b/modules/programs/tui/cava.nix
index d9f967b..5ab314a 100644
--- a/modules/programs/tui/cava.nix
+++ b/modules/programs/tui/cava.nix
@@ -12,7 +12,7 @@
           # keep-sorted end
         };
 
-        # Use pulseaudio as input as pipewire doesnt work on pc?
+        # Use pulseaudio because pipewire input is unreliable on pc for some reason.
         input.method = "pulse";
 
         smoothing = {
diff --git a/modules/programs/tui/fzf.nix b/modules/programs/tui/fzf.nix
index 89c7ee9..261d1e5 100644
--- a/modules/programs/tui/fzf.nix
+++ b/modules/programs/tui/fzf.nix
@@ -15,7 +15,6 @@
       enableZshIntegration = enableShellIntegration;
       # keep-sorted end
 
-      # Change prompt default to look better.
       defaultOptions = [
         # keep-sorted start
         "--border sharp"
diff --git a/modules/programs/tui/impala.nix b/modules/programs/tui/impala.nix
index 43e1691..06ffafe 100644
--- a/modules/programs/tui/impala.nix
+++ b/modules/programs/tui/impala.nix
@@ -20,33 +20,30 @@
     cfgWifi = osConfig.capabilities.wifi;
     pkg = pkgs.impala;
   in {
-    config =
-      # Only install when wifi is enabled.
-      mkIf cfgWifi {
-        # keep-sorted start block=yes newline_separated=yes
-        home.packages = [pkg];
+    config = mkIf cfgWifi {
+      # keep-sorted start block=yes newline_separated=yes
+      home.packages = [pkg];
 
-        # Create desktop entry to allow launching via launcher.
-        xdg.desktopEntries.impala = {
-          name = "Impala";
-          genericName = "Terminal WiFi Manager";
-          icon = "network-wireless";
+      xdg.desktopEntries.impala = {
+        name = "Impala";
+        genericName = "Terminal WiFi Manager";
+        icon = "network-wireless";
 
-          exec = let
-            # keep-sorted start
-            impala = getExe' pkg "impala";
-            terminalCommand = getExe config.xdg.terminal-exec.package;
-            # keep-sorted end
-          in "${terminalCommand} --title=Impala ${impala}";
+        exec = let
+          # keep-sorted start
+          impala = getExe' pkg "impala";
+          terminalCommand = getExe config.xdg.terminal-exec.package;
+          # keep-sorted end
+        in "${terminalCommand} --title=Impala ${impala}";
 
-          categories = [
-            # keep-sorted start
-            "ConsoleOnly"
-            "Network"
-            # keep-sorted end
-          ];
-        };
-        # keep-sorted end
+        categories = [
+          # keep-sorted start
+          "ConsoleOnly"
+          "Network"
+          # keep-sorted end
+        ];
       };
+      # keep-sorted end
+    };
   };
 }
diff --git a/modules/programs/tui/neovim/components/indent.nix b/modules/programs/tui/neovim/components/indent.nix
index a5315b6..3664af6 100644
--- a/modules/programs/tui/neovim/components/indent.nix
+++ b/modules/programs/tui/neovim/components/indent.nix
@@ -1,7 +1,6 @@
 {
   flake.modules.homeManager.neovim = {
     programs.nvf.settings.vim = {
-      # Enable proper indentation across languages.
       utility = {
         # keep-sorted start
         auto-indent-nvim.enable = true;
diff --git a/modules/programs/tui/neovim/components/presence.nix b/modules/programs/tui/neovim/components/presence.nix
index b7c880b..c20ce5b 100644
--- a/modules/programs/tui/neovim/components/presence.nix
+++ b/modules/programs/tui/neovim/components/presence.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.homeManager.neovim = {
-    # Discord rich presence via cord.nvim.
     programs.nvf.settings.vim.presence.cord-nvim = {
       enable = true;
 
diff --git a/modules/programs/tui/neovim/components/scrollbar.nix b/modules/programs/tui/neovim/components/scrollbar.nix
index 63524d8..b00bb9c 100644
--- a/modules/programs/tui/neovim/components/scrollbar.nix
+++ b/modules/programs/tui/neovim/components/scrollbar.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.homeManager.neovim = {
-    # Add satellite.nvim scrollbar indicators.
     programs.nvf.settings.vim.visuals.satellite-nvim = {
       enable = true;
       setupOpts = {
diff --git a/modules/programs/tui/nvtop.nix b/modules/programs/tui/nvtop.nix
index 4857e4d..c1e8fc3 100644
--- a/modules/programs/tui/nvtop.nix
+++ b/modules/programs/tui/nvtop.nix
@@ -38,7 +38,7 @@
       default = [];
     };
 
-    # Override enables multiple gpu backends in single nvtop instance.
+    # Combine selected GPU backends into one nvtop instance.
     config.home.packages = let
       selectedTypes = config.programs.nvtop.types;
     in
diff --git a/modules/programs/tui/opencode/default.nix b/modules/programs/tui/opencode/default.nix
index c9d0c72..4d4232b 100644
--- a/modules/programs/tui/opencode/default.nix
+++ b/modules/programs/tui/opencode/default.nix
@@ -70,7 +70,6 @@
         '';
       };
 
-      # Set agent rules.
       context = ./instructions.md;
     };
 
@@ -78,7 +77,6 @@
       # Point opencode at the shared agent skills directory.
       configFile."opencode/skills".source = mkOutOfStoreSymlink "${home}/.agents/skills";
 
-      # Create desktop entry to allow launching via launcher.
       desktopEntries.opencode = {
         name = "Opencode";
         genericName = "AI Coding Assistant";
diff --git a/modules/programs/tui/opencode/plugins.nix b/modules/programs/tui/opencode/plugins.nix
index 29751e2..795bec4 100644
--- a/modules/programs/tui/opencode/plugins.nix
+++ b/modules/programs/tui/opencode/plugins.nix
@@ -18,8 +18,8 @@
       };
 
       quota = {
-        #enable = true;
-        #sidebar.enable = true;
+        enable = true;
+        sidebar.enable = true;
 
         settings = {
           # keep-sorted start
diff --git a/modules/programs/tui/television/theme.nix b/modules/programs/tui/television/theme.nix
index 782e984..0520e23 100644
--- a/modules/programs/tui/television/theme.nix
+++ b/modules/programs/tui/television/theme.nix
@@ -12,7 +12,7 @@
   in {
     xdg.configFile."television/themes/".source = with colors;
       tomlFormat.generate "television-stylix.toml" {
-        # general
+        # General
         # keep-sorted start
         background = base00;
         border_fg = base04;
@@ -20,13 +20,13 @@
         text_fg = base05;
         # keep-sorted end
 
-        # input
+        # Input
         # keep-sorted start
         input_text_fg = base08;
         result_count_fg = base08;
         # keep-sorted end
 
-        # results
+        # Results
         # keep-sorted start
         match_fg = base08;
         result_line_number_fg = base0A;
@@ -36,10 +36,10 @@
         selection_fg = base0B;
         # keep-sorted end
 
-        # preview
+        # Preview
         preview_title_fg = base0B;
 
-        # modes
+        # Modes
         # keep-sorted start
         action_picker_mode_bg = base0D;
         action_picker_mode_fg = base00;
diff --git a/modules/programs/tui/yazi/default.nix b/modules/programs/tui/yazi/default.nix
index ef34a47..9798925 100644
--- a/modules/programs/tui/yazi/default.nix
+++ b/modules/programs/tui/yazi/default.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.homeManager.yazi = {
-    # Yazi tui file manager.
     programs.yazi = {
       enable = true;
 
diff --git a/modules/programs/tui/yazi/plugins.nix b/modules/programs/tui/yazi/plugins.nix
index a95365a..d972b84 100644
--- a/modules/programs/tui/yazi/plugins.nix
+++ b/modules/programs/tui/yazi/plugins.nix
@@ -23,7 +23,7 @@
             resvg
             # keep-sorted end
           ])
-          # Reuse packages from home-manager modules to avoid duplicate package selections.
+          # Reuse Home Manager package selections.
           ++ (map (program: config.programs.${program}.package) [
             # keep-sorted start
             "fd"
@@ -32,7 +32,6 @@
           ]);
       };
 
-      # Add runtime helpers for Yazi plugins.
       extraPackages =
         (with pkgs; [
           # keep-sorted start
@@ -66,7 +65,7 @@
           glow
           sqlite
         ])
-        # Reuse packages from home-manager modules to avoid duplicate package selections.
+        # Reuse Home Manager package selections.
         ++ (map (program: config.programs.${program}.package) [
           # keep-sorted start
           "bat"
@@ -76,10 +75,10 @@
           "television"
           # keep-sorted end
         ])
-        # Pull packaged tools from the system config when home-manager does not own them.
+        # Use the system-owned udisks package.
         ++ [osConfig.services.udisks2.package];
 
-      # Keep plugins without dedicated modules together here.
+      # Group plugins without dedicated modules.
       plugins = {
         # keep-sorted start block=yes newline_separated=yes
         full-border = {
diff --git a/modules/programs/tui/yazi/plugins/faster-piper.nix b/modules/programs/tui/yazi/plugins/faster-piper.nix
index 661b49a..8e68309 100644
--- a/modules/programs/tui/yazi/plugins/faster-piper.nix
+++ b/modules/programs/tui/yazi/plugins/faster-piper.nix
@@ -16,10 +16,8 @@
     programs.yazi = {
       plugins.faster-piper = pkgs.nur.repos.adam0.yaziPlugins.faster-piper;
 
-      # Use faster-piper for markdown, archives, compressed text, sqlite, and systemd previews.
       settings.plugin = {
         # keep-sorted start newline_separated=yes
-        # Preloaders that render content for faster-piper.
         prepend_preloaders =
           mkYaziUrlEntries "${piper} CLICOLOR_FORCE=1 glow -w=$w -s=dark -- \"$1\"" ["*.md"]
           ++
diff --git a/modules/programs/tui/yazi/plugins/mediainfo.nix b/modules/programs/tui/yazi/plugins/mediainfo.nix
index b75ef6f..58ad337 100644
--- a/modules/programs/tui/yazi/plugins/mediainfo.nix
+++ b/modules/programs/tui/yazi/plugins/mediainfo.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.mediainfo = pkgs.yaziPlugins.mediainfo;
 
-      # Use mediainfo for media and related mime types.
       settings.plugin = {
         # keep-sorted start block=yes newline_separated=yes
         # Replace default magick/image/video preloaders with mediainfo.
diff --git a/modules/programs/tui/yazi/plugins/mount.nix b/modules/programs/tui/yazi/plugins/mount.nix
index 75ca68f..d532f2a 100644
--- a/modules/programs/tui/yazi/plugins/mount.nix
+++ b/modules/programs/tui/yazi/plugins/mount.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.mount = pkgs.yaziPlugins.mount;
 
-      # Bind the mount manager in manager mode.
       keymap.mgr.prepend_keymap = [
         {
           on = "M";
diff --git a/modules/programs/tui/yazi/plugins/ouch.nix b/modules/programs/tui/yazi/plugins/ouch.nix
index 78685b2..6fcdf7a 100644
--- a/modules/programs/tui/yazi/plugins/ouch.nix
+++ b/modules/programs/tui/yazi/plugins/ouch.nix
@@ -4,7 +4,6 @@
       plugins.ouch = pkgs.yaziPlugins.ouch;
 
       settings = {
-        # Previewers that render content for ouch.
         plugin.prepend_previewers = [
           {
             mime = "application/{*zip,tar,bzip2,7z*,rar,xz,zstd,java-archive}";
@@ -12,14 +11,12 @@
           }
         ];
 
-        # Compress selected files via the ouch plugin.
         mgr.prepend_keymap = {
           on = ["C"];
           run = "plugin ouch";
           desc = "Compress with ouch";
         };
 
-        # Extract archives via ouch.
         opener.extract = [
           # keep-sorted start block=yes newline_separated=yes
           {
diff --git a/modules/programs/tui/yazi/plugins/preview-cbz.nix b/modules/programs/tui/yazi/plugins/preview-cbz.nix
index e5a4a60..596403e 100644
--- a/modules/programs/tui/yazi/plugins/preview-cbz.nix
+++ b/modules/programs/tui/yazi/plugins/preview-cbz.nix
@@ -5,7 +5,6 @@
 
       settings.plugin = {
         # keep-sorted start block=yes newline_separated=yes
-        # Preloaders that render content for preview-cbz.
         prepend_preloaders = [
           {
             url = "*.cb{z,r}";
@@ -13,7 +12,6 @@
           }
         ];
 
-        # Previewers that render content for preview-cbz.
         prepend_previewers = [
           {
             url = "*.cb{z,r}";
diff --git a/modules/programs/tui/yazi/plugins/preview-epub.nix b/modules/programs/tui/yazi/plugins/preview-epub.nix
index 04f62e2..fdf7603 100644
--- a/modules/programs/tui/yazi/plugins/preview-epub.nix
+++ b/modules/programs/tui/yazi/plugins/preview-epub.nix
@@ -5,7 +5,6 @@
 
       settings.plugin = {
         # keep-sorted start block=yes newline_separated=yes
-        # Preloaders that render content for preview-epub.
         prepend_preloaders = [
           {
             mime = "";
@@ -13,7 +12,6 @@
           }
         ];
 
-        # Previewers that render content for preview-epub.
         prepend_previewers = [
           {
             mime = "";
diff --git a/modules/programs/tui/yazi/plugins/preview-git.nix b/modules/programs/tui/yazi/plugins/preview-git.nix
index 4bc20a3..e16e8cb 100644
--- a/modules/programs/tui/yazi/plugins/preview-git.nix
+++ b/modules/programs/tui/yazi/plugins/preview-git.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.preview-git = pkgs.nur.repos.adam0.yaziPlugins.preview-git;
 
-      # Previewers that render content for preview-git.
       settings.plugin.prepend_previewers = [
         {
           url = "**/.git/";
diff --git a/modules/programs/tui/yazi/plugins/recycle-bin.nix b/modules/programs/tui/yazi/plugins/recycle-bin.nix
index 5687a43..c56794b 100644
--- a/modules/programs/tui/yazi/plugins/recycle-bin.nix
+++ b/modules/programs/tui/yazi/plugins/recycle-bin.nix
@@ -6,7 +6,6 @@
         setup = true;
       };
 
-      # Bind key to open the recycle-bin plugin menu.
       keymap.mgr.prepend_keymap = [
         {
           on = ["R" "b"];
diff --git a/modules/programs/tui/yazi/plugins/restore.nix b/modules/programs/tui/yazi/plugins/restore.nix
index 979d1b6..9bf851a 100644
--- a/modules/programs/tui/yazi/plugins/restore.nix
+++ b/modules/programs/tui/yazi/plugins/restore.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.restore = pkgs.yaziPlugins.restore;
 
-      # Bind restore actions.
       keymap.mgr.prepend_keymap = [
         {
           on = ["u"];
diff --git a/modules/programs/tui/yazi/plugins/smart-enter.nix b/modules/programs/tui/yazi/plugins/smart-enter.nix
index 7d5717c..b095914 100644
--- a/modules/programs/tui/yazi/plugins/smart-enter.nix
+++ b/modules/programs/tui/yazi/plugins/smart-enter.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.smart-enter = pkgs.yaziPlugins.smart-enter;
 
-      # Use smart-enter bindings in manager mode.
       keymap.mgr.prepend_keymap = [
         # keep-sorted start block=yes newline_separated=yes
         {
diff --git a/modules/programs/tui/yazi/plugins/smart-paste.nix b/modules/programs/tui/yazi/plugins/smart-paste.nix
index 32fbf43..a80d772 100644
--- a/modules/programs/tui/yazi/plugins/smart-paste.nix
+++ b/modules/programs/tui/yazi/plugins/smart-paste.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.smart-paste = pkgs.yaziPlugins.smart-paste;
 
-      # Use smart-paste bindings in manager mode.
       keymap.mgr.prepend_keymap = [
         {
           on = "p";
diff --git a/modules/programs/tui/yazi/plugins/spot-audio.nix b/modules/programs/tui/yazi/plugins/spot-audio.nix
index 21916e3..3b53315 100644
--- a/modules/programs/tui/yazi/plugins/spot-audio.nix
+++ b/modules/programs/tui/yazi/plugins/spot-audio.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.spot-audio = pkgs.nur.repos.adam0.yaziPlugins.spot-audio;
 
-      # Spotters that render content for spot-audio.
       settings.plugin.append_spotters = [
         # keep-sorted start block=yes newline_separated=yes
         {
diff --git a/modules/programs/tui/yazi/plugins/spot-cbz.nix b/modules/programs/tui/yazi/plugins/spot-cbz.nix
index 12cefb8..ad7e643 100644
--- a/modules/programs/tui/yazi/plugins/spot-cbz.nix
+++ b/modules/programs/tui/yazi/plugins/spot-cbz.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.spot-cbz = pkgs.nur.repos.adam0.yaziPlugins.spot-cbz;
 
-      # Spotters that render content for spot-cbz.
       settings.plugin.append_spotters = [
         {
           url = "*.cb{z,r}";
diff --git a/modules/programs/tui/yazi/plugins/spot-image.nix b/modules/programs/tui/yazi/plugins/spot-image.nix
index 8c53c48..b917428 100644
--- a/modules/programs/tui/yazi/plugins/spot-image.nix
+++ b/modules/programs/tui/yazi/plugins/spot-image.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.spot-image = pkgs.nur.repos.adam0.yaziPlugins.spot-image;
 
-      # Spotters that render content for spot-image.
       settings.plugin.append_spotters = [
         {
           mime = "image/*";
diff --git a/modules/programs/tui/yazi/plugins/spot-video.nix b/modules/programs/tui/yazi/plugins/spot-video.nix
index 069902d..cd9c071 100644
--- a/modules/programs/tui/yazi/plugins/spot-video.nix
+++ b/modules/programs/tui/yazi/plugins/spot-video.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.spot-v = pkgs.nur.repos.adam0.yaziPlugins.spot-video;
 
-      # Spotters that render content for spot-video.
       settings.plugin.append_spotters = [
         {
           url = "video/*";
diff --git a/modules/programs/tui/yazi/plugins/ucp.nix b/modules/programs/tui/yazi/plugins/ucp.nix
index 90eeb0a..8bd934d 100644
--- a/modules/programs/tui/yazi/plugins/ucp.nix
+++ b/modules/programs/tui/yazi/plugins/ucp.nix
@@ -3,7 +3,6 @@
     programs.yazi = {
       plugins.ucp = pkgs.nur.repos.adam0.yaziPlugins.ucp;
 
-      # Add ucp clipboard bindings with notifications.
       keymap.mgr.prepend_keymap = [
         # keep-sorted start block=yes newline_separated=yes
         {
diff --git a/modules/programs/tui/yazi/settings.nix b/modules/programs/tui/yazi/settings.nix
index 7c96077..8c9b569 100644
--- a/modules/programs/tui/yazi/settings.nix
+++ b/modules/programs/tui/yazi/settings.nix
@@ -4,7 +4,6 @@
     imageAllocMB = 1024;
   in {
     programs.yazi.settings = {
-      # Control memory used by image previews.
       tasks.image_alloc = imageAllocMB * 1024 * 1024;
 
       # keep-sorted start
diff --git a/modules/programs/tui/yazi/theme.nix b/modules/programs/tui/yazi/theme.nix
index 97cb6f9..7618544 100644
--- a/modules/programs/tui/yazi/theme.nix
+++ b/modules/programs/tui/yazi/theme.nix
@@ -1,42 +1,40 @@
 {
-  flake.modules.homeManager.yazi =
-    # Remove rounded corners.
-    {
-      programs.yazi.theme = {
+  flake.modules.homeManager.yazi = {
+    programs.yazi.theme = {
+      # keep-sorted start block=yes newline_separated=yes
+      indicator.padding = {
+        open = "█";
+        close = "█";
+      };
+
+      status = {
         # keep-sorted start block=yes newline_separated=yes
-        indicator.padding = {
-          open = "█";
-          close = "█";
+        sep_left = {
+          open = "";
+          close = "";
         };
 
-        status = {
-          # keep-sorted start block=yes newline_separated=yes
-          sep_left = {
-            open = "";
-            close = "";
-          };
-
-          sep_right = {
-            open = "";
-            close = "";
-          };
-          # keep-sorted end
+        sep_right = {
+          open = "";
+          close = "";
         };
+        # keep-sorted end
+      };
 
-        tabs = {
-          # keep-sorted start block=yes newline_separated=yes
-          sep_inner = {
-            open = "";
-            close = "";
-          };
+      tabs = {
+        # keep-sorted start block=yes newline_separated=yes
+        sep_inner = {
+          open = "";
+          close = "";
+        };
 
-          sep_outer = {
-            open = "";
-            close = "";
-          };
-          # keep-sorted end
+        sep_outer = {
+          open = "";
+          close = "";
         };
         # keep-sorted end
       };
+      # keep-sorted end
     };
+  };
 }
diff --git a/modules/services/bpftune.nix b/modules/services/bpftune.nix
index 94fe483..519b33b 100644
--- a/modules/services/bpftune.nix
+++ b/modules/services/bpftune.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.nixos.bpftune = {
-    # Auto-tune kernel bpf settings for performance.
     services.bpftune.enable = true;
   };
 }
diff --git a/modules/services/evolution-data-server.nix b/modules/services/evolution-data-server.nix
index 0ac231a..004bf88 100644
--- a/modules/services/evolution-data-server.nix
+++ b/modules/services/evolution-data-server.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.nixos.evolution-data-server = {
-    # Enable gnome evolution data server for calendar and contact integration.
     services.gnome.evolution-data-server.enable = true;
   };
 }
diff --git a/modules/services/libinput.nix b/modules/services/libinput.nix
index 2bf8154..ba46734 100644
--- a/modules/services/libinput.nix
+++ b/modules/services/libinput.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.nixos.libinput = {
-    # Input stack defaults (touchpad, mouse) via libinput.
     services.libinput.enable = true;
   };
 
diff --git a/modules/services/podman.nix b/modules/services/podman.nix
index bad83ce..6904b37 100644
--- a/modules/services/podman.nix
+++ b/modules/services/podman.nix
@@ -13,7 +13,6 @@
   in {
     virtualisation = {
       podman = {
-        # Enable podman service and tooling.
         enable = true;
         # Expose docker-compatible socket for tooling that expects dockerd.
         dockerSocket.enable = true;
@@ -59,10 +58,8 @@
       iifname "podman*" tcp dport 44407 accept
     '';
 
-    # Enable the usage of compose files with podman.
     environment.systemPackages = [pkgs.podman-compose];
 
-    # Add user to the podman group.
     users.users.${username}.extraGroups = ["podman"];
   };
 }
diff --git a/modules/services/printing.nix b/modules/services/printing.nix
index 70bad0a..afbf683 100644
--- a/modules/services/printing.nix
+++ b/modules/services/printing.nix
@@ -5,10 +5,8 @@
       # Allow network clients to reach cups.
       openFirewall = true;
 
-      # Disable the web interface.
       webInterface = false;
 
-      # Printer drivers packages.
       drivers = with pkgs; [
         # keep-sorted start
         foomatic-db-ppds
@@ -24,10 +22,8 @@
       defaultShared = true;
     };
 
-    # Enable fonts for ghostscript.
     fonts.enableGhostscriptFonts = true;
 
-    # Enable the printer config program.
     programs.system-config-printer.enable = true;
   };
 }
diff --git a/modules/services/udisks2.nix b/modules/services/udisks2.nix
index 2bea911..fb8051d 100644
--- a/modules/services/udisks2.nix
+++ b/modules/services/udisks2.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.nixos.udisks2 = {
-    # Disk management dbus service.
     services.udisks2.enable = true;
   };
 }
diff --git a/modules/services/upower.nix b/modules/services/upower.nix
index 3032a30..b09eb3b 100644
--- a/modules/services/upower.nix
+++ b/modules/services/upower.nix
@@ -1,6 +1,5 @@
 {
   flake.modules.nixos.upower = {
-    # Power and battery information service used by desktops.
     services.upower.enable = true;
   };
 }
diff --git a/modules/users.nix b/modules/users.nix
index 4f60063..ed7cb80 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -31,7 +31,6 @@
       mutableUsers = false;
 
       users.${username} = {
-        # Hashed password file provided by sops-nix.
         hashedPasswordFile = config.sops.secrets.user_password.path;
 
         extraGroups = [
diff --git a/vars.nix b/vars.nix
index a1c3f54..94749f1 100644
--- a/vars.nix
+++ b/vars.nix
@@ -20,7 +20,7 @@ rec {
   regionalLocale = "nl_${countryCode}.UTF-8";
   # keep-sorted end
 
-  # Domains
+  # Domains.
   # keep-sorted start
   groundDomain = "zezura.xyz";
   orbitDomain = "adam0.dev";