diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index e8e1e3f..d36d32f 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -21,7 +21,6 @@ end return { -- automatically_reload_config = false, - font = font_with_fallback("Iosevka Term SS09 Light"), font_rules = { { @@ -58,8 +57,8 @@ return { bottom = 0, }, - enable_tab_bar = true, - show_tab_index_in_tab_bar = false, + enable_tab_bar = false, + show_tab_index_in_tab_bar = true, enable_scroll_bar = false, window_decorations = "NONE", scrollback_lines = 5000, @@ -100,44 +99,99 @@ return { }, colors = { - foreground = "#ded9ce", - background = "#171717", + foreground = "#ded9ce", + background = "#171717", - cursor_bg = "#FB8C00", - -- cursor_fg = "black", - cursor_border = "#FB8C00", + cursor_bg = "#FB8C00", + -- cursor_fg = "black", + cursor_border = "#FB8C00", - split = "#444444", + split = "#444444", - ansi = { - "#000000", - "#ff605a", - "#b1e869", - "#ead89c", - "#5da9f6", - "#e86aff", - "#82fff6", - "#ded9ce" + ansi = { + "#000000", + "#ff605a", + "#b1e869", + "#ead89c", + "#5da9f6", + "#e86aff", + "#82fff6", + "#ded9ce" + }, + + brights = { + "#313131", + "#f58b7f", + "#dcf88f", + "#eee5b2", + "#a5c7ff", + "#ddaaff", + "#b6fff9", + "#fefffe" + }, + + tab_bar = { + background = "#000000", + active_tab = { + bg_color = "#171717", + fg_color = "#c0b070", + intensity = "Bold", + }, + inactive_tab = { + bg_color = "#000000", + fg_color = "#c0c0c0", + intensity = "Half", }, - brights = { - "#313131", - "#f58b7f", - "#dcf88f", - "#eee5b2", - "#a5c7ff", - "#ddaaff", - "#b6fff9", - "#fefffe" + -- You can configure some alternate styling when the mouse pointer + -- moves over inactive tabs + inactive_tab_hover = { + bg_color = "#333333", + fg_color = "#909090", + italic = true, } - }, - - ssh_domains = { - { - name = "dln-dev", - remote_address = "dln-dev", - username = "dln", } }, + tab_bar_style = { + active_tab_left = wezterm.format({ + {Background={Color="#171717"}}, + {Foreground={Color="#000000"}}, + {Text=" "}, + }), + active_tab_right = wezterm.format({ + {Background={Color="#171717"}}, + {Foreground={Color="#000000"}}, + {Text=" "}, + }), + inactive_tab_left = wezterm.format({ + {Background={Color="#000000"}}, + {Foreground={Color="#171717"}}, + {Text=" "}, + }), + inactive_tab_right = wezterm.format({ + {Background={Color="#000000"}}, + {Foreground={Color="#171717"}}, + {Text="▕"}, + }), + inactive_tab_hover_left = wezterm.format({ + {Background={Color="#333333"}}, + {Foreground={Color="#ffffff"}}, + {Text=" "}, + }), + inactive_tab_hover_right = wezterm.format({ + {Background={Color="#333333"}}, + {Foreground={Color="#ffffff"}}, + {Text=" "}, + }), + }, + + -- ssh_domains = { + -- { + -- name = "dln-dev", + -- remote_address = "dln-dev", + -- username = "dln", + -- } + -- }, + } diff --git a/.local/share/applications/tmux-local.desktop b/.local/share/applications/tmux-local.desktop deleted file mode 100644 index d5e5d3d..0000000 --- a/.local/share/applications/tmux-local.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=tmux local -GenericName=tmux-local -StartupWMClass=tmux-local -Type=Application -TryExec=/usr/bin/wezterm -Icon=org.wezfurlong.wezterm -Terminal=false -Categories=System;TerminalEmulator; -Exec=/usr/bin/wezterm start --class=tmux-local -# Exec=/usr/bin/wezterm connect local diff --git a/.local/share/applications/wezterm-dln-dev.desktop b/.local/share/applications/wezterm-dln-dev.desktop new file mode 100644 index 0000000..e5e9c59 --- /dev/null +++ b/.local/share/applications/wezterm-dln-dev.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=wezterm-dln-dev +GenericName=wezterm-dln-dev +StartupWMClass=wezterm-dln-dev +Type=Application +TryExec=/usr/bin/wezterm +Icon=org.wezfurlong.wezterm +Terminal=false +Categories=System;TerminalEmulator; +Exec=/usr/bin/wezterm --config 'default_prog={"ssh", "dln-dev"}' start --class=wezterm-dln-dev diff --git a/.local/share/applications/tmux-devel.desktop b/.local/share/applications/wezterm-local.desktop similarity index 52% rename from .local/share/applications/tmux-devel.desktop rename to .local/share/applications/wezterm-local.desktop index 902b072..5275fe7 100644 --- a/.local/share/applications/tmux-devel.desktop +++ b/.local/share/applications/wezterm-local.desktop @@ -1,10 +1,10 @@ [Desktop Entry] -Name=tmux devel -GenericName=tmux-devel -StartupWMClass=tmux-devel +Name=wezterm-local +GenericName=wezterm-local +StartupWMClass=wezterm-local Type=Application TryExec=/usr/bin/wezterm Icon=org.wezfurlong.wezterm Terminal=false Categories=System;TerminalEmulator; -Exec=/usr/bin/wezterm start --class=tmux-devel -- ssh devel +Exec=/usr/bin/wezterm start --class=wezterm-local diff --git a/.ssh/config b/.ssh/config index d5f0660..f874758 100644 --- a/.ssh/config +++ b/.ssh/config @@ -7,6 +7,7 @@ Ciphers aes128-gcm@openssh.com,aes256-gcm@openssh.com,chacha20-poly1305@openssh. AddressFamily inet RequestTty yes +Host dln-dev Host devel Hostname 10.1.100.16 IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh @@ -20,4 +21,3 @@ LocalForward 127.0.0.1:8250 127.0.0.1:8250 LocalForward 127.0.0.1:8888 127.0.0.1:8888 RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh -RemoteCommand /usr/bin/env LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 /usr/bin/tmux new-session -A -D -s 0 diff --git a/.zshrc b/.zshrc index 320a550..c9175d8 100644 --- a/.zshrc +++ b/.zshrc @@ -76,6 +76,7 @@ cd_func () { fi "cd" "${dir}" fasd -A $PWD + set_win_title } alias cd=cd_func @@ -124,6 +125,19 @@ alias xc='xclip -selection clipboard' alias c='cut -c-${COLUMNS}' + +## Prompt +eval "$(starship init zsh)" + +function _title(){ + printf '%-16.16s' "$(starship module directory | sed 's/\x1b\[[0-9;]*m//g')" +} + +function set_win_title(){ + echo -ne "\033]0; $(_title) \007" +} +set_win_title + ## vim export EDITOR=nvim export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket @@ -131,7 +145,7 @@ export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket e () { nvr --remote $(readlink -f "$@") - echo -e "\x1b]2;1234567890123456$(date +%s):nvim\x1b\\" + echo -e "\x1b]2;$(_title) $(date +%s):nvim\x1b\\" } ## fzf @@ -168,14 +182,6 @@ GOPROXY=https://proxy.golang.org/ ## Ansible export ANSIBLE_NOCOWS=1 -## Prompt -eval "$(starship init zsh)" -# function set_win_title(){ -# echo -ne "\033]0; $(basename $PWD) \007" -# } -# precmd_functions+=(set_win_title) - - export PATH=$HOME/bin:$PATH autoload -U +X bashcompinit && bashcompinit