From 328591c15f2d332b7e7c2d63298fed27c333fac3 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Tue, 7 Mar 2023 08:02:21 +0100 Subject: [PATCH] Remove no longer needed dmenu scripts I now migrate to shell.nix. And I've now enabled xdebug all the time within webserver (php-fpm). --- .../packages/custom/dmenu-scripts/default.nix | 74 ------------------- home/packages/custom/dmenu-scripts/xdebug.sh | 54 -------------- 2 files changed, 128 deletions(-) delete mode 100644 home/packages/custom/dmenu-scripts/xdebug.sh diff --git a/home/packages/custom/dmenu-scripts/default.nix b/home/packages/custom/dmenu-scripts/default.nix index f73d63c..c4efd12 100644 --- a/home/packages/custom/dmenu-scripts/default.nix +++ b/home/packages/custom/dmenu-scripts/default.nix @@ -10,23 +10,6 @@ let - # Things like version switch should not be necessary once I managed nix shells. - - dmenu-custom-scripts-calc = writeShellApplication { - name = "dmenu-custom-scripts-calc"; - - runtimeInputs = [ - dmenu - bc - ]; - - text = '' - input=$(dmenu -i) - result=$(echo "$input" | scale=4 bc -l) - echo "$result" | dmenu -i -p "Result:" - ''; - }; - dmenu-custom-scripts-notifications = writeShellApplication { name = "dmenu-custom-scripts-notifications"; @@ -63,47 +46,6 @@ let text = builtins.readFile ./system.sh; }; - dmenu-custom-scripts-docs-php = writeShellApplication { - name = "dmenu-custom-scripts-docs-php"; - - runtimeInputs = [ - dmenu - xdg-utils - ]; - - text = '' - file=$(find ~/Projects/docs/php/ -maxdepth 1 -name '*.html' -printf "%f\n" | dmenu -i -l 20 -p "Search Term") - xdg-open "http://php.docs.localhost/$file" - ''; - }; - - dmenu-custom-scripts-php-version = writeShellApplication { - name = "dmenu-custom-scripts-php-version"; - - runtimeInputs = [ - dmenu - libnotify - ]; - - text = '' - chosen=$(update-alternatives --list php | dmenu -i -l 20 -p "$(php --version | head -1 | cut -d' ' -f2 | cut -d'.' -f1,2)") - sudo update-alternatives --set php "$chosen" > /dev/null - pkill -SIGRTMIN+10 i3blocks - notify-send "switching php version" "$(php --version)" - ''; - }; - - dmenu-custom-scripts-xdebug = writeShellApplication { - name = "dmenu-custom-scripts-xdebug"; - - runtimeInputs = [ - dmenu - libnotify - ]; - - text = builtins.readFile ./xdebug.sh; - }; - dmenu-custom-scripts-open-issue = writeShellApplication { name = "dmenu-custom-scripts-open-issue"; @@ -121,13 +63,9 @@ writeShellApplication { # TODO: Find way to remove the nix prefixes from "files" text = '' scripts=() - scripts+=("${dmenu-custom-scripts-calc.name}") scripts+=("${dmenu-custom-scripts-notifications.name}") scripts+=("${dmenu-custom-scripts-open-issue.name}") scripts+=("${dmenu-custom-scripts-system.name}") - scripts+=("${dmenu-custom-scripts-php-version.name}") - scripts+=("${dmenu-custom-scripts-docs-php.name}") - scripts+=("${dmenu-custom-scripts-xdebug.name}") OIFS="$IFS" IFS=$'\n' scriptsString="''${scripts[*]}" @@ -136,9 +74,6 @@ writeShellApplication { action=$(echo -e "$scriptsString" | dmenu -i -l 20) case "$action" in - "${dmenu-custom-scripts-calc.name}") - bash "${dmenu-custom-scripts-calc}/bin/${dmenu-custom-scripts-calc.name}" || exit 0 - ;; "${dmenu-custom-scripts-notifications.name}") bash "${dmenu-custom-scripts-notifications}/bin/${dmenu-custom-scripts-notifications.name}" || exit 0 ;; @@ -148,15 +83,6 @@ writeShellApplication { "${dmenu-custom-scripts-system.name}") bash "${dmenu-custom-scripts-system}/bin/${dmenu-custom-scripts-system.name}" || exit 0 ;; - "${dmenu-custom-scripts-docs-php.name}") - bash "${dmenu-custom-scripts-docs-php}/bin/${dmenu-custom-scripts-docs-php.name}" || exit 0 - ;; - "${dmenu-custom-scripts-php-version.name}") - bash "${dmenu-custom-scripts-php-version}/bin/${dmenu-custom-scripts-php-version.name}" || exit 0 - ;; - "${dmenu-custom-scripts-xdebug.name}") - bash "${dmenu-custom-scripts-xdebug}/bin/${dmenu-custom-scripts-xdebug.name}" || exit 0 - ;; *) exit 0 ;; diff --git a/home/packages/custom/dmenu-scripts/xdebug.sh b/home/packages/custom/dmenu-scripts/xdebug.sh deleted file mode 100644 index a2d6d96..0000000 --- a/home/packages/custom/dmenu-scripts/xdebug.sh +++ /dev/null @@ -1,54 +0,0 @@ -activeString="" -action=$(echo -e "enable\ndisable\n" | dmenu -l 2 -i -p "$activeString") -case "$action" in -"enable") - sudo /bin/ln -s /etc/php/7.2/mods-available/xdebug.ini /etc/php/7.2/cli/conf.d/20-xdebug.ini || true - sudo /bin/ln -s /etc/php/7.2/mods-available/xdebug.ini /etc/php/7.2/fpm/conf.d/20-xdebug.ini || true - - sudo /bin/ln -s /etc/php/7.3/mods-available/xdebug.ini /etc/php/7.3/cli/conf.d/20-xdebug.ini || true - sudo /bin/ln -s /etc/php/7.3/mods-available/xdebug.ini /etc/php/7.3/fpm/conf.d/20-xdebug.ini || true - - sudo /bin/ln -s /etc/php/7.4/mods-available/xdebug.ini /etc/php/7.4/cli/conf.d/20-xdebug.ini || true - sudo /bin/ln -s /etc/php/7.4/mods-available/xdebug.ini /etc/php/7.4/fpm/conf.d/20-xdebug.ini || true - - sudo /bin/ln -s /etc/php/8.0/mods-available/xdebug.ini /etc/php/8.0/cli/conf.d/20-xdebug.ini || true - sudo /bin/ln -s /etc/php/8.0/mods-available/xdebug.ini /etc/php/8.0/fpm/conf.d/20-xdebug.ini || true - - sudo /bin/ln -s /etc/php/8.1/mods-available/xdebug.ini /etc/php/8.1/cli/conf.d/20-xdebug.ini || true - sudo /bin/ln -s /etc/php/8.1/mods-available/xdebug.ini /etc/php/8.1/fpm/conf.d/20-xdebug.ini || true - - sudo /bin/ln -s /etc/php/8.2/mods-available/xdebug.ini /etc/php/8.2/cli/conf.d/20-xdebug.ini || true - sudo /bin/ln -s /etc/php/8.2/mods-available/xdebug.ini /etc/php/8.2/fpm/conf.d/20-xdebug.ini || true - ;; -"disable") - sudo /usr/bin/unlink /etc/php/7.2/cli/conf.d/20-xdebug.ini || true - sudo /usr/bin/unlink /etc/php/7.2/fpm/conf.d/20-xdebug.ini || true - - sudo /usr/bin/unlink /etc/php/7.3/cli/conf.d/20-xdebug.ini || true - sudo /usr/bin/unlink /etc/php/7.3/fpm/conf.d/20-xdebug.ini || true - - sudo /usr/bin/unlink /etc/php/7.4/cli/conf.d/20-xdebug.ini || true - sudo /usr/bin/unlink /etc/php/7.4/fpm/conf.d/20-xdebug.ini || true - - sudo /usr/bin/unlink /etc/php/8.0/cli/conf.d/20-xdebug.ini || true - sudo /usr/bin/unlink /etc/php/8.0/fpm/conf.d/20-xdebug.ini || true - - sudo /usr/bin/unlink /etc/php/8.1/cli/conf.d/20-xdebug.ini || true - sudo /usr/bin/unlink /etc/php/8.1/fpm/conf.d/20-xdebug.ini || true - - sudo /usr/bin/unlink /etc/php/8.2/cli/conf.d/20-xdebug.ini || true - sudo /usr/bin/unlink /etc/php/8.2/fpm/conf.d/20-xdebug.ini || true - ;; -*) - exit 0 - ;; -esac - -sudo /bin/systemctl reload php7.2-fpm.service || true -sudo /bin/systemctl reload php7.3-fpm.service || true -sudo /bin/systemctl reload php7.4-fpm.service || true -sudo /bin/systemctl reload php8.0-fpm.service || true -sudo /bin/systemctl reload php8.1-fpm.service || true -sudo /bin/systemctl reload php8.2-fpm.service || true -pkill -SIGRTMIN+10 i3blocks || true -notify-send "switching xdebug: $action"