diff --git a/homes/aarch64-linux/matt@pi5/default.nix b/homes/aarch64-linux/matt@pi5/default.nix
index 8ffb986..930f61d 100755
--- a/homes/aarch64-linux/matt@pi5/default.nix
+++ b/homes/aarch64-linux/matt@pi5/default.nix
@@ -57,4 +57,8 @@ in
   programs = {
     zsh.shellAliases = shellAliases;
   };
+
+  services = {
+    kdeconnect.enable = false;
+  };
 }
diff --git a/homes/x86_64-linux/deck@steamdeck/default.nix b/homes/x86_64-linux/deck@steamdeck/default.nix
index 43835ea..cef066f 100755
--- a/homes/x86_64-linux/deck@steamdeck/default.nix
+++ b/homes/x86_64-linux/deck@steamdeck/default.nix
@@ -78,6 +78,6 @@ in
     mgba
     prismlauncher
     ryujinx-greemdev
-    vmware-horizon-client
+    omnissa-horizon-client
   ];
 }
diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix
index 073621c..e69af90 100755
--- a/modules/home/desktop/hyprland/default.nix
+++ b/modules/home/desktop/hyprland/default.nix
@@ -292,7 +292,8 @@ in
           "tag +waydroid, class:([Ww]aydroid.*)"
           "float, tag:waydroid"
           "pin, tag:waydroid"
-        ] ++ cfg.windowRule;
+        ]
+        ++ cfg.windowRule;
 
         plugin = {
           touch_gestures = {
@@ -395,16 +396,15 @@ in
         };
       };
 
-      extraConfig =
-        ''
-          exec-once = dbus-update-activation-environment --systemd --all
-          exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-          exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-          exec-once = xhost +SI:localuser:root
-          exec-once = nwg-look -a
-          exec-once = nwg-dock-hyprland -d
-        ''
-        + cfg.extraConfig or '''';
+      extraConfig = ''
+        exec-once = dbus-update-activation-environment --systemd --all
+        exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+        exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+        exec-once = xhost +SI:localuser:root
+        exec-once = nwg-look -a
+        exec-once = nwg-dock-hyprland -d
+      ''
+      + cfg.extraConfig or '''';
     };
   };
 }
diff --git a/modules/home/desktop/hyprland/services/hyprlock/default.nix b/modules/home/desktop/hyprland/services/hyprlock/default.nix
index 527086f..bc2175a 100644
--- a/modules/home/desktop/hyprland/services/hyprlock/default.nix
+++ b/modules/home/desktop/hyprland/services/hyprlock/default.nix
@@ -12,7 +12,7 @@ in
 
   config = lib.mkIf cfg.enable {
     programs.hyprlock = {
-      enable = false;
+      enable = true;
       settings = {
         background = [
           {
diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix
index 4304690..533a324 100644
--- a/modules/home/home/default.nix
+++ b/modules/home/home/default.nix
@@ -52,10 +52,14 @@
     nh = {
       enable = true;
       flake = "/etc/nixos";
+      clean = {
+        enable = true;
+        extraArgs = "--keep 5";
+      };
     };
 
     micro = {
-      enable = true;
+      enable = lib.mkDefault true;
       settings = {
         autoindent = true;
         autosu = true;
@@ -66,7 +70,7 @@
     };
 
     tmux = {
-      enable = true;
+      enable = lib.mkDefault true;
       terminal = "screen-256color";
       sensibleOnTop = true;
       focusEvents = true;
@@ -109,8 +113,8 @@
     nextcloud-client.enable = lib.mkDefault true;
     pass-secret-service.enable = lib.mkDefault true;
     kdeconnect = {
-      enable = true;
-      indicator = true;
+      enable = lib.mkDefault true;
+      indicator = lib.mkDefault true;
     };
   };
 }
diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix
index b5e6f26..497ce54 100755
--- a/modules/home/programs/waybar/default.nix
+++ b/modules/home/programs/waybar/default.nix
@@ -80,9 +80,9 @@ in
             "custom/right-end"
           ];
 
-          # modules-right = [ 
+          # modules-right = [
           #   "tray"
-          #   "custom/left-end" ] ++ 
+          #   "custom/left-end" ] ++
           #   cfg.modules-right ++
           #   [ "custom/right-end" ];
 
@@ -323,262 +323,262 @@ in
             format = "&nbsp";
             tooltip = false;
           };
-        } // cfg.extraModules;
+        }
+        // cfg.extraModules;
       };
 
       # * { font-size: 13px; }
       # window.eDP-1 * { font-size: 10px; }
 
