diff --git a/modules/home-manager/cli/bin.nix b/modules/home-manager/cli/bin.nix
deleted file mode 100644
index 43864ae2..00000000
--- a/modules/home-manager/cli/bin.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ self, ... }:
-{
-  home.sessionPath = [ "$HOME/bin" ];
-
-  home.file."bin" = {
-    source = "${self}/bin";
-    recursive = true;
-  };
-}
diff --git a/modules/home-manager/cli/bin/default.nix b/modules/home-manager/cli/bin/default.nix
new file mode 100644
index 00000000..2da9de18
--- /dev/null
+++ b/modules/home-manager/cli/bin/default.nix
@@ -0,0 +1,10 @@
+{
+  home = {
+    sessionPath = [ "$HOME/.local/bin" ];
+
+    file.".local/bin" = {
+      source = ./scripts;
+      recursive = true;
+    };
+  };
+}
diff --git a/bin/create-script b/modules/home-manager/cli/bin/scripts/create-script
similarity index 100%
rename from bin/create-script
rename to modules/home-manager/cli/bin/scripts/create-script
diff --git a/bin/git-abort b/modules/home-manager/cli/bin/scripts/git-abort
similarity index 100%
rename from bin/git-abort
rename to modules/home-manager/cli/bin/scripts/git-abort
diff --git a/bin/git-bare-clone b/modules/home-manager/cli/bin/scripts/git-bare-clone
similarity index 100%
rename from bin/git-bare-clone
rename to modules/home-manager/cli/bin/scripts/git-bare-clone
diff --git a/bin/git-continue b/modules/home-manager/cli/bin/scripts/git-continue
similarity index 100%
rename from bin/git-continue
rename to modules/home-manager/cli/bin/scripts/git-continue
diff --git a/bin/git-sync b/modules/home-manager/cli/bin/scripts/git-sync
similarity index 100%
rename from bin/git-sync
rename to modules/home-manager/cli/bin/scripts/git-sync
diff --git a/bin/git-up b/modules/home-manager/cli/bin/scripts/git-up
similarity index 100%
rename from bin/git-up
rename to modules/home-manager/cli/bin/scripts/git-up
diff --git a/bin/import-gzip-database b/modules/home-manager/cli/bin/scripts/import-gzip-database
similarity index 100%
rename from bin/import-gzip-database
rename to modules/home-manager/cli/bin/scripts/import-gzip-database
diff --git a/bin/main-or-master-branch b/modules/home-manager/cli/bin/scripts/main-or-master-branch
similarity index 100%
rename from bin/main-or-master-branch
rename to modules/home-manager/cli/bin/scripts/main-or-master-branch
diff --git a/bin/mounter b/modules/home-manager/cli/bin/scripts/mounter
similarity index 100%
rename from bin/mounter
rename to modules/home-manager/cli/bin/scripts/mounter
diff --git a/bin/move-firefox-screenshots b/modules/home-manager/cli/bin/scripts/move-firefox-screenshots
similarity index 100%
rename from bin/move-firefox-screenshots
rename to modules/home-manager/cli/bin/scripts/move-firefox-screenshots
diff --git a/bin/new-drupal-module b/modules/home-manager/cli/bin/scripts/new-drupal-module
similarity index 100%
rename from bin/new-drupal-module
rename to modules/home-manager/cli/bin/scripts/new-drupal-module
diff --git a/bin/setbg b/modules/home-manager/cli/bin/scripts/setbg
similarity index 100%
rename from bin/setbg
rename to modules/home-manager/cli/bin/scripts/setbg
diff --git a/bin/start-traefik b/modules/home-manager/cli/bin/scripts/start-traefik
similarity index 100%
rename from bin/start-traefik
rename to modules/home-manager/cli/bin/scripts/start-traefik
diff --git a/bin/stop-all-docker-containers b/modules/home-manager/cli/bin/scripts/stop-all-docker-containers
similarity index 100%
rename from bin/stop-all-docker-containers
rename to modules/home-manager/cli/bin/scripts/stop-all-docker-containers
diff --git a/bin/stop-traefik b/modules/home-manager/cli/bin/scripts/stop-traefik
similarity index 100%
rename from bin/stop-traefik
rename to modules/home-manager/cli/bin/scripts/stop-traefik
diff --git a/bin/tag-release b/modules/home-manager/cli/bin/scripts/tag-release
similarity index 100%
rename from bin/tag-release
rename to modules/home-manager/cli/bin/scripts/tag-release
diff --git a/bin/unmounter b/modules/home-manager/cli/bin/scripts/unmounter
similarity index 100%
rename from bin/unmounter
rename to modules/home-manager/cli/bin/scripts/unmounter
diff --git a/bin/update-all-git-repos b/modules/home-manager/cli/bin/scripts/update-all-git-repos
similarity index 100%
rename from bin/update-all-git-repos
rename to modules/home-manager/cli/bin/scripts/update-all-git-repos
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index 726f02e6..1b911633 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./bin.nix
+    ./bin
     ./bluetuith.nix
     ./direnv.nix
     ./fzf.nix