diff --git a/outputs.nix b/outputs.nix
index 1efdda3..903ade5 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,10 +1,18 @@
-{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
+{
+  nixpkgs,
+  nixpkgs-unstable,
+  home-manager,
+  nix-flatpak,
+  ...
+}:
 
 let
-  mkPkgsUnstable = system: import nixpkgs-unstable {
-    inherit system;
-    config.allowUnfree = true;
-  };
+  mkPkgsUnstable =
+    system:
+    import nixpkgs-unstable {
+      inherit system;
+      config.allowUnfree = true;
+    };
 in
 
 {
diff --git a/systems/balrog/default.nix b/systems/balrog/default.nix
index 198fb93..1ab0772 100644
--- a/systems/balrog/default.nix
+++ b/systems/balrog/default.nix
@@ -2,25 +2,30 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../modules/home-manager.nix
-      ../modules/common.nix
-      ../modules/users.nix
-      ../modules/locales.nix
-      ../modules/services.nix
-      ../modules/programs.nix
-      ../modules/docker.nix
-      ../modules/printing.nix
-      ../modules/bambu-studio-flatpak.nix
-      ../modules/arduino-ide.nix
-      ../modules/devenv.nix
-#      ../modules/bitwarden.nix
-    ];
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ../modules/home-manager.nix
+    ../modules/common.nix
+    ../modules/users.nix
+    ../modules/locales.nix
+    ../modules/services.nix
+    ../modules/programs.nix
+    ../modules/docker.nix
+    ../modules/printing.nix
+    ../modules/bambu-studio-flatpak.nix
+    ../modules/arduino-ide.nix
+    ../modules/devenv.nix
+    #      ../modules/bitwarden.nix
+  ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
@@ -31,25 +36,33 @@
       efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
     };
     grub = {
-       efiSupport = true;
-       device = "nodev";
+      efiSupport = true;
+      device = "nodev";
     };
   };
 
   networking.hostName = "balrog";
   networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
 
   hardware.enableAllFirmware = true;
 
-  boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
+  boot.initrd.kernelModules = [ "wl" ];
+  boot.kernelModules = [
+    "wl"
+    "kvm-intel"
+  ];
 
   boot.extraModulePackages = with config.boot.kernelPackages; [
     broadcom_sta
   ];
 
   nixpkgs.config = {
-    allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"]; 
+    allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ "broadcom-sta" ];
   };
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
diff --git a/systems/balrog/hardware-configuration.nix b/systems/balrog/hardware-configuration.nix
index 94d15c3..027a8e5 100644
--- a/systems/balrog/hardware-configuration.nix
+++ b/systems/balrog/hardware-configuration.nix
@@ -1,28 +1,43 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/A202-E19C";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A202-E19C";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
   swapDevices = [ ];
 
diff --git a/systems/frodo/default.nix b/systems/frodo/default.nix
index f6966cf..26b7a6d 100644
--- a/systems/frodo/default.nix
+++ b/systems/frodo/default.nix
@@ -5,15 +5,15 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../modules/common.nix
-      ../modules/users.nix
-      ../modules/locales.nix
-      ../modules/services.nix
-      ../modules/programs.nix
-    ];
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ../modules/common.nix
+    ../modules/users.nix
+    ../modules/locales.nix
+    ../modules/services.nix
+    ../modules/programs.nix
+  ];
 
   # Bootloader.
   boot.loader.grub.enable = true;
diff --git a/systems/frodo/hardware-configuration.nix b/systems/frodo/hardware-configuration.nix
index a39ea33..7d7ada1 100644
--- a/systems/frodo/hardware-configuration.nix
+++ b/systems/frodo/hardware-configuration.nix
@@ -1,22 +1,34 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
+    fsType = "ext4";
+  };
 
   swapDevices = [ ];
 
