Merge branch 'main' of https://github.com/ION606/config-backup

i3/config

@@ -22,7 +22,12 @@ font pango:monospace 8
 # Start XDG autostart .desktop files using dex. See also
 # https://wiki.archlinux.org/index.php/XDG_Autostart
 exec --no-startup-id dex --autostart --environment i3
-exec_always --no-startup-id killall -q polybar; polybar -c .config/polybar/main.module &
+
+# COMMENT THIS IN FOR ONE SCREEN
+# exec_always --no-startup-id killall -q polybar; polybar -c .config/polybar/main.module &
+
+# DELETEME if you change your monitor setup
+exec_always --no-startup-id bash /home/ion606/setupScreens.sh
 
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
@@ -30,14 +35,21 @@ exec_always --no-startup-id killall -q polybar; polybar -c .config/polybar/main.
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+exec_always --no-startup-id dunst
+
+# no timeout after 600 seconds ffs
+exec_always --no-startup-id xset s off
+exec_always --no-startup-id xset s noblank
+exec_always --no-startup-id xset -dpms
+
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
 exec --no-startup-id nm-applet
 exec --no-startup-id /usr/lib/notify-osd/notify-osd &
 
-exec_always feh --bg-fill  "$(find /home/ion606/Pictures/astolfo/ -type f | shuf -n 1)"
+exec_always feh --bg-fill "$(find /home/ion606/Pictures/astolfo/ -type f | shuf -n 1)"
-exec_always picom --config /home/ion606/.config/picom/picom.config
+exec_always picom --config /home/ion606/.config/picom/picom.conf
 exec_always --no-startup-id eww daemon
 
 focus_follows_mouse no
@@ -53,7 +65,7 @@ bindsym XF86MonBrightnessDown exec brightnessctl set 10%-
 bindsym XF86MonBrightnessUp exec brightnessctl set +10%
 
 
-bindsym $mod+Shift+B exec feh --bg-fill "/home/ion606/Pictures/bk.gif"
+bindsym $mod+Shift+B exec feh --bg-fill "$(find /home/ion606/Pictures/astolfo/ -type f | shuf -n 1)"
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod

i3/lock.sh

@@ -1,8 +1,13 @@
 #!/bin/bash
 
+img="$(find /home/ion606/Pictures/astolfo/ -type f | shuf -n 1)";
+tmp="/tmp/i3lock-bg.png";
+
+magick "$img" -strip "$tmp";
+
 if [[ "$1" == "--single" ]]; then
-    i3lock -i Pictures/ohnocringe.jpg -F
+  i3lock -i "$tmp" -F
-    exit 0
+  exit 0
 fi
 
 BLANK='#00000000'
@@ -13,33 +18,32 @@ WRONG='#880000bb'
 VERIFYING='#00564dE6'
 
 i3lock \
---insidever-color=$CLEAR     \
+  --insidever-color=$CLEAR \
---ringver-color=$VERIFYING   \
+  --ringver-color=$VERIFYING \
-\
+  \
---insidewrong-color=$CLEAR   \
+  --insidewrong-color=$CLEAR \
---ringwrong-color=$WRONG     \
+  --ringwrong-color=$WRONG \
-\
+  \
---inside-color=$BLANK        \
+  --inside-color=$BLANK \
---ring-color=$DEFAULT        \
+  --ring-color=$DEFAULT \
---line-color=$BLANK          \
+  --line-color=$BLANK \
---separator-color=$DEFAULT   \
+  --separator-color=$DEFAULT \
-\
+  \
---verif-color=$TEXT          \
+  --verif-color=$TEXT \
---wrong-color=$TEXT          \
+  --wrong-color=$TEXT \
---time-color=$TEXT           \
+  --time-color=$TEXT \
---date-color=$TEXT           \
+  --date-color=$TEXT \
---layout-color=$TEXT         \
+  --layout-color=$TEXT \
---keyhl-color=$WRONG         \
+  --keyhl-color=$WRONG \
---bshl-color=$WRONG          \
+  --bshl-color=$WRONG \
-\
+  \
---screen 1                   \
+  --screen 1 \
---blur 9                     \
+  --blur 9 \
---clock                      \
+  --clock \
---indicator                  \
+  --indicator \
---time-str="%H:%M:%S"        \
+  --time-str="%H:%M:%S" \
---date-str="%A, %Y-%m-%d"       \
+  --date-str="%A, %Y-%m-%d" \
---keylayout 1   
+  --keylayout 1
-
 
 # # paths for temporary images
 # tmpbg='/tmp/lockscreen.png'

i3/main.module

@@ -1,4 +1,5 @@
 [bar/example]
+monitor = ${env:MONITOR:}
 width = 100%
 height = 30
 background = #2c2c54
