diff --git a/flake.lock b/flake.lock
index 4147925..5fe3161 100644
--- a/flake.lock
+++ b/flake.lock
@@ -442,11 +442,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1728554473,
-        "narHash": "sha256-wzVeYNRedx8aAi8NsUvBbPJAilozHp+mC49NUKYk73c=",
+        "lastModified": 1728640579,
+        "narHash": "sha256-jaUDVs2vKdLLC/NCgQahnFQHGHL6HmDrwLMfxKshj3M=",
         "ref": "refs/heads/main",
-        "rev": "b65773bea9b912a41cfcbc789fb2e60a07e3d0c1",
-        "revCount": 5325,
+        "rev": "d655a10381f01212635f2eadd69e1f22930f8f06",
+        "revCount": 5326,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
diff --git a/glasshouse-desktop/home/hyprland/config.nix b/glasshouse-desktop/home/hyprland/config.nix
index f5455ed..471b413 100644
--- a/glasshouse-desktop/home/hyprland/config.nix
+++ b/glasshouse-desktop/home/hyprland/config.nix
@@ -108,9 +108,9 @@
 
 				bezier = [
 					"fluent_decel, 0, 0.2, 0.4, 1"
-						"easeOutCirc, 0, 0.55, 0.45, 1"
-						"easeOutCubic, 0.33, 1, 0.68, 1"
-						"easeinoutsine, 0.37, 0, 0.63, 1"
+					"easeOutCirc, 0, 0.55, 0.45, 1"
+					"easeOutCubic, 0.33, 1, 0.68, 1"
+					"easeinoutsine, 0.37, 0, 0.63, 1"
 				];
 
 				animation = [
diff --git a/glasshouse-desktop/home/scripts/default.nix b/glasshouse-desktop/home/scripts/default.nix
index 0eaf312..d9ce0ac 100644
--- a/glasshouse-desktop/home/scripts/default.nix
+++ b/glasshouse-desktop/home/scripts/default.nix
@@ -1,76 +1,84 @@
 {pkgs, ...}: let
-  wall-change = pkgs.writeShellScriptBin "wall-change" (builtins.readFile ./scripts/wall-change.sh);
-  wallpaper-picker = pkgs.writeShellScriptBin "wallpaper-picker" (builtins.readFile ./scripts/wallpaper-picker.sh);
-  
-  runbg = pkgs.writeShellScriptBin "runbg" (builtins.readFile ./scripts/runbg.sh);
-  music = pkgs.writeShellScriptBin "music" (builtins.readFile ./scripts/music.sh);
-  lofi = pkgs.writeScriptBin "lofi" (builtins.readFile ./scripts/lofi.sh);
+	wall-change = pkgs.writeShellScriptBin "wall-change" (builtins.readFile ./scripts/wall-change.sh);
+	wallpaper-picker = pkgs.writeShellScriptBin "wallpaper-picker" (builtins.readFile ./scripts/wallpaper-picker.sh);
 
-  splash = pkgs.writeShellScriptBin "splash" (builtins.readFile ./scripts/splash.sh);
-  switchmon = pkgs.writeShellScriptBin "switchmon" (builtins.readFile ./scripts/switchmon.sh);
-  nixswitch = pkgs.writeShellScriptBin "nixswitch" (builtins.readFile ./scripts/nixswitch.sh);
-  garbage-collect = pkgs.writeShellScriptBin "garbage-collect" (builtins.readFile ./scripts/garbage-collect.sh);
-  scheck = pkgs.writeShellScriptBin "scheck" (builtins.readFile ./scripts/s_check.sh);
-  mcd = pkgs.writeShellScriptBin "mcd" (builtins.readFile ./scripts/mcd.sh);
-  crs = pkgs.writeShellScriptBin "crs" (builtins.readFile ./scripts/crs.sh);
-  nixcommit = pkgs.writeShellScriptBin "nixcommit" (builtins.readFile ./scripts/nixcommit.sh);
-  invoke = pkgs.writeShellScriptBin "invoke" (builtins.readFile ./scripts/invoke.sh);
-  nsp = pkgs.writeShellScriptBin "nsp" (builtins.readFile ./scripts/nsp.sh);
-  
-  
-  toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh);
-  toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (builtins.readFile ./scripts/toggle_oppacity.sh);
-  
-  maxfetch = pkgs.writeScriptBin "maxfetch" (builtins.readFile ./scripts/maxfetch.sh);
-  
-  compress = pkgs.writeScriptBin "compress" (builtins.readFile ./scripts/compress.sh);
-  extract = pkgs.writeScriptBin "extract" (builtins.readFile ./scripts/extract.sh);
-  
-  shutdown-script = pkgs.writeScriptBin "shutdown-script" (builtins.readFile ./scripts/shutdown-script.sh);
-  
-  show-keybinds = pkgs.writeScriptBin "show-keybinds" (builtins.readFile ./scripts/keybinds.sh);
-  
-  vm-start = pkgs.writeScriptBin "vm-start" (builtins.readFile ./scripts/vm-start.sh);
+	runbg = pkgs.writeShellScriptBin "runbg" (builtins.readFile ./scripts/runbg.sh);
+	music = pkgs.writeShellScriptBin "music" (builtins.readFile ./scripts/music.sh);
+	lofi = pkgs.writeScriptBin "lofi" (builtins.readFile ./scripts/lofi.sh);
 
