diff --git a/.bashrc b/.bashrc index 2f2a940..4e83d57 100644 --- a/.bashrc +++ b/.bashrc @@ -5,7 +5,7 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return -# add from /etc/bash.bashrc defaultl with fix for alacritty window title bars +# add from /etc/bash.bashrc default with fix for alacritty window title bars case ${TERM} in xterm*|rxvt*|Eterm|alacritty|aterm|kterm|gnome*) PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' @@ -43,6 +43,7 @@ alias tree='tree -CL 2' #alias vim='nvim' alias nv='nvim' export EDITOR=vim +alias feh='feh --scale-down' #alias xclip="xclip -selection clipboard" #alias ts="date --iso-8601='seconds' | tr -d '\n' | xclip" @@ -70,8 +71,8 @@ source /usr/share/fzf/completion.bash #export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"' export FZF_DEFAULT_COMMAND='rg -i --files --glob "!.git/*"' -alias fzf='fzf --bind "enter:execute(nvim {})"' -bind -x '"\C-p": fzf;' +alias fzfcmd='fzf --bind "enter:execute(nvim {})"' +bind -x '"\C-p": fzfcmd;' # bind -x '"\C-p": nvim $(fzf);' #setup history for fzf diff --git a/.config/i3status/config b/.config/i3status/config index a9eed12..7daae94 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -29,7 +29,9 @@ order += "ipv6" order += "wireless _first_" order += "ethernet _first_" #order += "run_watch DHCP" -order += "path_exists VPN" +order += "path_exists ovpn" +order += "path_exists wgvpn" +order += "path_exists wg0" order += "battery all" order += "cpu_temperature 0" order += "load" @@ -62,11 +64,19 @@ disk "/" { format = "%avail" } -path_exists VPN { +path_exists ovpn { # path exists when a VPN tunnel launched by nmcli/nm-applet is active path = "/proc/sys/net/ipv4/conf/tun0" } +path_exists wgvpn { + # path exists when a WireGuard VPN tunnel is active + path = "/proc/sys/net/ipv4/conf/wgpia0" +} +path_exists wg0 { + # path exists when a WireGuard VPN tunnel is active + path = "/proc/sys/net/ipv4/conf/wg0" +} run_watch DHCP { pidfile = "/var/run/dhclient*.pid" } diff --git a/.config/sway/config b/.config/sway/config index f3e3cbd..57b3316 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -256,8 +256,9 @@ bar { mode dock hidden_state hide - modifier Mod1 - + #modifier Mod1 + modifier "" + colors { background $base00 separator $base03 diff --git a/.vimrc b/.vimrc index 716be5d..0b0b5f9 100644 --- a/.vimrc +++ b/.vimrc @@ -142,7 +142,7 @@ call plug#end() filetype plugin indent on "Syntax highlighting in Markdown -"au BufNewFile,BufReadPost *.md set filetype=markdown +" au BufNewFile,BufReadPost *.md, *.mkd set filetype=markdown "let g:polyglot_disabled = ['markdown'] let g:markdown_fenced_languages = ['html','r', 'javascript', 'python', 'sh', 'bash=sh', 'css', 'js=javascript', 'json=javascript']