Deletged generated, testing new location scripts

Droidnix/README.org

@@ -1343,18 +1343,13 @@ in
   environment.systemPackages = [ pkgs.waybar ];
 
   home-manager.users.${username} = {
-    home.file = {
-      ".config/waybar/config.jsonc".source = "${waybarPath}/config.jsonc";
-      ".config/waybar/style-dark.css".source = "${waybarPath}/style-dark.css";
-    };
-
-    home.activation.MakeMutable = {
+    home.activation.MakeWaybarMutable = {
         after = [ "writeBoundary" ];
         before = [];
         data = ''
           rm -f $HOME/.config/waybar/*
-              cp ${waybarPath}/* $HOME/.config/waybar/
-              chmod u+w $HOME/.config/waybar/*
+          cp ${waybarPath}/* $HOME/.config/waybar/
+          chmod u+w $HOME/.config/waybar/*
         '';
     };
   };
@@ -3746,9 +3741,9 @@ ShellRoot {
 }
 #+END_SRC
 
-** =generated/.config/scripts/batterywarn.sh=
+** =generated/.config/waybar/scripts/batterywarn.sh=
 Providing an media
-#+BEGIN_SRC sh :tangle generated/.config/scripts/batterywarn.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
+#+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/batterywarn.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
 capacity=$(cat /sys/class/power_supply/BAT*/capacity)
 status=$(cat /sys/class/power_supply/BAT*/status)
 
@@ -3759,9 +3754,9 @@ else
 fi
 #+END_SRC
 
-** =generated/.config/scripts/media.sh=
+** =generated/.config/waybar/scripts/media.sh=
 Providing an media
-#+BEGIN_SRC sh :tangle generated/.config/scripts/media.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
+#+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/media.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
 
 # Player selection — prefer actively playing player
 player=$(playerctl -l 2>/dev/null | while read -r p; do
@@ -4829,15 +4824,15 @@ These are  config files for waybar
 "custom/windows": {
   "align": 0,
   "format": "{text}",
-  "exec": "~/.config/scripts/hypr-workspaces.sh",
+  "exec": "~/.config/waybar/scripts/hypr-workspaces.sh",
   "interval": 2,
   "return-type": "json",
-  "on-click": "~/.config/scripts/hypr-workspacesmenu.sh",
+  "on-click": "~/.config/waybar/scripts/hypr-workspacesmenu.sh",
   "tooltip": true
 },
 
 "custom/media": {
-    "exec": "~/.config/scripts/media.sh",
+    "exec": "~/.config/waybar/scripts/media.sh",
     "interval": 1,
     "return-type": "json",
     "format": "{}",
@@ -4848,7 +4843,7 @@ These are  config files for waybar
 },
 
   "custom/bluetooth": {
-    "exec": "~/.config/scripts/bluetooth-status.sh",
+    "exec": "~/.config/waybar/scripts/bluetooth-status.sh",
     "interval": 5,
     "return-type": "json",
     "on-click": "blueman-manager",
@@ -4856,7 +4851,7 @@ These are  config files for waybar
   },
 
   "custom/batterywarn": {
-      "exec": "~/.config/scripts/batterywarn.sh",
+      "exec": "~/.config/waybar/scripts/batterywarn.sh",
       "interval": 60,
       "format": "{}"
   },
@@ -4864,7 +4859,7 @@ These are  config files for waybar
     "custom/kdeconnect": {
     "format": "{name} {battery}% ",
     "interval": 10,
-    "exec": "~/.config/scripts/kdeconnect-status.sh",
+    "exec": "~/.config/waybar/scripts/kdeconnect-status.sh",
     "tooltip": true
   },
 
@@ -5243,9 +5238,9 @@ label#custom-windows:not(.active) {
 }
 #+END_SRC
 
-** =generated/.config/scripts/bluetooth-status.sh=
+** =generated/.config/waybar/scripts/bluetooth-status.sh=
 These are  config files for waybar
-#+BEGIN_SRC sh :tangle generated/.config/scripts/bluetooth-status.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
+#+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/bluetooth-status.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
 bt_connected=""
 while read -r _ mac name_rest; do
     if [ "$(bluetoothctl info "$mac" | awk '/Connected:/ {print $2}')" = "yes" ]; then
@@ -5264,9 +5259,9 @@ fi
 printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"
 #+END_SRC
 
-** =generated/.config/scripts/hypr-workspaces.sh=
+** =generated/.config/waybar/scripts/hypr-workspaces.sh=
 These are  config files for waybar
-#+BEGIN_SRC sh :tangle generated/.config/scripts/hypr-workspaces.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
+#+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/hypr-workspaces.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
 # Get focused monitor name
 focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused==true) | .name')
 monitor="${WAYBAR_OUTPUT_NAME:-$focused_monitor}"
@@ -5302,9 +5297,9 @@ jq -c -n \
   '{text:$text, tooltip:$tooltip, class:$class}'
 #+END_SRC
 
-** =generated/.config/scripts/hypr-workspacesmenu.sh=
+** =generated/.config/waybar/scripts/hypr-workspacesmenu.sh=
 These are  config files for waybar
-#+BEGIN_SRC sh :tangle generated/.config/scripts/hypr-workspacesmenu.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
+#+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/hypr-workspacesmenu.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
 active_ws=$(hyprctl activeworkspace -j | jq -r '.id')
 clients=$(hyprctl clients -j | jq -r \
   ".[] | select(.workspace.id==$active_ws) | \"\(.address)|\(.title)\"")
@@ -5320,9 +5315,9 @@ addr=$(echo "$clients" | grep "|$choice" | head -n1 | cut -d'|' -f1)
 hyprctl dispatch focuswindow address:"$addr"
 #+END_SRC
 
-** =generated/.config/scripts/kdeconnect-status.sh=
+** =generated/.config/waybar/scripts/kdeconnect-status.sh=
 These are  config files for waybar
-#+BEGIN_SRC sh :tangle generated/.config/scripts/kdeconnect-status.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
+#+BEGIN_SRC sh :tangle generated/.config/waybar/scripts/kdeconnect-status.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never
 DEVICE=$(kdeconnect-cli --list-devices | grep -oP '(?<=\().*?(?=\))' | head -n 1)
 
 if [ -z "$DEVICE" ]; then