Skip to content

Commit 64d3923

Browse files
committed
misc
1 parent bd2bc2f commit 64d3923

File tree

7 files changed

+162
-53
lines changed

7 files changed

+162
-53
lines changed

.gitconfig

+25
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,28 @@
4343
cmd = "nvr -cc tabnew -o \"$BASE\" \"$REMOTE\" -O \"$LOCAL\" \"$MERGED\""
4444
[commit]
4545
gpgsign = true
46+
[filter "lfs"]
47+
clean = git-lfs clean -- %f
48+
smudge = git-lfs smudge -- %f
49+
process = git-lfs filter-process
50+
required = true
51+
[core]
52+
#pager = git-split-diffs --color | less -RFX
53+
pager = delta --dark
54+
[interactive]
55+
diffFilter = delta --color-only --features=interactive
56+
[include]
57+
path = ~/.delta.themes.gitconfig
58+
[delta]
59+
features = mellow-barbet
60+
side-by-side = true
61+
[delta "interactive"]
62+
keep-plus-minus-markers = false
63+
[delta "decorations"]
64+
commit-decoration-style = blue ol
65+
commit-style = raw
66+
file-style = omit
67+
hunk-header-decoration-style = blue box
68+
hunk-header-file-style = red
69+
hunk-header-line-number-style = "#067a00"
70+
hunk-header-style = file line-number syntax

.tmux.conf

+55-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@ setw -g window-status-separator ''
2020
setw -g status-left " #H "
2121
setw -g status-right " %H:%M %d-%b-%y "
2222
setw -g status-right-style bold
23-
setw -g window-status-format " #I: #W "
23+
#setw -g window-status-format " #I: #W "
24+
setw -g window-status-format "#{pane_current_path}".
2425
setw -g window-status-current-format " #I: #W "
2526
setw -g pane-base-index 1
2627
set-option -g default-shell /bin/zsh
2728
set-option -g escape-time 0
2829

29-
set -g default-terminal "tmux"
30+
set -g default-terminal "screen-256color"
31+
32+
bind-key G new-window -c "#{pane_current_path}" -n "gitui" gitui
33+
bind-key d new-window -c "#{pane_current_path}" -n "lazydocker" lazydocker
3034

3135
run -b 'tmux bind -t vi-copy v begin-selection 2> /dev/null || true'
3236
run -b 'tmux bind -T copy-mode-vi v send -X begin-selection 2> /dev/null || true'
@@ -39,10 +43,36 @@ run -b 'tmux bind -T copy-mode-vi Escape send -X cancel 2> /dev/null || true'
3943
run -b 'tmux bind -t vi-copy H start-of-line 2> /dev/null || true'
4044
run -b 'tmux bind -T copy-mode-vi L send -X end-of-line 2> /dev/null || true'
4145

46+
# is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
47+
48+
# bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' { if -F '#{pane_at_left}' '' 'select-pane -L' }
49+
# bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' { if -F '#{pane_at_bottom}' '' 'select-pane -D' }
50+
# bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' { if -F '#{pane_at_top}' '' 'select-pane -U' }
51+
# bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' { if -F '#{pane_at_right}' '' 'select-pane -R' }
52+
53+
# bind-key -T copy-mode-vi 'C-h' if -F '#{pane_at_left}' '' 'select-pane -L'
54+
# bind-key -T copy-mode-vi 'C-j' if -F '#{pane_at_bottom}' '' 'select-pane -D'
55+
# bind-key -T copy-mode-vi 'C-k' if -F '#{pane_at_top}' '' 'select-pane -U'
56+
# bind-key -T copy-mode-vi 'C-l' if -F '#{pane_at_right}' '' 'select-pane -R'
57+
58+
59+
# bind -n 'M-h' if-shell "$is_vim" 'send-keys M-h' 'resize-pane -L 1'
60+
# bind -n 'M-j' if-shell "$is_vim" 'send-keys M-j' 'resize-pane -D 1'
61+
# bind -n 'M-k' if-shell "$is_vim" 'send-keys M-k' 'resize-pane -U 1'
62+
# bind -n 'M-l' if-shell "$is_vim" 'send-keys M-l' 'resize-pane -R 1'
63+
64+
# bind-key -T copy-mode-vi M-h resize-pane -L 1
65+
# bind-key -T copy-mode-vi M-j resize-pane -D 1
66+
# bind-key -T copy-mode-vi M-k resize-pane -U 1
67+
# bind-key -T copy-mode-vi M-l resize-pane -R 1
68+
69+
bind-key S capture-pane -b temp-capture-buffer -S - \; save-buffer -b temp-capture-buffer /tmp/tmux.log \; delete-buffer -b capture-buffer
4270

4371
set -g @resurrect-processes ':all:'
72+
set -g @tmux_power_theme 'sky'
73+
set -g @srcery_tmux_patched_font '1'
4474

45-
source-file ~/.tmux/lightline
75+
#source-file ~/.tmux/lightline
4676

