Minor tweaks and stuff
This commit is contained in:
parent
9a431cf88e
commit
642cde6b02
@ -28,6 +28,10 @@
|
|||||||
background-color: $bg0;
|
background-color: $bg0;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.outline {
|
||||||
|
border: 1px solid $bg1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.nebula {
|
.nebula {
|
||||||
|
|||||||
@ -54,17 +54,17 @@
|
|||||||
|
|
||||||
|
|
||||||
(defwindow network-status
|
(defwindow network-status
|
||||||
:monitor 2
|
:monitor 0
|
||||||
:geometry (geometry :width "200px"
|
:geometry (geometry :width "200px"
|
||||||
:height "0px"
|
:height "0px"
|
||||||
:x "407px"
|
:x "300px"
|
||||||
:y "0px"
|
:y "0px"
|
||||||
:anchor "top right")
|
:anchor "top right")
|
||||||
:exclusive false
|
:exclusive false
|
||||||
:focusable false
|
:focusable false
|
||||||
:stacking "overlay"
|
:stacking "overlay"
|
||||||
(box :orientation "v"
|
(box :orientation "v"
|
||||||
:class "bar root bg"
|
:class "bar root bg outline"
|
||||||
:visible {network--show-details}
|
:visible {network--show-details}
|
||||||
(network-detail)))
|
(network-detail)))
|
||||||
|
|
||||||
|
|||||||
@ -142,8 +142,8 @@
|
|||||||
:spacing 20
|
:spacing 20
|
||||||
:class "rightbox"
|
:class "rightbox"
|
||||||
(vpn-network)
|
(vpn-network)
|
||||||
(network)
|
|
||||||
(mpris2)
|
(mpris2)
|
||||||
|
(network)
|
||||||
(system-memory)
|
(system-memory)
|
||||||
(system-cpu-avg)
|
(system-cpu-avg)
|
||||||
(clock)))
|
(clock)))
|
||||||
|
|||||||
@ -39,14 +39,14 @@ column_meter_modes_0=2 2 2 2 2 2
|
|||||||
column_meters_1=AllCPUs2 Blank MemorySwap
|
column_meters_1=AllCPUs2 Blank MemorySwap
|
||||||
column_meter_modes_1=1 2 1
|
column_meter_modes_1=1 2 1
|
||||||
tree_view=0
|
tree_view=0
|
||||||
sort_key=46
|
sort_key=47
|
||||||
tree_sort_key=46
|
tree_sort_key=46
|
||||||
sort_direction=-1
|
sort_direction=-1
|
||||||
tree_sort_direction=-1
|
tree_sort_direction=-1
|
||||||
tree_view_always_by_pid=0
|
tree_view_always_by_pid=0
|
||||||
all_branches_collapsed=0
|
all_branches_collapsed=0
|
||||||
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
|
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
|
||||||
.sort_key=PERCENT_CPU
|
.sort_key=PERCENT_MEM
|
||||||
.tree_sort_key=PERCENT_CPU
|
.tree_sort_key=PERCENT_CPU
|
||||||
.tree_view_always_by_pid=0
|
.tree_view_always_by_pid=0
|
||||||
.tree_view=0
|
.tree_view=0
|
||||||
|
|||||||
@ -153,6 +153,12 @@ for_window [app_id="Alacritty"] {
|
|||||||
client.unfocused $colorbackground $colorwallpaper $colorprimary $colorbackground $colorbackground
|
client.unfocused $colorbackground $colorwallpaper $colorprimary $colorbackground $colorbackground
|
||||||
}
|
}
|
||||||
|
|
||||||
|
## Floating windows should have titles
|
||||||
|
for_window [floating] border normal 1
|
||||||
|
|
||||||
|
## Thunderbird New.* windows should float
|
||||||
|
for_window [app_id="thunderbird" title="(New|Write)"] floating enable
|
||||||
|
|
||||||
### ###
|
### ###
|
||||||
# Application Keybinds #
|
# Application Keybinds #
|
||||||
### ###
|
### ###
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
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 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 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"'
|
timeout 300 'loginctl lock-session && swaymsg "output * power off"'
|
||||||
lock ~/.local/bin/screenlock
|
lock ~/.local/bin/screenlock
|
||||||
before-sleep 'loginctl lock-session'
|
before-sleep 'loginctl lock-session'
|
||||||
unlock 'pkill -SIGUSR1 swaylock'
|
unlock 'pkill -SIGUSR1 swaylock'
|
||||||
|
|||||||
@ -101,7 +101,10 @@
|
|||||||
"index": 14,
|
"index": 14,
|
||||||
"name": "mail",
|
"name": "mail",
|
||||||
"exec": "thunderbird",
|
"exec": "thunderbird",
|
||||||
"program_name": "thunderbird"
|
"program_name": "thunderbird",
|
||||||
|
"environ": {
|
||||||
|
"MOZ_ENABLE_WAYLAND": "1"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index": 15,
|
"index": 15,
|
||||||
@ -127,8 +130,8 @@
|
|||||||
{
|
{
|
||||||
"index": 18,
|
"index": 18,
|
||||||
"name": "music",
|
"name": "music",
|
||||||
"exec": "spotify",
|
"exec": "feishin",
|
||||||
"program_name": "spotify"
|
"program_name": "feishin"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index": 19,
|
"index": 19,
|
||||||
|
|||||||
@ -4,7 +4,7 @@ BindTo=sway-session.target
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
ExecStart=/usr/bin/lxpolkit
|
ExecStart=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=sway-session.target
|
WantedBy=sway-session.target
|
||||||
|
|||||||
@ -27,6 +27,8 @@ alias sudo='sudo '
|
|||||||
alias sign='gpg --sign-with ezri@ezri.dev --detach-sign'
|
alias sign='gpg --sign-with ezri@ezri.dev --detach-sign'
|
||||||
alias verify='gpg --verify'
|
alias verify='gpg --verify'
|
||||||
|
|
||||||
|
alias bw-personal='BITWARDENCLI_APPDATA_DIR=~/.config/bw-cli-personal bw'
|
||||||
|
|
||||||
function didifuckingstutter {
|
function didifuckingstutter {
|
||||||
echo $fg[blue]Apologies, right away.$fg[default]
|
echo $fg[blue]Apologies, right away.$fg[default]
|
||||||
# Run the last command as root
|
# Run the last command as root
|
||||||
|
|||||||
@ -2,10 +2,6 @@
|
|||||||
setopt auto_cd
|
setopt auto_cd
|
||||||
# Use directory stack
|
# Use directory stack
|
||||||
setopt auto_pushd
|
setopt auto_pushd
|
||||||
# Always resolve symlinks when changing directory
|
|
||||||
setopt chase_links
|
|
||||||
|
|
||||||
# Ignore duplicate commands and commands starting with space
|
# Ignore duplicate commands and commands starting with space
|
||||||
setopt hist_ignore_dups
|
setopt hist_ignore_dups
|
||||||
setopt hist_ignore_space
|
setopt hist_ignore_space
|
||||||
|
|
||||||
|
|||||||
@ -75,3 +75,62 @@ function lsssh() {
|
|||||||
echo "$user@$host"
|
echo "$user@$host"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function bwunlock() {
|
||||||
|
# Unlock Bitwarden vault and export session key
|
||||||
|
local bwfd
|
||||||
|
local bwpasswd
|
||||||
|
local secretstore
|
||||||
|
local bwcmd
|
||||||
|
local skipkeyring
|
||||||
|
|
||||||
|
# Use default Bitwarden account
|
||||||
|
secretstore="bw"
|
||||||
|
bwcmd="bw"
|
||||||
|
skipkeyring=0
|
||||||
|
|
||||||
|
while [[ $# -gt 0 ]]; do
|
||||||
|
case $1 in
|
||||||
|
--personal)
|
||||||
|
# Use personal Bitwarden account
|
||||||
|
secretstore="bw-personal"
|
||||||
|
bwcmd="env BITWARDENCLI_APPDATA_DIR=$HOME/.config/bw-cli-personal bw"
|
||||||
|
;;
|
||||||
|
--debug)
|
||||||
|
# Enable debug output
|
||||||
|
set -x
|
||||||
|
;;
|
||||||
|
--ask)
|
||||||
|
# Prompt for Bitwarden password
|
||||||
|
skipkeyring=1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown option: $1" >&2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
# Attempt to read Bitwarden password from keyring
|
||||||
|
if ! (( skipkeyring )); then
|
||||||
|
bwpasswd=$(secret-tool lookup service $secretstore 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)
|
||||||
|
if [[ -z "${BW_SESSION}" ]]; then
|
||||||
|
echo "Failed to unlock Bitwarden vault" >&2
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
echo "Bitwarden vault unlocked"
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user