diff --git a/deploy b/deploy
index 9e2f02e..adec8b2 100755
--- a/deploy
+++ b/deploy
@@ -20,7 +20,6 @@ rebuild_flake () {
 	git add . --verbose
 	if [ "$1" = "reinstall-bootloader" ]; then
 		sudo nixos-rebuild switch --flake . --install-bootloader
-		# STC_DISPLAY_ALL_UNITS=1 (verbose, show output of all units)
 	else	
 		sudo nixos-rebuild switch --flake .
 		#nixos-rebuild build --flake .# --cores 8 -j 1
diff --git a/docs/nixos_notes.md b/docs/nixos_notes.md
deleted file mode 100644
index e396b10..0000000
--- a/docs/nixos_notes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Building specific parts of a NixOS system
-https://nixos.org/manual/nixos/stable/#sec-building-parts
diff --git a/homes/me/default.nix b/homes/me/default.nix
index f35678d..2636693 100755
--- a/homes/me/default.nix
+++ b/homes/me/default.nix
@@ -11,6 +11,7 @@
   };
 
   imports = [
+    #inputs.hyprpanel.packages.homeManagerModules.hyprpanel
     ../modules/git.nix
     ../modules/bat.nix
     ../modules/fish.nix
@@ -22,7 +23,7 @@
     ../modules/nixcord.nix
 
     #../modules/hypr/hypridle.nix
-    ../modules/hypr/hyprlock.nix
+    #../modules/hypr/hyprlock.nix
     ../modules/kanshi.nix
     ../modules/ags
   ];
@@ -92,7 +93,7 @@
 
     # DEBUG: testing if my xdg-desktop-portal-hyprland is working or not
     obs-studio = {
-      enable = false;
+      enable = true;
       plugins = with pkgs.obs-studio-plugins; [
         wlrobs
         obs-backgroundremoval
@@ -125,15 +126,6 @@
           port = 22;
           identityFile = "~/.ssh/id_subspace";
         };
-        dead = {
-          hostname = "deadlyserver.com";
-          user = "emile";
-          port = 29843;
-          identityFile = "~/.ssh/id_deadlyserver";
-          setEnv = {
-            TERM = "xterm-256color";
-          };
-        };
         youcue = {
           hostname = "moss.labs.eait.uq.edu.au";
           user = "s4740056";
@@ -143,6 +135,15 @@
             TERM = "xterm-256color";
           };
         };
+        deadlyserver = {
+          hostname = "deadlyserver.com";
+          user = "emile";
+          port = 29843;
+          identityFile = "~/.ssh/id_deadlyserver";
+          setEnv = {
+            TERM = "xterm-256color";
+          };
+        };
       };
     };
 
diff --git a/homes/subspace/default.nix b/homes/subspace/default.nix
index c827022..6b1c0fa 100644
--- a/homes/subspace/default.nix
+++ b/homes/subspace/default.nix
@@ -41,27 +41,12 @@
           user = "ae";
           port = 22;
           identityFile = "~/.ssh/id_hyrule";
-          setEnv = {
-            TERM = "linux";
-          };
         };
-        dead = {
+        YearnForTheMines = {
           hostname = "deadlyserver.com";
           user = "emile";
           port = 29843;
           identityFile = "~/.ssh/id_deadlyserver";
-          setEnv = {
-            TERM = "xterm-256color";
-          };
-        };
-        youcue = {
-          hostname = "moss.labs.eait.uq.edu.au";
-          user = "s4740056";
-          port = 22;
-          identityFile = "~/.ssh/id_youcue";
-          setEnv = {
-            TERM = "xterm-256color";
-          };
         };
       };
     };
diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix
index c2c0461..11048b6 100755
--- a/hosts/hyrule/default.nix
+++ b/hosts/hyrule/default.nix
@@ -450,9 +450,10 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
-    git
     vim
     helix
+
+    #wishlist
   ];
 
   programs = {
diff --git a/hosts/imbored/default.nix b/hosts/imbored/default.nix
index 0e0e268..df99d85 100755
--- a/hosts/imbored/default.nix
+++ b/hosts/imbored/default.nix
@@ -76,7 +76,6 @@ in {
   #};
 
   environment.SystemPackages = with pkgs; [
-    btop
   ];
 
   programs = {
diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix
index 2dcf179..c06299d 100755
--- a/hosts/lolcathost/default.nix
+++ b/hosts/lolcathost/default.nix
@@ -117,7 +117,7 @@ in {
       # literally me fr (personal account)
       me = {
         isNormalUser = true;
-        extraGroups = ["wheel" "docker"];
+        extraGroups = ["wheel"];
         shell = pkgs.bash; #pkgs.fish
         packages = let
           # TODO: can I just do this: https://nix.dev/manual/nix/2.18/command-ref/new-cli/nix3-flake#url-like-syntax
@@ -229,7 +229,6 @@ in {
     acpi
     vim
     powertop
-    gcc
 
     # Unix Commands
     wget
@@ -309,8 +308,6 @@ in {
     "flakes"
   ];
 
-  virtualisation.docker.enable = true;
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix
index 7e8c5ce..117cfee 100755
--- a/hosts/myputer/default.nix
+++ b/hosts/myputer/default.nix
@@ -213,7 +213,6 @@ in {
     acpi
     vim
     nix-prefetch-git
-    gcc
 
     # Unix Commands
     wget