diff options
author | Yaroslav <contact@yaroslavps.com> | 2020-06-29 05:46:13 +0300 |
---|---|---|
committer | Yaroslav <contact@yaroslavps.com> | 2020-06-29 05:46:13 +0300 |
commit | 378cab2ec31574daae3f8332cf30924214b58c8f (patch) | |
tree | 776b8bfbdafd5efbf5b573c5785a17bcbd75e501 /dotfiles | |
parent | 03af81b91d0b5570fb8fe2d33c16edd810637d2b (diff) | |
download | swayrice-378cab2ec31574daae3f8332cf30924214b58c8f.tar.gz swayrice-378cab2ec31574daae3f8332cf30924214b58c8f.zip |
artix-specific stuff; use pacmixer instead of ncpamixer
Diffstat (limited to 'dotfiles')
-rw-r--r-- | dotfiles/.config/sway/config | 3 | ||||
-rwxr-xr-x | dotfiles/.local/bin/menublk | 2 | ||||
-rw-r--r-- | dotfiles/.profile | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config index 5504b6e..b80bf3f 100644 --- a/dotfiles/.config/sway/config +++ b/dotfiles/.config/sway/config @@ -67,6 +67,7 @@ set $ws10 10 # Open specific applications in specific modes for_window [title="alsamixer"] floating enable for_window [title="ncpamixer"] floating enable +for_window [title="pacmixer"] floating enable for_window [title="nmtui"] floating enable for_window [title="i3_help"] floating enable, sticky enable for_window [class="Lightdm-settings"] floating enable @@ -210,7 +211,7 @@ bindsym --to-code { Ctrl+Print exec --no-startup-id swayrecord # Sound - $mod+Shift+m exec $term -e 'ncpamixer' + $mod+Shift+m exec $term -e 'pacmixer' $mod+Ctrl+m exec --no-startup-id menuoutput # Applications that start with no gaps diff --git a/dotfiles/.local/bin/menublk b/dotfiles/.local/bin/menublk index 3c507ac..cfc1a7b 100755 --- a/dotfiles/.local/bin/menublk +++ b/dotfiles/.local/bin/menublk @@ -42,7 +42,7 @@ get_unmountable() { if [ -z "$mountpoint" ] && [ "$fstype" = "crypto_LUKS" ]; then mountpoint="$(lsblk -r -o MOUNTPOINT "/dev/$name" | tail -n 1)" fi - if [ -n "$mountpoint" ] && [ "$mountpoint" != "/" ] && [ "$mountpoint" != "/boot" ] + if [ -n "$mountpoint" ] && [ "$mountpoint" != "/" ] && [ "$mountpoint" != "/boot" ] && [ "$mountpoint" != "[SWAP]" ] then echo "$name" fi diff --git a/dotfiles/.profile b/dotfiles/.profile index d849ada..76288ac 100644 --- a/dotfiles/.profile +++ b/dotfiles/.profile @@ -25,14 +25,17 @@ eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)" export LESSHISTFILE="-" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export INPUTRC="$XDG_CONFIG_HOME/zsh/inputrc" +export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat" export CARGO_HOME="$XDG_DATA_HOME/cargo" export RUSTUP_HOME="$XDG_DATA_HOME/rustup" export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" eval "$(dircolors "$HOME/.config/dir_colors")" -# Start sway automatically upon login on tty1 -if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then +# Start sway automatically upon login on tty1 or tty2 +if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ] || [ $(tty) = /dev/tty2 ]; then + # DBUS variables (for Artix) + export $(dbus-launch) sway > ~/.cache/sway.log 2>&1 && clear && exit fi |