-      style =
-        ''
-          .blink_me {
-            animation: blinker 1s linear infinite;
+      style = ''
+        .blink_me {
+          animation: blinker 1s linear infinite;
+        }
+
+        @keyframes blinker {
+          50% {
+            color: ${nord.aurora.nord11};
           }
+        }
 
-          @keyframes blinker {
-            50% {
-              color: ${nord.aurora.nord11};
-            }
-          }
+        * {
+          font-family:
+            Jetbrains Mono Nerd Font,
+            monospace;
+          font-size: 14px;
+          min-height: 0;
+        }
 
-          * {
-            font-family:
-              Jetbrains Mono Nerd Font,
-              monospace;
-            font-size: 14px;
-            min-height: 0;
-          }
+        #waybar {
+          background: transparent;
+          color: ${nord.snowStorm.nord6};
+          margin: 5px 5px;
+        }
 
-          #waybar {
-            background: transparent;
-            color: ${nord.snowStorm.nord6};
-            margin: 5px 5px;
-          }
+        #workspaces {
+          background-color: ${nord.polarNight.nord0};
+          ${defaultBorderRadius}
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          margin-left: 0.6rem;
+        }
 
-          #workspaces {
-            background-color: ${nord.polarNight.nord0};
-            ${defaultBorderRadius}
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            margin-left: 0.6rem;
-          }
+        #workspaces button {
+          color: ${nord.frost.nord10};
+          ${defaultBorderRadius}
+          padding: 0.4rem;
+        }
 
-          #workspaces button {
-            color: ${nord.frost.nord10};
-            ${defaultBorderRadius}
-            padding: 0.4rem;
-          }
+        #workspaces button.active {
+          color: ${nord.frost.nord8};
+          ${defaultBorderRadius}
+        }
 
-          #workspaces button.active {
-            color: ${nord.frost.nord8};
-            ${defaultBorderRadius}
-          }
+        #workspaces button:hover {
+          color: ${nord.frost.nord7};
+          ${defaultBorderRadius}
+        }
 
-          #workspaces button:hover {
-            color: ${nord.frost.nord7};
-            ${defaultBorderRadius}
-          }
+        #workspaces button.focused {
+          color: ${nord.snowStorm.nord6};
+          background: ${nord.aurora.nord13};
+          ${defaultBorderRadius}
+        }
 
-          #workspaces button.focused {
-            color: ${nord.snowStorm.nord6};
-            background: ${nord.aurora.nord13};
-            ${defaultBorderRadius}
-          }
+        #workspaces button.urgent {
+          color: ${nord.polarNight.nord0};
+          background: ${nord.snowStorm.nord6};
+          ${defaultBorderRadius}
+        }
 
-          #workspaces button.urgent {
-            color: ${nord.polarNight.nord0};
-            background: ${nord.snowStorm.nord6};
-            ${defaultBorderRadius}
-          }
+        #tooltip {
+          background: ${nord.polarNight.nord0};
+          border-color: ${nord.polarNight.nord0};
+          ${defaultBorderRadius}
+          border-width: 1rem;
+          border-style: solid;
+        }
 
-          #tooltip {
-            background: ${nord.polarNight.nord0};
-            border-color: ${nord.polarNight.nord0};
-            ${defaultBorderRadius}
-            border-width: 1rem;
-            border-style: solid;
-          }
+        #window {
+          color: ${nord.aurora.nord15};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultBorderRadius}
+          ${defaultCenterOptions}
+          margin-left: 4rem;
+          margin-right: ${toString cfg.windowOffset}rem;
+        }
 
-          #window {
-            color: ${nord.aurora.nord15};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultBorderRadius}
-            ${defaultCenterOptions}
-            margin-left: 4rem;
-            margin-right: ${toString cfg.windowOffset}rem;
-          }
+        /* make window module transparent when no windows present */
+        #window.empty {
+          background-color: transparent;
+        }
 
