updated. On startup apps.conf, removed the &

10 files changed, 406 insertions, 23 deletions

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index e41a7ecb..2be4e7d7 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -1,5 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-#Commands & Apps to be executed at launch
+# Commands and Apps to be executed at launch
 
 $scriptsDir = $HOME/.config/hypr/scripts
 $UserScripts = $HOME/.config/hypr/UserScripts
@@ -20,25 +20,25 @@ exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESK
 exec-once = $scriptsDir/Polkit.sh
 
 # starup apps
-exec-once = waybar &
-exec-once = nm-applet --indicator &
-exec-once = swaync &
-#exec-once = ags &
-#exec-once = blueman-applet & 
-#exec-once = rog-control-center &
+exec-once = nm-applet --indicator
+exec-once = swaync
+#exec-once = ags
+#exec-once = blueman-applet 
+#exec-once = rog-control-center
+exec-once = waybar
 
 #clipboard manager
 exec-once = wl-paste --type text --watch cliphist store 
 exec-once = wl-paste --type image --watch cliphist store
 
 # Rainbow borders
-exec-once = $UserScripts/RainbowBorders.sh &
+exec-once = $UserScripts/RainbowBorders.sh
 
 # Starting hypridle to start hyprlock
-exec-once = hypridle &
+exec-once = hypridle
 
 # Start pyprland daemon
-exec-once = pypr &
+exec-once = pypr
 
 # Here are list of features available but disabled by default
 # exec-once = swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 55beff2d..447bcaef 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -44,7 +44,6 @@ bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
 bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh # Waybar Layout Menu
 
 # FEATURES / EXTRAS (UserScripts)
-bind = $mainMod SHIFT, E, exec, $UserScripts/Kool_Quick_Settings.sh # Settings Menu KooL Hyprland Settings
 bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music using rofi
 bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply
 bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagick
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 9a754929..c295c141 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -9,14 +9,13 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $UserConfigs = $HOME/.config/hypr/UserConfigs
 $UserScripts = $HOME/.config/hypr/UserScripts
 
-bind = $mainMod SHIFT, E, exec, $scriptsDir/Kool_Quick_Settings.sh # Settings Menu KooL Hyprland Settings
-
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod, Q, killactive, #kill
 bind = $mainMod SHIFT, Q, exec, $scriptsDir/KillActiveProcess.sh # Kill active process
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh # screen lock
 bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh # power menu
 bind = $mainMod SHIFT, N, exec, swaync-client -t -sw # swayNC notification panel
+bind = $mainMod SHIFT, E, exec, $scriptsDir/Kool_Quick_Settings.sh # Settings Menu KooL Hyprland Settings
 
 # Master Layout
 bind = $mainMod CTRL, D, layoutmsg, removemaster
diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh
index 0fd62cab..5e799181 100755
--- a/config/hypr/scripts/LockScreen.sh
+++ b/config/hypr/scripts/LockScreen.sh
@@ -2,6 +2,6 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # For Hyprlock
+#pidof hyprlock || hyprlock -q 
 
-pidof hyprlock || hyprlock -q 
-
+loginctl lock-session
\ No newline at end of file
diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index 3eec2b68..3cd320aa 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -65,4 +65,5 @@ element-text {
   vertical-align: 0.5;
   horizontal-align: 0.5;
   padding: 6px;
-  margin: 6px;
\ No newline at end of file
+  margin: 6px;
+}
\ No newline at end of file
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 011eebb1..0a75c1f6 100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -19,4 +19,5 @@
 /* note: Main themes in ~/.config/rofi/themes */
 /* You can manually change here or you can use rofi theme selector SUPER SHIFT E */
 
+
 @theme "~/.config/rofi/themes/KooL_style-9.rasi"
diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom
index 86cbe6c6..df5f8786 100644
--- a/config/waybar/ModulesCustom
+++ b/config/waybar/ModulesCustom
@@ -40,7 +40,7 @@
 
 "custom/settings": {
 	"format": " ",
-	"on-click": "$HOME/.config/hypr/UserScripts/Kool_Quick_Settings.sh",
+	"on-click": "$HOME/.config/hypr/scripts/Kool_Quick_Settings.sh",
 	"tooltip": true,
 	"tooltip-format": "Launch KooL Hyprland Settings Menu",
 },
@@ -217,4 +217,53 @@
 	"interval": "once",
 	"tooltip": false
 },
