diff --git a/Makefile b/Makefile
index 1bb4333..f7a4b74 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
 install:
+	cp ./environment /etc/environment
 	$(MAKE) -C ./scripts install
+	$(MAKE) -C ./neovim
+	$(MAKE) -C ./starship
 	$(MAKE) -C ./dwl install
 	$(MAKE) -C ./someblocks install
 	$(MAKE) -C ./dunst install
 	cd ./somebar && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd ..
+
+
 	cd ./wmenu && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd ..
diff --git a/dwl b/dwl
index bcaeddc..9ad94e3 160000
--- a/dwl
+++ b/dwl
@@ -1 +1 @@
-Subproject commit bcaeddcedef875b01e87d240f5da49c0c0053339
+Subproject commit 9ad94e33c2c889a62a526a767c864be71b630777
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a1ff7b8..b6bcb72 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -4,9 +4,11 @@
 	home.username = "steven";
 	home.homeDirectory = "/home/steven";
 	home.stateVersion = "25.11"; # Please read the comment before changing.
-	home.packages = with pkgs; [
+	home.packages = [
 	];
 	home.file = {
+		"hmhello.txt".text = ''
+		hello'';
 	};
 	home.sessionVariables = {
 		QT_QPA_PLATFORMTHEME = "gtk3";
@@ -15,32 +17,6 @@
 	programs = {
 		home-manager.enable = true;
 		fish.enable = true;
-		zoxide.enable = true;
-		starship = {
-			enable = true;
-			enableFishIntegration = true;
-			settings = {
-				format = "$username@$hostname: $character";
-				right_format = "$directory$git_status$git_branch";
-				hostname = {
-					ssh_only = false;
-					style = "bold blue dimmed";
-					format = "[$hostname]($style)";
-				};
-				username = {
-					show_always = true;
-					format = "[$user]($style)";
-				};
-				directory = {
-					fish_style_pwd_dir_length = 4;
-				};
-				sudo = {
-					style = "bold green";
-					symbol = "SUDO";
-					disabled = false;
-				};
-			};
-		};
 		neovim = {
 			enable = true;
 			viAlias = true;
@@ -56,7 +32,6 @@
 				vim-airline
 				nvim-web-devicons
 				vim-startify
-				nvim-lspconfig
 			];
 			extraLuaConfig = builtins.readFile ./neovim/init.lua;
 		};
diff --git a/home-manager/neovim/init.lua b/home-manager/neovim/init.lua
index 814b1be..f626636 100644
--- a/home-manager/neovim/init.lua
+++ b/home-manager/neovim/init.lua
@@ -12,18 +12,10 @@ vim.cmd [[
 -- Disable netrw first:
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
-vim.diagnostic.config({
- virtual_text = true,
-})
+
 require("oil").setup({
   default_file_explorer = true,
 })
-vim.lsp.config['rust-analyzer'] = {
-    cmd = { 'rust-analyzer' },
-	filetypes = { 'rust' },
-	root_markers = { {'Cargo.toml', 'Cargo.lock'} },
-}
-vim.lsp.enable('rust-analyzer')
 -- Keymaps
 vim.keymap.set("n", "-", require("oil").open, { desc = "Open Oil" })
 vim.keymap.set("n", "<leader>-", require("oil").open_float, { desc = "Open Oil float" })
diff --git a/home-manager/starship.toml b/starship/starship.toml
similarity index 100%
rename from home-manager/starship.toml
rename to starship/starship.toml