-          /* make window module transparent when no windows present */
-          #window.empty {
-            background-color: transparent;
-          }
+        #custom-weather { 
+          color: ${nord.frost.nord10};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #custom-weather { 
-            color: ${nord.frost.nord10};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        #battery {
+          color: ${nord.aurora.nord15};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+          min-width: 3rem;
+        }
 
-          #battery {
-            color: ${nord.aurora.nord15};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-            min-width: 3rem;
-          }
+        #clock {
+          color: ${nord.frost.nord9};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #clock {
-            color: ${nord.frost.nord9};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        /* ------------- */
 
-          /* ------------- */
+        #idle_inhibitor {
+          color: ${nord.frost.nord10};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+          padding-right: 1rem;
+        }
 
-          #idle_inhibitor {
-            color: ${nord.frost.nord10};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-            padding-right: 1rem;
-          }
+        #idle_inhibitor:hover {
+          background: ${nord.polarNight.nord3};
+        }
 
-          #idle_inhibitor:hover {
-            background: ${nord.polarNight.nord3};
-          }
+        #network {
+          color: ${nord.aurora.nord15};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+          padding-right: 15px;
+        }
 
-          #network {
-            color: ${nord.aurora.nord15};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-            padding-right: 15px;
-          }
+        #network:hover {
+          background: ${nord.polarNight.nord3};
+        }
 
-          #network:hover {
-            background: ${nord.polarNight.nord3};
-          }
+        #bluetooth {
+          color: ${nord.frost.nord9};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #bluetooth {
-            color: ${nord.frost.nord9};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        #bluetooth:hover {
+          background: ${nord.polarNight.nord3};
+        }
 
-          #bluetooth:hover {
-            background: ${nord.polarNight.nord3};
-          }
+        #wireplumber.source {
+          color: ${nord.frost.nord8};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #wireplumber.source {
-            color: ${nord.frost.nord8};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        #wireplumber.source.muted {
+          animation-name: blinker;
+          animation-duration: 2s;
+          animation-timing-function: linear;
+          animation-iteration-count: infinite;
+          padding-right: 1rem;
+        }
 
-          #wireplumber.source.muted {
-            animation-name: blinker;
-            animation-duration: 2s;
-            animation-timing-function: linear;
-            animation-iteration-count: infinite;
-            padding-right: 1rem;
-          }
+        #wireplumber.source:hover {
+          background: ${nord.polarNight.nord3};
+        }
 
-          #wireplumber.source:hover {
-            background: ${nord.polarNight.nord3};
-          }
+        #wireplumber.sink {
+          color: ${nord.frost.nord7};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #wireplumber.sink {
-            color: ${nord.frost.nord7};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        #wireplumber.sink.muted {
+          animation-name: blinker;
+          animation-duration: 5s;
+          animation-timing-function: linear;
+          animation-iteration-count: infinite;
+        }
 
-          #wireplumber.sink.muted {
-            animation-name: blinker;
-            animation-duration: 5s;
-            animation-timing-function: linear;
-            animation-iteration-count: infinite;
-          }
+        #wireplumber.sink:hover {
+          background: ${nord.polarNight.nord3};
+        }
 
-          #wireplumber.sink:hover {
-            background: ${nord.polarNight.nord3};
-          }
+        #keyboard-state.numlock {
+          color: ${nord.frost.nord8};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #keyboard-state.numlock {
-            color: ${nord.frost.nord8};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        #keyboard-state.capslock {
+          color: ${nord.frost.nord9};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #keyboard-state.capslock {
-            color: ${nord.frost.nord9};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        #temperature.gpu {
+          color: ${nord.frost.nord10};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0;
+        }
 
-          #temperature.gpu {
-            color: ${nord.frost.nord10};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0;
-          }
+        #temperature.gpu:hover {
+          background: ${nord.polarNight.nord3};
+        }
 
-          #temperature.gpu:hover {
-            background: ${nord.polarNight.nord3};
-          }
+        #temperature {
+          color: ${nord.frost.nord9};
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          border-radius: 0
+        }
 
-          #temperature {
-            color: ${nord.frost.nord9};
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            border-radius: 0
-          }
+        /* ------------- */
 
-          /* ------------- */
+        #tray {
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${defaultCenterOptions}
+          ${defaultBorderRadius}
+          margin-right: 0.6rem;
+        }
 
-          #tray {
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${defaultCenterOptions}
-            ${defaultBorderRadius}
-            margin-right: 0.6rem;
-          }
+        /* ------------- */
 