+"custom/arrow1": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow2": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow3": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow4": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow5": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow6": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow7": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow8": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow9": {
+	"format": "",
+	"tooltip": false
+},
+
+"custom/arrow10": {
+	"format": "",
+	"tooltip": false
+}
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Arrow b/config/waybar/configs/[TOP] Arrow
new file mode 100644
index 00000000..8001d8fb
--- /dev/null
+++ b/config/waybar/configs/[TOP] Arrow
@@ -0,0 +1,43 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* .....[TOP] Arrow Best to combine with [Extra] Arrow Style ......... */
+/* --- 👍 taken from https://github.com/mxkrsv  👍 --- */
+
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  "$HOME/.config/waybar/UserModules",
+  ],
+  
+	"layer": "top",
+	"position": "top",
+
+	"modules-left": [
+		"hyprland/mode",
+		"hyprland/workspaces",
+		"custom/arrow10",
+		"hyprland/window"
+	],
+
+	"modules-right": [
+		"custom/arrow9",
+		"pulseaudio",
+		"custom/arrow8",
+		"network",
+		"custom/arrow7",
+		"memory",
+		"custom/arrow6",
+		"cpu",
+		"custom/arrow5",
+		"temperature",
+		"custom/arrow4",
+		"battery",
+		"custom/arrow2",
+		"tray",
+		"custom/arrow1",
+		"clock#2"
+	],
+}
+
diff --git a/config/waybar/style/[Extra] Arrow.css b/config/waybar/style/[Extra] Arrow.css
new file mode 100644
index 00000000..16aab612
--- /dev/null
+++ b/config/waybar/style/[Extra] Arrow.css
@@ -0,0 +1,291 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* .....[Extra] Arrow Best to combine with [TOP] Arrow.... */
+/* --- 👍 taken from https://github.com/mxkrsv  👍 --- */
+
+* {
+    font-family: "JetBrainsMono Nerd Font";
+    font-weight: bold;
+	min-height: 0;  
+    /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+    font-size: 97%;
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+    border: none;
+	border-radius: 0;
+	min-height: 0;
+	margin: 0;
+	padding: 0;
+	box-shadow: none;
+	text-shadow: none;
+	icon-shadow: none;
+}
+
+/* Colors (gruvbox) */
+@define-color black		#282828;
+@define-color red		#cc241d;
+@define-color green		#98971a;
+@define-color yellow	#d79921;
+@define-color blue		#458588;
+@define-color purple	#b16286;
+@define-color aqua		#689d6a;
+@define-color gray		#a89984;
+@define-color brgray	#928374;
+@define-color brred		#fb4934;
+@define-color brgreen	#b8bb26;
+@define-color bryellow	#fabd2f;
+@define-color brblue	#83a598;
+@define-color brpurple	#d3869b;
+@define-color braqua	#8ec07c;
+@define-color white		#ebdbb2;
+@define-color bg2		#504945;
+
+
+@define-color warning 	@bryellow;
+@define-color critical	@red;
+@define-color mode		@black;
+@define-color unfocused	@bg2;
+@define-color focused	@braqua;
+@define-color inactive	@purple;
+@define-color sound		@brpurple;
+@define-color network	@purple;
+@define-color memory	@braqua;
+@define-color cpu		@green;
+@define-color temp		@brgreen;
+@define-color layout	@bryellow;
+@define-color battery	@aqua;
+@define-color date		@black;
+@define-color time		@white;
+
+/* The whole bar */
+#waybar {
+	background: rgba(40, 40, 40, 0.8784313725); /* #282828e0 */
+	color: @white;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-browser,
+#custom-cava_mviz,
+#custom-cycle_wall,
+#custom-dot_update,
+#custom-file_manager,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-hint,
+#custom-hypridle,
+#custom-menu,
+#custom-playerctl,
+#custom-power_vertical,
+#custom-power,
+#custom-quit,
+#custom-reboot,
+#custom-settings,
+#custom-spotify,
+#custom-swaync,
+#custom-tty,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default, 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+	padding-left: 8pt;
+	padding-right: 8pt;
+}
+
+/* Each critical module */
+#mode,
+#memory.critical,
+#cpu.critical,
+#temperature.critical,
+#battery.critical.discharging {
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+	animation-name: blink-critical;
+	animation-duration: 1s;
+}
+
+/* Each warning */
+#network.disconnected,
+#memory.warning,
+#cpu.warning,
+#temperature.warning,
+#battery.warning.discharging {
+	color: @warning;
+}
+
+/* Keyframes */
+
+@keyframes blink-critical {
+	to {
+		/*color: @white;*/
+		background-color: @critical;
+	}
+}
+
+/* Current sway mode (resize etc) */
+#mode {
+	color: @white;
+	background: @mode;
+}
+
+/* Workspaces stuff */
+#workspaces button {
+	/*font-weight: bold;*/
+	padding-left: 2pt;
+	padding-right: 2pt;
+	color: @white;
+	background: @unfocused;
+}
+
+/* Inactive (on unfocused output) */
+#workspaces button.visible {
+	color: @white;
+	background: @inactive;
+}
+
+/* Active (on focused output) */
+#workspaces button.focused {
+	color: @black;
+	background: @focused;
+}
+
+/* Contains an urgent window */
+#workspaces button.urgent {
+	color: @black;
+	background: @warning;
+}
+
+/* Style when cursor is on the button */
+#workspaces button:hover {
+	background: @black;
+	color: @white;
+}
+
+#window {
+	margin-right: 35pt;
+	margin-left: 35pt;
+}
+
+#pulseaudio {
+	background: @sound;
+	color: @black;
+}
+
+#network {
+	background: @network;
+	color: @white;
+}
+
+#memory {
+	background: @memory;
+	color: @black;
+}
+
+#cpu {
+	background: @cpu;
+	color: @white;
+}
+
+#temperature {
+	background: @temp;
+	color: @black;
+}
+
+#language {
+	background: @layout;
+	color: @black;
+}
+
+#battery {
+	background: @battery;
+	color: @white;
+}
+
+#tray {
+	background: @date;
+}
+
+#clock {
+	background: @time;
+	color: @black;
+}
+
+#custom-arrow1 {
+	color: @time;
+	background: @date;
+}
+
+#custom-arrow2 {
+	color: @date;
+	background: @layout;
+}
+
+#custom-arrow3 {
+	color: @layout;
+	background: @battery;
+}
+
+#custom-arrow4 {
+	color: @battery;
+	background: @temp;
+}
+
+#custom-arrow5 {
+	color: @temp;
+	background: @cpu;
+}
+
+#custom-arrow6 {
+	color: @cpu;
+	background: @memory;
+}
+
+#custom-arrow7 {
+	color: @memory;
+	background: @network;
+}
+
+#custom-arrow8 {
+	color: @network;
+	background: @sound;
+}
+
+#custom-arrow9 {
+	color: @sound;
+	background: transparent;
+}
+
+#custom-arrow10 {
+	color: @unfocused;
+	background: transparent;
+}
diff --git a/copy.sh b/copy.sh
index e821d139..d6d66cf7 100755
--- a/copy.sh
+++ b/copy.sh
@@ -119,7 +119,7 @@ fi
 if grep -iq '^\(ID_LIKE\|ID\)=.*\(debian\|ubuntu\)' /etc/os-release >/dev/null 2>&1; then
 	echo "${INFO} Debian/Ubuntu based distro. Disabling pyprland since it does not work properly" 2>&1 | tee -a "$LOG" || true
   # disabling pyprland as causing issues
