diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix
index eb1a861..d38117d 100644
--- a/home/programs/zsh.nix
+++ b/home/programs/zsh.nix
@@ -13,11 +13,7 @@
     enable = true;
     dotDir = "${config.xdg.configHome}/zsh";
     shellAliases = {
-      encryptSops = "sops --age age1ammls20r5t3dx4cvhpt8n5dejxcpdmpqt37sa9r9fuztd8c43g4sz889zd -e -i secrets/secrets.yaml";
       update = "sudo nixos-rebuild switch";
-      conWG = "ssh elias@logout.nonagon.dev -p 6969";
-      conWS = "ssh elias@192.168.31.200";
-      setupPC = "wlr-randr --output HDMI-A-2 --on --mode 1920x1080 --pos 0,0;wlr-randr --output DVI-D-1 --on --mode 1920x1080 --pos 1920,0;wlr-randr --output DP-2 --on --mode 1920x1080 --pos 3840,0 --primary";
     };
     autosuggestion.enable = true;
     localVariables = {
diff --git a/machines/hardware-configuration-desktop.nix b/machines/hardware-configuration-desktop.nix
index 56523bd..16250aa 100644
--- a/machines/hardware-configuration-desktop.nix
+++ b/machines/hardware-configuration-desktop.nix
@@ -1,54 +1,71 @@
 # 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,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    fsType = "btrfs";
+    options = [ "subvol=root" ];
+  };
 
-  fileSystems."/.swapvol" =
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
-      fsType = "btrfs";
-      options = [ "subvol=swap" ];
-    };
+  fileSystems."/.swapvol" = {
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    fsType = "btrfs";
+    options = [ "subvol=swap" ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/A38E-500D";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A38E-500D";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    fsType = "btrfs";
+    options = [ "subvol=home" ];
+  };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    fsType = "btrfs";
+    options = [ "subvol=nix" ];
+  };
 
-  fileSystems."/partition-root" =
-    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
-      fsType = "btrfs";
-    };
+  fileSystems."/partition-root" = {
+    device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f";
+    fsType = "btrfs";
+  };
 
-  swapDevices = [ ];
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/aded1c84-f4d0-4841-ab2f-68266532737f"; }
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/machines/hardware-configuration-laptop.nix b/machines/hardware-configuration-laptop.nix
index 222b19c..f155d03 100644
--- a/machines/hardware-configuration-laptop.nix
+++ b/machines/hardware-configuration-laptop.nix
@@ -1,31 +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,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "ehci_pci"
+    "xhci_pci"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/10e64a0a-7ef7-492e-8f1e-5d3916405d82";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/10e64a0a-7ef7-492e-8f1e-5d3916405d82";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/40CB-8C4C";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/40CB-8C4C";
+    fsType = "vfat";
+  };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/6a36bba4-5be8-4fd5-af21-05447bded927"; }
-    ];
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/6a36bba4-5be8-4fd5-af21-05447bded927"; }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's