diff --git a/systems/gandalf/default.nix b/systems/gandalf/default.nix
index 895d5a0..c451bfd 100644
--- a/systems/gandalf/default.nix
+++ b/systems/gandalf/default.nix
@@ -1,34 +1,33 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../modules/home-manager.nix
-      ../modules/common.nix
-      ../modules/users.nix
-      ../modules/locales.nix
-      ../modules/services.nix
-      ../modules/programs.nix
-      ../modules/gaming.nix
-      ../modules/obs-studio.nix
-      ../modules/garbage-collection.nix
-      ../modules/printing.nix
-      ../modules/docker.nix
-      ../modules/matrix.nix
-      ../modules/kdenlive.nix
-      ../modules/audacity.nix
-      ../modules/ollama.nix
-      ../modules/wireguard.nix
-      ../modules/qbittorrent.nix
-      ../modules/gimp.nix
-      ../modules/openscad.nix
-      ../modules/bambu-studio-flatpak.nix
-      ../modules/arduino-ide.nix
-      ../modules/bitwarden.nix
-      ./mtp-fix.nix
-    ];
-  
+  imports = [
+    ./hardware-configuration.nix
+    ../modules/home-manager.nix
+    ../modules/common.nix
+    ../modules/users.nix
+    ../modules/locales.nix
+    ../modules/services.nix
+    ../modules/programs.nix
+    ../modules/gaming.nix
+    ../modules/obs-studio.nix
+    ../modules/garbage-collection.nix
+    ../modules/printing.nix
+    ../modules/docker.nix
+    ../modules/matrix.nix
+    ../modules/kdenlive.nix
+    ../modules/audacity.nix
+    ../modules/ollama.nix
+    ../modules/wireguard.nix
+    ../modules/qbittorrent.nix
+    ../modules/gimp.nix
+    ../modules/openscad.nix
+    ../modules/bambu-studio-flatpak.nix
+    ../modules/arduino-ide.nix
+    ../modules/bitwarden.nix
+    ./mtp-fix.nix
+  ];
+
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader.systemd-boot.enable = true;
@@ -36,7 +35,11 @@
 
   networking.hostName = "gandalf";
   networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
   networking.firewall.enable = false;
 
   home-manager.users.avravels.home.hyprland.execOnce = [
@@ -49,7 +52,7 @@
   networking.interfaces.enp130s0.wakeOnLan.enable = true;
   networking.firewall.allowedUDPPorts = [ 9 ];
 
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
   services.openssh.settings.X11Forwarding = true;
 
   hardware = {
diff --git a/systems/gandalf/hardware-configuration.nix b/systems/gandalf/hardware-configuration.nix
index 0632a53..3623f53 100644
--- a/systems/gandalf/hardware-configuration.nix
+++ b/systems/gandalf/hardware-configuration.nix
@@ -1,28 +1,44 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/01E4-5DD7";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/01E4-5DD7";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];
 
diff --git a/systems/gandalf/mtp-fix.nix b/systems/gandalf/mtp-fix.nix
index 3667ceb..54b8099 100644
--- a/systems/gandalf/mtp-fix.nix
+++ b/systems/gandalf/mtp-fix.nix
@@ -1,26 +1,30 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 {
   nixpkgs.overlays = [
-    (final: prev: let
-      targetVersion = "1.1.23";
-    in {
-      libmtp =
-        if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then
-          prev.libmtp
-        else
-          prev.libmtp.overrideAttrs (_: {
-            version = targetVersion;
-  
-            src = final.fetchFromGitHub {
-               owner = "libmtp";
-               repo = "libmtp";
-               rev = "v${targetVersion}";
-               hash = "sha256-FlPj9PEeOAWabU11dFTzDgY9TBbgmJclbeL0iULYw6A=";
-            };
+    (
+      final: prev:
+      let
+        targetVersion = "1.1.23";
+      in
+      {
+        libmtp =
+          if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then
+            prev.libmtp
+          else
+            prev.libmtp.overrideAttrs (_: {
+              version = targetVersion;
 
-            patches = [];
-          });
-    })
+              src = final.fetchFromGitHub {
+                owner = "libmtp";
+                repo = "libmtp";
+                rev = "v${targetVersion}";
+                hash = "sha256-FlPj9PEeOAWabU11dFTzDgY9TBbgmJclbeL0iULYw6A=";
+              };
+
+              patches = [ ];
+            });
+      }
+    )
   ];
 }
diff --git a/systems/legolas/default.nix b/systems/legolas/default.nix
index 3e9df82..4e25cd0 100644
--- a/systems/legolas/default.nix
+++ b/systems/legolas/default.nix
@@ -1,25 +1,28 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../modules/common.nix
-      ../modules/users.nix
-      ../modules/locales.nix
-      ../modules/services.nix
-      ../modules/programs.nix
-      ../modules/gaming.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ../modules/common.nix
+    ../modules/users.nix
+    ../modules/locales.nix
+    ../modules/services.nix
+    ../modules/programs.nix
+    ../modules/gaming.nix
+  ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "legolas";
   networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
 
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
 
   hardware = {
     graphics.enable = true;
@@ -30,6 +33,6 @@
   };
 
   virtualisation.libvirtd.enable = true;
-  
+
   system.stateVersion = "25.11"; # Did you read the comment?
 }
diff --git a/systems/legolas/hardware-configuration.nix b/systems/legolas/hardware-configuration.nix
index e9b756f..cbebc78 100644
--- a/systems/legolas/hardware-configuration.nix
+++ b/systems/legolas/hardware-configuration.nix
@@ -1,33 +1,48 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C4C8-E90E";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/C4C8-E90E";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
-  fileSystems."/media" =
-    { device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232";
-      fsType = "ext4";
-    };
+  fileSystems."/media" = {
+    device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232";
+    fsType = "ext4";
+  };
 
   swapDevices = [ ];
 
diff --git a/systems/modules/arduino-ide.nix b/systems/modules/arduino-ide.nix
index c4d8365..e449b3b 100644
--- a/systems/modules/arduino-ide.nix
+++ b/systems/modules/arduino-ide.nix
@@ -5,4 +5,3 @@
     arduino-ide
   ];
 }
-
diff --git a/systems/modules/bambu-studio-flatpak.nix b/systems/modules/bambu-studio-flatpak.nix
index 99d44e5..8a749a7 100644
--- a/systems/modules/bambu-studio-flatpak.nix
+++ b/systems/modules/bambu-studio-flatpak.nix
@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 {
   services.flatpak.enable = true;
diff --git a/systems/modules/bitwarden.nix b/systems/modules/bitwarden.nix
index 3a7a665..036bfda 100644
--- a/systems/modules/bitwarden.nix
+++ b/systems/modules/bitwarden.nix
@@ -9,4 +9,3 @@
     bitwarden-desktop
   ];
 }