-  sed -i '/^exec-once = pypr &/ s/^/#/' config/hypr/UserConfigs/Startup_Apps.conf
+  sed -i '/^\s*exec-once = pypr\s*/ s/^/#/' config/hypr/UserConfigs/Startup_Apps.conf
 fi
 
 # activating hyprcursor on env by checking if the directory ~/.icons/Bibata-Modern-Ice/hyprcursors exists
@@ -236,17 +236,17 @@ done
 
 # Check if asusctl is installed and add rog-control-center on Startup
 if command -v asusctl >/dev/null 2>&1; then
-    sed -i '/exec-once = rog-control-center &/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf
+    sed -i '/^\s*#exec-once = rog-control-center/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf
 fi
 
 # Check if blueman-applet is installed and add blueman-applet on Startup
 if command -v blueman-applet >/dev/null 2>&1; then
-    sed -i '/exec-once = blueman-applet &/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf
+    sed -i '/^\s*#exec-once = blueman-applet/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf
 fi
 
 # Check if ags is installed edit ags behaviour on configs
 if command -v ags >/dev/null 2>&1; then
-    sed -i '/#exec-once = ags &/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf
+    sed -i '/^\s*#exec-once = ags/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf
     sed -i '/#ags -q && ags &/s/^#//' config/hypr/scripts/RefreshNoWaybar.sh
     sed -i '/#ags -q && ags &/s/^#//' config/hypr/scripts/Refresh.sh
 fi
@@ -432,7 +432,7 @@ read -p "${CAT} Do you want to disable Rainbow Borders animation? (y/N): " borde
 if [[ "$border_choice" =~ ^[Yy]$ ]]; then
     mv config/hypr/UserScripts/RainbowBorders.sh config/hypr/UserScripts/RainbowBorders.bak.sh
     
-    sed -i '/exec-once = \$UserScripts\/RainbowBorders.sh \&/s/^/#/' config/hypr/UserConfigs/Startup_Apps.conf
+    sed -i '/exec-once = \$UserScripts\/RainbowBorders.sh/s/^/#/' config/hypr/UserConfigs/Startup_Apps.conf
     sed -i '/^[[:space:]]*animation = borderangle, 1, 180, liner, loop/s/^/#/' config/hypr/UserConfigs/UserAnimations.conf
     
     echo "${OK} Rainbow borders is now disabled." 2>&1 | tee -a "$LOG"
@@ -910,7 +910,7 @@ printf "\n%.0s" {1..1}
 echo "${MAGENTA}By default only a few wallpapers are copied${RESET}..."
 
 while true; do
-  read -rp "${CAT} Would you like to download additional wallpapers? ${WARN} This is almost 1GB (y/n)" WALL
+  read -rp "${CAT} Would you like to download additional wallpapers? ${WARN} This is almost 1GB (y/n): " WALL
   case $WALL in
     [Yy])
       echo "${NOTE} Downloading additional wallpapers..."