Polybar path changes, dpi, sxhkd changes

8 files changed, 47 insertions, 40 deletions

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 3c00329..a162096 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -2,8 +2,7 @@
 ~/.screenlayout/work.sh
 export GPG_TTY=$(tty)
 nitrogen --restore
-~/.config/polybar/forest/launch.sh 2> /dev/null
-lxappearance &
+~/.config/polybar/launch.sh 2> /dev/null
 #picom --config  ~/.config/picom/picom.conf --experimental-backends  2> /dev/null &
 #picom --config  ~/.config/picom/picom.conf --experimental-backends  2> /dev/null &
 spgrep -x sxhkd > /dev/null || sxhkd &
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index f5a2437..bd46172 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -23,10 +23,10 @@ margin-top = 0
 ;; File Inclusion
 ; include an external file, like module file, etc.
 
-include-file = ~/.config/polybar/forest/bars.ini
-include-file = ~/.config/polybar/forest/colors.ini
-include-file = ~/.config/polybar/forest/modules.ini
-include-file = ~/.config/polybar/forest/user_modules.ini
+include-file = ~/.config/polybar/bars.ini
+include-file = ~/.config/polybar/colors.ini
+include-file = ~/.config/polybar/modules.ini
+include-file = ~/.config/polybar/user_modules.ini
 #include-file = ~/Repos/ampp/ampp.ini
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
@@ -62,7 +62,7 @@ fixed-center = true
 ; the percentage can optionally be extended with a pixel offset like so:
 ; 50%:-10, this will result in a width or height of 50% minus 10 pixels
 width = 100%
-height = 50 
+height = 50
 
 ; Offset defined as pixel value (e.g. 35) or percentage (e.g. 50%)
 ; the percentage can optionally be extended with a pixel offset like so:
@@ -87,7 +87,7 @@ foreground = ${color.foreground}
 ; Individual top/bottom values can be defined using:
 ;   radius-{top,bottom}
 radius-top = 0.0
-radius-bottom = 8.0
+radius-bottom = 0.0
 
 ; Under-/overline pixel size and argb color
 ; Individual values can be defined using:
@@ -143,7 +143,7 @@ font-3 = "Nerd Font:size=10;3"
 
 modules-left =  workspaces 
 modules-center = title 
-modules-right = battery network date  
+modules-right = network pulseaudio date  
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
diff --git a/.config/polybar/modules.ini b/.config/polybar/modules.ini
index b286b08..2d30ff9 100644
--- a/.config/polybar/modules.ini
+++ b/.config/polybar/modules.ini
@@ -378,7 +378,7 @@ interval = 1.0
 date = %A, %d %B
 
 ; Optional time format
-time = %I:%M %p
+time =  %d %b, %I:%M %p
 
 ; if `date-alt` or `time-alt` is defined, clicking
 ; the module will toggle between formats
@@ -749,7 +749,7 @@ toggle-off-foreground = ${color.red}
 ; If you use both a wired and a wireless network, just add 2 module definitions. For example
 [module/wired-network]
 type = internal/network
-interface = eth0
+interface = enp6s0 
 
 [module/wireless-network]
 type = internal/network
diff --git a/.config/polybar/preview.ini b/.config/polybar/preview.ini
index bcd553f..63d9a6f 100644
--- a/.config/polybar/preview.ini
+++ b/.config/polybar/preview.ini
@@ -23,10 +23,10 @@ margin-top = 0
 ;; File Inclusion
 ; include an external file, like module file, etc.
 