-          /* ------------- */
+        #custom-left-end {
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${borderLeft}
+        }
 
-          #custom-left-end {
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${borderLeft}
-          }
-
-          #custom-right-end {
-            background-color: ${nord.polarNight.nord0};
-            ${defaultOpacity}
-            ${borderRight}
-          }
-        ''
-        + cfg.extraModulesStyle or '''';
+        #custom-right-end {
+          background-color: ${nord.polarNight.nord0};
+          ${defaultOpacity}
+          ${borderRight}
+        }
+      ''
+      + cfg.extraModulesStyle or '''';
     };
   };
 }
diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix
index d48af7b..5a2906a 100644
--- a/modules/home/user/default.nix
+++ b/modules/home/user/default.nix
@@ -65,20 +65,19 @@ in
       ];
 
       home = {
-        file =
-          {
-            "Desktop/.keep".text = "";
-            "Documents/.keep".text = "";
-            "Downloads/.keep".text = "";
-            "Music/.keep".text = "";
-            "Pictures/.keep".text = "";
-            "Videos/.keep".text = "";
-          }
-          // lib.optionalAttrs (cfg.icon != null) {
-            ".face".source = cfg.icon;
-            ".face.icon".source = cfg.icon;
-            "Pictures/${cfg.icon.fileName or (builtins.baseNameOf cfg.icon)}".source = cfg.icon;
-          };
+        file = {
+          "Desktop/.keep".text = "";
+          "Documents/.keep".text = "";
+          "Downloads/.keep".text = "";
+          "Music/.keep".text = "";
+          "Pictures/.keep".text = "";
+          "Videos/.keep".text = "";
+        }
+        // lib.optionalAttrs (cfg.icon != null) {
+          ".face".source = cfg.icon;
+          ".face.icon".source = cfg.icon;
+          "Pictures/${cfg.icon.fileName or (builtins.baseNameOf cfg.icon)}".source = cfg.icon;
+        };
 
         homeDirectory = mkDefault cfg.home;
 
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index 4479dcf..556abbe 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -28,7 +28,7 @@ in
 
     programs = {
       kdeconnect = {
-        enable = true;
+        enable = lib.mkDefault true;
         package = pkgs.gnomeExtensions.gsconnect;
       };
     };
