Compare commits
No commits in common. "fe659f4386dbd425fb5818fab694d0a2331e1d34" and "ce547fe18dff8ab6e2401ed5accf0a9c96ecf93d" have entirely different histories.
fe659f4386
...
ce547fe18d
@ -19,11 +19,8 @@
|
|||||||
version = HTTP/1.1
|
version = HTTP/1.1
|
||||||
[pack]
|
[pack]
|
||||||
window = 1
|
window = 1
|
||||||
|
[credential]
|
||||||
|
helper =
|
||||||
|
helper = /usr/local/share/gcm-core/git-credential-manager
|
||||||
[credential "https://dev.azure.com"]
|
[credential "https://dev.azure.com"]
|
||||||
useHttpPath = true
|
useHttpPath = true
|
||||||
[credential "https://github.com"]
|
|
||||||
helper =
|
|
||||||
helper = !/opt/homebrew/bin/gh auth git-credential
|
|
||||||
[credential "https://gist.github.com"]
|
|
||||||
helper =
|
|
||||||
helper = !/opt/homebrew/bin/gh auth git-credential
|
|
||||||
|
|||||||
@ -1,9 +1,7 @@
|
|||||||
xterm-kitty|KovIdTTY,
|
xterm-kitty|KovIdTTY,
|
||||||
Su,
|
Su,
|
||||||
Tc,
|
Tc,
|
||||||
XF,
|
|
||||||
am,
|
am,
|
||||||
bw,
|
|
||||||
ccc,
|
ccc,
|
||||||
fullkbd,
|
fullkbd,
|
||||||
hs,
|
hs,
|
||||||
@ -18,23 +16,10 @@ xterm-kitty|KovIdTTY,
|
|||||||
it#8,
|
it#8,
|
||||||
lines#24,
|
lines#24,
|
||||||
pairs#32767,
|
pairs#32767,
|
||||||
BD=\E[?2004l,
|
|
||||||
BE=\E[?2004h,
|
|
||||||
Cr=\E]112\007,
|
|
||||||
Cs=\E]12;%p1%s\007,
|
|
||||||
Ms=\E]52;%p1%s;%p2%s\E\\,
|
|
||||||
PE=\E[201~,
|
|
||||||
PS=\E[200~,
|
|
||||||
RV=\E[>c,
|
|
||||||
Se=\E[2\sq,
|
|
||||||
Setulc=\E[58:2:%p1%{65536}%/%d:%p1%{256}%/%{255}%&%d:%p1%{255}%&%d%;m,
|
|
||||||
Smulx=\E[4:%p1%dm,
|
Smulx=\E[4:%p1%dm,
|
||||||
Ss=\E[%p1%d\sq,
|
|
||||||
Sync=\EP=%p1%ds\E\\,
|
Sync=\EP=%p1%ds\E\\,
|
||||||
XR=\E[>0q,
|
|
||||||
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
||||||
bel=^G,
|
bel=^G,
|
||||||
blink=\E[5m,
|
|
||||||
bold=\E[1m,
|
bold=\E[1m,
|
||||||
cbt=\E[Z,
|
cbt=\E[Z,
|
||||||
civis=\E[?25l,
|
civis=\E[?25l,
|
||||||
@ -57,13 +42,11 @@ xterm-kitty|KovIdTTY,
|
|||||||
dim=\E[2m,
|
dim=\E[2m,
|
||||||
dl=\E[%p1%dM,
|
dl=\E[%p1%dM,
|
||||||
dl1=\E[M,
|
dl1=\E[M,
|
||||||
dsl=\E]2;\E\\,
|
dsl=\E]2;\007,
|
||||||
ech=\E[%p1%dX,
|
ech=\E[%p1%dX,
|
||||||
ed=\E[J,
|
ed=\E[J,
|
||||||
el=\E[K,
|
el=\E[K,
|
||||||
el1=\E[1K,
|
el1=\E[1K,
|
||||||
fd=\E[?1004l,
|
|
||||||
fe=\E[?1004h,
|
|
||||||
flash=\E[?5h$<100/>\E[?5l,
|
flash=\E[?5h$<100/>\E[?5l,
|
||||||
fsl=^G,
|
fsl=^G,
|
||||||
home=\E[H,
|
home=\E[H,
|
||||||
@ -142,8 +125,12 @@ xterm-kitty|KovIdTTY,
|
|||||||
kUP5=\E[1;5A,
|
kUP5=\E[1;5A,
|
||||||
kUP6=\E[1;6A,
|
kUP6=\E[1;6A,
|
||||||
kUP7=\E[1;7A,
|
kUP7=\E[1;7A,
|
||||||
|
ka1=,
|
||||||
|
ka3=,
|
||||||
kbeg=\EOE,
|
kbeg=\EOE,
|
||||||
kbs=\177,
|
kbs=\177,
|
||||||
|
kc1=,
|
||||||
|
kc3=,
|
||||||
kcbt=\E[Z,
|
kcbt=\E[Z,
|
||||||
kcub1=\EOD,
|
kcub1=\EOD,
|
||||||
kcud1=\EOB,
|
kcud1=\EOB,
|
||||||
@ -214,6 +201,7 @@ xterm-kitty|KovIdTTY,
|
|||||||
kf7=\E[18~,
|
kf7=\E[18~,
|
||||||
kf8=\E[19~,
|
kf8=\E[19~,
|
||||||
kf9=\E[20~,
|
kf9=\E[20~,
|
||||||
|
khlp=,
|
||||||
khome=\EOH,
|
khome=\EOH,
|
||||||
kich1=\E[2~,
|
kich1=\E[2~,
|
||||||
kind=\E[1;2B,
|
kind=\E[1;2B,
|
||||||
@ -221,8 +209,7 @@ xterm-kitty|KovIdTTY,
|
|||||||
knp=\E[6~,
|
knp=\E[6~,
|
||||||
kpp=\E[5~,
|
kpp=\E[5~,
|
||||||
kri=\E[1;2A,
|
kri=\E[1;2A,
|
||||||
kxIN=\E[I,
|
kund=,
|
||||||
kxOUT=\E[O,
|
|
||||||
oc=\E]104\007,
|
oc=\E]104\007,
|
||||||
op=\E[39;49m,
|
op=\E[39;49m,
|
||||||
rc=\E8,
|
rc=\E8,
|
||||||
@ -245,7 +232,7 @@ xterm-kitty|KovIdTTY,
|
|||||||
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
|
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
|
||||||
setrgbb=\E[48:2:%p1%d:%p2%d:%p3%dm,
|
setrgbb=\E[48:2:%p1%d:%p2%d:%p3%dm,
|
||||||
setrgbf=\E[38:2:%p1%d:%p2%d:%p3%dm,
|
setrgbf=\E[38:2:%p1%d:%p2%d:%p3%dm,
|
||||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;%?%p5%t;2%;m,
|
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
|
||||||
sgr0=\E(B\E[m,
|
sgr0=\E(B\E[m,
|
||||||
sitm=\E[3m,
|
sitm=\E[3m,
|
||||||
smacs=\E(0,
|
smacs=\E(0,
|
||||||
|
|||||||
Binary file not shown.
@ -12,45 +12,9 @@ bind C-a send-prefix -2
|
|||||||
|
|
||||||
# reload configuration
|
# reload configuration
|
||||||
bind r source-file ~/.tmux.conf \; display '~/.tmux.conf sourced'
|
bind r source-file ~/.tmux.conf \; display '~/.tmux.conf sourced'
|
||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "xterm-kitty"
|
||||||
set -s set-clipboard external
|
|
||||||
set -s extended-keys on
|
|
||||||
set -s extended-keys-format csi-u
|
|
||||||
set -as terminal-features ",xterm-kitty:RGB"
|
|
||||||
set -as terminal-features ",xterm-kitty:clipboard"
|
|
||||||
set -as terminal-features ",xterm-kitty:extkeys"
|
|
||||||
set -as terminal-features ",xterm:RGB"
|
|
||||||
set -as terminal-features ",xterm-ghostty:RGB"
|
|
||||||
set -as terminal-features ",xterm-ghostty:clipboard"
|
|
||||||
set -as terminal-features ",xterm-ghostty:extkeys"
|
|
||||||
set -as terminal-features ",xterm-256color:RGB"
|
|
||||||
set -as terminal-features ",xterm-256color:extkeys"
|
|
||||||
set -as terminal-features ",xterm-kitty:hyperlinks"
|
|
||||||
set -as terminal-features ",xterm-ghostty:hyperlinks"
|
|
||||||
set -as terminal-features ",xterm-256color:hyperlinks"
|
|
||||||
set -as terminal-overrides ",xterm-256color:Ms=\E]52;c;%p2%s\007"
|
|
||||||
set -as terminal-overrides ",screen-256color:Ms=\E]52;c;%p2%s\007"
|
|
||||||
set -g allow-passthrough on
|
|
||||||
set-window-option -g mode-keys vi
|
set-window-option -g mode-keys vi
|
||||||
|
|
||||||
# Copy selections by writing OSC 52 directly to the pane tty. This avoids the
|
|
||||||
# broken tmux load-buffer -w path seen under mosh, and works across macOS,
|
|
||||||
# Linux, FreeBSD, and OpenBSD with $HOME/.local/bin/yank-osc52.
|
|
||||||
bind-key -n MouseDrag1Pane if-shell -F '#{mouse_any_flag}' 'send-keys -M' 'copy-mode -M'
|
|
||||||
bind-key -n MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel '$HOME/.local/bin/yank-osc52 > #{pane_tty}'
|
|
||||||
bind-key -n DoubleClick1Pane select-pane -t = \; copy-mode -H \; send-keys -X select-word \; run-shell -b 'sleep 0.2; tmux send-keys -X -t "#{pane_id}" copy-pipe-and-cancel "$HOME/.local/bin/yank-osc52 > #{pane_tty}"'
|
|
||||||
bind-key -n TripleClick1Pane select-pane -t = \; copy-mode -H \; send-keys -X select-line \; run-shell -b 'sleep 0.2; tmux send-keys -X -t "#{pane_id}" copy-pipe-and-cancel "$HOME/.local/bin/yank-osc52 > #{pane_tty}"'
|
|
||||||
bind-key -T copy-mode-vi Space send-keys -X begin-selection
|
|
||||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
|
||||||
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
|
||||||
bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel '$HOME/.local/bin/yank-osc52 > #{pane_tty}'
|
|
||||||
bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel '$HOME/.local/bin/yank-osc52 > #{pane_tty}'
|
|
||||||
bind-key -T copy-mode-vi WheelUpPane select-pane \; send-keys -N 1 -X scroll-up
|
|
||||||
bind-key -T copy-mode-vi WheelDownPane select-pane \; send-keys -N 1 -X scroll-down
|
|
||||||
bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel '$HOME/.local/bin/yank-osc52 > #{pane_tty}'
|
|
||||||
bind-key -T copy-mode-vi DoubleClick1Pane send-keys -X select-word \; run-shell -b 'sleep 0.2; tmux send-keys -X -t "#{pane_id}" copy-pipe-and-cancel "$HOME/.local/bin/yank-osc52 > #{pane_tty}"'
|
|
||||||
bind-key -T copy-mode-vi TripleClick1Pane send-keys -X select-line \; run-shell -b 'sleep 0.2; tmux send-keys -X -t "#{pane_id}" copy-pipe-and-cancel "$HOME/.local/bin/yank-osc52 > #{pane_tty}"'
|
|
||||||
|
|
||||||
# Nova Config
|
# Nova Config
|
||||||
set -g @nova-nerdfonts true
|
set -g @nova-nerdfonts true
|
||||||
set -g @nova-nerdfonts-left
|
set -g @nova-nerdfonts-left
|
||||||
|
|||||||
@ -11,7 +11,6 @@ set -gx EDITOR nvim
|
|||||||
set fish_color_valid_path
|
set fish_color_valid_path
|
||||||
set -g fish_greeting
|
set -g fish_greeting
|
||||||
|
|
||||||
|
|
||||||
if test -S ~/.1password/agent.sock
|
if test -S ~/.1password/agent.sock
|
||||||
set -gx SSH_AUTH_SOCK ~/.1password/agent.sock
|
set -gx SSH_AUTH_SOCK ~/.1password/agent.sock
|
||||||
end
|
end
|
||||||
@ -23,18 +22,6 @@ end
|
|||||||
|
|
||||||
# Commands to run in interactive sessions can go here
|
# Commands to run in interactive sessions can go here
|
||||||
if status is-interactive
|
if status is-interactive
|
||||||
set -l kitty_fish_integration /Applications/kitty.app/Contents/Resources/kitty/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
|
|
||||||
set -l kitty_fish_completions /Applications/kitty.app/Contents/Resources/kitty/shell-integration/fish/vendor_completions.d
|
|
||||||
if test -f "$kitty_fish_integration"
|
|
||||||
if test "$TERM" = xterm-kitty; or set -q KITTY_MOSH
|
|
||||||
set -g KITTY_SHELL_INTEGRATION enabled
|
|
||||||
source "$kitty_fish_integration"
|
|
||||||
if test -d "$kitty_fish_completions"
|
|
||||||
set --prepend fish_complete_path "$kitty_fish_completions"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if type -q atuin; and test -s ~/.local/share/atuin/key
|
if type -q atuin; and test -s ~/.local/share/atuin/key
|
||||||
atuin init fish --disable-up-arrow | source
|
atuin init fish --disable-up-arrow | source
|
||||||
end
|
end
|
||||||
@ -49,7 +36,6 @@ alias b "bat -p"
|
|||||||
alias l "ls -la"
|
alias l "ls -la"
|
||||||
alias lll "ls -latr"
|
alias lll "ls -latr"
|
||||||
alias lg "lazygit"
|
alias lg "lazygit"
|
||||||
alias claude "env -u TMUX claude"
|
|
||||||
|
|
||||||
# abbreviations
|
# abbreviations
|
||||||
abbr lsn littlesnitch
|
abbr lsn littlesnitch
|
||||||
@ -81,14 +67,6 @@ function s
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function mosh
|
|
||||||
if contains -- -- $argv
|
|
||||||
command mosh $argv
|
|
||||||
else
|
|
||||||
command mosh $argv -- env KITTY_MOSH=1 sh -lc 'exec "${SHELL:?}" -l'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function icat
|
function icat
|
||||||
if test "$TERM_PROGRAM" = "WezTerm"
|
if test "$TERM_PROGRAM" = "WezTerm"
|
||||||
wezterm imgcat $argv
|
wezterm imgcat $argv
|
||||||
@ -168,7 +146,3 @@ fish_add_path $HOME/.cache/lm-studio/bin
|
|||||||
source ~/.orbstack/shell/init.fish 2>/dev/null || :
|
source ~/.orbstack/shell/init.fish 2>/dev/null || :
|
||||||
|
|
||||||
fish_add_path $HOME/.antigravity/antigravity/bin
|
fish_add_path $HOME/.antigravity/antigravity/bin
|
||||||
|
|
||||||
# Added by OrbStack: command-line tools and integration
|
|
||||||
# This won't be added again if you remove it.
|
|
||||||
source ~/.orbstack/shell/init2.fish 2>/dev/null || :
|
|
||||||
|
|||||||
@ -8,5 +8,5 @@ patrickf1/colored_man_pages.fish
|
|||||||
jhillyerd/plugin-git
|
jhillyerd/plugin-git
|
||||||
patrickf1/fzf.fish
|
patrickf1/fzf.fish
|
||||||
lilyball/nix-env.fish
|
lilyball/nix-env.fish
|
||||||
|
antonme/tide
|
||||||
edc/bass
|
edc/bass
|
||||||
~/dev/tide
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user