diff --git a/flake.lock b/flake.lock
index 0468085..e982d67 100644
--- a/flake.lock
+++ b/flake.lock
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693187908,
-        "narHash": "sha256-cTcNpsqi1llmUFl9bmCdD0mTyfjhBrNFPhu2W12WXzA=",
+        "lastModified": 1692503956,
+        "narHash": "sha256-MOA6FKc1YgfGP3ESnjSYfsyJ1BXlwV5pGlY/u5XdJfY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8bde7a651b94ba30bd0baaa9c4a08aae88cc2e92",
+        "rev": "958c06303f43cf0625694326b7f7e5475b1a2d5c",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693208669,
-        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
+        "lastModified": 1692099905,
+        "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
+        "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1692952286,
-        "narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
+        "lastModified": 1692373088,
+        "narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
+        "rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693231525,
-        "narHash": "sha256-Zmh8m0HHcgGBDth6jdJPmc4UAAP0L4jQmqIztywF1Iw=",
+        "lastModified": 1692525914,
+        "narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c540061ac8d72d6e6d99345bd2d590c82b2f58c1",
+        "rev": "475d5ae2c4cb87b904545bdb547af05681198fcc",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1693250523,
-        "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=",
+        "lastModified": 1692447944,
+        "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e",
+        "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b6b1ad4..747da57 100755
--- a/flake.nix
+++ b/flake.nix
@@ -38,7 +38,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
 			agenix.packages.x86_64-linux.default
 			git
 			plasma5Packages.plasma-sdk
-			nix-diff
 		];
 		shellHook =''
 			export PS1="$PS1(toast-configs)> "
diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix
index dfd748a..eb8bc43 100644
--- a/machines/Archie/configuration.nix
+++ b/machines/Archie/configuration.nix
@@ -33,11 +33,22 @@
 	# Enable the X11 windowing system.
 	services.xserver.enable = true;
 
-	# Enable the pipewire sound server
+	/*# Enable the pipewire sound server
 	services.pipewire = {
 		enable = true;
 		pulse.enable = true;
+	}; /*
+
+	/*
+	Pipewire's audio server seems to be broken for now, so I'm going to
+	temporarely use pulse as my audio server
+	*/
+	services.pipewire = {
+		audio.enable = false;
+		pulse.enable = false;
+		alsa.enable = false;
 	};
+	hardware.pulseaudio.enable = true;
 
 	# Configure keymap in X11
 	# services.xserver.layout = "us";
diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix
index b25ff4d..6aa4825 100755
--- a/roles/desktop/programs/default.nix
+++ b/roles/desktop/programs/default.nix
@@ -6,6 +6,5 @@
 		./firefox.nix
 		./micro.nix
 		./keepassxc.nix
-		./jamesdsp.nix
 	];
 }
diff --git a/roles/desktop/programs/jamesdsp.nix b/roles/desktop/programs/jamesdsp.nix
deleted file mode 100644
index 4316cb5..0000000
--- a/roles/desktop/programs/jamesdsp.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	users.users.toast.packages = [ pkgs.jamesdsp ];
-}
diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/programs/keepassxc.nix
index 2bff9ed..6ffb436 100644
--- a/roles/desktop/programs/keepassxc.nix
+++ b/roles/desktop/programs/keepassxc.nix
@@ -23,33 +23,36 @@ let
 in
 
 {
-	users.users.toast.packages = [ pkgs.keepassxc ];
+	# I'm only using keepass on my user, so I'm installing it with home-manager
 	home-manager = {
 		extraSpecialArgs = { kpxcSettings = kpxcSettings; };
 		users.toast = { config, pkgs, kpxcSettings, ... }: {
-			# No module for KeePassXC config :(
-			home.file = {
-				".config/keepassxc/keepassxc.ini".text = kpxcSettings;
-				# For some reason the autostart .desktop is not the same as the regular one
-				".config/autostart/org.keepassxc.KeePassXC.desktop".text = ''
-				[Desktop Entry]
-				Name=KeePassXC
-				GenericName=Password Manager
-				Exec=keepassxc
-				TryExec=keepassxc
-				Icon=keepassxc
-				StartupWMClass=keepassxc
-				StartupNotify=true
-				Terminal=false
-				Type=Application
-				Version=1.0
-				Categories=Utility;Security;Qt;
-				MimeType=application/x-keepass2;
-				X-GNOME-Autostart-enabled=true
-				X-GNOME-Autostart-Delay=2
-				X-KDE-autostart-after=panel
-				X-LXQt-Need-Tray=true
-				'';
+			home = {
+				packages = [ pkgs.keepassxc ];
+				# No module for KeePassXC config :(
+				file = {
+					".config/keepassxc/keepassxc.ini".text = kpxcSettings;
+					# For some reason the autostart .desktop is not the same as the regular one
+					".config/autostart/org.keepassxc.KeePassXC.desktop".text = ''
+					[Desktop Entry]
+					Name=KeePassXC
+					GenericName=Password Manager
+					Exec=keepassxc
+					TryExec=keepassxc
+					Icon=keepassxc
+					StartupWMClass=keepassxc
+					StartupNotify=true
+					Terminal=false
+					Type=Application
+					Version=1.0
+					Categories=Utility;Security;Qt;
+					MimeType=application/x-keepass2;
+					X-GNOME-Autostart-enabled=true
+					X-GNOME-Autostart-Delay=2
+					X-KDE-autostart-after=panel
+					X-LXQt-Need-Tray=true
+					'';
+				};
 			};
 		};
 	};
diff --git a/roles/kde/programs/kate.nix b/roles/kde/programs/kate.nix
index 99b1e5d..ff84a90 100644
--- a/roles/kde/programs/kate.nix
+++ b/roles/kde/programs/kate.nix
@@ -1,5 +1,8 @@
 { config, pkgs, ... }:
 
 {
-	environment.systemPackages = [ pkgs.kate ];
+	home-manager.users.toast = { config, pkgs, ... }:
+	{
+		home.packages = [ pkgs.kate ];
+	};
 }