hyprland: enable mouse refocus

Signed-off-by: Myned <dev@bjork.tech>

configuration.nix

@@ -3,26 +3,33 @@
   inputs,
   lib,
   ...
-}: {
+}:
-  age.secrets = let
+
+{
+  age.secrets =
+    let
       secret = filename: {
         file = "${inputs.self}/secrets/${filename}";
       };
-  in {
+    in
+    {
       "common/nix/access-tokens.conf" = secret "common/nix/access-tokens.conf";
     };
 
   ### NixOS
-  nixpkgs = let
+  nixpkgs =
+    let
       config = {
         allowUnfree = true;
 
-      allowInsecurePredicate = pkg: let
+        allowInsecurePredicate =
+          pkg:
+          let
             name = lib.getName pkg;
           in
           # HACK: Allow all insecure electron versions
-        name
+          name == "electron"
-        == "electron"
+
           # HACK: Some Matrix clients rely on libolm, which is deprecated
           # https://github.com/NixOS/nixpkgs/pull/334638
           || name == "cinny"
@@ -31,13 +38,16 @@
           || name == "olm"
           || name == "openssl"; # Cisco Packet Tracer
       };
-  in {
+    in
+    {
       inherit config;
 
       overlays = [
         (
-        final: prev: let
+          final: prev:
-          nixpkgs = branch:
+          let
+            nixpkgs =
+              branch:
               import inputs."nixpkgs-${branch}" {
                 inherit config;
                 system = prev.system;
@@ -47,7 +57,8 @@
             unstable = nixpkgs "unstable";
             staging-next = nixpkgs "staging-next";
             local = nixpkgs "local";
-        in {
+          in
+          {
             # Overlay nixpkgs branches
             #?? nixpkgs.BRANCH.PACKAGE
             inherit stable unstable staging-next;

flake.in.nix

@@ -59,17 +59,24 @@
     fw-fanctrl = flake "github:TamtamHero/fw-fanctrl/packaging/nix" // unstable "nixpkgs";
     hypridle = flake "github:hyprwm/hypridle" // unstable "nixpkgs";
     #// hyprland = flake "git+https://github.com/hyprwm/Hyprland?submodules=1" // unstable "nixpkgs";
-    hyprland = flake "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.43.0&submodules=1" // unstable "nixpkgs";
+    hyprland =
-    #// hyprland = flake "git+https://github.com/UjinT34/Hyprland?ref=vrr-cursor-fix&submodules=1" // unstable "nixpkgs";
+      flake "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.43.0&submodules=1"
+      // unstable "nixpkgs";
+    #// hyprland =
+    #//   flake "git+https://github.com/UjinT34/Hyprland?ref=vrr-cursor-fix&submodules=1"
+    #//   // unstable "nixpkgs";
     hyprland-contrib = flake "github:hyprwm/contrib" // unstable "nixpkgs";
-    hyprland-plugins = flake "github:hyprwm/hyprland-plugins" // unstable "nixpkgs" // follows "hyprland";
+    hyprland-plugins =
+      flake "github:hyprwm/hyprland-plugins" // unstable "nixpkgs" // follows "hyprland";
     hyprlock = flake "github:hyprwm/hyprlock" // unstable "nixpkgs";
     hyprpaper = flake "github:hyprwm/hyprpaper" // unstable "nixpkgs";
     hyprpicker = flake "github:hyprwm/hyprpicker" // unstable "nixpkgs";
     nix-flatpak = flake "github:gmodena/nix-flatpak?ref=v0.4.1";
     nix-vscode-extensions = flake "github:nix-community/nix-vscode-extensions" // unstable "nixpkgs";
     nixd = flake "github:nix-community/nixd" // unstable "nixpkgs";
-    xdg-desktop-portal-hyprland = flake "github:hyprwm/xdg-desktop-portal-hyprland" // unstable "nixpkgs";
+    xdg-desktop-portal-hyprland =
+      flake "github:hyprwm/xdg-desktop-portal-hyprland"
+      // unstable "nixpkgs";
 
     # Server flakes
     conduwuit = flake "github:Myned/conduwuit" // unstable "nixpkgs";
@@ -105,7 +112,10 @@
       common = branch: arch: modules:
         inputs."nixpkgs-${branch}".lib.nixosSystem {
           system = arch;
-          specialArgs = {inherit inputs;};
+
+          specialArgs = {
+            inherit inputs;
+          };
 
           # TODO: Clean up optional attributes with each new release
           #!! Options will diverge between branches over time
@@ -148,14 +158,36 @@
       unstable = arch: modules: common "unstable" "${arch}-linux" modules;
     in {
       ### Stable
-      myarm = stable "aarch64" [./profiles/server ./machines/myarm];
+      myarm = stable "aarch64" [
-      myne = stable "x86_64" [./profiles/server ./machines/myne];
+        ./profiles/server
-      mypi3 = stable "aarch64" [./profiles/sbc ./machines/mypi3];
+        ./machines/myarm
+      ];
+
+      myne = stable "x86_64" [
+        ./profiles/server
+        ./machines/myne
+      ];
+
+      mypi3 = stable "aarch64" [
+        ./profiles/sbc
+        ./machines/mypi3
+      ];
 
       ### Unstable
-      myeck = unstable "x86_64" [./profiles/console ./machines/myeck];
+      myeck = unstable "x86_64" [
-      mynix = unstable "x86_64" [./profiles/desktop ./machines/mynix];
+        ./profiles/console
-      myork = unstable "x86_64" [./profiles/laptop ./machines/myork];
+        ./machines/myeck
+      ];
+
+      mynix = unstable "x86_64" [
+        ./profiles/desktop
+        ./machines/mynix
+      ];
+
+      myork = unstable "x86_64" [
+        ./profiles/laptop
+        ./machines/myork
+      ];
     };
   };
 }

machines/myarm/hardware-configuration.nix

@@ -7,7 +7,9 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+
+{
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   boot.initrd.availableKernelModules = [

machines/myeck/hardware-configuration.nix

@@ -7,7 +7,9 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [

machines/myne/hardware-configuration.nix

@@ -7,7 +7,9 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+
+{
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   boot.initrd.availableKernelModules = [

machines/mynix/hardware-configuration.nix

@@ -7,7 +7,9 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [

machines/myork/default.nix

@@ -4,9 +4,12 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+
+let
   brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
-in {
+in
+{
   imports = [
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
 

machines/myork/hardware-configuration.nix

@@ -7,7 +7,9 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [

machines/mypi3/hardware-configuration.nix

@@ -7,7 +7,9 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ ];

options/custom/default.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom;
-in {
+in
+{
   options.custom = {
     ### Profiles
     default = mkOption { default = true; };

options/custom/desktops/default.nix

@@ -1,8 +1,7 @@
+{ config, lib, ... }:
+
+with lib;
+
 {
-  config,
-  lib,
-  ...
-}:
-with lib; {
   config.custom.desktops.hyprland.enable = config.custom.full;
 }

options/custom/desktops/gnome/default.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.desktops.gnome;
-in {
+in
+{
   options.custom.desktops.gnome = {
     enable = mkOption { default = false; };
     gdm = mkOption { default = true; };

options/custom/desktops/hyprland/default.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.desktops.hyprland;
-in {
+in
+{
   options.custom.desktops.hyprland.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/desktops/hyprland/plugins.nix

@@ -4,11 +4,15 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   hyprctl = "${pkgs.hyprland}/bin/hyprctl";
 
   cfg = config.custom.desktops.hyprland.plugins;
-in {
+in
+{
   options.custom.desktops.hyprland.plugins.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/desktops/hyprland/settings.nix

@@ -4,7 +4,10 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   clipse = "${pkgs.clipse}/bin/clipse";
   firefox-esr = "${
     config.home-manager.users.${config.custom.username}.programs.firefox.finalPackage
@@ -19,7 +22,8 @@ with lib; let
   }/bin/waybar";
 
   cfg = config.custom.desktops.hyprland.settings;
-in {
+in
+{
   options.custom.desktops.hyprland.settings.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
@@ -47,14 +51,12 @@ in {
       #?? envd = VARIABLE, VALUE
       # HACK: Mapped home-manager variables to envd in lieu of upstream fix
       # https://github.com/nix-community/home-manager/issues/2659
-      envd = with builtins;
+      envd =
-        attrValues
+        with builtins;
-        (
+        attrValues (
-          mapAttrs
+          mapAttrs (
-          (
             name: value: "${name}, ${toString value}"
-          )
+          ) config.home-manager.users.${config.custom.username}.home.sessionVariables
-          config.home-manager.users.${config.custom.username}.home.sessionVariables
         )
         ++ [
           "EDITOR, gnome-text-editor"
@@ -64,8 +66,7 @@ in {
       #// exec = [ ];
 
       # https://wiki.hyprland.org/Configuring/Keywords/#executing
-      exec-once =
+      exec-once = [
-        [
         "${rm} ~/.config/qalculate/qalc.dmenu.history" # Clear calc history
         "${clipse} -clear" # Clear clipboard history
         "${clipse} -listen" # Monitor clipboard
@@ -142,10 +143,7 @@ in {
           "col.inactive" = "rgba(6c71c440)";
           "col.locked_active" = "rgb(d33682)";
           "col.locked_inactive" = "rgba(d3368240)";
-          font_size =
+          font_size = if config.custom.hidpi then 16 else 10;
-            if config.custom.hidpi
-            then 16
-            else 10;
           height = 5;
           render_titles = false;
           text_color = "rgb(93a1a1)";

options/custom/desktops/kde/default.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.desktops.kde;
-in {
+in
+{
   options.custom.desktops.kde.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable { services.desktopManager.plasma6.enable = true; };

options/custom/files/agenix.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.files.agenix;
-in {
+in
+{
   # https://wiki.nixos.org/wiki/Agenix
   # https://github.com/ryantm/agenix
   options.custom.files.agenix.enable = mkOption { default = false; };

options/custom/files/default.nix

@@ -1,9 +1,8 @@
+{ config, lib, ... }:
+
+with lib;
+
 {
-  config,
-  lib,
-  ...
-}:
-with lib; {
   config.custom.files = mkIf config.custom.default {
     agenix.enable = true;
     dev.enable = true;

options/custom/files/dev.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.files.dev;
-in {
+in
+{
   options.custom.files.dev.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/files/mnt.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.files.mnt;
-in {
+in
+{
   options.custom.files.mnt.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/files/nixos.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.files.nixos;
-in {
+in
+{
   options.custom.files.nixos.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/adb.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.adb;
-in {
+in
+{
   options.custom.programs.adb.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/ags/default.nix

@@ -4,9 +4,13 @@
   lib,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.ags;
-in {
+in
+{
   options.custom.programs.ags.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/alacritty.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.alacritty;
-in {
+in
+{
   options.custom.programs.alacritty.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/anime-game-launcher.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.anime-game-launcher;
-in {
+in
+{
   options.custom.programs.anime-game-launcher.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/appimage.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.appimage;
-in {
+in
+{
   options.custom.programs.appimage.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/bitwarden-menu.nix

@@ -1,13 +1,13 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   wofi = "${config.home-manager.users.${config.custom.username}.programs.wofi.package}/bin/wofi";
 
   cfg = config.custom.programs.bitwarden-menu;
-in {
+in
+{
   options.custom.programs.bitwarden-menu.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/chromium.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.chromium;
-in {
+in
+{
   options.custom.programs.chromium.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/clipse.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.clipse;
-in {
+in
+{
   options.custom.programs.clipse.enable = mkOption { default = false; };
 
   config = {

options/custom/programs/dconf.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.dconf;
-in {
+in
+{
   options.custom.programs.dconf.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/default.nix

@@ -1,9 +1,8 @@
+{ config, lib, ... }:
+
+with lib;
+
 {
-  config,
-  lib,
-  ...
-}:
-with lib; {
   config.custom.programs = mkMerge [
     (mkIf config.custom.default {
       direnv.enable = true;

options/custom/programs/direnv.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.direnv;
-in {
+in
+{
   options.custom.programs.direnv.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/discord.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.discord;
-in {
+in
+{
   options.custom.programs.discord.enable = mkOption { default = false; };
 
   config.home-manager.users.myned = mkIf cfg.enable {

options/custom/programs/element-desktop.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.element-desktop;
-in {
+in
+{
   options.custom.programs.element-desktop.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/fastfetch.nix

@@ -4,11 +4,15 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   fastfetch = "${pkgs.fastfetch}/bin/fastfetch";
 
   cfg = config.custom.programs.fastfetch;
-in {
+in
+{
   options.custom.programs.fastfetch = {
     enable = mkOption { default = false; };
     greet = mkOption { default = false; };

options/custom/programs/firefox.nix

@@ -5,9 +5,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.firefox;
-in {
+in
+{
   options.custom.programs.firefox.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
@@ -112,7 +116,8 @@ in {
         # https://mozilla.github.io/policy-templates/#extensionsettings
         #?? https://addons.mozilla.org/en-US/firefox
         #?? about:support#addons
-        ExtensionSettings = let
+        ExtensionSettings =
+          let
             extension = id: {
               install_url = "https://addons.mozilla.org/firefox/downloads/latest/${id}/latest.xpi";
               installation_mode = "normal_installed";
@@ -189,12 +194,14 @@ in {
         #!! Only certain preferences are supported via policies
         # https://mozilla.github.io/policy-templates/#preferences
         #?? about:config
-        Preferences = let
+        Preferences =
+          let
             locked = value: {
               Value = value;
               Status = "locked";
             };
-        in {
+          in
+          {
             "accessibility.browsewithcaret" = locked false;
             "accessibility.typeaheadfind" = locked false;
             "browser.aboutConfig.showWarning" = locked false;

options/custom/programs/fish.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.fish;
-in {
+in
+{
   options.custom.programs.fish.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/foot.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.foot;
-in {
+in
+{
   options.custom.programs.foot.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/fuzzel.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.fuzzel;
-in {
+in
+{
   options.custom.programs.fuzzel.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/gamemode.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.gamemode;
-in {
+in
+{
   options.custom.programs.gamemode.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/gamescope.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.gamescope;
-in {
+in
+{
   options.custom.programs.gamescope.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/git.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.git;
-in {
+in
+{
   options.custom.programs.git.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/gnome-shell.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.gnome-shell;
-in {
+in
+{
   options.custom.programs.gnome-shell.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
@@ -14,7 +18,8 @@ in {
     programs.gnome-shell = {
       enable = true;
 
-      extensions = with pkgs.gnomeExtensions;
+      extensions =
+        with pkgs.gnomeExtensions;
         optionals config.custom.default [
           { package = appindicator; } # https://github.com/ubuntu/gnome-shell-extension-appindicator
         ]

options/custom/programs/gnome-terminal.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.gnome-terminal;
-in {
+in
+{
   options.custom.programs.gnome-terminal.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/gpg.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.gpg;
-in {
+in
+{
   options.custom.programs.gpg.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/htop.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.htop;
-in {
+in
+{
   options.custom.programs.htop.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/hyprlock.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.hyprlock;
-in {
+in
+{
   options.custom.programs.hyprlock.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/kdeconnect.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.kdeconnect;
-in {
+in
+{
   options.custom.programs.kdeconnect.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/kitty.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.kitty;
-in {
+in
+{
   options.custom.programs.kitty.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/libreoffice.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.libreoffice;
-in {
+in
+{
   options.custom.programs.libreoffice = {
     enable = mkOption { default = false; };
     package = mkOption { default = pkgs.libreoffice-fresh; };

options/custom/programs/librewolf.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.librewolf;
-in {
+in
+{
   options.custom.programs.librewolf.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/localsend.nix

@@ -1,16 +1,15 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.localsend;
-in {
+in
+{
   options.custom.programs.localsend.enable = mkOption { default = false; };
 
   config =
-    if (versionAtLeast version "24.11")
+    if (versionAtLeast version "24.11") then
-    then
       (mkIf cfg.enable {
         # https://github.com/localsend/localsend
         programs.localsend = {
@@ -18,5 +17,6 @@ in {
           openFirewall = true;
         };
       })
-    else {};
+    else
+      { };
 }

options/custom/programs/logseq.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.logseq;
-in {
+in
+{
   options.custom.programs.logseq.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/man.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.man;
-in {
+in
+{
   options.custom.programs.man.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/mangohud.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.mangohud;
-in {
+in
+{
   options.custom.programs.mangohud.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/mosh.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.mosh;
-in {
+in
+{
   options.custom.programs.mosh.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/nano.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.nano;
-in {
+in
+{
   options.custom.programs.nano.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/nautilus.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.nautilus;
-in {
+in
+{
   options.custom.programs.nautilus.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/networkmanager-dmenu.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.networkmanager-dmenu;
-in {
+in
+{
   options.custom.programs.networkmanager-dmenu.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
@@ -13,9 +13,11 @@ in {
     # https://github.com/firecat53/networkmanager-dmenu/blob/main/config.ini.example
     #!! Option not available, files written directly
     # FIXME: active_chars does not take effect
-    home.file.".config/networkmanager-dmenu/config.ini".text = let
+    home.file.".config/networkmanager-dmenu/config.ini".text =
+      let
         wofi = "${config.home-manager.users.${config.custom.username}.programs.wofi.package}/bin/wofi";
-    in ''
+      in
+      ''
         [dmenu]
         dmenu_command = ${wofi} --dmenu --lines 11
         active_chars = >

options/custom/programs/nh.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.nh;
-in {
+in
+{
   options.custom.programs.nh.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {
@@ -16,11 +16,7 @@ in {
 
       clean = {
         enable = true;
-        extraArgs = "--keep-since ${
+        extraArgs = "--keep-since ${if config.custom.minimal then "7" else "30"}d";
-          if config.custom.minimal
-          then "7"
-          else "30"
-        }d";
       };
     };
   };

options/custom/programs/nheko.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.nheko;
-in {
+in
+{
   options.custom.programs.nheko.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/nix-index.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.nix-index;
-in {
+in
+{
   options.custom.programs.nix-index.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/nix-ld.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.nix-ld;
-in {
+in
+{
   options.custom.programs.nix-ld.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/nushell.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.nushell;
-in {
+in
+{
   options.custom.programs.nushell.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/nvtop.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.nvtop;
-in {
+in
+{
   options.custom.programs.nvtop.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/obs-studio.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.obs-studio;
-in {
+in
+{
   options.custom.programs.obs-studio.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/onedrive.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.onedrive;
-in {
+in
+{
   options.custom.programs.onedrive.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/path-of-building.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.path-of-building;
-in {
+in
+{
   options.custom.programs.path-of-building.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/rbw.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.rbw;
-in {
+in
+{
   options.custom.programs.rbw.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/rofi-rbw.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.rofi-rbw;
-in {
+in
+{
   options.custom.programs.rofi-rbw.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/rofi.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.rofi;
-in {
+in
+{
   options.custom.programs.rofi.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/seahorse.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.seahorse;
-in {
+in
+{
   options.custom.programs.seahorse.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/slurp.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.slurp;
-in {
+in
+{
   options.custom.programs.slurp.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/ssh.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.ssh;
-in {
+in
+{
   options.custom.programs.ssh.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/steam.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.steam;
-in {
+in
+{
   # https://wiki.nixos.org/wiki/Steam
   # https://store.steampowered.com
   options.custom.programs.steam = {
@@ -15,8 +19,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    programs.steam =
+    programs.steam = {
-      {
       enable = true;
       extest.enable = cfg.extest; # Work around invisible cursor on Wayland
       extraCompatPackages = [ pkgs.proton-ge-bin ];
@@ -28,7 +31,6 @@ in {
         #   "--fullscreen"
         # ];
       };
-      }
+    } // optionalAttrs (versionAtLeast version "24.11") { protontricks.enable = true; };
-      // optionalAttrs (versionAtLeast version "24.11") {protontricks.enable = true;};
   };
 }

options/custom/programs/swaylock.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.swaylock;
-in {
+in
+{
   options.custom.programs.swaylock.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/thunderbird.nix

@@ -5,9 +5,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.thunderbird;
-in {
+in
+{
   options.custom.programs.thunderbird.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/tio.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.tio;
-in {
+in
+{
   options.custom.programs.tio.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/tmux.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.tmux;
-in {
+in
+{
   options.custom.programs.tmux.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/vscode.nix

@@ -5,9 +5,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.programs.vscode;
-in {
+in
+{
   options.custom.programs.vscode.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/waybar/default.nix

@@ -4,7 +4,6 @@
   pkgs,
   ...
 }:
-with lib; let
 with lib; let
   bash = "${pkgs.bash}/bin/bash";
   blueberry = "${pkgs.blueberry}/bin/blueberry";
@@ -33,8 +32,6 @@ with lib; let
   wttrbar = "${pkgs.wttrbar}/bin/wttrbar";
 
   cfg = config.custom.programs.waybar;
-in {
-  options.custom.programs.waybar.enable = mkOption {default = false;};
 in {
   options.custom.programs.waybar.enable = mkOption {default = false;};
 
@@ -49,52 +46,6 @@ in {
       ### SETTINGS ###
       # https://github.com/Alexays/Waybar/wiki/Configuration
       #?? pkill -SIGUSR2 -x waybar
-      settings = let
-        ## INHERIT ##
-        #!! Module defaults are not accurate to documentation
-        # TODO: Submit pull request to fix in addition to inconsistent hyphen vs underscore
-        # https://github.com/Alexays/Waybar/wiki/Module:-Cava
-        cava-config = {
-          cava_config = null; # Default: null?
-          framerate = 30; # Default: 30?
-          autosens = 1; # Default: 1
-          # sensitivity = 0; # Default: 100?
-          bars = 16; # Default: 2
-          lower_cutoff_freq = 50; # Default: 50?
-          higher_cutoff_freq = 10000; # Default: 10000?
-          sleep_timer = 5; # Default: 0
-          hide_on_silence = true; # Default: false
-          method = "pipewire"; # Default: pulse
-          source = "auto"; # Default: auto?
-          sample_rate = 44100; # Default: 44100?
-          sample_bits = 16; # Default: 16?
-          stereo = false; # Default: true
-          reverse = false; # Default: false
-          bar_delimiter = 32; # ASCII code for space, default: 59 or ;
-          monstercat = true; # Default: false?
-          waves = true; # Default: false?
-          noise_reduction = 0.2; # Default: 0.77?
-          input_delay = 1; # Default: 4
-          format-icons = [
-            "▁"
-            "▂"
-            "▃"
-            "▄"
-            "▅"
-            "▆"
-            "▇"
-            "█"
-          ]; # !! Required
-          on-click = easyeffects;
-          on-scroll-up = "${swayosd-client} --output-volume raise";
-          on-scroll-down = "${swayosd-client} --output-volume lower";
-          rotate = 180;
-        };
-      in {
-        status = {
-          ## GLOBAL ##
-          layer = "top";
-          position = "bottom";
       settings = let
         ## INHERIT ##
         #!! Module defaults are not accurate to documentation
@@ -142,26 +93,6 @@ in {
           layer = "top";
           position = "bottom";
 
-          ## POSITION ##
-          modules-left = [
-            "custom/power"
-            "custom/inhibitor"
-            "custom/vpn"
-            "custom/vm"
-            "hyprland/workspaces"
-          ];
-          modules-center = [
-            "clock"
-            "custom/weather"
-          ];
-          modules-right = [
-            "mpris"
-            "tray"
-            "wireplumber"
-            "bluetooth"
-            "network"
-            "battery"
-          ];
           ## POSITION ##
           modules-left = [
             "custom/power"
@@ -183,14 +114,6 @@ in {
             "battery"
           ];
 
-          ## MODULES ##
-          # https://github.com/Alexays/Waybar/wiki/Module:-Custom
-          "custom/power" = {
-            format = "";
-            on-click = "${systemctl} poweroff";
-            on-click-right = "${systemctl} reboot";
-            on-click-middle = "${loginctl} terminate-session ''";
-          };
           ## MODULES ##
           # https://github.com/Alexays/Waybar/wiki/Module:-Custom
           "custom/power" = {
@@ -200,26 +123,12 @@ in {
             on-click-middle = "${loginctl} terminate-session ''";
           };
 
-          "custom/inhibitor" = {
-            interval = 5;
-            exec = "~/.config/waybar/scripts/inhibitor.sh";
-            on-click = "~/.local/bin/inhibit";
-          };
           "custom/inhibitor" = {
             interval = 5;
             exec = "~/.config/waybar/scripts/inhibitor.sh";
             on-click = "~/.local/bin/inhibit";
           };
 
-          "custom/vm" = {
-            interval = 5;
-            exec = "~/.config/waybar/scripts/vm.sh";
-            on-click = "~/.local/bin/vm -x ${
-              if config.custom.hidpi
-              then "/scale:140"
-              else ""
-            }";
-          };
           "custom/vm" = {
             interval = 5;
             exec = "~/.config/waybar/scripts/vm.sh";
@@ -230,27 +139,12 @@ in {
             }";
           };
 
-          "custom/vpn" = {
-            interval = 5;
-            exec = "~/.config/waybar/scripts/vpn.sh";
-            on-click = "~/.local/bin/vpn mypi3";
-          };
           "custom/vpn" = {
             interval = 5;
             exec = "~/.config/waybar/scripts/vpn.sh";
             on-click = "~/.local/bin/vpn mypi3";
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Idle-Inhibitor
-          # FIXME: Not currently usable
-          # https://github.com/Alexays/Waybar/issues/690
-          idle_inhibitor = {
-            format = "{icon}";
-            format-icons = {
-              activated = "󰅶";
-              deactivated = "󰾪";
-            };
-          };
           # https://github.com/Alexays/Waybar/wiki/Module:-Idle-Inhibitor
           # FIXME: Not currently usable
           # https://github.com/Alexays/Waybar/issues/690
@@ -262,17 +156,8 @@ in {
             };
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
           # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
           # https://www.nerdfonts.com/cheat-sheet
-          "hyprland/workspaces" = {
-            show-special = true;
-            format = "{icon}";
-            format-icons = {
-              android = "";
-              dropdown = "󰞷";
-              game = "󰊴";
-              music = "󰝚";
           "hyprland/workspaces" = {
             show-special = true;
             format = "{icon}";
@@ -283,7 +168,6 @@ in {
               music = "󰝚";
               office = "󰈙";
               pip = "󰹙";
-              pip = "󰹙";
               scratchpad = "";
               steam = "󰓓";
               terminal = "";
@@ -291,28 +175,9 @@ in {
               wallpaper = "󰏩";
             };
           };
-              steam = "󰓓";
-              terminal = "";
-              vm = "󰢹";
-              wallpaper = "󰏩";
-            };
-          };
 
-          cava = cava-config;
           cava = cava-config;
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Clock
-          clock = {
-            # https://fmt.dev/latest/syntax.html#chrono-specs
-            format = "{:%a %b %d   %I:%M %p}"; # Mon Jan 01  12:00 AM
-            tooltip-format = "{calendar}";
-            calendar.format = {
-              months = "<span color='#eee8d5'>{}</span>";
-              weeks = "<span color='#eee8d5'>{}</span>";
-              weekdays = "<span color='#93a1a1'>{}</span>";
-              days = "<span color='#586e75'>{}</span>";
-              today = "<span color='#eee8d5'>{}</span>";
-            };
           # https://github.com/Alexays/Waybar/wiki/Module:-Clock
           clock = {
             # https://fmt.dev/latest/syntax.html#chrono-specs
@@ -333,19 +198,7 @@ in {
             on-scroll-up = "${swayosd-client} --output-volume raise";
             on-scroll-down = "${swayosd-client} --output-volume lower";
           };
-            # FIXME: Click release event sends to incorrect layer without sleeping
-            # https://github.com/hyprwm/Hyprland/issues/1348
-            on-click = "${swaync-client} --toggle-panel";
-            # on-click-right = easyeffects;
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-          };
 
-          # https://github.com/bjesus/wttrbar
-          "custom/weather" = {
-            format = "{}°";
-            interval = 60 * 60;
-            return-type = "json";
           # https://github.com/bjesus/wttrbar
           "custom/weather" = {
             format = "{}°";
@@ -358,13 +211,9 @@ in {
               "--fahrenheit"
               "--hide-conditions"
               "--main-indicator temp_F"
-              "--location 'Cedar Falls Iowa'"
             ];
           };
 
-          "cava#reverse" =
-            cava-config
-            // {
           "cava#reverse" =
             cava-config
             // {
@@ -387,37 +236,7 @@ in {
             on-scroll-up = "${swayosd-client} --output-volume raise";
             on-scroll-down = "${swayosd-client} --output-volume lower";
           };
-          # https://github.com/Alexays/Waybar/wiki/Module:-MPRIS
-          mpris = {
-            format = "{player_icon} {dynamic}";
-            format-paused = "{status_icon} {dynamic}";
-            dynamic-len = 50;
-            dynamic-order = [
-              "title"
-              "artist"
-            ];
-            dynamic-separator = " 󰧟 ";
-            player-icons.default = "󰎈";
-            status-icons.paused = "";
-            on-click-middle = ""; # TODO: Close music player
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-          };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-WirePlumber
-          wireplumber = {
-            format = "{icon} {volume}%";
-            format-muted = "󰸈";
-            format-icons = [
-              "󰕿"
-              "󰖀"
-              "󰕾"
-            ];
-            on-click = easyeffects;
-            on-click-right = "${swayosd-client} --output-volume mute-toggle";
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-          };
           # https://github.com/Alexays/Waybar/wiki/Module:-WirePlumber
           wireplumber = {
             format = "{icon} {volume}%";
@@ -433,16 +252,6 @@ in {
             on-scroll-down = "${swayosd-client} --output-volume lower";
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Bluetooth
-          bluetooth = {
-            format-disabled = "󰂲";
-            format-off = "󰂲";
-            format-on = "󰂯";
-            format-connected = "󰂱";
-            on-click = blueberry;
-            on-click-right = "${bluetoothctl} disconnect";
-            on-click-middle = "${rfkill} toggle bluetooth"; # Toggle bluetooth on/off
-          };
           # https://github.com/Alexays/Waybar/wiki/Module:-Bluetooth
           bluetooth = {
             format-disabled = "󰂲";
@@ -454,22 +263,6 @@ in {
             on-click-middle = "${rfkill} toggle bluetooth"; # Toggle bluetooth on/off
           };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Network
-          network = {
-            format = "{icon}";
-            format-icons = {
-              disabled = "";
-              disconnected = "";
-              ethernet = "󰈀";
-              linked = "";
-              wifi = [
-                "󰤯"
-                "󰤟"
-                "󰤢"
-                "󰤥"
-                "󰤨"
-              ];
-            };
           # https://github.com/Alexays/Waybar/wiki/Module:-Network
           network = {
             format = "{icon}";
@@ -490,31 +283,7 @@ in {
             on-click = nm-connection-editor;
             on-click-right = "~/.local/bin/network"; # Toggle networking on/off
           };
-            on-click = nm-connection-editor;
-            on-click-right = "~/.local/bin/network"; # Toggle networking on/off
-          };
 
-          # https://github.com/Alexays/Waybar/wiki/Module:-Battery
-          "battery" = {
-            format = "{icon} {power:.0f}W";
-            format-icons = [
-              "󰂃"
-              "󰁺"
-              "󰁻"
-              "󰁼"
-              "󰁽"
-              "󰁾"
-              "󰁿"
-              "󰂀"
-              "󰂁"
-              "󰂂"
-              "󰁹"
-            ];
-            interval = 5;
-            states = {
-              critical = 15;
-              warning = 30;
-            };
           # https://github.com/Alexays/Waybar/wiki/Module:-Battery
           "battery" = {
             format = "{icon} {power:.0f}W";
@@ -541,10 +310,6 @@ in {
           };
         };
       };
-            on-click = "~/.local/bin/power"; # Toggle power-saver mode
-          };
-        };
-      };
     };
 
     # TODO: Convert to writeShellApplication

options/custom/programs/wezterm/default.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.wezterm;
-in {
+in
+{
   options.custom.programs.wezterm.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/wireshark.nix

@@ -1,12 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  pkgs,
+
-  ...
+let
-}:
-with lib; let
   cfg = config.custom.programs.wireshark;
-in {
+in
+{
   options.custom.programs.wireshark.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/programs/wofi.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.wofi;
-in {
+in
+{
   options.custom.programs.wofi.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/programs/wpaperd.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.programs.wpaperd;
-in {
+in
+{
   options.custom.programs.wpaperd.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/scripts/default.nix

@@ -4,14 +4,19 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   # Use packages from local derivation
   git = config.home-manager.users.${config.custom.username}.programs.git.package;
   hyprland =
     config.home-manager.users.${config.custom.username}.wayland.windowManager.hyprland.finalPackage;
   wofi = config.home-manager.users.${config.custom.username}.programs.wofi.package;
-in {
+in
-  config.home-manager.users.${config.custom.username}.home.file = let
+{
+  config.home-manager.users.${config.custom.username}.home.file =
+    let
       # Place script.ext in the same directory as this file
       #?? pkg = (SHELL "NAME" [ DEPENDENCIES ])
       # https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeShellApplication
@@ -167,6 +172,7 @@ in {
             swww
             tailscale
           ])
+
         ]
         ++ (with pkgs.python3Packages; [
           # Python files with extension .py

options/custom/services/agenix.nix

@@ -4,12 +4,16 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cat = "${pkgs.coreutils}/bin/cat";
   sed = "${pkgs.gnused}/bin/sed";
 
   cfg = config.custom.services.agenix;
-in {
+in
+{
   options.custom.services.agenix.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/services/auto-cpufreq.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.services.auto-cpufreq;
-in {
+in
+{
   options.custom.services.auto-cpufreq = {
     enable = mkOption { default = false; };
 

options/custom/services/avizo.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.services.avizo;
-in {
+in
+{
   options.custom.services.avizo.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/services/blueman-applet.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.services.blueman-applet;
-in {
+in
+{
   options.custom.services.blueman-applet.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/services/blueman.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.services.blueman;
-in {
+in
+{
   options.custom.services.blueman.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/services/borgmatic.nix

@@ -5,11 +5,15 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cat = "${pkgs.coreutils}/bin/cat";
 
   cfg = config.custom.services.borgmatic;
-in {
+in
+{
   # https://wiki.nixos.org/wiki/Borg_backup
   # https://github.com/borgmatic-collective/borgmatic
   #!! Imperative initialization
@@ -64,9 +68,11 @@ in {
       };
     };
 
-    age.secrets = let
+    age.secrets =
+      let
         secret = filename: { file = "${inputs.self}/secrets/${filename}"; };
-    in {
+      in
+      {
         "${config.custom.profile}/borgmatic/borgbase.${config.custom.hostname}" = secret "${config.custom.profile}/borgmatic/borgbase.${config.custom.hostname}";
       };
   };

options/custom/services/caddy.nix

@@ -4,19 +4,25 @@
   lib,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.services.caddy;
-in {
+in
+{
   options.custom.services.caddy.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {
-    age.secrets = let
+    age.secrets =
+      let
         secret = filename: {
           file = "${inputs.self}/secrets/${filename}";
           owner = "caddy";
           group = "caddy";
         };
-    in {
+      in
+      {
         "${config.custom.profile}/caddy/Caddyfile" = secret "${config.custom.profile}/caddy/Caddyfile";
       };
 

options/custom/services/clipcat.nix

@@ -1,13 +1,13 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   wofi = "${config.home-manager.users.${config.custom.username}.programs.wofi.package}/bin/wofi";
 
   cfg = config.custom.services.clipcat;
-in {
+in
+{
   options.custom.services.clipcat.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/services/cliphist.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.services.cliphist;
-in {
+in
+{
   options.custom.services.cliphist.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/services/create_ap.nix

@@ -5,7 +5,10 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   bash = "${pkgs.bash}/bin/bash";
   cat = "${pkgs.coreutils}/bin/cat";
   sleep = "${pkgs.coreutils}/bin/sleep";
@@ -15,7 +18,8 @@ with lib; let
   }/bin/create_ap";
 
   cfg = config.custom.services.create_ap;
-in {
+in
+{
   options.custom.services.create_ap = {
     enable = mkOption { default = false; };
     internet = mkOption { default = "eth0"; };
@@ -23,9 +27,11 @@ in {
   };
 
   config = mkIf cfg.enable {
-    age.secrets = let
+    age.secrets =
+      let
         secret = filename: { file = "${inputs.self}/secrets/${filename}"; };
-    in {
+      in
+      {
         "${config.custom.profile}/create_ap/passphrase" = secret "${config.custom.profile}/create_ap/passphrase";
         "${config.custom.profile}/create_ap/ssid" = secret "${config.custom.profile}/create_ap/ssid";
       };
@@ -52,7 +58,8 @@ in {
     systemd.services.create_ap.serviceConfig = {
       ExecStartPre = "${sleep} 15s"; # Some cards like Intel force regulatory domain discovery
 
-      ExecStart = let
+      ExecStart =
+        let
           configFile = pkgs.writeText "create_ap.conf" (
             generators.toKeyValue { } config.services.create_ap.settings
           );

options/custom/services/dbus.nix

@@ -4,9 +4,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.services.dbus;
-in {
+in
+{
   options.custom.services.dbus.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {

options/custom/services/default.nix

@@ -1,9 +1,8 @@
+{ config, lib, ... }:
+
+with lib;
+
 {
-  config,
-  lib,
-  ...
-}:
-with lib; {
   config.custom.services = mkMerge [
     (mkIf config.custom.default {
       #// agenix.enable = true;

options/custom/services/easyeffects.nix

@@ -1,11 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
+
-  lib,
+with lib;
-  ...
+
-}:
+let
-with lib; let
   cfg = config.custom.services.easyeffects;
-in {
+in
+{
   options.custom.services.easyeffects.enable = mkOption { default = false; };
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {

options/custom/services/flatpak.nix

@@ -5,9 +5,13 @@
   pkgs,
   ...
 }:
-with lib; let
+
+with lib;
+
+let
   cfg = config.custom.services.flatpak;
-in {
+in
+{
   options.custom.services.flatpak.enable = mkOption { default = false; };
 
   config = mkIf cfg.enable {