home: code readability improvements

homeManagerModules/apps/bash/default.nix

@@ -15,6 +15,7 @@
         enable = true;
         enableCompletion = true;
         enableVteIntegration = true;
+
         shellOptions = [
           "autocd"
           "cdspell"
@@ -26,6 +27,7 @@
           "globstar"
           "histappend"
         ];
+
         initExtra = ''
           export PS1="[\[$(tput setaf 27)\]\u\[$(tput setaf 135)\]@\[$(tput setaf 45)\]\h:\[$(tput setaf 33)\]\w] \[$(tput sgr0)\]$ "
         '';

homeManagerModules/apps/chromium/default.nix

@@ -8,6 +8,7 @@
     programs.chromium = {
       enable = true;
       package = config.ar.home.apps.chromium.package;
+
       extensions = [
         {id = "enamippconapkdmgfgjchkhakpfinmaj";} # dearrow
         {id = "jldhpllghnbhlbpcmnajkpdmadaolakh";} # todoist

homeManagerModules/apps/keepassxc/default.nix

@@ -40,9 +40,7 @@
         LockDatabaseScreenLock = false;
       };
 
-      SSHAgent = {
+      SSHAgent.Enabled = true;
-        Enabled = true;
-      };
     };
 
     xdg.configFile."keepassxc/keepassxc.ini".text =

homeManagerModules/apps/tmux/default.nix

@@ -9,6 +9,7 @@
       enable = true;
       mouse = true;
       newSession = true;
+
       plugins = with pkgs; [
         tmuxPlugins.battery
         tmuxPlugins.better-mouse-mode
@@ -16,7 +17,9 @@
         tmuxPlugins.resurrect
         tmuxPlugins.weather
       ];
+
       terminal = "tmux-256color";
+
       extraConfig = ''
         run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/battery/battery.tmux
         run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux

homeManagerModules/apps/vsCodium/default.nix

@@ -10,6 +10,7 @@
       package = pkgs.vscodium;
       enableUpdateCheck = false;
       enableExtensionUpdateCheck = false;
+
       userSettings = {
         "diffEditor.ignoreTrimWhitespace" = false;
         "editor.fontFamily" = "'NotoSansM Nerd Font', 'monospace', monospace";
@@ -42,6 +43,7 @@
         "[shellscript]" = {
           "editor.defaultFormatter" = "foxundermoon.shell-format";
         };
+
         "shellformat.flag" = "-i 4";
 
         "terminal.external.linuxExec" = lib.getExe config.ar.home.defaultApps.terminal;

homeManagerModules/apps/waybar/default.nix

@@ -20,11 +20,13 @@
             ["sway/workspaces" "sway/scratchpad" "sway/mode"]
             ++ lib.optionals (config.ar.home.desktop.hyprland.tabletMode.menuButton)
             ["custom/menu" "custom/hyprland-close"];
+
           modules-center = ["clock"];
           modules-right = [
             "tray"
             "group/hardware"
           ];
+
           "hyprland/workspaces" = {
             "all-outputs" = true;
             "format" = "{icon} {name}";
@@ -32,18 +34,22 @@
               "default" = "󰝥";
               "active" = "󰪥";
             };
+
             "sort-by" = "id";
           };
+
           "hyprland/submap" = {
             "on-click" = ''${lib.getExe'
                 config.wayland.windowManager.hyprland.package "hyprctl"} dispatch submap reset'';
           };
+
           "hyprland/window" = {
             "format" = "";
             "max-length" = 100;
             "separate-outputs" = true;
             "icon" = true;
           };
+
           "sway/workspaces" = {
             "all-outputs" = true;
             "format" = "{icon} {name}";
@@ -53,12 +59,15 @@
             };
             "sort-by" = "id";
           };
