Updates
This commit is contained in:
parent
5c549a577f
commit
ed2c763352
6
.bashrc
6
.bashrc
|
@ -37,3 +37,9 @@ case ${TERM} in
|
||||||
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
|
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
|
||||||
;;
|
;;
|
||||||
esac
|
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
|
||||||
|
|
|
@ -17,6 +17,8 @@ set --export XSECURELOCK_NO_COMPOSITE 1
|
||||||
set --export XSECURELOCK_DIM_TIME_MS 10000
|
set --export XSECURELOCK_DIM_TIME_MS 10000
|
||||||
# bun
|
# bun
|
||||||
set --export BUN_INSTALL "$HOME/.bun"
|
set --export BUN_INSTALL "$HOME/.bun"
|
||||||
|
# prompt_toolkit
|
||||||
|
set --export PROMPT_TOOLKIT_COLOR_DEPTH "DEPTH_24_BIT"
|
||||||
|
|
||||||
if status is-interactive
|
if status is-interactive
|
||||||
source "$HOME/.config/fish/abbreviations.fish"
|
source "$HOME/.config/fish/abbreviations.fish"
|
||||||
|
|
|
@ -30,6 +30,7 @@ terminal = "alacritty"
|
||||||
opaque_config = "--config-file /home/roland/.config/alacritty/alacritty-opaque.toml"
|
opaque_config = "--config-file /home/roland/.config/alacritty/alacritty-opaque.toml"
|
||||||
terminal_opaque = f"alacritty {opaque_config}"
|
terminal_opaque = f"alacritty {opaque_config}"
|
||||||
qtile_config = f"alacritty {opaque_config} -e nvim /home/roland/.config/qtile/config.py"
|
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"
|
ipython = f"alacritty {opaque_config} -e ipython"
|
||||||
python = f"alacritty {opaque_config} -e python"
|
python = f"alacritty {opaque_config} -e python"
|
||||||
vpn_vta = "alacritty -e /home/roland/.local/bin/vpn"
|
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([], "i", lazy.group["scratchpad"].dropdown_toggle("ipython"), desc="Launch IPython"),
|
||||||
Key([], "p", lazy.group["scratchpad"].dropdown_toggle("python"), desc="Launch python"),
|
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([], "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([], "v", lazy.group["scratchpad"].dropdown_toggle("vpn"), desc="Launch vpn"),
|
||||||
Key([], "b", lazy.group["scratchpad"].dropdown_toggle("bjendal"), desc="Launch xrdp: bjendal"),
|
Key([], "b", lazy.group["scratchpad"].dropdown_toggle("bjendal"), desc="Launch xrdp: bjendal"),
|
||||||
Key([], "l", lazy.group["scratchpad"].dropdown_toggle("lumar"), desc="Launch xrdp: lumar"),
|
Key([], "l", lazy.group["scratchpad"].dropdown_toggle("lumar"), desc="Launch xrdp: lumar"),
|
||||||
|
@ -351,6 +353,16 @@ groups.extend(
|
||||||
y=0.05,
|
y=0.05,
|
||||||
x=0.25,
|
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(
|
DropDown(
|
||||||
"vpn",
|
"vpn",
|
||||||
vpn_vta,
|
vpn_vta,
|
||||||
|
@ -505,10 +517,11 @@ screens = [
|
||||||
widgets=[
|
widgets=[
|
||||||
widget.Mpris2(
|
widget.Mpris2(
|
||||||
name="spotifyd",
|
name="spotifyd",
|
||||||
|
font="Font Awesome",
|
||||||
# objname=media_player,
|
# objname=media_player,
|
||||||
format="{xesam:title} - ({xesam:artist})",
|
format="{xesam:title} - ({xesam:artist})",
|
||||||
playing_text=" 契 {track}",
|
playing_text=" \uf04b {track}",
|
||||||
paused_text=" {track}",
|
paused_text=" \uf04c {track}",
|
||||||
width=400,
|
width=400,
|
||||||
scroll_delay=5,
|
scroll_delay=5,
|
||||||
scroll_interval=0.25,
|
scroll_interval=0.25,
|
||||||
|
|
|
@ -10,7 +10,7 @@ if [ "$DISPLAY" = ":0" ]; then
|
||||||
# if ! pactl set-default-sink alsa_output.0.hdmi-stereo; then
|
# if ! pactl set-default-sink alsa_output.0.hdmi-stereo; then
|
||||||
# pactl set-default-sink alsa_output.1.hdmi-stereo
|
# pactl set-default-sink alsa_output.1.hdmi-stereo
|
||||||
# fi
|
# fi
|
||||||
pactl set-default-sink alsa_output.0.analog-stereo
|
pactl set-default-sink 1
|
||||||
echo "$DISPLAY set audio"
|
echo "$DISPLAY set audio"
|
||||||
elif [ "$DISPLAY" = ":10.0" ]; then
|
elif [ "$DISPLAY" = ":10.0" ]; then
|
||||||
pactl set-default-sink xrdp-sink
|
pactl set-default-sink xrdp-sink
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
setw -g mode-keys vi
|
setw -g mode-keys vi
|
||||||
set -g status-keys vi
|
set -g status-keys vi
|
||||||
set -g default-terminal "xterm-256color"
|
set -g default-terminal "xterm-256color"
|
||||||
|
set-option -g default-shell /usr/bin/fish
|
||||||
|
|
||||||
# remap prefix from 'C-b' to 'C-s'
|
# remap prefix from 'C-b' to 'C-s'
|
||||||
unbind C-b
|
unbind C-b
|
||||||
|
|
Loading…
Reference in New Issue