diff --git a/Makefile b/Makefile
index f7a4b74..a0704fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 install:
-	cp ./environment /etc/environment
 	$(MAKE) -C ./scripts install
 	$(MAKE) -C ./neovim
 	$(MAKE) -C ./starship
diff --git a/dwl b/dwl
index 9ad94e3..01082b4 160000
--- a/dwl
+++ b/dwl
@@ -1 +1 @@
-Subproject commit 9ad94e33c2c889a62a526a767c864be71b630777
+Subproject commit 01082b4d9e1a927e186a2e8cdb4c606f66b03ffd
diff --git a/dwlb b/dwlb
new file mode 160000
index 0000000..48dbe00
--- /dev/null
+++ b/dwlb
@@ -0,0 +1 @@
+Subproject commit 48dbe00bdb98a1ae6a0e60558ce14503616aa759
diff --git a/home-manager/flake.lock b/home-manager/flake.lock
deleted file mode 100644
index b8bf553..0000000
--- a/home-manager/flake.lock
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768598210,
-        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1768564909,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/home-manager/flake.nix b/home-manager/flake.nix
deleted file mode 100644
index ba331c1..0000000
--- a/home-manager/flake.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  description = "Home Manager configuration of steven";
-
-  inputs = {
-    # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs =
-    { nixpkgs, home-manager, ... }:
-    let
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
-    in
-    {
-      homeConfigurations."steven" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-
-        # Specify your home configuration modules here, for example,
-        # the path to your home.nix.
-        modules = [ ./home.nix ];
-
-        # Optionally use extraSpecialArgs
-        # to pass through arguments to home.nix
-      };
-    };
-}
diff --git a/home-manager/home.nix b/home-manager/home.nix
deleted file mode 100644
index b6bcb72..0000000
--- a/home-manager/home.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	home.username = "steven";
-	home.homeDirectory = "/home/steven";
-	home.stateVersion = "25.11"; # Please read the comment before changing.
-	home.packages = [
-	];
-	home.file = {
-		"hmhello.txt".text = ''
-		hello'';
-	};
-	home.sessionVariables = {
-		QT_QPA_PLATFORMTHEME = "gtk3";
-		PATH = "$PATH:/home/steven/.local/share/JetBrains/Toolbox/scripts/";
-	};
-	programs = {
-		home-manager.enable = true;
-		fish.enable = true;
-		neovim = {
-			enable = true;
-			viAlias = true;
-			vimAlias = true;
-			plugins = with pkgs.vimPlugins; [
-				oil-nvim
-				nvim-colorizer-lua
-				nvim-treesitter
-				mini-nvim
-				plenary-nvim
-				telescope-nvim
-				gitsigns-nvim
-				vim-airline
-				nvim-web-devicons
-				vim-startify
-			];
-			extraLuaConfig = builtins.readFile ./neovim/init.lua;
-		};
-	};
-}
diff --git a/home-manager/neovim/init.lua b/home-manager/neovim/init.lua
deleted file mode 100644
index f626636..0000000
--- a/home-manager/neovim/init.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-vim.opt.number = true
-vim.opt.tabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.undofile = true
-vim.opt.clipboard = "unnamedplus"
-vim.cmd [[
-  highlight Normal guibg=none
-  highlight NonText guibg=none
-  highlight Normal ctermbg=none
-  highlight NonText ctermbg=none
-]]
--- Disable netrw first:
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-
-require("oil").setup({
-  default_file_explorer = true,
-})
--- Keymaps
-vim.keymap.set("n", "-", require("oil").open, { desc = "Open Oil" })
-vim.keymap.set("n", "<leader>-", require("oil").open_float, { desc = "Open Oil float" })
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
-vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
diff --git a/scripts/src/startup.sh b/scripts/src/startup.sh
index a80abdd..88b8d11 100755
--- a/scripts/src/startup.sh
+++ b/scripts/src/startup.sh
@@ -1 +1,2 @@
-someblocks -p | dwl -s 'setup.sh'
+dwlb -ipc -font "BlexMono Nerd Font:size=16" &
+someblocks -p | dwlb -status-stdin all