[Scripts] Fixes for vpn script

config/astal/components/QuickActions/modules/Brightness/Brightness.tsx

@@ -7,6 +7,7 @@ const BrightnessModule = () => {
     const setBrightness = (value: number) => {
         brightness.screen = value;
     }
+
     return (
         <box visible={bind(brightness, 'screenAvailable')}>
             <image iconName={"brightness-high-symbolic"}></image>

config/fish/config.fish

@@ -26,6 +26,7 @@ alias ff='fastfetch'
 alias p='nvimpager -p'
 alias latexdocs='zathura ~/projects/latex/docs/docs.pdf &>> /dev/null & disown'
 alias gccerr='gcc -Wall -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99'
+alias linecount='cloc --vcs git .'
 
 # Add scripts in ~/projects/dotfiles/scripts/ to path
 fish_add_path -P ~/projects/dotfiles/scripts/

config/hypr/hyprland/general.conf

@@ -9,21 +9,18 @@ exec-once = ~/.config/hypr/xdg-portal-hyprland
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XAUTHORITY DISPLAY
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-# exec-once = waybar
 exec-once = hypridle
 exec-once = nm-applet
 exec-once = nextcloud --background
-exec-once = sleep 2 && bash -c "ags run -d ~/projects/dotfiles/config/astal/ --gtk4 >> /tmp/runner-log 2>&1"
+exec-once = sleep 2 && bash -c "ags run -d ~/projects/dotfiles/config/astal/ --gtk 4 >> /tmp/runner-log 2>&1"
-# exec-once = sleep 2 && bash -c "ags run -d ~/projects/active/dotfiles/config/astal/ --gtk4"
+exec-once = bash -c "ags run -d ~/projects/dotfiles/config/ags/notifications/ --gtk 3 >> /tmp/notifier-log 2>&1"
-exec-once = bash -c "ags run -d ~/projects/dotfiles/config/ags/notifications/ >> /tmp/notifier-log 2>&1"
+
-# exec-once = bash -c "ags run -d ~/projects/active/dotfiles/config/ags/notifications/"
 
 # ── wlhist ──────────────────────────────────────────────────────────
 exec-once = wl-paste --type text --watch cliphist store # Stores only text data
 exec-once = wl-paste --type image --watch cliphist store # Stores only image data
 
 
-exec = hyprctl setcursor oreo_spark_blue_cursors 24
 env = QT_QPA_PLATFORM,wayland
 env = QT_QPA_PLATFORM_THEME,qt6ct
 env = OLLAMA_HOST,0.0.0.0

config/hypr/hyprland/modal-binds/device.conf

@@ -19,6 +19,11 @@ bind = $mainMod, D, submap, device
 submap = device
 
 
+# ── Swapescape ──────────────────────────────────────────────────────
+bind = , S, exec, fish -c "toggle-swapescape"
+bind = , S, submap, reset
+
+
 # ── FPV goggles binds ───────────────────────────────────────────────
 bind = CTRL, D, exec, hyprctl keyword monitor HDMI-A-1, 1280x720@60, 1920x0, 1, mirror, DP-1 && notify-send 'Set FPV goggles to mirror main screen' --app-name="Hyprctl"
 bind = CTRL, E, exec, hyprctl keyword monitor HDMI-A-1, 1280x720@60, 3840x0, 1 && notify-send 'Set to expand FPV goggles' --app-name="Hyprctl"

config/hypr/hyprland/modal-binds/launch.conf

@@ -40,6 +40,12 @@ bind = , E, submap, reset
 bind = , D, exec, vesktop
 bind = , D, submap, reset
 
+bind = SHIFT, B, exec, brave
+bind = SHIFT, B, submap, reset
+
+bind = , F, exec, filezilla
+bind = , F, submap, reset
+
 bind = , V, exec, vscodium
 bind = , V, submap, reset
 

config/hypr/hyprland/windowrules.conf

@@ -1,17 +1,3 @@
-# ────────────────────────────────────────────────────────────────────
-#          ╭────────────────────────────────────────────────╮
-#          │                WORKSPACE RULES                 │
-#          ╰────────────────────────────────────────────────╯
-# ────────────────────────────────────────────────────────────────────
-
-# Display full sized (without gaps), if only window on screen
-# workspace = w[tv1], gapsout:0, gapsin:0
-# workspace = f[1], gapsout:0, gapsin:0
-# windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
-# windowrule = rounding 0, floating:0, onworkspace:w[tv1]
-# windowrule = bordersize 0, floating:0, onworkspace:f[1]
-# windowrule = rounding 0, floating:0, onworkspace:f[1]
-
 $mainMod = SUPER
 
 # ────────────────────────────────────────────────────────────────────
@@ -19,18 +5,18 @@ $mainMod = SUPER
 #          │                  WINDOW RULES                  │
 #          ╰────────────────────────────────────────────────╯
 # ────────────────────────────────────────────────────────────────────
-windowrule = move 1450 50, title:^(.*)(Power menu)$
+windowrule = move 1450 50, title:(.*)Power menu$
 windowrule = workspace 2, class:evince
-windowrule = workspace 2, title:.*(Okular).*
+windowrule = workspace 2, title:.*Okular.*
 windowrule = workspace 2, class:org.pwmt.zathura
 windowrule = fullscreen, title:wlogout
 windowrule = workspace 2, class:librewolf
 windowrule = workspace 2, title:LibreWolf
 windowrule = workspace 2, title:BSManager
 windowrule = workspace 1, title:ALVR(.*)
-windowrule = workspace 2, title:(.*)BeatSaber(.*)
+windowrule = workspace 2, title:(.*)Beat Saber(.*)
-windowrule = fullscreen, title:(.*)BeatSaber(.*)
+windowrule = fullscreen, title:(.*)Beat Saber(.*)
-windowrule = workspace 2, title:(.*)(Discord)(.*)
+windowrule = workspace 2, title:(.*)Discord(.*)
 windowrule = workspace 3, title:^(Steam)(.*)$
 windowrule = workspace 1, title:(.*)(VSCodium)$
 windowrule = center, title:^(.*)(VSCodium)$
@@ -50,6 +36,7 @@ windowrule = float, title:^(.*)hidden-terminator*(.*)$
 windowrule = float, title:^(.*)termfilechooser*(.*)$
 windowrule = size 1400 800, title:^(.*)termfilechooser*(.*)$
 windowrule = center, title:^(.*)termfilechooser*(.*)$
+windowrule = dimaround, title:^(.*)termfilechooser*(.*)$
 
 # ┌                                                ┐
 # │ Set floating windows & position them centered  │
@@ -111,6 +98,7 @@ windowrule = center, class:pavucontrol
 windowrule = float, class:file-roller
 windowrule = center, class:file-roller
 
+# idleinhibit
 windowrule = idleinhibit focus, title:^(Rocket League)(.*)$
 windowrule = fullscreen, title:^(Steam Big Picture)$
 windowrule = idleinhibit always, class:steam
@@ -120,6 +108,12 @@ windowrule = idleinhibit focus, class:supertuxkart
 windowrule = idleinhibit fullscreen, title:^(.*)(Discord)(.*)$
 windowrule = idleinhibit fullscreen, title:^(.*)(~)(.*)$
 
+# Do not screenshare bitwarden windows
+windowrule = noscreenshare, title:(.*)(Bitwarden)(.*)
+windowrule = noscreenshare, class:nm-connection-editor
+windowrule = noscreenshare, title:(.*)(secret)(.*)
+windowrule = noscreenshare, class:(.*)[aA]uthentication(.*)
+
 
 # ┌                                                ┐
 # │                  Layer rules                   │

config/hypr/hyprland_desktop.conf

@@ -20,6 +20,7 @@
 monitor=DP-1, 1920x1080@144, 0x0, 1, vrr, 2
 monitor=DP-2, 1920x1080@75, 1920x0, 1
 
+exec = hyprctl setcursor oreo_spark_blue_cursors 24
 
 source=./hyprland/binds.conf
 source=./hyprland/general.conf

config/hypr/hyprland_laptop.conf

@@ -32,7 +32,7 @@ source=./hyprland/windowrules.conf
 exec = hyprctl setcursor oreo_spark_blue_cursors 36
 env = HYPRCURSOR_THEME, Oreo_spark_blue_cursor
 env = X_CURSOR_THEME, Oreo_spark_blue_cursor
-env = XCURSOR_SIZE, 24
+env = XCURSOR_SIZE, 36
 env = ELECTRON_ENABLE_HIGHDPI_SUPPORT, 1
 env = XDG_SESSION_TYPE, wayland
 env = QT_QPA_PLATFORM, wayland

config/lint/latexfmt.yaml

@@ -4,6 +4,12 @@ defaultIndent: "    "
 # Limit Number of backups
 maxNumberOfBackups: 3
 
+verbatimEnvironments:
+  verbatim: 1
+  lstlisting: 1
+  minted: 1
+  code: 1
+
 indentRules:
   recall: "    "
   remarks: "    "

config/yazi/theme.toml

@@ -1,2 +1,3 @@
 [flavor]
-use = "tokyo-night"
+dark = "tokyo-night"
+light = "tokyo-night"

install

@@ -84,7 +84,7 @@ echo "
 ==> Installing other utilities...
 "
 sleep 2
-yay -S --noconfirm --noremovemake okular vlc nextcloud-client p7zip zip unzip noto-fonts pavucontrol light fastfetch bashtop hugo uxplay upower gdu dig nwg-look serpl fcitx5 qalculate-gtk openconnect light blueman xdg-desktop-portal-termfilechooser-hunkyburrito-git lazygit tldr
+yay -S --noconfirm --noremovemake okular vlc nextcloud-client p7zip zip unzip noto-fonts pavucontrol light fastfetch bashtop hugo uxplay upower gdu dig nwg-look serpl fcitx5 qalculate-gtk openconnect light blueman xdg-desktop-portal-termfilechooser-hunkyburrito-git lazygit tldr cloc usbutils bluez-utils bluez
 
 # LaTeX
 echo "
@@ -128,6 +128,7 @@ cd nvim
 xdg-settings set default-web-browser librewolf.desktop
 xdg-mime default org.pwmt.zathura.desktop application/pdf
 sudo systemctl disable rustdesk
+sudo systemctl enable --now systemd-timesyncd
 hyprpm update
 
 git-credential-manager configure

renderable/yazi/theme.toml

@@ -1,2 +1,3 @@
 [flavor]
-use = "{{ yazi-theme }}"
+dark = "{{ yazi-theme }}"
+light = "{{ yazi-theme }}"

scripts/ethz-vpn

@@ -1,58 +1,75 @@
 #!/usr/bin/env bash
 
 connect() {
-    read -sp $'Please enter your Encryption Password: ' encpass
+	read -sp $'Please enter your Encryption Password: ' encpass
-    echo " ==> Connecting"
+	echo "
-    TOKEN=$(cat ~/.local/share/ethz-vpn-connect/ethzvpntoken.secret | openssl enc -aes-256-cbc -pbkdf2 -d -a -k $encpass)
+    ==> Connecting"
-    PASSWORD=$(cat ~/.local/share/ethz-vpn-connect/ethzvpnpass.secret | openssl enc -aes-256-cbc -pbkdf2 -d -a -k $encpass)
+	TOKEN=$(cat ~/.local/share/ethz-vpn-connect/ethzvpntoken.secret | openssl enc -aes-256-cbc -pbkdf2 -d -a -k $encpass)
-    USERNAME=$(cat ~/.local/share/ethz-vpn-connect/ethzvpnusername.txt)
+	PASSWORD=$(cat ~/.local/share/ethz-vpn-connect/ethzvpnpass.secret | openssl enc -aes-256-cbc -pbkdf2 -d -a -k $encpass)
-    echo $PASSWORD | sudo openconnect -b -u $USERNAME@student-net.ethz.ch -g student-net --useragent=AnyConnect --passwd-on-stdin --token-mode=totp --token-secret=sha1:base32:$TOKEN sslvpn.ethz.ch
+	USERNAME=$(cat ~/.local/share/ethz-vpn-connect/ethzvpnusername.txt)
-    encpass=""
+	echo $PASSWORD | sudo openconnect -b -u $USERNAME@student-net.ethz.ch -g student-net --useragent=AnyConnect --no-external-auth --passwd-on-stdin --token-mode=totp --token-secret=sha1:base32:$TOKEN sslvpn.ethz.ch
-    PASSWORD=""
+	if [ $? -ne 0 ]; then
-    TOKEN=""
+		echo ' ==> Failed to connect <=='
+	else
+		echo ' ==> Connected <==
+        '
+	fi
+	encpass=""
+	PASSWORD=""
+	TOKEN=""
 }
 
 disconnect() {
-    sudo killall -v -SIGINT openconnect
+	sudo killall -v -SIGINT openconnect
-    echo " ==> Disconnected"
+	echo " ==> Disconnected"
 }
 
 setup() {
-    echo 'You are about to overwrite your secrets. Press ctrl + C to cancel.'
+	echo 'You are about to overwrite your secrets. Press ctrl + C to cancel.'
-    read -p $'Please enter your ETHZ-Username: ' USERNAME
+	read -p 'Please enter your ETHZ-Username: ' USERNAME
-    read -sp $'Please choose and enter your Encryption Password (will be required when launching): ' encpass
+	read -sp 'Please choose and enter your Encryption Password (will be required when launching): ' encpass
-    read -sp $'Please enter your ETHZ WLAN (= Radius) Password: ' PASSWORD
+	echo ""
-    read -sp $'Please enter your ETHZ OTP Secret: ' TOKEN
+	read -sp 'Please enter your ETHZ WLAN (= Radius) Password: ' PASSWORD
-    mkdir ~/.local/share/ethz-vpn-connect
+	echo ""
-    echo $PASSWORD | openssl enc -aes-256-cbc -pbkdf2 -a -k $encpass >~/.local/share/ethz-vpn-connect/ethzvpnpass.secret
+	read -sp 'Please enter your ETHZ OTP Secret: ' TOKEN
-    echo $TOKEN | openssl enc -aes-256-cbc -pbkdf2 -a -k $encpass >~/.local/share/ethz-vpn-connect/ethzvpntoken.secret
+	echo ""
-    echo $USERNAME >~/.local/share/ethz-vpn-connect/ethzvpnusername.txt
+	if [[ -d ~/.local/share/ethz-vpn-connect ]]; then
-    encpass=""
+		rm -rf ~/.local/share/ethz-vpn-connect
-    PASSWORD=""
+	fi
-    TOKEN=""
+	mkdir ~/.local/share/ethz-vpn-connect
-    echo $' ==> Secrets set <==\n'
+	echo $PASSWORD | openssl enc -aes-256-cbc -pbkdf2 -a -k $encpass >~/.local/share/ethz-vpn-connect/ethzvpnpass.secret
+	echo $TOKEN | openssl enc -aes-256-cbc -pbkdf2 -a -k $encpass >~/.local/share/ethz-vpn-connect/ethzvpntoken.secret
+	echo $USERNAME >~/.local/share/ethz-vpn-connect/ethzvpnusername.txt
+	encpass=""
+	PASSWORD=""
+	TOKEN=""
+	if [ $? -ne 0 ]; then
+		echo ' ==> Failed to set secrets <=='
+	else
+		echo ' ==> Secrets set <==\n'
+	fi
 }
 
 case "$1" in
 'connect')
-    connect
+	connect
-    ;;
+	;;
 c)
