From b89d454ad853773482c8e79c0158ef3aa5145273 Mon Sep 17 00:00:00 2001 From: Sheldon Lee Date: Sun, 18 Jun 2023 15:26:22 +0100 Subject: [PATCH] untrack sway monitor config --- .bash_aliases | 20 ++++++++------------ .bash_profile | 3 ++- .bashrc | 18 ++++++++++++++---- .config/alacritty/alacritty.yml | 7 +++++++ .config/sway/config | 12 +++++++----- .config/sway/monitor | 6 ------ 6 files changed, 38 insertions(+), 28 deletions(-) delete mode 100644 .config/sway/monitor diff --git a/.bash_aliases b/.bash_aliases index 8ca638f..3a45074 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -10,24 +10,20 @@ alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' alias sizes='du -hs .[^.]* * | sort -h' # bash tree alias alias gittree="git log --all --decorate --oneline --graph" -# turn screen off -alias lock="slock & sleep 1; xset dpms force off" -alias screenoff="sleep 2; xset dpms force off" -# sleep -alias suspend="slock & sleep 5 ; systemctl suspend" # screen brightness script alias brightness="$HOME/.config/scripts/wm/brightness.sh" +alias linkmic='link-virtual-mic -a' +alias unlinkmic='link-virtual-mic -d' + +alias sbSetfile='file=$(fzf)' +alias sbPlay='mpv "$file" --volume=70 --audio-device=pipewire/loopback &> /dev/null' +alias sbLoop='while true; do sbPlay; sleep 0.5; done' +alias sbSpam='c=5; while [[ $c -gt 0 ]]; do sbPlay & sleep 0.15; echo $c; c=$((c-1)); done' + # # TUI # # run pulsemixer alias mixer="pulsemixer" - -# -# GUI -# - -# tmux '-2' colors -alias tmux="tmux -2" diff --git a/.bash_profile b/.bash_profile index 01e673a..9eb9ff0 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,7 +1,6 @@ # # ~/.bash_profile # - [[ -f ~/.bashrc ]] && . ~/.bashrc # custom scripts and programs @@ -23,6 +22,8 @@ export XMODIFIERS="@im=fcitx" export QT_IM_MODULE=fcitx export GTK_IM_MODULE=fcitx +#export GTK_USE_PORTAL=1 + if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then if [[ ! -z "$IS_LAPTOP" ]]; then WLR_DRM_DEVICES=/dev/dri/card1:/dev/dri/card0 sway diff --git a/.bashrc b/.bashrc index a0b2704..ca2b3e6 100644 --- a/.bashrc +++ b/.bashrc @@ -23,10 +23,7 @@ export TERMINAL=alacritty export WDIR_PATH="/tmp/$(id -u).wdir" # include bash aliases -if [ -f ~/.bash_aliases ] -then - source ~/.bash_aliases -fi +[ -f ~/.bash_aliases ] && source ~/.bash_aliases # source custom functions. for f in ~/.config/scripts/functions/*; do source "$f"; done @@ -37,3 +34,16 @@ then echo "Working directory from $WDIR_PATH" cd "$wdir" fi + +# NNN configuration +export NNN_FIFO=/tmp/nnn.fifo +export NNN_PLUG='p:preview-tui' + +# fzf +export FZF_DEFAULT_OPTS="--height 40% --layout=reverse" +export FZF_DEFAULT_COMMAND='find' +# source fzf bash completions +[ -f /usr/share/bash-completion/completions/fzf ] && + source /usr/share/bash-completion/completions/fzf +[ -f /usr/share/fzf/key-bindings.bash ] && + source /usr/share/fzf/key-bindings.bash diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index daff93c..0533bca 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -31,3 +31,10 @@ font: window: title: Terminal + + padding: + x: 1 + y: 1 + + dynamic_padding: true + diff --git a/.config/sway/config b/.config/sway/config index 6195697..5d10bd9 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -25,8 +25,8 @@ set $down j set $up k set $right l # Your preferred terminal emulator -#set $term alacritty -set $term kitty +set $term alacritty +#set $term kitty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. @@ -338,10 +338,10 @@ bindsym $mod+Shift+f gaps horizontal current toggle 400 smart_gaps inverse_outer -gaps inner 2 +#gaps inner 2 default_border pixel 3 -smart_borders on +#smart_borders on # # Startup programs: @@ -351,7 +351,7 @@ exec gentoo-pipewire-launcher restart &> $HOME/.config/pipewire/pipewire.log exec dunst exec wlsunset -l 55.0 -L -1.6 -exec alacritty +exec $term exec firefox exec discord-ff exec signal-desktop @@ -390,4 +390,6 @@ for_window [app_id="^io.crow_translate.CrowTranslate$"] floating enable for_window [title="^Origin$"] floating enable, move container to workspace trash; for_window [title="^Wine System Tray$"] move container to workspace trash; +for_window [app_id="^com.example.MyApplication$"] floating enable + include /etc/sway/config.d/* diff --git a/.config/sway/monitor b/.config/sway/monitor deleted file mode 100644 index 00138f8..0000000 --- a/.config/sway/monitor +++ /dev/null @@ -1,6 +0,0 @@ -set $mon1 DP-2 -set $mon2 HDMI-A-3 -set $mon3 HDMI-A-2 - -output $mon1 pos 1920 0 adaptive_sync on -output $mon2 pos 0 0