@@ -43,6 +44,9 @@ pseudo-transparency = false
 
 [module/i3]
 type = internal/i3
+index-sort = true
+sort-workspaces = true
+pin-workspaces = true
 ws-icon-0 = 1;♚
 ws-icon-1 = 2;♛
 ws-icon-2 = 3;♜
@@ -125,7 +129,7 @@ label-warn = CPU %percentage%%
 
 [module/wifi]
 type = internal/network
-interface = wlo1
+interface = wlan0
 interface-type = wireless
 interval = 3.0
 udspeed-minwidth = 5
@@ -235,10 +239,113 @@ ramp-4 = 🌕
 
 
 [module/battery]
-type = custom/script
+type = internal/battery
-exec = ~/.config/polybar/scripts/battery_status.sh
-interval = 5
 
-; toggle the display mode (percentage vs time remaining) on left-click and refresh the module immediately
+; This is useful in case the battery never reports 100% charge
-click-left = ~/.config/polybar/scripts/toggle_battery_display.sh && polybar-msg hook battery_script 1
+; Default: 100
-hook-0 = ~/.config/polybar/scripts/battery_status.sh
+full-at = 98
+
+; format-low once this charge percentage is reached
+; Default: 10
+; New in version 3.6.0
+low-at = 20
+
+; Use the following command to list batteries and adapters:
+; $ ls -1 /sys/class/power_supply/
+battery = BAT1
+adapter = ADP1
+
+; If an inotify event haven't been reported in this many
+; seconds, manually poll for new values.
+;
+; Needed as a fallback for systems that don't report events
+; on sysfs/procfs.
+;
+; Disable polling by setting the interval to 0.
+;
+; Default: 5
+poll-interval = 5
+
+; see "man date" for details on how to format the time string
+; NOTE: if you want to use syntax tags here you need to use %%{...}
+; Default: %H:%M:%S
+time-format = %H:%M
+
+; Available tags:
+;   <label-charging> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+;   <animation-charging>
+format-charging = ⚡ <animation-charging>  <label-charging>
+
+; Available tags:
+;   <label-discharging> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+;   <animation-discharging>
+; format-discharging = <ramp-capacity>  <label-discharging>
+
+; Available tags:
+;   <label-full> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+format-full = <ramp-capacity>  <label-full>
+
+; Format used when battery level drops to low-at
+; If not defined, format-discharging is used instead.
+; Available tags:
+;   <label-low>
+;   <animation-low>
+;   <bar-capacity>
+;   <ramp-capacity>
+; New in version 3.6.0
+format-low = <label-low>  <animation-low>
+
+; Available tokens:
+;   %percentage% (default) - is set to 100 if full-at is reached
+;   %percentage_raw%
+;   %time%
+;   %consumption% (shows current charge rate in watts)
+label-charging = %percentage%%
+
+; Available tokens:
+;   %percentage% (default) - is set to 100 if full-at is reached
+;   %percentage_raw%
+label-full = %percentage%% ^~^
+
+; Available tokens:
+;   %percentage% (default) - is set to 100 if full-at is reached
+;   %percentage_raw%
+;   %time%
+;   %consumption% (shows current discharge rate in watts)
+; New in version 3.6.0
+label-low = BATTERY LOW AT %percentage%
+
+; Only applies if <ramp-capacity> is used
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+
+; Only applies if <bar-capacity> is used
+bar-capacity-width = 10
+
+; Only applies if <animation-charging> is used
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+animation-charging-4 = 
+; Framerate in milliseconds
+animation-charging-framerate = 750
+
+; Only applies if <animation-low> is used
+; New in version 3.6.0
+animation-low-0 = ⚠️
+animation-low-1 = ⚠️
+animation-low-2 = ⚠️
+animation-low-3 = 
+animation-low-4 = 
+animation-low-5 = 
+animation-low-framerate = 600

i3/setupScreens.sh

