From 80dd1b744bc2fa1148ffa7b2502d36a91695cefd Mon Sep 17 00:00:00 2001
From: Sebastian Fischer <typo3@evoweb.de>
Date: Sun, 8 Feb 2026 09:46:24 +0100
Subject: [PATCH] [TASK] Cleanup aliases

---
 config/home.nix    | 49 ++++------------------------------------------
 config/scripts.nix | 47 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 45 deletions(-)
 create mode 100644 config/scripts.nix

diff --git a/config/home.nix b/config/home.nix
index 18abb9e..dd86b6b 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -2,47 +2,7 @@
 { config, pkgs, ... }:
 
 let
-  composer = pkgs.writeShellScriptBin "composer" ''
-    mkdir -p "''${HOME}/.config/composer"
-    mkdir -p "''${HOME}/.cache/composer"
-    if ! ${pkgs.docker}/bin/docker network inspect db >/dev/null 2>&1; then
-      ${pkgs.docker}/bin/docker network create db
-    fi
-    SSH_AUTH_PATH=$(readlink -f "''${SSH_AUTH_SOCK:-/dev/null}")
-    exec ${pkgs.docker}/bin/docker run -t --rm \
-      --user $(id -u):33 \
-      --env COMPOSER_CACHE_DIR=/cache \
-      --env SSH_AUTH_SOCK=/ssh-agent \
-      --network db \
-      --volume "$SSH_AUTH_PATH":/ssh-agent \
-      --volume /etc/passwd:/etc/passwd:ro \
-      --volume "''${HOME}":"''${HOME}" \
-      --volume "''${HOME}/.config/composer":/tmp \
-      --volume "''${HOME}/.cache/composer":/cache \
-      --volume "''${PWD}":/app \
-      evoweb/php:composer "$@"
-  '';
-
-  git-cleanup-local-branches = pkgs.writeShellScriptBin "gclb" ''
-    ${pkgs.git}/bin/git fetch -p
-    GONE_BRANCHES=$(${pkgs.git}/bin/git for-each-ref --format '%(refname) %(upstream:track)' refs/heads | ${pkgs.gawk}/bin/awk '$2 == "[gone]" {sub("refs/heads/", "", $1); print $1}')
-    if [ -z "$GONE_BRANCHES" ]; then
-      echo "Keine verwaisten Branches gefunden."
-      exit 0
-    fi
-    for BRANCH in $GONE_BRANCHES; do
-      ${pkgs.git}/bin/git branch -D "$BRANCH"
-    done
-  '';
-
-  lazydocker = pkgs.writeShellScriptBin "lazydocker" ''
-    mkdir -p "''${HOME}/.config/lazydocker"
-    exec ${pkgs.docker}/bin/docker run \
-      --rm -it \
-      --volume /var/run/docker.sock:/var/run/docker.sock \
-      --volume "''${HOME}/.config/lazydocker":/.config/jesseduffield/lazydocker \
-      lazyteam/lazydocker
-  '';
+  localScripts = import ./scripts.nix { inherit pkgs; };
 in
 {
   home.stateVersion = "25.11";
@@ -81,7 +41,6 @@ in
     mkcert
     gitflow
 
-    stow
     gnumake
     p7zip
     cacert
@@ -92,9 +51,9 @@ in
     gnomeExtensions.dash-to-dock
 
     # Aliases
-    composer
-    git-cleanup-local-branches
-    lazydocker
+    localScripts.composer
+    localScripts.git-cleanup-local-branches
+    localScripts.lazydocker
   ];
 
   # Powerlevel10k Theme installieren
diff --git a/config/scripts.nix b/config/scripts.nix
new file mode 100644
index 0000000..bfa6212
--- /dev/null
+++ b/config/scripts.nix
@@ -0,0 +1,47 @@
+{ pkgs }:
+
+{
+  composer = pkgs.writeShellScriptBin "composer" ''
+    mkdir -p "''${HOME}/.config/composer"
+    mkdir -p "''${HOME}/.cache/composer"
+    if ! ${pkgs.docker}/bin/docker network inspect db >/dev/null 2>&1; then
+      ${pkgs.docker}/bin/docker network create db
+    fi
+    SSH_AUTH_PATH=$(readlink -f "''${SSH_AUTH_SOCK:-/dev/null}")
+    exec ${pkgs.docker}/bin/docker run \
+      -t \
+      --rm \
+      --user $(id -u):33 \
+      --env COMPOSER_CACHE_DIR=/cache \
+      --env SSH_AUTH_SOCK=/ssh-agent \
+      --network db \
+      --volume "$SSH_AUTH_PATH":/ssh-agent \
+      --volume /etc/passwd:/etc/passwd:ro \
+      --volume "''${HOME}":"''${HOME}" \
+      --volume "''${HOME}/.config/composer":/tmp \
+      --volume "''${HOME}/.cache/composer":/cache \
+      --volume "''${PWD}":/app \
+      evoweb/php:composer "$@"
+  '';
+
+  git-cleanup-local-branches = pkgs.writeShellScriptBin "gclb" ''
+    ${pkgs.git}/bin/git fetch -p
+    GONE_BRANCHES=$(${pkgs.git}/bin/git for-each-ref --format '%(refname) %(upstream:track)' refs/heads | ${pkgs.gawk}/bin/awk '$2 == "[gone]" {sub("refs/heads/", "", $1); print $1}')
+    if [ -z "$GONE_BRANCHES" ]; then
+      echo "Found now orphan local branches."
+      exit 0
+    fi
+    for BRANCH in $GONE_BRANCHES; do
+      ${pkgs.git}/bin/git branch -D "$BRANCH"
+    done
+  '';
+
+  lazydocker = pkgs.writeShellScriptBin "lazydocker" ''
+    mkdir -p "''${HOME}/.config/lazydocker"
+    exec ${pkgs.docker}/bin/docker run \
+      --rm -it \
+      --volume /var/run/docker.sock:/var/run/docker.sock \
+      --volume "''${HOME}/.config/lazydocker":/.config/jesseduffield/lazydocker \
+      lazyteam/lazydocker
+  '';
+}