diff --git a/.config/alacritty/alacritty.toml##default b/.config/alacritty/alacritty.toml##default index 58eec09..c87e543 100644 --- a/.config/alacritty/alacritty.toml##default +++ b/.config/alacritty/alacritty.toml##default @@ -62,5 +62,5 @@ style = "Regular" [window] dynamic_padding = true dynamic_title = true -opacity = 0.98 +opacity = 0.8 title = "Terminal" diff --git a/.config/eww/eww.yuck##hostname.tycho b/.config/eww/eww.yuck##hostname.tycho index 39506e4..4e2ae5d 100644 --- a/.config/eww/eww.yuck##hostname.tycho +++ b/.config/eww/eww.yuck##hostname.tycho @@ -12,7 +12,7 @@ (defwindow leftbar :monitor 1 - :geometry (geometry :width "100%" + :geometry (geometry :width "1440px" :height "36px" :anchor "top center") :exclusive true @@ -40,7 +40,7 @@ (defwindow rightbar :monitor 2 - :geometry (geometry :width "100%" + :geometry (geometry :width "1440px" :height "36px" :anchor "top center") :exclusive true diff --git a/.config/eww/scripts/mpris.py b/.config/eww/scripts/mpris.py index f279563..c27155a 100755 --- a/.config/eww/scripts/mpris.py +++ b/.config/eww/scripts/mpris.py @@ -14,9 +14,9 @@ except: from gi.repository import Playerctl, GLib -title_maxlen = 30 +title_maxlen = 40 title_end_at = ["(", "-"] -artist_maxlen = 30 +artist_maxlen = 40 album_maxlen = 30 # Split on these characters, take the first part, and strip whitespace # from the result. This can be used to remove subtitles (like " - Remastered" or " (feat. Artist)"). diff --git a/.config/eww/windows.yuck b/.config/eww/windows.yuck index 4c655b9..f8ab9bc 100644 --- a/.config/eww/windows.yuck +++ b/.config/eww/windows.yuck @@ -167,7 +167,6 @@ :space-evenly false :spacing 20 :class "rightbox" - (aggietime-shift) (vpn-network) (network) (mpris2) diff --git a/.config/sway/config b/.config/sway/config index a5e802a..c23cc59 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -61,6 +61,8 @@ mode "resize" { } } +bindsym $mod+r mode "resize" + ## Moving Windows bindsym { # Arrow key bindings diff --git a/.config/sway/display-arrangement.conf##hostname.tycho b/.config/sway/display-arrangement.conf##hostname.tycho index c3c910d..8e31ef1 100644 --- a/.config/sway/display-arrangement.conf##hostname.tycho +++ b/.config/sway/display-arrangement.conf##hostname.tycho @@ -3,11 +3,14 @@ ### ### set $leftdisplay "HP Inc. HP Z27n G2 6CM0151FHY" -set $centerdisplay "HP Inc. HP Z27n G2 6CM0151FLX" +set $centerdisplay "Hewlett Packard HP S340c CN490508SQ" set $rightdisplay "HP Inc. HP Z27n G2 6CM0151FD4" output { - $leftdisplay pos 0 0 mode 2560x1440 transform 270 - $centerdisplay pos 1440 510 mode 2560x1440 transform 0 - $rightdisplay pos 4000 30 mode 2560x1440 transform 90 + $leftdisplay pos 0 0 mode 2560x1440@60Hz transform 270 + $leftdisplay bg ~/Images/Sidepaper.png center + $centerdisplay pos 1440 450 mode 3440x1440 transform 0 + $centerdisplay bg ~/Images/Wallpaper.png center + $rightdisplay pos 4880 0 mode 2560x1440@60Hz transform 90 + $rightdisplay bg ~/Images/Sidepaper.png center } \ No newline at end of file diff --git a/.config/sway/local-config.d/20-vpn.conf##class.uses-usu-vpn b/.config/sway/local-config.d/20-vpn.conf##class.uses-usu-vpn index 3588b99..7a3c068 100644 --- a/.config/sway/local-config.d/20-vpn.conf##class.uses-usu-vpn +++ b/.config/sway/local-config.d/20-vpn.conf##class.uses-usu-vpn @@ -3,3 +3,5 @@ ### ### bindsym $mod+Shift+V exec vpn-toggle + +for_window [class="Gpauth"] floating enable diff --git a/.config/sway/swayidle##class.desktop,hostname.tycho b/.config/sway/swayidle##class.desktop,hostname.tycho index 1d5fadc..b23c007 100644 --- a/.config/sway/swayidle##class.desktop,hostname.tycho +++ b/.config/sway/swayidle##class.desktop,hostname.tycho @@ -1,8 +1,8 @@ # -*-conf-*- -#timeout 10 'pgrep swaylock &> /dev/null && swaymsg "output * power off"' resume 'pgrep swaylock &> /dev/null && swaymsg "output * power on" && gpg-connect-agent UPDATESTARTUPTTY /bye' -#timeout 15 'pgrep swaylock &> /dev/null && pkill -u 1000 -SIGSTOP electron' resume 'pgrep swaylock &> /dev/null && pkill -u 1000 -SIGCONT electron' -timeout 120 'pgrep swaylock &> /dev/null && systemctl suspend' +timeout 10 'pgrep swaylock &> /dev/null && swaymsg "output * power off"' resume 'pgrep swaylock &> /dev/null && swaymsg "output * power on" && gpg-connect-agent UPDATESTARTUPTTY /bye' +timeout 15 'pgrep swaylock &> /dev/null && pkill -u 1000 -SIGSTOP electron' resume 'pgrep swaylock &> /dev/null && pkill -u 1000 -SIGCONT electron' +timeout 150 'loginctl lock-session && swaymsg "output * power off"' lock ~/.local/bin/screenlock before-sleep 'loginctl lock-session' unlock 'pkill -SIGUSR1 swaylock' diff --git a/.config/sway/workspaces.json##hostname.tycho b/.config/sway/workspaces.json##hostname.tycho index 729b3eb..f210cd7 100644 --- a/.config/sway/workspaces.json##hostname.tycho +++ b/.config/sway/workspaces.json##hostname.tycho @@ -68,9 +68,9 @@ { "index": 9, "name": "project", - "exec": "firefox", - "args": ["--new-window"], - "program_name": "firefox" + "exec": "firefox-developer-edition", + "args": ["-start-debugger-server", "--new-window"], + "program_name": "firefox-developer-edition" }, { "index": 10, @@ -93,9 +93,9 @@ }, { "index": 13, - "name": "tbd", - "exec": "console", - "program_name": "console" + "name": "edex-ui", + "exec": "edex-ui", + "program_name": "edex-ui" }, { "index": 14, @@ -142,6 +142,11 @@ "name": "slack", "exec": "slack", "program_name": "slack", + "args": [ + "--enable-features=UseOzonePlatform", + "--ozone-platform=wayland", + "--enable-gpu-rasterization" + ], "memory_profile": { "high": "800M", "max": "1.2G" diff --git a/.config/swaync/config.json b/.config/swaync/config.json index 68aefbd..b952bdf 100644 --- a/.config/swaync/config.json +++ b/.config/swaync/config.json @@ -18,7 +18,7 @@ "timeout": 10, "timeout-low": 5, "timeout-critical": 0, - "fit-to-screen": true, + "fit-to-screen": false, "relative-timestamps": true, "control-center-width": 500, "control-center-height": 600, @@ -26,7 +26,7 @@ "keyboard-shortcuts": true, "image-visibility": "when-available", "transition-time": 200, - "hide-on-clear": false, + "hide-on-clear": true, "hide-on-action": true, "script-fail-notify": true, "scripts": { diff --git a/.config/swaync/style.css b/.config/swaync/style.css index 28d9e8d..e4a474e 100644 --- a/.config/swaync/style.css +++ b/.config/swaync/style.css @@ -1,13 +1,13 @@ -@define-color cc-bg rgba(30, 30, 30, 0.8); +@define-color cc-bg rgb(30, 30, 30); @define-color noti-border-color #815986; @define-color noti-border-color-low #3f3242; @define-color noti-border-color-critical #cf6a4c; -@define-color noti-bg rgba(30, 30, 30, 0.8); +@define-color noti-bg rgb(30, 30, 30); @define-color noti-bg-opaque #1e1e1e; @define-color noti-bg-darker #1a1a1a; -@define-color noti-bg-hover rgba(32, 32, 32, 0.8); +@define-color noti-bg-hover rgb(32, 32, 32); @define-color noti-bg-hover-opaque #202020; -@define-color noti-bg-focus rgba(40, 40, 40, 0.8); +@define-color noti-bg-focus rgb(40, 40, 40); @define-color noti-close-bg rgba(255, 255, 255, 0.1); @define-color noti-close-bg-hover rgba(255, 255, 255, 0.15); @define-color text-color #9b859d; @@ -158,11 +158,12 @@ .text-box .summary { /* Notification summary/title */ - font-size: 16px; + font-size: 20px; font-weight: bold; background: transparent; color: @text-color; text-shadow: none; + font-family: "Nebula"; } .notification-row @@ -431,6 +432,7 @@ /* The Control Center which contains the old notifications + widgets */ background: @cc-bg; color: @text-color; + border: 1px solid @noti-border-color; } .control-center .control-center-list-placeholder { diff --git a/.config/zsh/prompt.zsh b/.config/zsh/prompt.zsh index b5c111f..6e117e3 100644 --- a/.config/zsh/prompt.zsh +++ b/.config/zsh/prompt.zsh @@ -60,7 +60,8 @@ eval $(awk '{print "OS_" $0}' /etc/os-release) eval $(awk '{print "MACHINE_" $0}' /etc/machine-info) eval $(awk '{print "PERSONAL_" $0}' ${HOME}/.personal-info 2>/dev/null) -if [[ -z ${MACHINE_CHASSIS} ]]; then MACHINE_CHASSIS=$(hostnamectl chassis); fi +if [[ -z ${MACHINE_CHASSIS} ]]; then MACHINE_CHASSIS=$(hostnamectl chassis 2>/dev/null); fi +if [[ -z ${MACHINE_CHASSIS} ]]; then MACHINE_CHASSIS="desktop"; fi if [[ ${MACHINE_CHASSIS} != "container" ]]; then # Only check if a reboot is necessary if we're not in a container diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org index f516632..66cced0 100644 --- a/.emacs.d/settings.org +++ b/.emacs.d/settings.org @@ -700,6 +700,5 @@ After installing the ~rust-analyzer~ program, the following can be used: * TRAMP Customization #+BEGIN_SRC emacs-lisp - ;; (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:")) - ;; (add-to-list 'tramp-default-proxies-alist (quote ((,(regexp-quote (system-name)) "\\`root\\'" nil)))) + (add-hook 'after-init-hook 'tramp-nspawn-setup) #+END_SRC diff --git a/.local/bin/screenlock b/.local/bin/screenlock index 5ee14a7..a9f93ca 100755 --- a/.local/bin/screenlock +++ b/.local/bin/screenlock @@ -1,7 +1,5 @@ #!/usr/bin/env zsh -#i3lock -u -i ~/.config/i3lock/background -e -f - background="#1e1e1e" #inside="#2d272f" inside=$background @@ -13,32 +11,13 @@ red="#cf6a4c" purple="#815986" swaylock --font 'Source Sans Pro' --font-size 15 \ - --indicator-radius 80 --indicator-thickness 10 \ - --inside-color $inside --inside-clear-color $inside --inside-caps-lock-color $inside \ - --inside-ver-color $inside --inside-wrong-color $inside \ - --key-hl-color $purple --bs-hl-color $red \ - --caps-lock-key-hl-color $orange --caps-lock-bs-hl-color $red \ - --ring-color $purple --ring-clear-color $yellow --ring-caps-lock-color $orange \ - --ring-ver-color $purple --ring-wrong-color $red -n \ - --text-color $purple --text-clear-color $yellow --text-caps-lock-color $orange \ - --text-ver-color $purple --text-wrong-color $red \ - -c $background -F -f --ignore-empty-password --indicator-idle-visible - -sleep 1 - -#result=$(/usr/bin/node $(which aggietimed) -s /run/user/1000/aggietimed.sock --action clock-in 2>/dev/null) - -# If the last command reported 'err' as true, or if it exited -# non-zero, then the user did not clock in successfully. In this case, -# we want to display a notification to the user that they did not -# clock in successfully. - -# if [[ $? -ne 0 ]] || [[ $result == *"err"* ]] || [[ $result == *"ERR:"* ]]; then -# # Check to see if the user is clocked in already -# # If they are, then don't display a notification -# shift_data=$(/usr/bin/node $(which aggietimed) -s /run/user/1000/aggietimed.sock --action current-shift 2>/dev/null) - -# if [[ $? -ne 0 ]] || [[ ${shift_data} == "null" ]] || [[ ${shift_data} == *"err"* ]] || [[ ${shift_data} == *"ERR:"* ]]; then -# notify-send "Clock In Failed" "You were not successfully clocked in, please go to the website and clock in manually." -u critical -a "AggieTime" -# fi -# fi + --indicator-radius 80 --indicator-thickness 10 \ + --inside-color $inside --inside-clear-color $inside --inside-caps-lock-color $inside \ + --inside-ver-color $inside --inside-wrong-color $inside \ + --key-hl-color $purple --bs-hl-color $red \ + --caps-lock-key-hl-color $orange --caps-lock-bs-hl-color $red \ + --ring-color $purple --ring-clear-color $yellow --ring-caps-lock-color $orange \ + --ring-ver-color $purple --ring-wrong-color $red -n \ + --text-color $purple --text-clear-color $yellow --text-caps-lock-color $orange \ + --text-ver-color $purple --text-wrong-color $red \ + -i "DP-1:$HOME/Images/Lockscreen.png" -c $background -F -f --ignore-empty-password --indicator-idle-visible diff --git a/.local/bin/vpn-toggle b/.local/bin/vpn-toggle index 4fa36ba..ccedc64 100755 --- a/.local/bin/vpn-toggle +++ b/.local/bin/vpn-toggle @@ -10,5 +10,6 @@ if pgrep gpclient &>/dev/null; then else # VPN is disconnected, so connect echo "Connecting to VPN..." + # pkexec doesn't pass the DISPLAY and XAUTHORITY environment variables, so we need to pass them manually pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY gpclient connect gp.usu.edu fi