+
           "sway/mode" = {
             "on-click" = ''${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"} mode default'';
           };
+
           "sway/window" = {
             "max-length" = 100;
           };
+
           "sway/scratchpad" = {
             "format" = "{icon}　{count}";
             "show-empty" = false;
@@ -66,27 +75,33 @@
             "tooltip" = true;
             "tooltip-format" = "{app}: {title}";
           };
+
           "custom/sway-close" = {
             "on-click" = ''${lib.getExe'
                 config.wayland.windowManager.sway.package "swaymsg"} kill'';
             "format" = "󰅗";
           };
+
           "custom/hyprland-close" = {
             "on-click" = ''${lib.getExe'
                 config.wayland.windowManager.hyprland.package "hyprctl"} dispatch killactive'';
             "format" = "󰅗";
           };
+
           "river/window" = {
             "max-length" = 100;
           };
+
           "river/tags" = {
             "num-tags" = 4;
           };
+
           "clock" = {
             "tooltip-format" = "{:%Y-%m-%d | %H:%M}";
             "interval" = 60;
             "format" = "{:%I:%M%p}";
           };
+
           "battery" = {
             "states" = {"critical" = 20;};
             "format" = "{icon}";
@@ -95,6 +110,7 @@
               {capacity}%: {timeTo}.
               Draw: {power} watts.'';
           };
+
           "inhibitor" = {
             "what" = "sleep";
             "format" = "{icon}";
@@ -103,6 +119,7 @@
               "deactivated" = "";
             };
           };
+
           "bluetooth" = {
             "format" = "󰂯";
             "format-disabled" = ""; # an empty format will hide the module
@@ -115,20 +132,24 @@
             "tooltip-format-enumerate-connected" = "{device_alias}	{device_address}";
             "on-click" = lib.getExe' pkgs.blueberry "blueberry";
           };
+
           "pulseaudio" = {
             "format" = "{icon}";
             "format-bluetooth" = "{volume}% {icon}󰂯";
             "format-muted" = "";
+
             "format-icons" = {
               "headphones" = "󰋋";
               "handsfree" = "󰋎";
               "headset" = "󰋎";
               "default" = ["" "" ""];
             };
+
             "scroll-step" = 5;
             "ignored-sinks" = ["Easy Effects Sink"];
             "on-click" = "${lib.getExe pkgs.pavucontrol} -t 3";
           };
+
           "network" = {
             "format-wifi" = "{icon}";
             "format-ethernet" = "󰈀";
@@ -140,21 +161,28 @@
             "tooltip-format-disconnected" = "Disconnected";
             "on-click" = "${lib.getExe config.ar.home.defaultApps.terminalEditor} --class nmtui -e ${pkgs.networkmanager}/bin/nmtui";
           };
+
           "tray" = {"spacing" = 15;};
+
           "custom/logout" = {
             "on-click" = "${lib.getExe pkgs.wlogout}";
             "format" = "󰗽";
           };
+
           "custom/menu" = {
             "on-click" = "${lib.getExe pkgs.nwg-drawer} -mt 5";
             "format" = "󰀻";
           };
+
           "power-profiles-daemon" = {
             "format" = "{icon}";
+
             "tooltip-format" = ''
               Profile: {profile}
               Driver: {driver}'';
+
             "tooltip" = true;
+
             "format-icons" = {
               "default" = "󱐌";
               "performance" = "󱐌";
@@ -162,6 +190,7 @@
               "power-saver" = "󰌪";
             };
           };
+
           "group/hardware" = {
             "orientation" = "horizontal";
             modules = ["pulseaudio" "power-profiles-daemon" "battery" "custom/logout"];

homeManagerModules/desktop/cinnamon/default.nix

@@ -17,13 +17,9 @@
           workspaces-only-on-primary = true;
         };
 
-        "org/cinnamon/desktop/interface" = {
+        "org/cinnamon/desktop/interface".clock-use-24h = false;
-          clock-use-24h = false;
-        };
 
-        "org/gnome/desktop/interface" = {
+        "org/gnome/desktop/interface".clock-format = "12h";
-          clock-format = "12h";
-        };
 
         "org/cinnamon/settings-daemon/peripherals/touchscreen".orientation-lock = false;
 
@@ -57,9 +53,7 @@
           switch-to-workspace-9 = ["<Super>9"];
         };
 
