diff --git a/.bashrc b/.bashrc index 0f18d0c..af9df40 100644 --- a/.bashrc +++ b/.bashrc @@ -37,3 +37,9 @@ case ${TERM} in PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' ;; esac + +if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]] +then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' + exec fish $LOGIN_OPTION +fi diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 63951ea..cccba2c 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -17,6 +17,8 @@ set --export XSECURELOCK_NO_COMPOSITE 1 set --export XSECURELOCK_DIM_TIME_MS 10000 # bun set --export BUN_INSTALL "$HOME/.bun" +# prompt_toolkit +set --export PROMPT_TOOLKIT_COLOR_DEPTH "DEPTH_24_BIT" if status is-interactive source "$HOME/.config/fish/abbreviations.fish" diff --git a/.config/qtile/config.py b/.config/qtile/config.py index 07271d7..993c20c 100644 --- a/.config/qtile/config.py +++ b/.config/qtile/config.py @@ -30,6 +30,7 @@ terminal = "alacritty" opaque_config = "--config-file /home/roland/.config/alacritty/alacritty-opaque.toml" terminal_opaque = f"alacritty {opaque_config}" qtile_config = f"alacritty {opaque_config} -e nvim /home/roland/.config/qtile/config.py" +nvim_config = f"alacritty {opaque_config} -e nvim /home/roland/.config/nvim/init.lua" ipython = f"alacritty {opaque_config} -e ipython" python = f"alacritty {opaque_config} -e python" vpn_vta = "alacritty -e /home/roland/.local/bin/vpn" @@ -194,6 +195,7 @@ keys = [ Key([], "i", lazy.group["scratchpad"].dropdown_toggle("ipython"), desc="Launch IPython"), Key([], "p", lazy.group["scratchpad"].dropdown_toggle("python"), desc="Launch python"), Key([], "q", lazy.group["scratchpad"].dropdown_toggle("qtile-config"), desc="Launch qtile config"), + Key([], "n", lazy.group["scratchpad"].dropdown_toggle("nvim-config"), desc="Launch qtile config"), Key([], "v", lazy.group["scratchpad"].dropdown_toggle("vpn"), desc="Launch vpn"), Key([], "b", lazy.group["scratchpad"].dropdown_toggle("bjendal"), desc="Launch xrdp: bjendal"), Key([], "l", lazy.group["scratchpad"].dropdown_toggle("lumar"), desc="Launch xrdp: lumar"), @@ -351,6 +353,16 @@ groups.extend( y=0.05, x=0.25, ), + DropDown( + "nvim-config", + nvim_config, + on_focus_lost_hide=False, + opacity=1.0, + height=0.9, + width=0.5, + y=0.05, + x=0.25, + ), DropDown( "vpn", vpn_vta, @@ -505,10 +517,11 @@ screens = [ widgets=[ widget.Mpris2( name="spotifyd", + font="Font Awesome", # objname=media_player, format="{xesam:title} - ({xesam:artist})", - playing_text=" 契 {track}", - paused_text="  {track}", + playing_text=" \uf04b {track}", + paused_text=" \uf04c {track}", width=400, scroll_delay=5, scroll_interval=0.25, diff --git a/.local/bin/set_audio_sink b/.local/bin/set_audio_sink index 3e67eb4..e3eed0a 100755 --- a/.local/bin/set_audio_sink +++ b/.local/bin/set_audio_sink @@ -10,7 +10,7 @@ if [ "$DISPLAY" = ":0" ]; then # if ! pactl set-default-sink alsa_output.0.hdmi-stereo; then # pactl set-default-sink alsa_output.1.hdmi-stereo # fi - pactl set-default-sink alsa_output.0.analog-stereo + pactl set-default-sink 1 echo "$DISPLAY set audio" elif [ "$DISPLAY" = ":10.0" ]; then pactl set-default-sink xrdp-sink diff --git a/.tmux.conf b/.tmux.conf index 04030cb..1a97610 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,6 +1,7 @@ setw -g mode-keys vi set -g status-keys vi set -g default-terminal "xterm-256color" +set-option -g default-shell /usr/bin/fish # remap prefix from 'C-b' to 'C-s' unbind C-b