4777
# List of plugins
4878
set -g @plugin 'tmux-plugins/tpm'
@@ -53,6 +83,28 @@ set -g @plugin 'tmux-plugins/tmux-yank'
5383
set -g @plugin 'tmux-plugins/tmux-sensible'
5484
set -g @plugin 'tmux-plugins/tmux-logging'
5585
set -g @plugin 'tmux-plugins/tmux-sessionist'
86+
set -g @plugin 'wfxr/tmux-power'
87+
set -g @plugin 'srcery-colors/srcery-tmux'
88+
set -g @plugin 'o0th/tmux-nova'
89+
#set -g @plugin 'aserowy/tmux.nvim'
90+
91+
set -g @nova-nerdfonts true
92+
set -g @nova-nerdfonts-left 
93+
set -g @nova-nerdfonts-right 
94+
95+
set -g @nova-segment-mode "#{?client_prefix,Ω,ω}"
96+
set -g @nova-segment-mode-colors "#50fa7b #282a36"
97+
98+
set -g @nova-segment-whoami "#(whoami)@#h"
99+
set -g @nova-segment-whoami-colors "#50fa7b #282a36"
100+
101+
set -g @nova-pane "#I#{?pane_in_mode,  #{pane_mode},}  #{b:pane_current_path}  #W " # #W"
102+
103+
set -g @nova-rows 0
104+
set -g @nova-segments-0-left "mode"
105+
set -g @nova-segments-0-right "whoami"
106+
107+
set -g status-left "#{pane_current_path}"
56108

57109
# Initialize TMUX plugin manager
58110
run '~/.tmux/plugins/tpm/tpm'

.tmux/resurrect/last

-31
This file was deleted.

.tmux/resurrect/last

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tmux_resurrect_20230606T125249.txt

.vim/.vimrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Plug 'tpope/vim-sleuth'
1717
Plug 'tpope/vim-sensible'
1818
Plug 'majutsushi/tagbar'
1919
Plug 'scrooloose/nerdcommenter'
20-
Plug 'sebdah/vim-delve'
20+
"Plug 'sebdah/vim-delve'
2121
Plug 'Shougo/neosnippet'
2222
Plug 'Shougo/neosnippet-snippets'
23-
Plug 'airblade/vim-gitgutter'
23+
"Plug 'airblade/vim-gitgutter'
2424
Plug 'chriskempson/base16-vim'
2525
Plug 'arcticicestudio/nord-vim'
2626
Plug 'ternjs/tern_for_vim'
@@ -52,7 +52,7 @@ Plug 'roxma/vim-hug-neovim-rpc'
5252
Plug 'haya14busa/incsearch.vim'
5353
Plug 'Shougo/denite.nvim'
5454
Plug 'tomlion/vim-solidity'
55-
Plug 'jpalardy/vim-slime'
55+
"Plug 'jpalardy/vim-slime'
5656
call plug#end()
5757

5858
syntax on

.vim/colorscheme.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
colorscheme base16-material-darker
1+
colorscheme badwolf

.zsh.aliases

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ alias music='tmux new-session "tmux source-file ~/.ncmpcpp/tmux_session"' # Tmux
55
alias rm="rm -i"
66
alias vi=nvim
77
alias vim=nvim
8+
alias ls=exa
9+
alias cat=bat
810