diff --git a/modules/nixos/homeassistant/default.nix b/modules/nixos/homeassistant/default.nix
index 367bf73..d3b3de9 100755
--- a/modules/nixos/homeassistant/default.nix
+++ b/modules/nixos/homeassistant/default.nix
@@ -256,7 +256,7 @@ in
         openhasp = {
           plate = {
             objects = [
-              { 
+              {
                 obj = "p0b1"; # temperature label on all pages
                 properties = {
                   "text" = ''{{ states("sensor.thermostat_current_temperature") }}°F'';
@@ -265,8 +265,8 @@ in
               {
                 obj = "p1b2"; # light-switch toggle button
                 properties = {
-                  "val" =  ''{{ 1 if states("light.living_room_lights") == "on" else 0 }}'';
-                  "text" =  ''{{ "\uE6E8" if is_state("light.living_room_lights", "on") else "\uE335" | e }}'';
+                  "val" = ''{{ 1 if states("light.living_room_lights") == "on" else 0 }}'';
+                  "text" = ''{{ "\uE6E8" if is_state("light.living_room_lights", "on") else "\uE335" | e }}'';
                 };
                 event = {
                   "up" = {
diff --git a/modules/nixos/ollama/default.nix b/modules/nixos/ollama/default.nix
index fa870ba..0e09dc7 100755
--- a/modules/nixos/ollama/default.nix
+++ b/modules/nixos/ollama/default.nix
@@ -8,18 +8,6 @@
 with lib;
 let
   cfg = config.${namespace}.services.ollama;
-
-  llamaPackage = pkgs.llama-cpp.overrideAttrs (_old: {
-    src = pkgs.fetchFromGitHub {
-      owner = "ggml-org";
-      repo = "llama.cpp";
-      rev = "b4920";
-      sha256 = "sha256-SnQIeY74JpAPRMxWcpklDH5D4CQvAgi0GYx5+ECk2J4=";
-    };
-    # Optionally override other attributes if you need to
-    # version = "my-fork-version";
-    # pname = "llama-cpp-custom";
-  });
 in
 {
   imports = [ ./options.nix ];
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index 5b4947a..5aab2a6 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -64,7 +64,8 @@ in
         "power"
         "nix"
         "i2c"
-      ] ++ cfg.extraGroups;
+      ]
+      ++ cfg.extraGroups;
 
       group = "users";
       home = "/home/${cfg.name}";
@@ -72,6 +73,7 @@ in
       shell = lib.mkForce pkgs.zsh;
       uid = 1000;
       hashedPasswordFile = cfg.passwordFile;
-    } // cfg.extraOptions;
+    }
+    // cfg.extraOptions;
   };
 }
diff --git a/packages/open-remote-ssh/default.nix b/packages/open-remote-ssh/default.nix
index e91a24c..2ff0a6b 100644
--- a/packages/open-remote-ssh/default.nix
+++ b/packages/open-remote-ssh/default.nix
@@ -1,8 +1,8 @@
-{ lib
-, stdenv
-, fetchurl
-, vscode-utils
-, pkgs
+{
+  lib,
+  fetchurl,
+  vscode-utils,
+  pkgs,
 }:
 
 let
@@ -14,10 +14,9 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     inherit name publisher version;
   };
-  
+
   vsix = fetchurl {
     url = "https://open-vsx.org/api/${publisher}/${name}/${version}/file/${publisher}.${name}-${version}.vsix";
-    # Update this hash after downloading
     sha256 = "sha256-QfJnAAx+kO2iJ1EzWoO5HLogJKg3RiC3hg1/u2Jm6t4=";
   };
 
@@ -33,7 +32,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
       and take full advantage of VS Code's feature set. This is an open-source
       alternative to Microsoft's proprietary Remote SSH extension, designed to
       work with VSCodium and other open-source VS Code variants.
-      
+
       Note: This extension requires enabling proposed APIs in VSCodium/Code-OSS.
       You need to add "jeanp413.open-remote-ssh" to the "enable-proposed-api" 
       array in ~/.vscode-oss/argv.json
@@ -41,7 +40,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     homepage = "https://github.com/jeanp413/open-remote-ssh";
     changelog = "https://github.com/jeanp413/open-remote-ssh/releases";
     license = licenses.mit;
-    maintainers = with maintainers; [ /* add your name here if you maintain this */ ];
     platforms = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/packages/pipewire-python/default.nix b/packages/pipewire-python/default.nix
index 61afdc6..7510386 100644
--- a/packages/pipewire-python/default.nix
+++ b/packages/pipewire-python/default.nix
@@ -1,5 +1,5 @@
 { python3Packages, fetchFromGitHub, ... }:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
   pname = "pipewire-python";
   version = "0.2.3";
   format = "pyproject";
@@ -12,6 +12,10 @@ python3Packages.buildPythonPackage rec {
   };
 
   buildInputs = with python3Packages; [ flit-core ];
-  nativeBuildInputs = with python3Packages; [ build wheel ];
-  doCheck = false; # no tests in the PyPI tarball
+  nativeBuildInputs = with python3Packages; [
+    build
+    wheel
+  ];
+
+  doCheck = false;
 }
diff --git a/packages/wyzeapy/default.nix b/packages/wyzeapy/default.nix
index 44db4f9..a1f485a 100644
--- a/packages/wyzeapy/default.nix
+++ b/packages/wyzeapy/default.nix
@@ -11,7 +11,10 @@ python3Packages.buildPythonPackage rec {
     sha256 = "sha256-rEmWsCIBGNmDEecVT8O9O5/E0WVpTfA7amFI70DEmiI=";
   };
 
-  buildInputs = with python3Packages; [ poetry-core hatchling ];
+  buildInputs = with python3Packages; [
+    poetry-core
+    hatchling
+  ];
 
   nativeBuildInputs = with python3Packages; [
     aiodns
diff --git a/systems/aarch64-darwin/macbook-pro/default.nix b/systems/aarch64-darwin/macbook-pro/default.nix
index 5f79faa..53591e1 100755
--- a/systems/aarch64-darwin/macbook-pro/default.nix
+++ b/systems/aarch64-darwin/macbook-pro/default.nix
@@ -4,7 +4,6 @@
 }:
 {
   imports = [
-    ./nix.nix
     ./homebrew.nix
     ./programs.nix
     ./system.nix
diff --git a/systems/aarch64-darwin/macbook-pro/nix.nix b/systems/aarch64-darwin/macbook-pro/nix.nix
deleted file mode 100644
index c420d99..0000000
--- a/systems/aarch64-darwin/macbook-pro/nix.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }:
-{
-  # Auto upgrade nix package and the daemon service.
-  # services.nix-daemon.enable = true;
-  # nix.package = pkgs.nix;
-
-  # Necessary for using flakes on this system.
-  nix = {
-    settings.experimental-features = "nix-command flakes";
-  };
-
-  # The platform the configuration will be used on.
-  nixpkgs = {
-    config.allowUnfree = true;
-    hostPlatform = "aarch64-darwin";
-  };
-}
diff --git a/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix b/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
index 43c0021..165c4ee 100644
--- a/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix
@@ -1,59 +1,69 @@
 # 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, ... }:
+{
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [
+    "usb_storage"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "none";
-      fsType = "tmpfs";
-      options = [ "mode=755" ];
-    };
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [ "mode=755" ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E66E-1A03";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/E66E-1A03";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
-  fileSystems."/root" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
+  fileSystems."/root" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=root" ];
+  };
 
-  fileSystems."/etc" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=etc" ];
-    };
+  fileSystems."/etc" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=etc" ];
+  };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=nix" ];
+  };
 
-  fileSystems."/var/log" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=log" ];
-    };
+  fileSystems."/var/log" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=log" ];
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/335f1bb3-6fdb-474e-972c-77b64e930d03";
+    fsType = "btrfs";
+    options = [ "subvol=home" ];
+  };
 
   swapDevices = [ ];
 
diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix
index b69c6ca..3bb55ad 100755
--- a/systems/aarch64-linux/pi4/default.nix
+++ b/systems/aarch64-linux/pi4/default.nix
@@ -3,7 +3,6 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  config,
   lib,
   pkgs,
   namespace,
@@ -26,19 +25,6 @@ in
     hardware.disko.enable = true;
   };
 
-  nix = {
-    settings = {
-      substituters = [
-        "https://nixos-raspberrypi.cachix.org"
-        "https://cache.mjallen.dev"
-      ];
-      trusted-public-keys = [
-        "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
-        "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
-      ];
-    };
-  };
-
   # Configure nixpkgs
   nixpkgs = {
     overlays = lib.mkAfter [
@@ -53,20 +39,8 @@ in
       })
     ];
   };
-
-  programs.zsh.enable = true;
   hardware.i2c.enable = true;
 
-  services = {
-    openssh = {
-      enable = true;
-      authorizedKeysFiles = [
-        config.sops.secrets."ssh-keys-public/pi5".path
-      ];
-      hostKeys = [ ];
-    };
-  };
-
   systemd.services.btattach = {
     before = [ "bluetooth.service" ];
     after = [ "dev-ttyAMA0.device" ];
diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index 034fa55..1197c69 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -11,7 +11,7 @@
 }:
 let
   user = "matt";
-  password = config.sops.secrets."pi5/matt-password".path;
+  # password = config.sops.secrets."pi5/matt-password".path;
   kernelBundle = pkgs.linuxAndFirmware.latest;
 in
 {
@@ -30,20 +30,6 @@ in
     };
   };
 
-  # Enable nix flakes and nix-command tools
-  nix = {
-    settings = {
-      substituters = [
-        "https://nixos-raspberrypi.cachix.org"
-        # "https://cache.mjallen.dev"
-      ];
-      trusted-public-keys = [
-        "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
-        # "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
-      ];
-    };
-  };
-
   # Configure nixpkgs
   nixpkgs = {
     overlays = lib.mkAfter [
@@ -119,5 +105,9 @@ in
     users.root.shell = pkgs.zsh;
   };
 
+  programs = {
+    kdeconnect.enable = false;
+  };
+
   zramSwap.enable = true;
 }
