From ab65bc34066ff013a14209db2549f459660488a6 Mon Sep 17 00:00:00 2001 From: Ezri Brimhall Date: Wed, 5 Feb 2025 09:06:45 -0700 Subject: [PATCH] rename gathering storm to zariman --- .config/eww/colors.scss | 8 +-- ...ering-storm => eww.yuck##hostname.zariman} | 0 ...g-storm => network.yuck##hostname.zariman} | 0 ...ing-storm => network.py##hostname.zariman} | 0 .config/htop/htoprc | 12 ++-- .config/sway/config | 3 + ...isplay-arrangement.conf##hostname.zariman} | 0 ...torm => workspaces.json##hostname.zariman} | 57 +++++++++++++++++++ .config/swaync/config.json | 2 +- ...torm => bar-launch.conf##hostname.zariman} | 0 .config/zsh/prompt.zsh | 8 +-- .config/zsh/utils.zsh | 37 ++++++++++-- 12 files changed, 107 insertions(+), 20 deletions(-) rename .config/eww/{eww.yuck##hostname.gathering-storm => eww.yuck##hostname.zariman} (100%) rename .config/eww/modules/{network.yuck##hostname.gathering-storm => network.yuck##hostname.zariman} (100%) rename .config/eww/scripts/{network.py##hostname.gathering-storm => network.py##hostname.zariman} (100%) rename .config/sway/{display-arrangement.conf##hostname.gathering-storm => display-arrangement.conf##hostname.zariman} (100%) rename .config/sway/{workspaces.json##hostname.gathering-storm => workspaces.json##hostname.zariman} (81%) rename .config/systemd/user/eww.service.d/{bar-launch.conf##hostname.gathering-storm => bar-launch.conf##hostname.zariman} (100%) diff --git a/.config/eww/colors.scss b/.config/eww/colors.scss index a62e408..f2e0350 100644 --- a/.config/eww/colors.scss +++ b/.config/eww/colors.scss @@ -1,13 +1,13 @@ $wallpaper: #1e1e1e; -$foreground: #9a7c9d; +$foreground: #966e9b; $bg0: #2d272f; $bg1: #3f3242; -$red: #cf6a4c; -$green: #8f9d6a; +$red: #b36152; +$green: #a1ae50; $yellow: #f9ee98; -$blue: #7587a6; +$blue: #7d7ca5; $magenta: #9b859d; $cyan: #afc4db; $white: #a7a7a7; diff --git a/.config/eww/eww.yuck##hostname.gathering-storm b/.config/eww/eww.yuck##hostname.zariman similarity index 100% rename from .config/eww/eww.yuck##hostname.gathering-storm rename to .config/eww/eww.yuck##hostname.zariman diff --git a/.config/eww/modules/network.yuck##hostname.gathering-storm b/.config/eww/modules/network.yuck##hostname.zariman similarity index 100% rename from .config/eww/modules/network.yuck##hostname.gathering-storm rename to .config/eww/modules/network.yuck##hostname.zariman diff --git a/.config/eww/scripts/network.py##hostname.gathering-storm b/.config/eww/scripts/network.py##hostname.zariman similarity index 100% rename from .config/eww/scripts/network.py##hostname.gathering-storm rename to .config/eww/scripts/network.py##hostname.zariman diff --git a/.config/htop/htoprc b/.config/htop/htoprc index e918bed..6dfc9a7 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -38,18 +38,18 @@ column_meters_0=Hostname Blank Tasks LoadAverage Uptime Clock column_meter_modes_0=2 2 2 2 2 2 column_meters_1=AllCPUs2 Blank MemorySwap column_meter_modes_1=1 2 1 -tree_view=0 -sort_key=46 -tree_sort_key=46 +tree_view=1 +sort_key=47 +tree_sort_key=47 sort_direction=-1 tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PERCENT_CPU -.tree_sort_key=PERCENT_CPU +.sort_key=PERCENT_MEM +.tree_sort_key=PERCENT_MEM .tree_view_always_by_pid=0 -.tree_view=0 +.tree_view=1 .sort_direction=-1 .tree_sort_direction=-1 .all_branches_collapsed=0 diff --git a/.config/sway/config b/.config/sway/config index 1f90343..a3ab5ab 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -202,6 +202,9 @@ for_window [app_id="thunderbird" title="(New|Write)"] floating enable ## Bitwarden extension windows should float by default for_window [app_id="firefox" title="Extension: \(Bitwarden Password Manager\)"] floating enable +## Kwallet popup prompts should float +for_window [app_id="rg.kde.kwalletd6"] floating enable + ### ### # Application Keybinds # ### ### diff --git a/.config/sway/display-arrangement.conf##hostname.gathering-storm b/.config/sway/display-arrangement.conf##hostname.zariman similarity index 100% rename from .config/sway/display-arrangement.conf##hostname.gathering-storm rename to .config/sway/display-arrangement.conf##hostname.zariman diff --git a/.config/sway/workspaces.json##hostname.gathering-storm b/.config/sway/workspaces.json##hostname.zariman similarity index 81% rename from .config/sway/workspaces.json##hostname.gathering-storm rename to .config/sway/workspaces.json##hostname.zariman index 5237547..8a8881c 100644 --- a/.config/sway/workspaces.json##hostname.gathering-storm +++ b/.config/sway/workspaces.json##hostname.zariman @@ -217,6 +217,63 @@ } } }, + "battlestation": { + "primary": "center", + "outputs": [ + { + "names": ["eDP-1"], + "group": "builtin", + "position": [0, 600], + "eww_windows": ["builtinbar"], + "mode": "2560x1600@165Hz scale 1.5 color_profile icc /usr/share/color/icc/colord/BOE_CQ_______NE160QDM_NZ6.icm" + }, + { + "make": "ASUSTek COMPUTER INC", + "model": "VG245", + "serial": "L7LMQS132447", + "group": "left", + "position": [1707, 200], + "mode": "1920x1080@75Hz", + "eww_windows": ["leftbar", "sidebar"] + }, + { + "make": "ASUSTek COMPUTER INC", + "model": "VG32AQA1A", + "serial": "S5LMQS033656", + "group": "center", + "position": [3627, 0], + "mode": "2560x1440@165Hz", + "eww_windows": ["centerbar"] + }, + { + "make": "ASUSTek COMPUTER INC", + "model": "VG245", + "serial": "L6LMQS065439", + "group": "right", + "position": [6187, 200], + "mode": "1920x1080@75Hz", + "eww_windows": ["rightbar"] + } + ], + "groups": { + "builtin": { + "workspaces": [21, 22], + "reverse": false + }, + "left": { + "workspaces": [6, 2, 3, 4, 5], + "reverse": true + }, + "center": { + "workspaces": [1, 7, 8, 9, 10, 11, 12, 13, 14, 15], + "reverse": false + }, + "right": { + "workspaces": [16, 17, 19, 18, 20, 13], + "reverse": false + } + } + }, "work-portable": { "primary": "builtin", "outputs": [ diff --git a/.config/swaync/config.json b/.config/swaync/config.json index b952bdf..b1500df 100644 --- a/.config/swaync/config.json +++ b/.config/swaync/config.json @@ -20,7 +20,7 @@ "timeout-critical": 0, "fit-to-screen": false, "relative-timestamps": true, - "control-center-width": 500, + "control-center-width": 800, "control-center-height": 600, "notification-window-width": 500, "keyboard-shortcuts": true, diff --git a/.config/systemd/user/eww.service.d/bar-launch.conf##hostname.gathering-storm b/.config/systemd/user/eww.service.d/bar-launch.conf##hostname.zariman similarity index 100% rename from .config/systemd/user/eww.service.d/bar-launch.conf##hostname.gathering-storm rename to .config/systemd/user/eww.service.d/bar-launch.conf##hostname.zariman diff --git a/.config/zsh/prompt.zsh b/.config/zsh/prompt.zsh index d7caa8c..6debd05 100644 --- a/.config/zsh/prompt.zsh +++ b/.config/zsh/prompt.zsh @@ -111,15 +111,15 @@ prompt_line1='$kernel_info_msg_0_' prompt_line3=" $prompt_char" # Create conditional prompt line 2 -if [[ -v SSH_CLIENT ]]; then - prompt_line2='${host}$pyenv_info_msg_0_ ${pwd}' - history_line="${host}" -elif [[ ${TTY} =~ "tty" ]]; then +if [[ ${TTY} =~ "tty" ]]; then prompt_line2='${serial_host}$pyenv_info_msg_0_ ${pwd}' history_line="${serial_host}" elif [[ ${MACHINE_CHASSIS} == "container" ]] || [[ ${MACHINE_CHASSIS} == "vm" ]]; then prompt_line2='${container_host}$pyenv_info_msg_0_ ${pwd}' history_line="${container_host}" +elif [[ -v SSH_CLIENT ]]; then + prompt_line2='${host}$pyenv_info_msg_0_ ${pwd}' + history_line="${host}" else prompt_line2='${localhost}$pyenv_info_msg_0_ ${pwd}' history_line="${localhost}" diff --git a/.config/zsh/utils.zsh b/.config/zsh/utils.zsh index 903a4f4..74841db 100644 --- a/.config/zsh/utils.zsh +++ b/.config/zsh/utils.zsh @@ -12,6 +12,13 @@ function getkernelpkg() { fi } +function docker() { + # Wrapper for docker command that executes it inside the systemd-nspawn docker container + # This container has our home directory bound, so we should cd to the current directory before running this command + + ssh -t dockerbox "cd $(pwd); /usr/bin/docker $*" +} + function random-xkcd() { blocklist=( "404" @@ -113,16 +120,12 @@ function bwunlock() { # Attempt to read Bitwarden password from keyring if ! (( skipkeyring )); then - bwpasswd=$(secret-tool lookup service $secretstore 2>/dev/null) + bwpasswd=$(kwallet-query -r bitwarden kdewallet 2>/dev/null) fi if [[ -z "${bwpasswd}" ]]; then # If password is not found in keyring, prompt for it read -s -p "Enter Bitwarden password: " bwpasswd echo - # Store Bitwarden password in keyring - if ! (( skipkeyring )); then - secret-tool store --label="Bitwarden" service $secretstore - fi fi # Unlock Bitwarden vault and export session key export BW_SESSION=$(eval $bwcmd unlock --raw "'$bwpasswd'" 2>/dev/tty) @@ -134,3 +137,27 @@ function bwunlock() { fi } + +function urlencode { + # credit to https://stackoverflow.com/a/34407620 for the jq solution + local multiline=0 + if [[ "$1" == "-m" ]] || [[ "$1" == "--multiline" ]]; then + # Multiline mode, read directly from stdin + multiline=1 + shift + fi + if [[ -z "$1" ]]; then + # Read from stdin + if (( multiline )); then + jq -sRr '@uri' + else + # Treat each line as a separate argument, and encode them separately + for line in $(cat); do + echo -n "$line" | jq -sRr '@uri' + done + fi + else + # Read from arguments (use echo because arguments may contain spaces and --arg wasn't working) + echo -n $@ | jq -sRr '@uri' + fi +}