-    connect
+	connect
-    ;;
+	;;
 'disconnect')
-    disconnect
+	disconnect
-    ;;
+	;;
 d)
-    disconnect
+	disconnect
-    ;;
+	;;
 dc)
-    disconnect
+	disconnect
-    ;;
+	;;
 setup)
-    setup
+	setup
-    ;;
+	;;
 *)
-    echo -e 'Usage: ethz-vpn [Option] \n [Option]: \n       connect, c:             Connect VPN \n  disconnect, d, dc:      Disconnect VPN \n setup: set secrets and eth-Username.\n'
+	echo -e 'Usage: ethz-vpn [Option] \n [Option]: \n       connect, c:             Connect VPN \n  disconnect, d, dc:      Disconnect VPN \n setup: set secrets and eth-Username.\n'
-    ;;
+	;;
 esac

scripts/pdf-wordcount

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Word count is $(pdftotext $1 - | tr -d '.' | wc -w)"

scripts/restart-bar

@@ -8,6 +8,6 @@ echo "
 killall gjs
 killall ags
 sleep 4
-ags run -d ~/projects/dotfiles/config/astal --gtk4 & disown
+ags run -d ~/projects/dotfiles/config/astal --gtk 4 & disown
 sleep 2
-ags run -d ~/projects/dotfiles/config/ags/notifications & disown
+ags run -d ~/projects/dotfiles/config/ags/notifications --gtk 3 & disown