-        "org/cinnamon/desktop/keybindings" = {
+        "org/cinnamon/desktop/keybindings".custom-list = ["__dummy__" "custom0"];
-          custom-list = ["__dummy__" "custom0"];
-        };
 
         "org/cinnamon/desktop/keybindings/custom-keybindings/custom0" = {
           binding = ["<Super>e"];

homeManagerModules/desktop/gnome/default.nix

@@ -6,6 +6,7 @@
 }: {
   config = lib.mkIf config.ar.home.desktop.gnome.enable {
     dconf.enable = true;
+
     dconf.settings = {
       "org/gnome/desktop/datetime".automatic-timezone = true;
 
@@ -55,6 +56,7 @@
 
     xdg.mimeApps = {
       enable = true;
+
       defaultApplications = {
         "x-scheme-handler/sms" = "org.gnome.Shell.Extensions.GSConnect.desktop";
         "x-scheme-handler/tel" = "org.gnome.Shell.Extensions.GSConnect.desktop";

homeManagerModules/desktop/sway/default.nix

@@ -7,18 +7,16 @@
   imports = [./randomWallpaper.nix ./redShift.nix];
 
   config = lib.mkIf config.ar.home.desktop.sway.enable {
-    wayland.windowManager.sway = {
-      enable = true;
-      wrapperFeatures.gtk = true;
-      checkConfig = false;
-    };
-
     ar.home.theme.gtk.hideTitleBar =
       if config.wayland.windowManager.sway.package == pkgs.sway
       then true
       else false;
+    wayland = {
+      windowManager.sway.enable = true;
+      windowManager.sway.wrapperFeatures.gtk = true;
+      windowManager.sway.checkConfig = false;
 
-    wayland.windowManager.sway.config = let
+      windowManager.sway.config = let
         modifier = "Mod4";
         swaymsg = lib.getExe' config.wayland.windowManager.sway.package "swaymsg";
 
@@ -87,6 +85,7 @@
         bars = [{command = "${bar}";}];
         modifier = "${modifier}";
         colors.background = "${config.ar.home.theme.colors.primary}EE";
+
         colors.focused = {
           background = "${config.ar.home.theme.colors.primary}EE";
           border = "${config.ar.home.theme.colors.primary}EE";
@@ -94,6 +93,7 @@
           indicator = "${config.ar.home.theme.colors.primary}EE";
           text = "${config.ar.home.theme.colors.text}";
         };
+
         colors.focusedInactive = {
           background = "${config.ar.home.theme.colors.inactive}AA";
           border = "${config.ar.home.theme.colors.inactive}AA";
@@ -101,6 +101,7 @@
           indicator = "${config.ar.home.theme.colors.inactive}AA";
           text = "${config.ar.home.theme.colors.text}";
         };
+
         colors.unfocused = {
           background = "${config.ar.home.theme.colors.inactive}AA";
           border = "${config.ar.home.theme.colors.inactive}AA";
@@ -108,19 +109,24 @@
           indicator = "${config.ar.home.theme.colors.inactive}AA";
           text = "${config.ar.home.theme.colors.text}";
         };
+
         defaultWorkspace = "workspace number 1";
+
         focus = {
           followMouse = "always";
           newWindow = "focus";
           # mouseWarping = "container";
         };
+
         fonts = {
           names = ["${config.gtk.font.name}"];
           style = "Bold";
           size = config.gtk.font.size + 0.0;
         };
+
         gaps.inner = 5;
         gaps.outer = 5;
+
         input = {
           "type:touchpad" = {
             click_method = "clickfinger";
@@ -130,17 +136,21 @@
             tap = "enabled";
             tap_button_map = "lrm";
           };
+
           "type:keyboard" = {
             xkb_layout = "us";
             xkb_variant = "altgr-intl";
           };
+
           "1386:21186:Wacom_HID_52C2_Finger" = {
             map_to_output = "'Samsung Display Corp. 0x4152 Unknown'";
           };
+
           "1386:21186:Wacom_HID_52C2_Pen" = {
             map_to_output = "'Samsung Display Corp. 0x4152 Unknown'";
           };
         };
+
         keybindings = {
           # Apps
           "${modifier}+B" = "exec ${browser}";
@@ -243,6 +253,7 @@
           "Ctrl+Mod1+M" = "mode move";
           "Ctrl+Mod1+R" = "mode resize";
         };
+
         modes = {
           move = {
             Escape = "mode default";
@@ -268,6 +279,7 @@
             "0" = "move container to workspace number 10; workspace 10";
             S = "move scratchpad";
           };
+
           resize = {
             Escape = "mode default";
             Left = "resize shrink width 10 px";
@@ -276,6 +288,7 @@
             Right = "resize grow width 10 px";
           };
         };
+
         startup = [
           {
             command =
@@ -292,30 +305,25 @@
           {command = lib.getExe' pkgs.swayosd "swayosd-server";}
           {command = notifyd;}
         ];
+
         output = {
-        "BOE 0x095F Unknown" = {
+          "BOE 0x095F Unknown".scale = "1.5";
-          scale = "1.5";
+          "LG Display 0x0569 Unknown".scale = "1.0";
-        };
+          "Samsung Display Corp. 0x4152 Unknown".scale = "2.0";
-        "LG Display 0x0569 Unknown" = {
+          "LG Electronics LG ULTRAWIDE 311NTAB5M720".scale = "1.25";
-          scale = "1.0";
+
-        };
-        "Samsung Display Corp. 0x4152 Unknown" = {
-          scale = "2.0";
-        };
-        "LG Electronics LG ULTRAWIDE 311NTAB5M720" = {
-          scale = "1.25";
-        };
           "Guangxi Century Innovation Display Electronics Co., Ltd 27C1U-D 0000000000001" = {
             scale = "1.5";
             pos = "-2560 0";
           };
+
           "HP Inc. HP 24mh 3CM037248S   " = {
             scale = "1.0";
             pos = "-1920 0";
           };
         };
-      floating = {
+
-        criteria = [
+        floating.criteria = [
           {app_id = ".blueman-manager-wrapped";}
           {app_id = "Bitwarden";}
           {app_id = "blueberry.py";}
@@ -330,7 +338,7 @@
           {window_role = "pop-up";}
           {window_type = "dialog";}
         ];
-      };
+
         window = {
           titlebar = false;
           commands = [
@@ -371,10 +379,11 @@
             }
           ];
         };
+
         workspaceAutoBackAndForth = true;
       };
 
-    wayland.windowManager.sway.extraConfig = let
+      windowManager.sway.extraConfig = let
         brightness = lib.getExe' pkgs.swayosd "swayosd-client";
         brightness_up = "${brightness} --brightness=raise";
         brightness_down = "${brightness} --brightness=lower";
@@ -441,6 +450,7 @@
           else ""
         }
       '';
+    };
 
     xdg.portal = {
       enable = true;

homeManagerModules/desktop/sway/randomWallpaper.nix

@@ -38,7 +38,6 @@
   '';
 in {
   config = lib.mkIf config.ar.home.desktop.sway.randomWallpaper {
-    # Packages that should be installed to the user profile.
     home.packages = with pkgs; [swaybg sway-randomWallpaper];
 
     wayland.windowManager.sway.config.startup = [

homeManagerModules/desktop/sway/redShift.nix

@@ -6,8 +6,8 @@
 }: {
   config = lib.mkIf config.ar.home.desktop.sway.redShift {
     home.packages = with pkgs; [gammastep];
+
     wayland.windowManager.sway.config.startup = [
-      # {command = "${pkgs.geoclue2}/libexec/geoclue-2.0/demos/agent";}
       {command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";}
     ];
   };

homeManagerModules/theme.nix

@@ -57,11 +57,9 @@ in {
         size = lib.mkDefault 11;
       };
 
-      gtk3.extraConfig = lib.attrsets.optionalAttrs (cfg.darkMode) {gtk-application-prefer-dark-theme = 1;};
+      gtk3 = {
-
+        extraConfig = lib.attrsets.optionalAttrs (cfg.darkMode) {gtk-application-prefer-dark-theme = 1;};
-      gtk4.extraConfig = lib.attrsets.optionalAttrs (cfg.darkMode) {gtk-application-prefer-dark-theme = 1;};
+        extraCss = ''
-
-      gtk3.extraCss = ''
           @define-color accent_bg_color ${cfg.colors.primary};
           @define-color accent_color @accent_bg_color;
 
@@ -91,8 +89,12 @@ in {
             ''
           }
         '';
+      };
 
-      gtk4.extraCss = config.gtk.gtk3.extraCss;
+      gtk4 = {
+        extraConfig = lib.attrsets.optionalAttrs (cfg.darkMode) {gtk-application-prefer-dark-theme = 1;};
+        extraCss = config.gtk.gtk3.extraCss;
+      };
     };
 
     qt = {

homes/aly/firefox/default.nix

@@ -11,8 +11,8 @@
       ref = "master";
     };
   in {
-    ".mozilla/firefox/default/chrome" = {inherit source;};
+    ".mozilla/firefox/default/chrome".source = source;
-    ".mozilla/firefox/work/chrome" = {inherit source;};
+    ".mozilla/firefox/work/chrome".source = source;
   };
 
   programs.firefox = {
@@ -39,12 +39,10 @@
           force = true;
 
           engines = {
-            "Bing" = {
+            "Bing".metaData = {
-              metaData = {
               hidden = true;
               alias = "!bing";
             };
-            };
 
             "Brave" = {
               definedAliases = ["!brave"];
@@ -63,12 +61,10 @@
               ];
             };
 
-            "Google" = {
+            "Google".metaData = {
-              metaData = {
               hidden = true;
               alias = "!google";
             };
-            };
 
             "Kagi" = {
               definedAliases = ["!kagi"];
@@ -133,6 +129,7 @@
               ];
             };
           };
+
           order = [
             "Brave"
             "Kagi"
@@ -193,15 +190,12 @@
           default = "Google";
           force = true;
           engines = {
-            "Bing" = {
+            "Bing".metaData = {
-              metaData = {
               hidden = true;
               alias = "!bing";
             };
-            };
 
-            "DuckDuckGo" = {
+            "DuckDuckGo".metaData = {
-              metaData = {
               hidden = true;
               alias = "!ddg";
             };
@@ -210,7 +204,6 @@
       };
     };
   };
-  };
 
   xdg.desktopEntries.firework = {
     categories = ["Application" "Network" "WebBrowser"];

homes/aly/mail/default.nix

@@ -53,6 +53,8 @@ in {
           --
           Aly Raffauf (née Chace)
         '';
+
+        showSignature = "append";
       };
 
       thunderbird = {
@@ -99,23 +101,21 @@ in {
           inherit settings;
           isDefault = true;
         };
-        work = {inherit settings;};
+        work.settings = settings;
       };
     };
   };
 
   xdg.desktopEntries.thunderwork = {
     categories = ["Application" "Network" "Chat" "Email" "Feed" "GTK" "News"];
-    exec = "thunderbird -P work --name thunderwork %U";
     comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars.";
+    exec = "thunderbird -P work --name thunderwork %U";
     genericName = "Email Client";
     icon = "thunderbird";
     mimeType = ["message/rfc822" "x-scheme-handler/mailto" "text/calendar" "text/x-vcard"];
     name = "Thunderbird (work)";
+    settings.StartupWMClass = "thunderwork";
     startupNotify = true;
     terminal = false;
-    settings = {
-      StartupWMClass = "thunderwork";
-    };
   };
 }

homes/dustin/default.nix

@@ -10,6 +10,7 @@ self: {
     username = "dustin";
     homeDirectory = "/home/dustin";
     stateVersion = "24.05";
+
     packages = with pkgs; [
       fractal
       libreoffice-fresh
@@ -24,9 +25,7 @@ self: {
 
   xdg.mimeApps = {
     enable = true;
-    defaultApplications = {
+    defaultApplications."application/epub+zip" = "com.calibre_ebook.calibre.desktop;org.gnome.Evince.desktop;com.calibre_ebook.calibre.ebook-viewer.desktop;";
-      "application/epub+zip" = "com.calibre_ebook.calibre.desktop;org.gnome.Evince.desktop;com.calibre_ebook.calibre.ebook-viewer.desktop;";
-    };
   };
 
   ar.home = {