-
diff --git a/systems/modules/btop.nix b/systems/modules/btop.nix
index 523a63c..03746b3 100644
--- a/systems/modules/btop.nix
+++ b/systems/modules/btop.nix
@@ -5,4 +5,3 @@
     btop
   ];
 }
-
diff --git a/systems/modules/common.nix b/systems/modules/common.nix
index 3f0e517..6685964 100644
--- a/systems/modules/common.nix
+++ b/systems/modules/common.nix
@@ -3,7 +3,10 @@
 {
   nixpkgs.config.allowUnfree = true;
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   users.defaultUserShell = pkgs.zsh;
 
diff --git a/systems/modules/devenv.nix b/systems/modules/devenv.nix
index fcd1aee..103f467 100644
--- a/systems/modules/devenv.nix
+++ b/systems/modules/devenv.nix
@@ -1,10 +1,12 @@
-
-{ config, pkgsUnstable, ... } :
+{ config, pkgsUnstable, ... }:
 
 {
   environment.systemPackages = with pkgsUnstable; [
     devenv
   ];
 
-  nix.settings.trusted-users = [ "root" "avravels" ];
+  nix.settings.trusted-users = [
+    "root"
+    "avravels"
+  ];
 }
diff --git a/systems/modules/enova.nix b/systems/modules/enova.nix
index 792d473..fd1ce7b 100644
--- a/systems/modules/enova.nix
+++ b/systems/modules/enova.nix
@@ -3,9 +3,12 @@
 {
   services.dnsmasq = {
     enable = true;
-    
+
     settings = {
-      server = [ "1.1.1.1" "8.8.8.8" ];
+      server = [
+        "1.1.1.1"
+        "8.8.8.8"
+      ];
       address = [ "/.enova.local/127.0.0.1" ];
     };
   };
diff --git a/systems/modules/gaming.nix b/systems/modules/gaming.nix
index c4063ac..6c4d047 100644
--- a/systems/modules/gaming.nix
+++ b/systems/modules/gaming.nix
@@ -8,7 +8,7 @@
     package = pkgs.steam.override {
       extraEnv = {
         MANGOHUD = "1";
-        WINE_VK_VULKAN_ONLY="1";
+        WINE_VK_VULKAN_ONLY = "1";
       };
     };
   };
diff --git a/systems/modules/gimp.nix b/systems/modules/gimp.nix
index dab447e..a202167 100644
--- a/systems/modules/gimp.nix
+++ b/systems/modules/gimp.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/systems/modules/home/home.nix b/systems/modules/home/home.nix
index 4b943c8..e767b18 100644
--- a/systems/modules/home/home.nix
+++ b/systems/modules/home/home.nix
@@ -9,7 +9,7 @@
 
   imports = [
     ./other/fonts.nix
-#    ./programs/bitwarden.nix
+    #    ./programs/bitwarden.nix
     ./programs/kitty.nix
     ./programs/zsh.nix
     ./programs/direnv.nix
diff --git a/systems/modules/home/programs/bitwarden.nix b/systems/modules/home/programs/bitwarden.nix
index e8b74f6..978d405 100644
--- a/systems/modules/home/programs/bitwarden.nix
+++ b/systems/modules/home/programs/bitwarden.nix
@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 {
   home.packages = [
diff --git a/systems/modules/home/programs/direnv.nix b/systems/modules/home/programs/direnv.nix
index 0028306..da770b6 100644
--- a/systems/modules/home/programs/direnv.nix
+++ b/systems/modules/home/programs/direnv.nix
@@ -6,7 +6,7 @@
     enableZshIntegration = true;
     nix-direnv.enable = true;
   };
-  
+
   home.file.".config/direnv/direnvrc" = {
     source = ./direnv/direnvrc;
   };
diff --git a/systems/modules/home/programs/firefox.nix b/systems/modules/home/programs/firefox.nix
index e49fa1c..61b83ce 100644
--- a/systems/modules/home/programs/firefox.nix
+++ b/systems/modules/home/programs/firefox.nix
@@ -12,25 +12,28 @@
 
     policies = {
       # From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
-      ExtensionSettings = with builtins;
-        let extension = shortId: uuid: {
-          name = uuid;
-          value = {
-            install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
-            installation_mode = "normal_installed";
+      ExtensionSettings =
+        with builtins;
+        let
+          extension = shortId: uuid: {
+            name = uuid;
+            value = {
+              install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
+              installation_mode = "normal_installed";
+            };
           };
-        };
-        in listToAttrs [
+        in
+        listToAttrs [
           (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
           (extension "ublock-origin" "uBlock0@raymondhill.net")
           (extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack")
           (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack")
         ];
-        # To add additional extensions, find it on addons.mozilla.org, find
-        # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
-        # Then, download the XPI by filling it in to the install_url template, unzip it,
-        # run `jq .browser_specific_settings.gecko.id manifest.json` or
-        # `jq .applications.gecko.id manifest.json` to get the UUID
+      # To add additional extensions, find it on addons.mozilla.org, find
+      # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
+      # Then, download the XPI by filling it in to the install_url template, unzip it,
+      # run `jq .browser_specific_settings.gecko.id manifest.json` or
+      # `jq .applications.gecko.id manifest.json` to get the UUID
     };
   };
 }
diff --git a/systems/modules/home/programs/git.nix b/systems/modules/home/programs/git.nix
index c00a61b..e4839d2 100644
--- a/systems/modules/home/programs/git.nix
+++ b/systems/modules/home/programs/git.nix
@@ -1,4 +1,9 @@
-{ lib, pkgsUnstable, config, ... }:
+{
+  lib,
+  pkgsUnstable,
+  config,
+  ...
+}:
 
 {
   options.home.git = {
diff --git a/systems/modules/home/programs/nvim.nix b/systems/modules/home/programs/nvim.nix
index cfa2c99..4abe60f 100644
--- a/systems/modules/home/programs/nvim.nix
+++ b/systems/modules/home/programs/nvim.nix
@@ -30,132 +30,132 @@
     ];
 
     initLua = ''
-      vim.cmd("colorscheme catppuccin-mocha")
-      -- Basic settings
-      vim.o.number = true
-      vim.o.relativenumber = true
+        vim.cmd("colorscheme catppuccin-mocha")
+        -- Basic settings
+        vim.o.number = true
+        vim.o.relativenumber = true
 
-      -- =========================
-      -- LSP (Neovim 0.11+ way)
-      -- =========================
+        -- =========================
+        -- LSP (Neovim 0.11+ way)
+        -- =========================
 
-      -- Add cmp capabilities
-      local capabilities = require("cmp_nvim_lsp").default_capabilities()
+        -- Add cmp capabilities
+        local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
-      vim.lsp.config("nil_ls", {
-        capabilities = capabilities,
-      })
+        vim.lsp.config("nil_ls", {
+          capabilities = capabilities,
+        })
 
-      -- PHP LSP
-      vim.lsp.config("intelephense", {
-        capabilities = capabilities,
-      })
+        -- PHP LSP
+        vim.lsp.config("intelephense", {
+          capabilities = capabilities,
+        })
 
-      vim.lsp.enable("intelephense")
+        vim.lsp.enable("intelephense")
 
 
-      vim.lsp.enable("nil_ls")
+        vim.lsp.enable("nil_ls")
 
-      -- =========================
-      -- nvim-cmp
-      -- =========================
+        -- =========================
+        -- nvim-cmp
+        -- =========================
 
-      local cmp = require("cmp")
+        local cmp = require("cmp")
 
-      cmp.setup({
-        mapping = cmp.mapping.preset.insert({
-          ["<C-Space>"] = cmp.mapping.complete(),
-          ["<CR>"] = cmp.mapping.confirm({ select = true }),
-        }),
-        sources = {
-          { name = "nvim_lsp" },
-          { name = "buffer" },
-          { name = "path" },
+        cmp.setup({
+          mapping = cmp.mapping.preset.insert({
+            ["<C-Space>"] = cmp.mapping.complete(),
+            ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          }),
+          sources = {
+            { name = "nvim_lsp" },
+            { name = "buffer" },
+            { name = "path" },
+          }
+        })
+
+        -- =========================
+        -- Telescope
+        -- =========================
+
+        local builtin = require("telescope.builtin")
+        vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+        vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+
+        -- =========================
+        -- Lualine (status line with Git branch)
+        -- =========================
+        require('lualine').setup {
+          options = {
+            theme = 'catppuccin',  -- match your colorscheme
+            section_separators = {'', ''},
+            component_separators = {'', ''},
+          },
+          sections = {
+            lualine_a = {'mode'},
+            lualine_b = {'branch'},  -- shows Git branch here
+            lualine_c = {'filename'},
+            lualine_x = {'encoding', 'fileformat', 'filetype'},
+            lualine_y = {'progress'},
+            lualine_z = {'location'}
+          }
         }
+
+        -- =========================
+        -- image-nvim
+        -- ========================= 
+        require("image").setup({
+          backend = "ueberzug", -- or "ueberzug" or "sixel"
+          processor = "magick_cli", -- or "magick_rock"
+          integrations = {
+          markdown = {
+            enabled = true,
+            clear_in_insert_mode = false,
+            download_remote_images = true,
+            only_render_image_at_cursor = false,
+            only_render_image_at_cursor_mode = "popup", -- or "inline"
+            floating_windows = false, -- if true, images will be rendered in floating markdown windows
+            filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
+          },
+          asciidoc = {
+            enabled = true,
+            clear_in_insert_mode = false,
+            download_remote_images = true,
+            only_render_image_at_cursor = false,
+            only_render_image_at_cursor_mode = "popup",
+            floating_windows = false,
+            filetypes = { "asciidoc", "adoc" },
+          },
+          neorg = {
+            enabled = true,
+            filetypes = { "norg" },
+          },
+          rst = {
+            enabled = true,
+          },
+          typst = {
+            enabled = true,
+            filetypes = { "typst" },
+          },
+          html = {
+            enabled = false,
+          },
+          css = {
+            enabled = false,
+          },
+        },
+        max_width = nil,
+        max_height = nil,
+        max_width_window_percentage = nil,
+        max_height_window_percentage = 50,
+        scale_factor = 1.0,
+        window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
+        window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
+        editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
+        tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
+        hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
       })
 
-      -- =========================
-      -- Telescope
-      -- =========================
-
-      local builtin = require("telescope.builtin")
-      vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
-      vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-
-      -- =========================
-      -- Lualine (status line with Git branch)
-      -- =========================
-      require('lualine').setup {
-        options = {
-          theme = 'catppuccin',  -- match your colorscheme
-          section_separators = {'', ''},
-          component_separators = {'', ''},
-        },
-        sections = {
-          lualine_a = {'mode'},
-          lualine_b = {'branch'},  -- shows Git branch here
-          lualine_c = {'filename'},
-          lualine_x = {'encoding', 'fileformat', 'filetype'},
-          lualine_y = {'progress'},
-          lualine_z = {'location'}
-        }
-      }
-
-      -- =========================
-      -- image-nvim
-      -- ========================= 
-      require("image").setup({
-        backend = "ueberzug", -- or "ueberzug" or "sixel"
-        processor = "magick_cli", -- or "magick_rock"
-        integrations = {
-        markdown = {
-          enabled = true,
-          clear_in_insert_mode = false,
-          download_remote_images = true,
-          only_render_image_at_cursor = false,
-          only_render_image_at_cursor_mode = "popup", -- or "inline"
-          floating_windows = false, -- if true, images will be rendered in floating markdown windows
-          filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
-        },
-        asciidoc = {
-          enabled = true,
-          clear_in_insert_mode = false,
-          download_remote_images = true,
-          only_render_image_at_cursor = false,
-          only_render_image_at_cursor_mode = "popup",
-          floating_windows = false,
-          filetypes = { "asciidoc", "adoc" },
-        },
-        neorg = {
-          enabled = true,
-          filetypes = { "norg" },
-        },
-        rst = {
-          enabled = true,
-        },
-        typst = {
-          enabled = true,
-          filetypes = { "typst" },
-        },
-        html = {
-          enabled = false,
-        },
-        css = {
-          enabled = false,
-        },
-      },
-      max_width = nil,
-      max_height = nil,
-      max_width_window_percentage = nil,
-      max_height_window_percentage = 50,
-      scale_factor = 1.0,
-      window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
-      window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
-      editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
-      tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
-      hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
-    })
-
     '';
   };
 }
diff --git a/systems/modules/home/programs/ripgrep.nix b/systems/modules/home/programs/ripgrep.nix
index 201b43e..033642b 100644
--- a/systems/modules/home/programs/ripgrep.nix
+++ b/systems/modules/home/programs/ripgrep.nix
@@ -1,8 +1,7 @@
-{ pkgs, ... }: 
+{ pkgs, ... }:
 
 {
   home.packages = with pkgs; [
     ripgrep
   ];
 }
-
diff --git a/systems/modules/home/programs/tmux.nix b/systems/modules/home/programs/tmux.nix
index faf4fe8..ec5eae8 100644
--- a/systems/modules/home/programs/tmux.nix
+++ b/systems/modules/home/programs/tmux.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  programs.tmux = { 
+  programs.tmux = {
     enable = true;
     mouse = true;
   };
diff --git a/systems/modules/home/programs/vscode.nix b/systems/modules/home/programs/vscode.nix
index 420d539..ef9522a 100644
--- a/systems/modules/home/programs/vscode.nix
+++ b/systems/modules/home/programs/vscode.nix
@@ -9,7 +9,7 @@
       ms-dotnettools.csharp
       ms-dotnettools.csdevkit
       ms-dotnettools.vscode-dotnet-runtime
-      mkhl.direnv   # Direnv integration for VSCode
+      mkhl.direnv # Direnv integration for VSCode
       catppuccin.catppuccin-vsc
       bmewburn.vscode-intelephense-client
       continue.continue
diff --git a/systems/modules/home/programs/zsh.nix b/systems/modules/home/programs/zsh.nix
index 317d5e5..47bfd4f 100644
--- a/systems/modules/home/programs/zsh.nix
+++ b/systems/modules/home/programs/zsh.nix
@@ -1,8 +1,7 @@
 { pkgs, ... }:
 
 {
-  home.file.".zsh/fastfetch.jsonc".source =
-    ./fastfetch/config.jsonc;
+  home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
 
   programs.zsh = {
     enable = true;
diff --git a/systems/modules/home/wm/cursor.nix b/systems/modules/home/wm/cursor.nix
index 456a01d..e00e2b2 100644
--- a/systems/modules/home/wm/cursor.nix
+++ b/systems/modules/home/wm/cursor.nix
@@ -2,8 +2,8 @@
 
 {
   home.pointerCursor = {
-#    name = "Bibata-Modern-Ice";   # change to your cursor theme
-#    package = pkgs.bibata-cursors;
+    #    name = "Bibata-Modern-Ice";   # change to your cursor theme
+    #    package = pkgs.bibata-cursors;
     name = "Adwaita";
     package = pkgs.adwaita-icon-theme;
     size = 24;
diff --git a/systems/modules/home/wm/hyprland.nix b/systems/modules/home/wm/hyprland.nix
index 51dcb2f..023c0ae 100644
--- a/systems/modules/home/wm/hyprland.nix
+++ b/systems/modules/home/wm/hyprland.nix
@@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 
 let
   cfg = config.home.hyprland;
@@ -25,152 +30,152 @@ in
       enable = true;
       configType = "lua";
       settings =
-      let
-        mkLuaInline = lib.generators.mkLuaInline;
-        toLua = lib.generators.toLua;
-        mkArgs = args: { _args = args; };
-        bind =
-          keys: dispatcher: options:
-          mkArgs [
-            keys
-            dispatcher
-            options
+        let
+          mkLuaInline = lib.generators.mkLuaInline;
+          toLua = lib.generators.toLua;
+          mkArgs = args: { _args = args; };
+          bind =
+            keys: dispatcher: options:
+            mkArgs [
+              keys
+              dispatcher
+              options
+            ];
+          dsp = {
+            exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
+            focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
+            window = {
+              move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
+              drag = mkLuaInline "hl.dsp.window.drag()";
+              resize = mkLuaInline "hl.dsp.window.resize()";
+              close = mkLuaInline "hl.dsp.window.close()";
+              kill = mkLuaInline "hl.dsp.window.kill()";
+              fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
+            };
+            exit = mkLuaInline "hl.dsp.exit()";
+            workspace = {
+              move = arg: mkLuaInline "hl.dsp.workspace.move(${toLua { } arg})";
+            };
+          };
+          mod = "SUPER";
+          workspaces = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
+        in
+        {
+          config = {
+            general = {
+              resize_on_border = true;
+              allow_tearing = true;
+            };
+
+            animations.enabled = true;
+
+            decoration = {
+              inactive_opacity = 0.8;
+              active_opacity = 0.9;
+              rounding = 5;
+              rounding_power = 2.5;
+              blur = {
+                enabled = true;
+                brightness = 1.0;
+                contrast = 1.0;
+                noise = 0.01;
+
+                vibrancy = 0.2;
+                vibrancy_darkness = 0.5;
+
+                passes = 4;
+                size = 7;
+
+                popups = true;
+                popups_ignorealpha = 0.2;
+              };
+              shadow = {
+                enabled = true;
+                color = "rgba(00000055)";
+                offset = "0 15";
+                range = 100;
+                render_power = 2;
+                scale = 0.97;
+              };
+            };
+
+            misc = {
+              focus_on_activate = true;
+            };
+          };
+
+          bind = lib.flatten [
+            (bind "${mod} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") { })
+            (bind "${mod} + Q" (dsp.window.kill) { })
+            (bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
+            (bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
+            (bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
+            (bind "${mod} + F" (dsp.window.fullscreen) { })
+            (bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
+            (bind "${mod} + M" (dsp.exit) { })
+            (bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
+            (bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
+
+            (bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
+            (bind "${mod} + SHIFT + DOWN" (dsp.window.move { direction = "d"; }) { })
+            (bind "${mod} + SHIFT + UP" (dsp.window.move { direction = "u"; }) { })
+            (bind "${mod} + SHIFT + RIGHT" (dsp.window.move { direction = "r"; }) { })
+
+            (bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
+            (bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
+            (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
+            (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
+
+            (bind "${mod} + 1" (dsp.focus { workspace = 1; }) { })
+            (bind "${mod} + 2" (dsp.focus { workspace = 2; }) { })
+            (bind "${mod} + 3" (dsp.focus { workspace = 3; }) { })
+            (bind "${mod} + 4" (dsp.focus { workspace = 4; }) { })
+            (bind "${mod} + 5" (dsp.focus { workspace = 5; }) { })
+            (bind "${mod} + 6" (dsp.focus { workspace = 6; }) { })
+            (bind "${mod} + 7" (dsp.focus { workspace = 7; }) { })
+            (bind "${mod} + 8" (dsp.focus { workspace = 8; }) { })
+            (bind "${mod} + 9" (dsp.focus { workspace = 9; }) { })
+
+            (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) { })
+            (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) { })
+            (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) { })
+            (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) { })
+            (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) { })
+            (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) { })
+            (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) { })
+            (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) { })
+            (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) { })
+
+            (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
+              repeating = true;
+              locked = true;
+            })
+            (bind "XF86AudioRaiseVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+") {
+              repeating = true;
+              locked = true;
+            })
+            (bind "XF86AudioPlay" (dsp.exec_cmd "playerctl play-pause") { locked = true; })
+            (bind "XF86AudioPrev" (dsp.exec_cmd "playerctl previous") { locked = true; })
+            (bind "XF86AudioNext" (dsp.exec_cmd "playerctl next") { locked = true; })
+
+            (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
+            (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
+          ];
+
+          on = mkArgs [
+            "hyprland.start"
+            (mkLuaInline ''
+              function()
+                hl.exec_cmd("waybar")
+                hl.monitor({
+                  output = "",
+                  mode = "preferred",
+                  position = "auto",
+                  scale = 1,
+                })
+              end'')
           ];
-        dsp = {
-          exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
-          focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
-          window = {
-            move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
-            drag = mkLuaInline "hl.dsp.window.drag()";
-            resize = mkLuaInline "hl.dsp.window.resize()";
-            close = mkLuaInline "hl.dsp.window.close()";
-            kill = mkLuaInline "hl.dsp.window.kill()";
-            fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
-          };
-          exit = mkLuaInline "hl.dsp.exit()";
-          workspace = {
-            move = arg: mkLuaInline "hl.dsp.workspace.move(${toLua { } arg})";
-          };
         };
-        mod = "SUPER";
-        workspaces = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
-      in
-      {
-        config = {
-          general = {
-            resize_on_border = true;
-            allow_tearing = true;
-          };
-
-          animations.enabled = true;
-
-          decoration = {
-            inactive_opacity = 0.8;
-            active_opacity = 0.9;
-            rounding = 5;
-            rounding_power = 2.5;
-            blur = {
-              enabled = true;
-              brightness = 1.0;
-              contrast = 1.0;
-              noise = 0.01;
-
-              vibrancy = 0.2;
-              vibrancy_darkness = 0.5;
-
-              passes = 4;
-              size = 7;
-
-              popups = true;
-              popups_ignorealpha = 0.2;
-            };
-            shadow = {
-              enabled = true;
-              color = "rgba(00000055)";
-              offset = "0 15";
-              range = 100;
-              render_power = 2;
-              scale = 0.97;
-            };
-          };
-
-          misc = {
-            focus_on_activate = true;
-          };
-        };
-
-        bind = lib.flatten [
-          (bind "${mod} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") {})
-          (bind "${mod} + Q" (dsp.window.kill) { })
-          (bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
-          (bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
-          (bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
-          (bind "${mod} + F" (dsp.window.fullscreen) { })
-          (bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
-          (bind "${mod} + M" (dsp.exit) { })
-          (bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
-          (bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
-
-          (bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
-          (bind "${mod} + SHIFT + DOWN" (dsp.window.move { direction = "d"; }) { })
-          (bind "${mod} + SHIFT + UP" (dsp.window.move { direction = "u"; }) { })
-          (bind "${mod} + SHIFT + RIGHT" (dsp.window.move { direction = "r"; }) { })
-
-          (bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
-          (bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
-          (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
-          (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
-
-          (bind "${mod} + 1" (dsp.focus { workspace = 1; }) {})
-          (bind "${mod} + 2" (dsp.focus { workspace = 2; }) {})
-          (bind "${mod} + 3" (dsp.focus { workspace = 3; }) {})
-          (bind "${mod} + 4" (dsp.focus { workspace = 4; }) {})
-          (bind "${mod} + 5" (dsp.focus { workspace = 5; }) {})
-          (bind "${mod} + 6" (dsp.focus { workspace = 6; }) {})
-          (bind "${mod} + 7" (dsp.focus { workspace = 7; }) {})
-          (bind "${mod} + 8" (dsp.focus { workspace = 8; }) {})
-          (bind "${mod} + 9" (dsp.focus { workspace = 9; }) {})
-
-          (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) {})
-          (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) {})
-          (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) {})
-          (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) {})
-          (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) {})
-          (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) {})
-          (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) {})
-          (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) {})
-          (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) {})
-
-          (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
-            repeating = true;
-            locked = true;
-          })
-          (bind "XF86AudioRaiseVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+") {
-            repeating = true;
-            locked = true;
-          })
-          (bind "XF86AudioPlay" (dsp.exec_cmd "playerctl play-pause") { locked = true; })
-          (bind "XF86AudioPrev" (dsp.exec_cmd "playerctl previous") { locked = true; })
-          (bind "XF86AudioNext" (dsp.exec_cmd "playerctl next") { locked = true; })
-
-          (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
-          (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
-        ];
-
-        on = mkArgs [
-          "hyprland.start"
-          (mkLuaInline ''
-            function()
-              hl.exec_cmd("waybar")
-              hl.monitor({
-                output = "",
-                mode = "preferred",
-                position = "auto",
-                scale = 1,
-              })
-            end'')
-        ];
-      };
     };
   };
 }
diff --git a/systems/modules/home/wm/hyprpaper.nix b/systems/modules/home/wm/hyprpaper.nix
index 83dfc89..9e25574 100644
--- a/systems/modules/home/wm/hyprpaper.nix
+++ b/systems/modules/home/wm/hyprpaper.nix
@@ -26,4 +26,3 @@ in
     };
   };
 }
-
diff --git a/systems/modules/home/wm/waybar.nix b/systems/modules/home/wm/waybar.nix
index f2f4960..d944442 100644
--- a/systems/modules/home/wm/waybar.nix
+++ b/systems/modules/home/wm/waybar.nix
@@ -15,7 +15,7 @@
         "hyprland/workspaces"
         "mpris"
       ];
-      
+
       modules-center = [
         "wlr/taskbar"
       ];
@@ -35,7 +35,11 @@
         scroll-step = 5;
 
         format-icons = {
-          default = [ "󰕿" "󰖀" "󰕾" ];
+          default = [
+            "󰕿"
+            "󰖀"
+            "󰕾"
+          ];
         };
 
         on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
@@ -46,7 +50,10 @@
         format = "{player_icon} {artist} - {title}";
         format-paused = "{player_icon} ⏸ {title}";
         tooltip = true;
-        ignored-players = [ "firefox" "vlc" ];
+        ignored-players = [
+          "firefox"
+          "vlc"
+        ];
       };
 
       cpu = {
diff --git a/systems/modules/jq.nix b/systems/modules/jq.nix
index 3e1bb52..aa09f27 100644
--- a/systems/modules/jq.nix
+++ b/systems/modules/jq.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/systems/modules/kdenlive.nix b/systems/modules/kdenlive.nix
index 6ed6a21..96502fe 100644
--- a/systems/modules/kdenlive.nix
+++ b/systems/modules/kdenlive.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/systems/modules/openscad.nix b/systems/modules/openscad.nix
index cf5b034..d0a9f2c 100644
--- a/systems/modules/openscad.nix
+++ b/systems/modules/openscad.nix
@@ -1,5 +1,4 @@
-
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/systems/modules/postman.nix b/systems/modules/postman.nix
index 99ac0fb..673eb93 100644
--- a/systems/modules/postman.nix
+++ b/systems/modules/postman.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }: 
+{ pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
     postman
   ];
-}
\ No newline at end of file
+}
diff --git a/systems/modules/printing.nix b/systems/modules/printing.nix
index 41aeb68..cfb3bb0 100644
--- a/systems/modules/printing.nix
+++ b/systems/modules/printing.nix
@@ -34,6 +34,9 @@
 
   # for samba
   networking.hosts = {
-    "192.168.68.60" = [ "2C2919000000.local" "2C2919000000" ];
+    "192.168.68.60" = [
+      "2C2919000000.local"
+      "2C2919000000"
+    ];
   };
 }
diff --git a/systems/modules/programs.nix b/systems/modules/programs.nix
index 206f870..94fda4b 100644
--- a/systems/modules/programs.nix
+++ b/systems/modules/programs.nix
@@ -10,4 +10,3 @@
     virt-manager.enable = true;
   };
 }
-
diff --git a/systems/modules/qbittorrent.nix b/systems/modules/qbittorrent.nix
index d443e9b..2784bfe 100644
--- a/systems/modules/qbittorrent.nix
+++ b/systems/modules/qbittorrent.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/systems/modules/remmina.nix b/systems/modules/remmina.nix
index 91f7924..d4fd0f2 100644
--- a/systems/modules/remmina.nix
+++ b/systems/modules/remmina.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
diff --git a/systems/modules/users.nix b/systems/modules/users.nix
index 2f90166..c1879d6 100644
--- a/systems/modules/users.nix
+++ b/systems/modules/users.nix
@@ -5,7 +5,12 @@
     initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "libvirtd"
+      "dialout"
+    ];
     packages = with pkgs; [
       home-manager
       legcord
diff --git a/systems/work/default.nix b/systems/work/default.nix
index f4bbe65..99a32e7 100644
--- a/systems/work/default.nix
+++ b/systems/work/default.nix
@@ -1,31 +1,30 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../modules/home-manager.nix
-      ../modules/common.nix
-      ../modules/users.nix
-      ../modules/locales.nix
-      ../modules/services.nix
-      ../modules/programs.nix
-      ../modules/garbage-collection.nix
-      ../modules/printing.nix
-      ../modules/docker.nix
-      ../modules/teams-for-linux.nix
-      ../modules/azure-data-studio.nix
-      ../modules/filezilla.nix
-      ../modules/wireguard.nix
-      ../modules/remmina.nix
-      ../modules/postman.nix
-      ../modules/gimp.nix
-      ../modules/jq.nix
-      ../modules/enova.nix
-      ../modules/devenv.nix
-      ../modules/bitwarden.nix
-      ../modules/btop.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ../modules/home-manager.nix
+    ../modules/common.nix
+    ../modules/users.nix
+    ../modules/locales.nix
+    ../modules/services.nix
+    ../modules/programs.nix
+    ../modules/garbage-collection.nix
+    ../modules/printing.nix
+    ../modules/docker.nix
+    ../modules/teams-for-linux.nix
+    ../modules/azure-data-studio.nix
+    ../modules/filezilla.nix
+    ../modules/wireguard.nix
+    ../modules/remmina.nix
+    ../modules/postman.nix
+    ../modules/gimp.nix
+    ../modules/jq.nix
+    ../modules/enova.nix
+    ../modules/devenv.nix
+    ../modules/bitwarden.nix
+    ../modules/btop.nix
+  ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
@@ -51,7 +50,12 @@
   home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl";
 
   networking.networkmanager.enable = true;
-  networking.nameservers = [ "127.0.0.1" "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.nameservers = [
+    "127.0.0.1"
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
   networking.firewall.enable = false;
 
   hardware.graphics.enable = true;
@@ -60,7 +64,12 @@
   virtualisation.libvirtd.enable = true;
 
   networking.hosts = {
-    "127.0.0.1" = [ "local.wormundco.de" "local.wormundco.nl" "local.wormenco.nl" "local.wurmundco.de" ];
+    "127.0.0.1" = [
+      "local.wormundco.de"
+      "local.wormundco.nl"
+      "local.wormenco.nl"
+      "local.wurmundco.de"
+    ];
     "149.210.174.226" = [ "kindertelefoon" ];
   };
 
diff --git a/systems/work/hardware-configuration.nix b/systems/work/hardware-configuration.nix
index b90cb92..a0d4d45 100644
--- a/systems/work/hardware-configuration.nix
+++ b/systems/work/hardware-configuration.nix
@@ -1,30 +1,46 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba";
+    fsType = "ext4";
+  };
 
-  boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device = "/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba";
+  boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device =
+    "/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba";
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3892-6129";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/3892-6129";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];