-  ascii = pkgs.writeScriptBin "ascii" (builtins.readFile ./scripts/ascii.sh);
-  
-  record = pkgs.writeScriptBin "record" (builtins.readFile ./scripts/record.sh);
+	splash = pkgs.writeShellScriptBin "splash" (builtins.readFile ./scripts/splash.sh);
+	switchmon = pkgs.writeShellScriptBin "switchmon" (builtins.readFile ./scripts/switchmon.sh);
+	nixswitch = pkgs.writeShellScriptBin "nixswitch" (builtins.readFile ./scripts/nixswitch.sh);
+	garbage-collect = pkgs.writeShellScriptBin "garbage-collect" (builtins.readFile ./scripts/garbage-collect.sh);
+	scheck = pkgs.writeShellScriptBin "scheck" (builtins.readFile ./scripts/s_check.sh);
+	mcd = pkgs.writeShellScriptBin "mcd" (builtins.readFile ./scripts/mcd.sh);
+	crs = pkgs.writeShellScriptBin "crs" (builtins.readFile ./scripts/crs.sh);
+	nixcommit = pkgs.writeShellScriptBin "nixcommit" (builtins.readFile ./scripts/nixcommit.sh);
+	invoke = pkgs.writeShellScriptBin "invoke" (builtins.readFile ./scripts/invoke.sh);
+	nsp = pkgs.writeShellScriptBin "nsp" (builtins.readFile ./scripts/nsp.sh);
+	nixp = pkgs.writeShellScriptBin "nixp" (builtins.readFile ./scripts/nixp.sh);
+	nixr = pkgs.writeShellScriptBin "nixr" (builtins.readFile ./scripts/nixr.sh);
+	homep = pkgs.writeShellScriptBin "homep" (builtins.readFile ./scripts/homep.sh);
+	homer = pkgs.writeShellScriptBin "homer" (builtins.readFile ./scripts/homer.sh);
+
+
+	toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh);
+	toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (builtins.readFile ./scripts/toggle_oppacity.sh);
+
+	maxfetch = pkgs.writeScriptBin "maxfetch" (builtins.readFile ./scripts/maxfetch.sh);
+
+	compress = pkgs.writeScriptBin "compress" (builtins.readFile ./scripts/compress.sh);
+	extract = pkgs.writeScriptBin "extract" (builtins.readFile ./scripts/extract.sh);
+
+	shutdown-script = pkgs.writeScriptBin "shutdown-script" (builtins.readFile ./scripts/shutdown-script.sh);
+
+	show-keybinds = pkgs.writeScriptBin "show-keybinds" (builtins.readFile ./scripts/keybinds.sh);
+
+	vm-start = pkgs.writeScriptBin "vm-start" (builtins.readFile ./scripts/vm-start.sh);
+
+	ascii = pkgs.writeScriptBin "ascii" (builtins.readFile ./scripts/ascii.sh);
+
+	record = pkgs.writeScriptBin "record" (builtins.readFile ./scripts/record.sh);
 in {
-  home.packages = [
-	nixswitch 
-	garbage-collect 
-	scheck 
-	mcd 
-	crs 
-	nixcommit 
-	invoke 
-	nsp 
-    wall-change
-    wallpaper-picker
-    
-    runbg
-    music
-    lofi
+	home.packages = [
+		nixswitch 
+			garbage-collect 
+			scheck 
+			mcd 
+			crs 
+			nixcommit 
+			invoke 
+			nsp 
+			wall-change
+			wallpaper-picker
+			nixp
+			nixr
+			homep
+			homer
 
-	splash
-	switchmon
-  
-    toggle_blur
-    toggle_oppacity
+			runbg
+			music
+			lofi
 
-    maxfetch
+			splash
+			switchmon
 
-    compress
-    extract
+			toggle_blur
+			toggle_oppacity
 
-    shutdown-script
-    
-    show-keybinds
+			maxfetch
 
-    vm-start
+			compress
+			extract
 
-    ascii
+			shutdown-script
 
-    record
-  ];
+			show-keybinds
+
+			vm-start
+
+			ascii
+
+			record
+			];
 }