scripts/toggle-swapescape

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+enabled=$(hyprctl getoption input:kb_options | grep "caps:swapescape")
+if [[ $enabled == "" ]]; then
+    hyprctl keyword input:kb_options "caps:swapescape"
+    notify-send "Swapescape enabled"
+else
+    hyprctl keyword input:kb_options ""
+    notify-send "Swapescape disabled"
+fi

setup

@@ -28,7 +28,6 @@ trap 'echo -e "\nCaught Ctrl+C, exiting..."; exit 130' SIGINT
 # Read platform to install on (only if no platform file present in ~/.config/)
 platform=""
 if [[ -f ~/.config/platform ]]; then
-    echo "Config type already selected, skipping"
     platform=$(cat ~/.config/platform)
 else
     read -p "Choose the configs to install, Laptop or Desktop (l/D): " platform
@@ -58,7 +57,6 @@ fi
 # hyprvim config
 hyprvim=""
 if [[ -f ~/.config/hyprvim ]]; then
-    echo "hyprvim config already specified, skipping"
     hyprvim=$(cat ~/.config/hyprvim)
 else
     read -p "Would you like to use hyprvim? (Y/n) " hyprvim
@@ -81,19 +79,19 @@ cp -r ./config/xdg-desktop-portal/ ~/.config/
 
 # Depending on platform, remove one or the other config and rename remaining one
 if [[ "$platform" == "d" ]]; then
-    echo "Running on desktop"
+    echo "==> Running on desktop"
     cp -f ~/.config/hypr/hyprland_desktop.conf ~/.config/hypr/hyprland.conf
 else
-    echo "Running on laptop"
+    echo "==> Running on laptop"
     cp -f ~/.config/hypr/hyprland_laptop.conf ~/.config/hypr/hyprland.conf
 fi
 
 # Enable or disable "hyprvim" (using hyprland with vim-inspired modes)
 if [[ "$hyprvim" == "y" ]]; then
-    echo "Enabling hyprvim"
+    echo "==> Enabling hyprvim"
     mv -f ~/.config/hypr/hyprland/mode-binds.conf ~/.config/hypr/hyprland/binds.conf
 else
-    echo "Disabling hyprvim"
+    echo "==> Disabling hyprvim"
     rm -rf ~/.config/hypr/hyprland/modal-binds
     rm ~/.config/hypr/hyprland/mode-binds.conf
 fi
@@ -114,6 +112,7 @@ cp ./config/lint/indentconfig.yaml ~/.indentconfig.yaml
 echo "
     => Installing yazi plugins
 "
+rm -rf ~/.config/yazi/plugins/*
 ya pkg upgrade
 
 if [[ "$restart" == "y" ]]; then