911
hexcmp () {
1012
cmp -l $1 $2 | gawk '{printf "%08X %02X %02X\n", $1, strtonum(0$2), strtonum(0$3)}' | vim -
@@ -13,3 +15,6 @@ hexcmp () {
1315
tux-session() {
1416
mosh $1 -- tmux -2u attach-session -t $2
1517
}
18+
19+
alias tldrf='tldr --list | fzf --preview "tldr {1}" --preview-window=right,80% --bind shift-up:preview-page-up,shift-down:preview-page-down | xargs tldr'
20+
alias ai="openai_pipe"

.zshrc

+72-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
2-
# Initialization code that may require console input (password prompts, [y/n]
3-
# confirmations, etc.) must go above this block, everything else may go below.
4-
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
5-
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
6-
fi
1+
# prompt
2+
export TERM=screen-256color
3+
#if [ -f /opt/homebrew/share/liquidprompt ]; then
4+
# . /opt/homebrew/share/liquidprompt
5+
#fi
76

87
stty -ixon
98
setopt noflowcontrol
109

1110
ZSH_THEME="flazz"
12-
plugins=(git golang history tmux archlinux z)
11+
plugins=(git golang history tmux archlinux autoenv fzf-docker)
1312

1413
[ ! -f ~/.zgen/zgen.zsh ] && git clone https://github.com/tarjoilija/zgen ~/.zgen
1514
source ~/.zgen/zgen.zsh
@@ -31,8 +30,6 @@ if [[ $TERM =~ konsole.* ]]; then
3130
export FZF_DEFAULT_OPTS='--color fg+:5,hl+:6'
3231
fi
3332

34-
export TERM=xterm-256color
35-
3633
export ZSH=~/.zgen/robbyrussell/oh-my-zsh-master/oh-my-zsh.sh
3734
export PATH=$HOME/bin:$PATH
3835
export PATH=$PATH:$HOME/go/bin
@@ -45,16 +42,19 @@ export PATH=$PATH:$HOME/.gem/ruby/2.4.0/bin
4542
export PATH=$PATH:/root/.gem/ruby/2.5.0/bin
4643
export PATH=$PATH:$HOME/.cargo/bin
4744
export PATH=$PATH:/snap/bin
48-
export PATH=$PATH:$HOME/.asdf/installs/golang/1.19.1/packages/bin
45+
export PATH=$PATH:$HOME/.asdf/installs/golang/1.20.4/packages/bin/
46+
export PATH=$PATH:$HOME/.asdf/installs/rust/beta/bin/
4947
export GPG_TTY=$(tty)
5048
export NODE_OPTIONS="--experimental-repl-await"
49+
export DISABLE_UPDATE_PROMPT=true
50+
export DISABLE_AUTO_UPDATE=true
5151

5252
NPM_PACKAGES="${HOME}/.npm-packages"
5353
PATH="$NPM_PACKAGES/bin:$PATH"
5454

5555
if ! zgen saved; then
5656
zgen oh-my-zsh
57-
zgen oh-my-zsh plugins/z
57+
#zgen oh-my-zsh plugins/z
5858
zgen save
5959
fi
6060

@@ -63,14 +63,71 @@ if (( $+commands[direnv] )) ; then
6363
fi
6464

6565
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
66-
[ -f ~/.fzf.colors ] && source ~/.fzf.colors
66+
#if [ "$TMUX" = "" ]; then tmux -2u new; fi
67+
if [ -t 0 ] && [[ -z $TMUX ]] && [[ $- = *i* ]]; then exec tmux; fi
68+
69+
eval "$(atuin init zsh --disable-up-arrow)"
6770

68-
if [ "$TMUX" = "" ]; then tmux -2u new; fi
71+
#eval "$(almel init zsh)"
72+
#eval "$(starship init zsh)"
73+
# eval "$(zoxide init zsh)"
74+
eval "$(oh-my-posh init zsh --config ~/.config/omp/agnoster.omp.json)"
6975

7076
# set PATH for cuda 10.1 installation
7177
if [ -d "/usr/local/cuda-10.2/bin/" ]; then
7278
export PATH=/usr/local/cuda-10.2/bin${PATH:+:${PATH}}
7379
export LD_LIBRARY_PATH=/usr/local/cuda-10.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
7480
fi
75-
export PATH="/home/tuxcanfly/Work/git-fuzzy/bin:$PATH"
76-
export LANG=en_US.utf8
81+
export LANG=en_US.UTF-8
82+
export LC_CTYPE=en_US.UTF-8
83+
84+
export PATH="$PATH:/Users/tuxcanfly/.foundry/bin"
85+
export ETH_RPC_URL=https://cloudflare-eth.com
86+
export ETHERSCAN_API_KEY=2PPG57MK97CYYUSYIBE45MSZJ5RWU28HKA
87+
88+
# Created by `pipx` on 2022-10-02 02:00:33
89+
export PATH="$PATH:/Users/tuxcanfly/Library/Python/3.10/bin"
90+
export DISABLE_AUTO_UPDATE=true
91+
92+
#source ~/Work/fzf-tab-completion/zsh/fzf-zsh-completion.sh
93+
#bindkey '^I' fzf_completion
94+
95+
source ~/Work/fzf-tab/fzf-tab.plugin.zsh
96+
97+
source ~/Work/forgit/forgit.plugin.zsh
98+
export PATH=$PATH:~/Work/forgit/bin/
99+
export FORGIT_FZF_DEFAULT_OPTS="
100+
--exact
101+
--border
102+
--cycle
103+
--reverse
104+
--height '80%'
105+
"
106+
export FZF_DEFAULT_OPTS="
107+
--border=rounded
108+
--margin=1
109+
--padding=1
110+
--info inline
111+
--reverse
112+
--cycle
113+
"
114+
115+
[ -f ~/.zsh.colors ] && source ~/.zsh.colors
116+
[ -f ~/.fzf.colors ] && source ~/.fzf.colors
117+
118+
export FZF_CTRL_T_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || cat {} || tree -C {}) 2> /dev/null | head -200'"
119+
export FZF_DEFAULT_COMMAND='fd --type f --strip-cwd-prefix --hidden --follow --exclude .git'
120+
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
121+
122+
[ -f ~/.zsh.fzf ] && . ~/.zsh.fzf
123+
[ -f ~/.fzf.docker ] && . ~/.fzf.docker
124+
export DENO_INSTALL="/Users/tuxcanfly/.deno"
125+
export PATH="$DENO_INSTALL/bin:$PATH"
126+
source ~/.env
127+
export bcli='bitcoin-cli -regtest -rpcport=18332 -rpcuser=rpcuser -rpcpassword=rpcpass'
128+
export FZF_COMPLETION_TRIGGER=','
129+
130+
# Added by Radicle.
131+
export PATH="$PATH:/Users/tuxcanfly/.radicle/bin"
132+
bindkey "^j" up-line-or-history
133+
bindkey "^k" down-line-or-history

0 commit comments

Comments
 (0)