diff --git a/home/any/bash/.bash_profile b/home/any/bash/.bash_profile index f854e0b..9864160 100644 --- a/home/any/bash/.bash_profile +++ b/home/any/bash/.bash_profile @@ -23,3 +23,5 @@ fi [ -f ~/.bash_profile.local ] && . "$HOME/.bash_profile.local" [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" + +. "$HOME/.atuin/bin/env" diff --git a/home/any/bash/.bashrc b/home/any/bash/.bashrc index 1e5c3ed..4774f83 100644 --- a/home/any/bash/.bashrc +++ b/home/any/bash/.bashrc @@ -101,6 +101,8 @@ else fi fi +[ -d "$HOME/.modular" ] && export PATH="$PATH:$HOME/.modular/bin" + if [ -d "$HOME/.kube" ] then export KUBECONFIG=$HOME/.kube/config.yaml @@ -156,3 +158,12 @@ then fi #### + +[[ -f ~/.bash-preexec.sh ]] && source ~/.bash-preexec.sh + +if [ -d ~/.atuin ] +then + source "$HOME/.atuin/bin/env" + eval "$(atuin init bash --disable-up-arrow)" + bind -x '"\C-r": __atuin_history' +fi diff --git a/home/any/var.dirs b/home/any/var.dirs new file mode 100644 index 0000000..b264aa2 --- /dev/null +++ b/home/any/var.dirs @@ -0,0 +1 @@ +.var/tmp/tmp diff --git a/home/any/var/.gitkeep b/home/any/var/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/home/any/var/tmp b/home/any/var/tmp new file mode 120000 index 0000000..6419e85 --- /dev/null +++ b/home/any/var/tmp @@ -0,0 +1 @@ +../../../../.var/tmp/tmp \ No newline at end of file diff --git a/home/any/vim.dirs b/home/any/vim.dirs index 9ddcb65..60ffa5d 100644 --- a/home/any/vim.dirs +++ b/home/any/vim.dirs @@ -3,4 +3,4 @@ .config/nvim/plugged .config/nvim/session .config/nvim/spell -.config/nvim/tmp +.var/tmp/vim/ diff --git a/home/any/vim/.config/nvim/vimrc b/home/any/vim/.config/nvim/vimrc index 3111de5..7061eda 100644 --- a/home/any/vim/.config/nvim/vimrc +++ b/home/any/vim/.config/nvim/vimrc @@ -146,6 +146,9 @@ Plug 'prabirshrestha/asyncomplete-lsp.vim' Plug 'neovim/nvim-lspconfig' " https://github.com/neovim/nvim-lspconfig Plug 'ziglang/zig.vim' " https://github.com/ziglang/zig.vim +" Mojo +Plug 'czheo/mojo.vim' + "***************************************************************************** "***************************************************************************** @@ -211,6 +214,8 @@ let g:session_command_aliases = 1 syntax on set ruler set number +set relativenumber +nnoremap nn :set relativenumber! let no_buffers_menu=1 colorscheme gruvbox @@ -246,7 +251,7 @@ endif "" Disable the blinking cursor. -set gcr=a:blinkon0 +" set gcr=a:blinkon0 au TermEnter * setlocal scrolloff=0 au TermLeave * setlocal scrolloff=3 @@ -675,6 +680,7 @@ au FileType rust nmap gs (rust-def-split) au FileType rust nmap gx (rust-def-vertical) au FileType rust nmap gd (rust-doc) +au FileType rust setlocal makeprg=make " Zig "disable format-on-save from `ziglang/zig.vim` @@ -737,9 +743,13 @@ else let g:airline_left_alt_sep = '' let g:airline_right_sep = '' let g:airline_right_alt_sep = '' - let g:airline_symbols.branch = '' + " let g:airline_symbols.branch = '' + let g:airline_symbols.branch = '' let g:airline_symbols.readonly = '' let g:airline_symbols.linenr = '' + let g:airline_symbols.notexists = ' 󱞄' + let g:airline_symbols.dirty = '󱞂' + let g:airline_symbols.crypt = '󰯄' endif "***************************************************************************** @@ -748,10 +758,11 @@ endif hi Normal guibg=NONE ctermbg=NONE command! W w !sudo tee >/dev/null % +command! Cleanup silent! execute "%bd|e#|bd#" -set backupdir=~/.vim/tmp/backup// -set directory=~/.vim/tmp/swap// -set undodir=~/.vim/tmp/undo// +set backupdir=~/.var/tmp/vim/backup// +set directory=~/.var/tmp/vim/swap// +set undodir=~/.var/tmp/vim/undo// set list lcs=tab:\⇥\ ,trail:▓ diff --git a/home/any/wezterm/.wezterm.lua b/home/any/wezterm/.wezterm.lua index a619ad0..63a3cd3 100644 --- a/home/any/wezterm/.wezterm.lua +++ b/home/any/wezterm/.wezterm.lua @@ -42,6 +42,11 @@ config.keys = { mods = 'CTRL|SHIFT', action = wezterm.action.ActivatePaneDirection "Down", }, + { + key = 'w', + mods = 'CTRL|SHIFT', + action = wezterm.action.CloseCurrentPane { confirm = true }, + }, } config.font = wezterm.font 'Fira Code Nerd Font'