diff --git a/glasshouse-desktop/home/scripts/scripts/homep.sh b/glasshouse-desktop/home/scripts/scripts/homep.sh
new file mode 100755
index 0000000..c36b0d8
--- /dev/null
+++ b/glasshouse-desktop/home/scripts/scripts/homep.sh
@@ -0,0 +1,30 @@
+#!/run/current-system/sw/bin/bash
+
+# Ensure the package manifest is generated or updated
+if [ ! -f "/tmp/nixpkgs_manifest.txt" ]; then
+    echo "Generating Nixpkgs manifest..."
+    nix-env -qaP 2>/dev/null | awk '{print $1}' | sed 's/nixos\.//' > /tmp/nixpkgs_manifest.txt
+fi
+
+# Select packages using fzf with multi-select enabled
+selected_packages=$(cat /tmp/nixpkgs_manifest.txt | fzf -m)
+
+# Check if any packages were selected
+if [ -n "$selected_packages" ]; then
+    echo "$selected_packages" | while read -r package; do
+        # Append each selected package to the Nix config file
+        sed -i "/^\t]/i \ \t\t$package" "$HOME/sysflakes/glasshouse-desktop/home/userpkgs.nix"
+        echo "Added $package to the Home Manager configuration."
+    done
+
+	echo "Packages added successfully. Rebuild system config?"
+	select yn in "Yes" "No"; do
+		case $yn in
+			"Yes" ) nixswitch;break;;
+			"No" ) exit;;
+		esac
+	done
+
+else
+    echo "No packages selected."
+fi
diff --git a/glasshouse-desktop/home/scripts/scripts/homer.sh b/glasshouse-desktop/home/scripts/scripts/homer.sh
new file mode 100755
index 0000000..86133ba
--- /dev/null
+++ b/glasshouse-desktop/home/scripts/scripts/homer.sh
@@ -0,0 +1,24 @@
+#!/run/current-system/sw/bin/bash
+
+selected_packages=$(sed -n '/\[/,/\]/p' "$HOME/sysflakes/glasshouse-desktop/home/userpkgs.nix" | sed '1d;$d' | fzf -m)
+
+if [ -n "$selected_packages" ]; then
+	echo "$selected_packages" | while read -r package; do
+		sed -i "/\b$package\b/d" "$HOME/sysflakes/glasshouse-desktop/home/userpkgs.nix"
+		echo "Removed $package from the Home Manager configuration."
+	done
+
+	echo "Removed packages. Rebuild system config?"
+	select yn in "Yes" "No"; do
+		case $yn in
+			"Yes" ) nixswitch;break;;
+			"No" ) exit;;
+		esac
+	done
+
+else
+	echo "No packages removed."
+fi
+
+
+
diff --git a/glasshouse-desktop/home/scripts/scripts/nixp.sh b/glasshouse-desktop/home/scripts/scripts/nixp.sh
new file mode 100755
index 0000000..a29d74b
--- /dev/null
+++ b/glasshouse-desktop/home/scripts/scripts/nixp.sh
@@ -0,0 +1,30 @@
+#!/run/current-system/sw/bin/bash
+
+# Ensure the package manifest is generated or updated
+if [ ! -f "/tmp/nixpkgs_manifest.txt" ]; then
+    echo "Generating Nixpkgs manifest..."
+    nix-env -qaP 2>/dev/null | awk '{print $1}' | sed 's/nixos\.//' > /tmp/nixpkgs_manifest.txt
+fi
+
+# Select packages using fzf with multi-select enabled
+selected_packages=$(cat /tmp/nixpkgs_manifest.txt | fzf -m)
+
+# Check if any packages were selected
+if [ -n "$selected_packages" ]; then
+    echo "$selected_packages" | while read -r package; do
+        # Append each selected package to the Nix config file
+        sed -i "/^\t]/i \ \t\t$package" "$HOME/sysflakes/glasshouse-desktop/sys/packages.nix"
+        echo "Added $package to the Nix configuration."
+    done
+
+	echo "Packages added successfully. Rebuild system config?"
+	select yn in "Yes" "No"; do
+		case $yn in
+			"Yes" ) nixswitch;break;;
+			"No" ) exit;;
+		esac
+	done
+
+else
+    echo "No packages selected."
+fi
diff --git a/glasshouse-desktop/home/scripts/scripts/nixr.sh b/glasshouse-desktop/home/scripts/scripts/nixr.sh
new file mode 100755
index 0000000..021fe8d
--- /dev/null
+++ b/glasshouse-desktop/home/scripts/scripts/nixr.sh
@@ -0,0 +1,24 @@
+#!/run/current-system/sw/bin/bash
+
+selected_packages=$(sed -n '/\[/,/\]/p' "$HOME/sysflakes/glasshouse-desktop/sys/packages.nix" | sed '1d;$d' | fzf -m)
+
+if [ -n "$selected_packages" ]; then
+	echo "$selected_packages" | while read -r package; do
+		sed -i "/\b$package\b/d" "$HOME/sysflakes/glasshouse-desktop/sys/packages.nix"
+		echo "Removed $package from the Nix configuration."
+	done
+
+	echo "Removed packages. Rebuild system config?"
+	select yn in "Yes" "No"; do
+		case $yn in
+			"Yes" ) nixswitch;break;;
+			"No" ) exit;;
+		esac
+	done
+
+else
+	echo "No packages removed."
+fi
+
+
+