diff --git a/home/common.nix b/home/common.nix
index 17258ab..c2a8869 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -32,5 +32,11 @@
     };
   };
 
+  home.file.".config/nixpkgs/config.nix".text = ''
+    {
+      allowUnfree = true;
+    }
+  '';
+
   home.stateVersion = "26.05";
 }
diff --git a/home/fish/config.fish b/home/fish/config.fish
index e9e1b63..87936b4 100644
--- a/home/fish/config.fish
+++ b/home/fish/config.fish
@@ -4,7 +4,7 @@ function nix
   if test "$argv[1]" = "develop"; and test (count $argv) -eq 1
     command nix develop -c fish $argv[2..-1]
   else if test "$argv[1]" = "shell"
-    env IN_NIX_SHELL=shell nix $argv
+    env IN_NIX_SHELL=shell nix $argv -c fish
   else
     command nix $argv
   end
diff --git a/home/kutu/config.rb b/home/kutu/config.rb
index 3b7a212..a095c1c 100644
--- a/home/kutu/config.rb
+++ b/home/kutu/config.rb
@@ -84,8 +84,8 @@ bind_key 55, true, "CM_LAUNCHER=rofi clipmenu"
 
 bind_key 39, true, :toggle_floating
 
-bind_mouse 9, false, :workspace_next
-bind_mouse 9, true, :move_window_next_workspace
+bind_mouse 8, false, :workspace_next
+bind_mouse 8, true, :move_window_next_workspace
 
-bind_mouse 8, false, :workspace_previous
-bind_mouse 8, true, :move_window_previous_workspace
+bind_mouse 9, false, :workspace_previous
+bind_mouse 9, true, :move_window_previous_workspace
diff --git a/home/picom/picom.conf b/home/picom/picom.conf
deleted file mode 100644
index 4bdfcdf..0000000
--- a/home/picom/picom.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# General settings
-fading = true;
-vsync = true;
-backend = "glx";
-fade-delta = 4;
-inactive-opacity = 0.9;
-
-# Window corner radius
-corner-radius = 7.0;
-round-borders = 1;
-
-# Blur settings
-blur-method = "gaussian";
-blur-size = 7;
-blur-deviation = 3;
-
-# Opacity rules
-opacity-rule = [
-    "100:class_g = 'Polybar'"
-];
-
-# Exclusions for corner radius
-corner-radius-exclude = [
-    "class_g = 'Dunst'",
-    "class_i = 'Dunst'",
-    "name = 'Dunst'",
-    "class_i = 'dmenu'",
-    "class_g = 'dmenu'",
-    "name - 'dmenu'"
-];
-
-# Exclusions for background blur
-blur-background-exclude = [
-    "class_g ~= 'slop'",
-    "class_i ~= 'slop'",
-    "name ~= 'slop'",
-    "window_type = 'menu'",
-    "window_type = 'tooltip'",
-    "role = 'xborder'",
-    "window_type = 'popup_menu'",
-    "window_type = 'dropdown_menu'"
-];
diff --git a/hosts/tardis/default.nix b/hosts/tardis/default.nix
index 729165d..4a5db24 100644
--- a/hosts/tardis/default.nix
+++ b/hosts/tardis/default.nix
@@ -27,7 +27,8 @@
       maim
       xclip
       xsel
-      prismlauncher
+      lunar-client
+      jdk21
       spotify
 
       kutu.packages.${stdenv.hostPlatform.system}.default