diff --git a/flake.lock b/flake.lock
index 1467ca6..b5c9582 100644
--- a/flake.lock
+++ b/flake.lock
@@ -228,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728041527,
-        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
+        "lastModified": 1728337164,
+        "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
+        "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1728018373,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "lastModified": 1728241625,
+        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
         "type": "github"
       },
       "original": {
@@ -506,8 +506,8 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1727909473,
-        "narHash": "sha256-Ns0pV0qxRmJ0TTcm+ozKKWqIDK3l8jrCqpM9d/FI5x8=",
+        "lastModified": 1728284376,
+        "narHash": "sha256-jByffzDhfj4YY+9l+K2Vz5aFkhVDuHsFth2W0dROtDI=",
         "path": "/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles/packages/nixvim",
         "type": "path"
       },
diff --git a/glasshouse-desktop/configuration.nix b/glasshouse-desktop/configuration.nix
index 1a40afb..72bbbc0 100644
--- a/glasshouse-desktop/configuration.nix
+++ b/glasshouse-desktop/configuration.nix
@@ -12,9 +12,9 @@
 
 	networking = {
 		networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-		hostName = "glasshouse";
+		hostName = "glasshaus";
 			hosts = {
-				"192.168.1.163" = [ "glasshaus" ];
+				"192.168.1.163" = [ "glasshaus.info" ];
 			};
 		firewall = {
 			enable = true;
@@ -30,9 +30,15 @@
 		];
 	};
 
-	environment.variables = {
-		XCURSOR_SIZE = "24";
-		PATH = "${pkgs.clang-tools}/bin:$PATH";
+	environment = {
+		variables = {
+			XCURSOR_SIZE = "24";
+			PATH = "${pkgs.clang-tools}/bin:$PATH";
+		};
+		shells = with pkgs; [
+			zsh
+			bash
+		];
 	};
 
 
@@ -46,23 +52,28 @@
 # Enable sound.
 	#hardware.pulseaudio.enable = true;
 # OR
-	services.pipewire = {
-		enable = true;
-		pulse.enable = true;
-		wireplumber.enable = true;
-		alsa.enable = true;
-		alsa.support32Bit = true;
-	};
+
 	services = {
+		pipewire = {
+				enable = true;
+				pulse.enable = true;
+				wireplumber.enable = true;
+				alsa.enable = true;
+				alsa.support32Bit = true;
+			};
 		udev.enable = true;
 		dbus.enable = true;
 		mullvad-vpn.enable = true;
 	};
+
+	hardware.keyboard.uhk.enable = true;
+	hardware.amdgpu.amdvlk.enable = true;
 	security.sudo.extraConfig = ''
 pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild
 	'';
 	users.users.pagedmov = {
 		isNormalUser = true;
+		defaultUserShell = pkgs.zsh;
 		extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
 	};
 
@@ -71,6 +82,10 @@ pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild
 	environment.systemPackages = with pkgs; [
 		parted
 		mullvad
+		fuse
+		wineWowPackages.full
+		vulkan-loader
+		mesa
 		vim 
 		pass
 		gnumake
diff --git a/glasshouse-desktop/dotfiles/packages/nixvim/config/options.nix b/glasshouse-desktop/dotfiles/packages/nixvim/config/options.nix
index d009584..0bd527d 100644
--- a/glasshouse-desktop/dotfiles/packages/nixvim/config/options.nix
+++ b/glasshouse-desktop/dotfiles/packages/nixvim/config/options.nix
@@ -5,6 +5,9 @@
 		
 		diagnostics.signs = false;
 		extraConfigLua = ''
+			if vim.g.started_by_firenvim == true then
+				vim.o.laststatus = 0
+			end
 			if vim.g.neovide then
 				vim.g.neovide_refresh_rate = 144
 				vim.g.neovide_cursor_vfx_mode = "sonicboom"
diff --git a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/nvim-tree.nix b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/nvim-tree.nix
index 572c15e..dcf5d49 100644
--- a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/nvim-tree.nix
+++ b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/nvim-tree.nix
@@ -1,8 +1,8 @@
 {
 	plugins.nvim-tree = { 
 			enable = true; 
-			hijackUnnamedBufferWhenOpening = true;
-			openOnSetup = true;
+			hijackUnnamedBufferWhenOpening = false;
+			openOnSetup = false;
 			onAttach = { __raw = ''
 			function(bufnr)
 local api = require('nvim-tree.api')
diff --git a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/plugins.nix b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/plugins.nix
index a40a5a2..332602d 100644
--- a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/plugins.nix
+++ b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/plugins.nix
@@ -13,6 +13,7 @@
 		floaterm.enable = true;
 		fugitive.enable = true;
 		rustaceanvim.enable = true;
+		firenvim.enable = true;
 		dap = {
 			enable = true;
 			extensions.dap-ui.enable = true;
diff --git a/glasshouse-desktop/home.nix b/glasshouse-desktop/home.nix
index c77e677..31db817 100644
--- a/glasshouse-desktop/home.nix
+++ b/glasshouse-desktop/home.nix
@@ -12,6 +12,7 @@
 		enableNixpkgsReleaseCheck = false;
 		sessionVariables = {
 			GTK_THEME = "Adwaita:dark";
+			SHELL = "/etc/profiles/per-user/pagedmov/bin/zsh";
 		};
 
 
@@ -59,6 +60,7 @@
 			snes9x-gtk
 			rustup
 			libreoffice
+			handbrake
 			nvim
 			toilet
 			nix-autobahn
diff --git a/glasshouse-desktop/modules/zshell.nix b/glasshouse-desktop/modules/zshell.nix
index d082dec..5a37af3 100644
--- a/glasshouse-desktop/modules/zshell.nix
+++ b/glasshouse-desktop/modules/zshell.nix
@@ -213,7 +213,7 @@ nixswitch() {
 	gen=$(readlink /nix/var/nix/profiles/system | sed 's/.*system-\([0-9]*\)-link/\1/')
 	gen=$((gen + 1))
 
-	git diff --cached --quiet
+	git diff --quiet
 	if [ $? -eq 1 ]; then
 		git add .
 		git commit -m "Commit for generation $gen"