diff --git a/systems/x86_64-linux/desktop/configuration.nix b/systems/x86_64-linux/desktop/configuration.nix
index ebfba82..0c8e916 100755
--- a/systems/x86_64-linux/desktop/configuration.nix
+++ b/systems/x86_64-linux/desktop/configuration.nix
@@ -51,17 +51,6 @@ let
   ];
 in
 {
-  # nix = {
-  #   settings = {
-  #     substituters = [
-  #       "https://cache.mjallen.dev"
-  #     ];
-  #     trusted-public-keys = [
-  #       "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
-  #     ];
-  #   };
-  # };
-
   chaotic.mesa-git.enable = false;
 
   # Environment configuration
diff --git a/systems/x86_64-linux/desktop/filesystems.nix b/systems/x86_64-linux/desktop/filesystems.nix
index c94ebd2..a55f9ac 100755
--- a/systems/x86_64-linux/desktop/filesystems.nix
+++ b/systems/x86_64-linux/desktop/filesystems.nix
@@ -27,7 +27,8 @@ in
       fsType = "bcachefs";
       options = [
         "noatime"
-      ] ++ defaultLocalOptions;
+      ]
+      ++ defaultLocalOptions;
     };
 
     # Network shares
diff --git a/systems/x86_64-linux/desktop/hardware-configuration.nix b/systems/x86_64-linux/desktop/hardware-configuration.nix
index 81aaf96..4e43a00 100755
--- a/systems/x86_64-linux/desktop/hardware-configuration.nix
+++ b/systems/x86_64-linux/desktop/hardware-configuration.nix
@@ -32,7 +32,8 @@ in
     options = [
       "subvol=nix"
       "noatime"
-    ] ++ defeaultBtrfsOptions;
+    ]
+    ++ defeaultBtrfsOptions;
   };
 
   fileSystems."/etc" = {
@@ -41,7 +42,8 @@ in
     options = [
       "subvol=etc"
       "noatime"
-    ] ++ defeaultBtrfsOptions;
+    ]
+    ++ defeaultBtrfsOptions;
   };
 
   fileSystems."/root" = {
@@ -50,7 +52,8 @@ in
     options = [
       "subvol=root"
       "noatime"
-    ] ++ defeaultBtrfsOptions;
+    ]
+    ++ defeaultBtrfsOptions;
   };
 
   fileSystems."/var/log" = {
@@ -59,7 +62,8 @@ in
     options = [
       "subvol=log"
       "noatime"
-    ] ++ defeaultBtrfsOptions;
+    ]
+    ++ defeaultBtrfsOptions;
   };
 
   fileSystems."/home" = {
@@ -67,7 +71,8 @@ in
     fsType = "btrfs";
     options = [
       "subvol=home"
-    ] ++ defeaultBtrfsOptions;
+    ]
+    ++ defeaultBtrfsOptions;
   };
 
   fileSystems."/boot" = {
diff --git a/systems/x86_64-linux/desktop/services/lsfg-vk/default.nix b/systems/x86_64-linux/desktop/services/lsfg-vk/default.nix
index a5b2f80..7962624 100644
--- a/systems/x86_64-linux/desktop/services/lsfg-vk/default.nix
+++ b/systems/x86_64-linux/desktop/services/lsfg-vk/default.nix
@@ -8,4 +8,4 @@
   environment.variables = {
     LSFG_DLL_PATH = "/media/matt/data/steam/steamapps/common/Lossless Scaling/Lossless.dll";
   };
-}
\ No newline at end of file
+}
diff --git a/systems/x86_64-linux/nas/boot.nix b/systems/x86_64-linux/nas/boot.nix
index 3c9bb58..096a9b0 100755
--- a/systems/x86_64-linux/nas/boot.nix
+++ b/systems/x86_64-linux/nas/boot.nix
@@ -52,7 +52,7 @@ in
       clevis = {
         enable = true;
         devices = {
-#          "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj".secretFile = "../../../pool.jwe";
+          # "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj".secretFile = "../../../pool.jwe";
         };
       };
     };
diff --git a/systems/x86_64-linux/nas/default.nix b/systems/x86_64-linux/nas/default.nix
index 1d377d7..ae8300e 100755
--- a/systems/x86_64-linux/nas/default.nix
+++ b/systems/x86_64-linux/nas/default.nix
@@ -1,4 +1,3 @@
-
 # Edit this configuration file to define what should be installed on
 # 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`).
@@ -19,7 +18,6 @@
     ./apps.nix
     ./grafana.nix
     ./networking.nix
-    ./nixpkgs.nix
     ./ups.nix
     ./users.nix
     ./samba.nix
@@ -191,20 +189,4 @@
 
     optimise.automatic = lib.mkDefault true;
   };