@@ -0,0 +1,53 @@
+# get list of connected outputs
+outputs=$(xrandr --query | grep " connected" | awk '{print $1}')
+current_workspace=$(i3-msg -t get_workspaces | jq -r '.[] | select(.focused==true).name') || 1
+
+dp=""
+hdmi=""
+
+for out in $outputs; do
+  if [[ $out == DisplayPort-* ]]; then
+    dp="$out"
+  elif [[ $out == HDMI-* ]]; then
+    # pick the first HDMI found
+    if [[ -z $hdmi ]]; then
+      hdmi="$out"
+    fi
+  fi
+done
+
+if [[ -z $dp ]]; then
+  echo "No DisplayPort output found. Exiting."
+  exit 1
+fi
+
+if [[ -z $hdmi ]]; then
+  echo "No HDMI output found. Using only $dp as primary."
+  xrandr --output "$dp" --auto --primary
+  exit 0
+fi
+
+# both found: apply layout
+xrandr --output "$dp" --auto --primary --output "$hdmi" --auto --left-of "$dp"
+
+# move windows
+
+# send workspace 1 to HDMI output
+i3-msg "workspace 1; move workspace to output $hdmi"
+
+# move 2,3,4 to DP out
+i3-msg "workspace 2; move workspace to output $dp"
+i3-msg "workspace 3; move workspace to output $dp"
+i3-msg "workspace 4; move workspace to output $dp"
+
+# polybar
+killall -q polybar
+
+while pgrep -u $UID -x polybar >/dev/null; do sleep 0.1; done
+
+for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
+  MONITOR=$m polybar -c .config/polybar/main.module &
+done
+
+# switch back to the workspace I was on
+i3-msg "workspace number $current_workspace"

ion-theme.css

@@ -236,8 +236,9 @@
 }
 
 [role="dialog"] {
+    background: transparent;
     /* background: linear-gradient(135deg, #7e5bef, #c084fc); */
-    background: linear-gradient(135deg, #4c2889, #7a3fc3);
+    /* background: linear-gradient(135deg, #4c2889, #7a3fc3); */
 }
 
 [role="dialog"] [data-text-variant="text-xs/normal"] {
@@ -361,3 +362,8 @@
     display: none;
 }
 
+/* popup */
+.standardSidebarView__23e6b {
+    background: rgb(0 0 0 / 90%);
+}
+

setup.sh

@@ -54,8 +54,8 @@ if [ "$answer" != "y" ]; then
 fi
 
 # Make temporary directory
-mkdir $USERTEMP/Downloads/tempinstall || ""
+mkdir /home/$USERTEMP/Downloads/tempinstall || ""
-cd $USERTEMP/Downloads/tempinstall
+cd /home/$USERTEMP/Downloads/tempinstall
 
 # Configuration Files
 git clone https://github.com/ION606/config-backup.git
@@ -64,7 +64,7 @@ cd config-backup
 # sway
 mv -f waybar/config /etc/xdg/waybar/
 mv -f waybar/style.css /etc/xdg/waybar/
-mv -f config $USERTEMP/.config/sway/config
+mv -f config /home/$USERTEMP/.config/sway/config
 
 # replace "ion606" with the selected user
 sed -i "s/ion606/$USERTEMP/g" config
@@ -84,11 +84,11 @@ mv -f terminal/alacritty.toml /home/$USERTEMP/.config/alacritty/
 mv -f terminal/starship.toml /home/$USERTEMP/.config/
 
 # battery
-mkdir -p $USERTEMP/auto-cpufreq/auto-cpufreq.conf
+mkdir -p /home/$USERTEMP/auto-cpufreq/auto-cpufreq.conf
-mv auto-cpufreq.conf $USERTEMP/auto-cpufreq/auto-cpufreq.conf
+mv auto-cpufreq.conf /home/$USERTEMP/auto-cpufreq/auto-cpufreq.conf
 
 # set up automations in child process
-mkdir -p $USERTEMP/.automations && cp -r -f auto/* $USERTEMP/.automations/ && $(sudo pacman -Sy --needed --noconfirm dunst && sudo bash $USERTEMP/.automations/setupauto.sh $USERTEMP &>$USERTEMP/setuplogs.log) &
+mkdir -p /home/$USERTEMP/.automations && cp -r -f auto/* /home/$USERTEMP/.automations/ && $(sudo pacman -Sy --needed --noconfirm dunst && sudo bash /home/$USERTEMP/.automations/setupauto.sh /home/$USERTEMP &> /home/$USERTEMP/setuplogs.log) &
 
 # Installs
 # Librewolf
@@ -117,11 +117,11 @@ mv -f Librewolf/chrome /home/$USERTEMP/.librewolf/
 
 npm install -g @bitwarden/cli alacritty-themes typescript || echo "failed to install Typescript!"
 
-mkdir -p $USERTEMP/.icons
+mkdir -p /home/$USERTEMP/.icons
-echo -e "https://www.gnome-look.org/p/1305251\nhttps://www.gnome-look.org/p/2091068" >$USERTEMP/.icons/links.txt
+echo -e "https://www.gnome-look.org/p/1305251\nhttps://www.gnome-look.org/p/2091068" > /home/$USERTEMP/.icons/links.txt
 
 alacritty-themes --create && alacritty-themes Hyper || echo "alacritty theme install failed!"
-cp -r $USERTEMP/.config/wofi/ wofi >/dev/null 2>&1 &
+cp -r /home/$USERTEMP/.config/wofi/ wofi >/dev/null 2>&1 &
 gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 
 # Remove old programs