-include-file = ~/.config/polybar/forest/bars.ini
-include-file = ~/.config/polybar/forest/colors.ini
-include-file = ~/.config/polybar/forest/modules.ini
-include-file = ~/.config/polybar/forest/user_modules.ini
+include-file = ~/.config/polybar/bars.ini
+include-file = ~/.config/polybar/colors.ini
+include-file = ~/.config/polybar/modules.ini
+include-file = ~/.config/polybar/user_modules.ini
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
diff --git a/.config/polybar/scripts/launcher.sh b/.config/polybar/scripts/launcher.sh
index 92a7c99..212a197 100755
--- a/.config/polybar/scripts/launcher.sh
+++ b/.config/polybar/scripts/launcher.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-FILE="$HOME/.config/polybar/forest/scripts/rofi/colors.rasi"
+FILE="$HOME/.config/polybar/scripts/rofi/colors.rasi"
 
 ## random accent color
 #COLORS=('#EC7875' '#EC6798' '#BE78D1' '#75A4CD' '#00C7DF' '#00B19F' '#61C766' \
@@ -10,4 +10,4 @@ FILE="$HOME/.config/polybar/forest/scripts/rofi/colors.rasi"
 #sed -i -e "s/ac: .*/ac:   ${AC}FF;/g" $FILE
 #sed -i -e "s/se: .*/se:   ${SE}FF;/g" $FILE
 
-rofi -dpi 144 -no-config -no-lazy-grab -show drun -modi drun -theme ~/.config/polybar/forest/scripts/rofi/launcher.rasi
+rofi -dpi 144 -no-config -no-lazy-grab -show drun -modi drun -theme ~/.config/polybar/scripts/rofi/launcher.rasi
diff --git a/.config/polybar/scripts/powermenu.sh b/.config/polybar/scripts/powermenu.sh
index 271006d..7b229ae 100755
--- a/.config/polybar/scripts/powermenu.sh
+++ b/.config/polybar/scripts/powermenu.sh
@@ -5,10 +5,10 @@
 ## Github  : @adi1090x
 ## Twitter : @adi1090x
 
-dir="~/.config/polybar/forest/scripts/rofi"
+dir="~/.config/polybar/scripts/rofi"
 uptime=$(uptime -p | sed -e 's/up //g')
 
-rofi_command="rofi -theme $dir/powermenu.rasi"
+rofi_command="rofi -no-config -theme $dir/powermenu.rasi"
 
 # Options
 shutdown=" Shutdown"
@@ -17,9 +17,19 @@ lock=" Lock"
 suspend=" Sleep"
 logout=" Logout"
 
+# Confirmation
+confirm_exit() {
+	rofi -dmenu\
+        -no-config\
+		-i\
+		-no-fixed-num-lines\
+		-p "Are You Sure? : "\
+		-theme $dir/confirm.rasi
+}
+
 # Message
 msg() {
-	rofi -theme "$dir/message.rasi" -e "Available Options  -  yes / y / no / n"
+	rofi -no-config -theme "$dir/message.rasi" -e "Available Options  -  yes / y / no / n"
 }
 
 # Variable passed to rofi
@@ -30,7 +40,7 @@ case $chosen in
     $shutdown)
 		ans=$(confirm_exit &)
 		if [[ $ans == "yes" || $ans == "YES" || $ans == "y" || $ans == "Y" ]]; then
-			loginctl poweroff
+			systemctl poweroff
 		elif [[ $ans == "no" || $ans == "NO" || $ans == "n" || $ans == "N" ]]; then
 			exit 0
         else
@@ -40,7 +50,7 @@ case $chosen in
     $reboot)
 		ans=$(confirm_exit &)
 		if [[ $ans == "yes" || $ans == "YES" || $ans == "y" || $ans == "Y" ]]; then
-			loginctl reboot 
+			systemctl reboot
 		elif [[ $ans == "no" || $ans == "NO" || $ans == "n" || $ans == "N" ]]; then
 			exit 0
         else
@@ -48,16 +58,14 @@ case $chosen in
         fi
         ;;
     $lock)
-		if [[ -f /usr/bin/i3lock ]]; then
-			i3lock
-		elif [[ -f /usr/bin/betterlockscreen ]]; then
-			betterlockscreen -l
-		fi
-        ;;
+			~/.config/i3lock/lock.sh
+				;;
     $suspend)
 		ans=$(confirm_exit &)
 		if [[ $ans == "yes" || $ans == "YES" || $ans == "y" || $ans == "Y" ]]; then