-
-  # Nixpkgs configuration
-  nixpkgs = {
-    config = {
-      allowUnfree = lib.mkForce true;
-      allowUnsupportedSystem = true;
-      permittedInsecurePackages = [
-        # ...
-      ];
-    };
-  };
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "vscode-extension-github-copilot"
-    ];
 }
diff --git a/systems/x86_64-linux/nas/filesystems.nix b/systems/x86_64-linux/nas/filesystems.nix
index 3a77a31..fee1613 100755
--- a/systems/x86_64-linux/nas/filesystems.nix
+++ b/systems/x86_64-linux/nas/filesystems.nix
@@ -1,11 +1,8 @@
 { ... }:
-let
-  defaultOptions = [ "compress=zstd" ];
-in
 {
-  fileSystems."/mnt" = {
+  fileSystems."/media/nas/main" = {
     label = "nas_pool";
-#    device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/:sdj";
+    # device = "/dev/sde:/dev/sdf:/dev/sdh:/dev/sdi:/dev/sdj:/dev/nmve0n1:/dev/nvme1n1";
     fsType = "bcachefs";
     mountPoint = "/media/nas/main";
   };
diff --git a/systems/x86_64-linux/nas/nixpkgs.nix b/systems/x86_64-linux/nas/nixpkgs.nix
deleted file mode 100755
index 1cad936..0000000
--- a/systems/x86_64-linux/nas/nixpkgs.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ ... }:
-{
-  # Configure nixpkgs
-  nixpkgs = {
-    config = {
-      # Enable non free
-      allowUnfree = true;
-
-      # enable cuda support
-      cudaSupport = true;
-      allowUnfreePredicate =
-        p:
-        builtins.all (
-          license:
-          license.free
-          || builtins.elem license.shortName [
-            "CUDA EULA"
-            "cuDNN EULA"
-            "cuTENSOR EULA"
-            "NVidia OptiX EULA"
-          ]
-        ) (if builtins.isList p.meta.license then p.meta.license else [ p.meta.license ]);
-    };
-  };
-}
diff --git a/systems/x86_64-linux/nuc/default.nix b/systems/x86_64-linux/nuc/default.nix
index 5fbcecd..f242120 100644
--- a/systems/x86_64-linux/nuc/default.nix
+++ b/systems/x86_64-linux/nuc/default.nix
@@ -45,15 +45,4 @@
 
     optimise.automatic = lib.mkDefault true;
   };
-
-  # Nixpkgs configuration
-  nixpkgs = {
-    config = {
-      allowUnfree = lib.mkForce true;
-      allowUnsupportedSystem = true;
-      permittedInsecurePackages = [
-        # ...
-      ];
-    };
-  };
 }
diff --git a/systems/x86_64-linux/steamdeck/boot.nix b/systems/x86_64-linux/steamdeck/boot.nix
index 719c382..7c0380d 100755
--- a/systems/x86_64-linux/steamdeck/boot.nix
+++ b/systems/x86_64-linux/steamdeck/boot.nix
@@ -60,9 +60,5 @@ in
   # Further reduce systemd output
   systemd = {
     services.systemd-udev-settle.enable = false;
-    extraConfig = ''
-      ShowStatus=no
-      DefaultTimeoutStartSec=15s
-    '';
   };
 }
diff --git a/systems/x86_64-linux/steamdeck/configuration.nix b/systems/x86_64-linux/steamdeck/configuration.nix
index 094311e..50f0444 100755
--- a/systems/x86_64-linux/steamdeck/configuration.nix
+++ b/systems/x86_64-linux/steamdeck/configuration.nix
@@ -9,8 +9,6 @@
   ...
 }:
 {
-
-  nixpkgs.config.allowUnfree = lib.mkForce true;
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users = {
     deck = {
diff --git a/systems/x86_64-linux/steamdeck/default.nix b/systems/x86_64-linux/steamdeck/default.nix
index 679db4b..f43fb48 100644
--- a/systems/x86_64-linux/steamdeck/default.nix
+++ b/systems/x86_64-linux/steamdeck/default.nix
@@ -19,8 +19,6 @@
     ./sops.nix
   ];
 
-  nixpkgs.config.allowUnfree = true;
-
   ${namespace} = {
     hardware.disko.enable = true;
     bootloader.lanzaboote.enable = true;