-			ZZZ	
+			mpc -q pause
+			amixer set Master mute
+			systemctl suspend
 		elif [[ $ans == "no" || $ans == "NO" || $ans == "n" || $ans == "N" ]]; then
 			exit 0
         else
diff --git a/.config/polybar/scripts/rofi/launcher.rasi b/.config/polybar/scripts/rofi/launcher.rasi
index 5a80370..9bea4a3 100644
--- a/.config/polybar/scripts/rofi/launcher.rasi
+++ b/.config/polybar/scripts/rofi/launcher.rasi
@@ -28,7 +28,7 @@ window {
 	border:							1px 1px 1px 1px;
 	border-color:					@fg;
     border-radius:                  0px;
-	width:							700px;
+	  width:							            700px;
     height:                         600px;
     location:                       center;
     x-offset:                       0;
@@ -92,7 +92,7 @@ element {
     text-color:                     @fg;
     orientation:                    horizontal;
     border-radius:                  0px;
-	padding: 						12px;
+	padding: 					                12px;
 }
 
 element-icon {
diff --git a/.config/polybar/user_modules.ini b/.config/polybar/user_modules.ini
index 5d6fa18..7314509 100644
--- a/.config/polybar/user_modules.ini
+++ b/.config/polybar/user_modules.ini
@@ -13,7 +13,7 @@ type = custom/script
 ; Available tokens:
 ;   %counter%
 ; Command to be executed (using "/usr/bin/env sh -c [command]")
-exec = ~/.config/polybar/forest/scripts/updates.sh
+exec = ~/.config/polybar/scripts/updates.sh
 
 ; Conditional command that, if defined, needs to exit successfully
 ; before the main exec command is invoked.
@@ -69,13 +69,13 @@ content = 
 content-foreground = ${color.purple}
 
 ; "click-(left|middle|right)" will be executed using "/usr/bin/env sh -c $COMMAND"
-click-left = ~/.config/polybar/forest/scripts/launcher.sh &
-;;click-middle = ~/.config/polybar/forest/scripts/launcher-full
-click-right = ~/.config/polybar/forest/scripts/style-switch.sh &
+click-left = ~/.config/polybar/scripts/launcher.sh &
+;;click-middle = ~/.config/polybar/scripts/launcher-full
+click-right = ~/.config/polybar/scripts/style-switch.sh &
 
 ; "scroll-(up|down)" will be executed using "/usr/bin/env sh -c $COMMAND"
-;;scroll-up = ~/.config/polybar/forest/scripts/launcher.sh &
-;;scroll-down = ~/.config/polybar/forest/scripts/color-switch.sh &
+;;scroll-up = ~/.config/polybar/scripts/launcher.sh &
+;;scroll-down = ~/.config/polybar/scripts/color-switch.sh &
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -85,7 +85,7 @@ type = custom/text
 content = 
 content-foreground = ${color.cyan}
 
-click-left = ~/.config/polybar/forest/scripts/powermenu.sh &
+click-left = ~/.config/polybar/scripts/powermenu.sh &
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -95,7 +95,7 @@ type = custom/text
 content = 
 content-foreground = ${color.red}
 
-click-left = ~/.config/polybar/forest/scripts/style-switch.sh &
+click-left = ~/.config/polybar/scripts/style-switch.sh &
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -211,7 +211,7 @@ expand-right = true
 ;   menu-close
 ; Other commands will be executed using "/usr/bin/env sh -c $COMMAND"
 menu-0-0 ="  Menu | "
-menu-0-0-exec = ~/.config/polybar/forest/scripts/launcher.sh &
+menu-0-0-exec = ~/.config/polybar/scripts/launcher.sh &
 
 menu-0-1 =" Files | "
 menu-0-1-exec = thunar &