diff --git a/config/fish/conf.d/aliases.fish b/config/fish/conf.d/aliases.fish index 109dd78..d93a582 100644 --- a/config/fish/conf.d/aliases.fish +++ b/config/fish/conf.d/aliases.fish @@ -1,37 +1,25 @@ # aliases -alias sdr="screen -aAdr" +alias sdr='screen -aAdr' alias ls='exa' -alias la="exa -a" -alias ll="exa -laF" -alias mkpasswd="head -c16 /dev/urandom | xxd -ps" -alias mc="mc -b" +alias la='exa -a' +alias ll='exa -laF' +alias mkpasswd='head -c16 /dev/urandom | xxd -ps' +alias mc='mc -b' alias cdp='cd (~/bin/cdp); clear' +alias cx='container exec' -if command -sq grc - alias ping="grc --colour=auto ping" - alias traceroute="grc --colour=auto traceroute" - alias make="grc --colour=auto make" - alias diff="grc --colour=auto diff" - alias cvs="grc --colour=auto cvs" - alias netstat="grc --colour=auto netstat" - alias mount="grc --colour=auto mount" - alias ifconfig="grc --colour=auto ifconfig" - alias dig="grc --colour=auto dig" - alias ps="grc --colour=auto ps" -end +alias rgrep='grep --exclude-dir=Godeps --exclude-dir=node_modules --exclude-dir=log --exclude-dir=vendor --exclude-dir=tmp --exclude-dir=public --exclude-dir=.git --exclude=.swp -rn' +alias grep='grep --exclude-dir=.git --color=auto' -alias rgrep="grep --exclude-dir=Godeps --exclude-dir=node_modules --exclude-dir=log --exclude-dir=vendor --exclude-dir=tmp --exclude-dir=public --exclude-dir=.git --exclude=.swp -rn" -alias grep="grep --exclude-dir=.git --color=auto" - -alias ag="ag --path-to-ignore $HOME/.agignore --nogroup" +alias ag='ag --path-to-ignore $HOME/.agignore --nogroup' # Typos -alias igt="git" -alias gti="git" -alias gitst="git st" +alias igt='git' +alias gti='git' +alias gitst='git st' # Ledger -# alias ledger="noglob ledger" -# alias "bin/ledger"="noglob bin/ledger" +# alias ledger='noglob ledger' +# alias 'bin/ledger'='noglob bin/ledger' # -# alias icat="kitty +kitten icat" +# alias icat='kitty +kitten icat' diff --git a/config/fish/fish_variables b/config/fish/fish_variables index e0072c1..2a141ca 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -10,14 +10,12 @@ SETUVAR __fish_init_2_39_8:\x1d SETUVAR __fish_init_2_3_0:\x1d SETUVAR __fish_init_3_x:\x1d SETUVAR __fish_initialized:3100 -SETUVAR _fisher_FabioAntunes_2F_fish_2D_nvm_files:/home/krsh/\x2econfig/fish/functions/__nvm_run\x2efish\x1e/home/krsh/\x2econfig/fish/functions/node\x2efish\x1e/home/krsh/\x2econfig/fish/functions/npm\x2efish\x1e/home/krsh/\x2econfig/fish/functions/npx\x2efish\x1e/home/krsh/\x2econfig/fish/functions/nvm\x2efish\x1e/home/krsh/\x2econfig/fish/functions/nvm_alias_command\x2efish\x1e/home/krsh/\x2econfig/fish/functions/nvm_alias_function\x2efish\x1e/home/krsh/\x2econfig/fish/functions/yarn\x2efish\x1e/home/krsh/\x2econfig/fish/completions/nvm\x2efish SETUVAR _fisher_edc_2F_bass_files:/home/krsh/\x2econfig/fish/functions/__bass\x2epy\x1e/home/krsh/\x2econfig/fish/functions/bass\x2efish SETUVAR _fisher_franciscolourenco_2F_done_files:/home/krsh/\x2econfig/fish/conf\x2ed/done\x2efish SETUVAR _fisher_jethrokuan_2F_fzf_files:/home/krsh/\x2econfig/fish/functions/__fzf_cd\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzf_complete\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzf_complete_preview\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzf_find_file\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzf_get_dir\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzf_open\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzf_parse_commandline\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzf_reverse_isearch\x2efish\x1e/home/krsh/\x2econfig/fish/functions/__fzfcmd\x2efish\x1e/home/krsh/\x2econfig/fish/conf\x2ed/fzf\x2efish SETUVAR _fisher_jorgebucaran_2F_fisher_files:/home/krsh/\x2econfig/fish/functions/fisher\x2efish\x1e/home/krsh/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher_jorgebucaran_2F_spark_2E_fish_files:/home/krsh/\x2econfig/fish/functions/spark\x2efish\x1e/home/krsh/\x2econfig/fish/completions/spark\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1erbenv/fish\x2drbenv\x1ejethrokuan/fzf\x1ejorgebucaran/spark\x2efish\x1efranciscolourenco/done\x1eFabioAntunes/fish\x2dnvm\x1eedc/bass -SETUVAR _fisher_rbenv_2F_fish_2D_rbenv_files:/home/krsh/\x2econfig/fish/functions/rbenv\x2efish\x1e/home/krsh/\x2econfig/fish/conf\x2ed/rbenv\x2efish\x1e/home/krsh/\x2econfig/fish/completions/rbenv\x2efish +SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/fzf\x1ejorgebucaran/spark\x2efish\x1efranciscolourenco/done\x1eedc/bass SETUVAR fish_color_autosuggestion:969896 SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:7aa6da @@ -48,4 +46,5 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR --export fish_user_paths:/home/krsh/\x2erbenv/bin +SETUVAR grc_plugin_execs:cat\x1ecvs\x1edf\x1ediff\x1edig\x1egcc\x1eg\x2b\x2b\x1els\x1eifconfig\x1emake\x1emount\x1emtr\x1enetstat\x1eping\x1eps\x1etail\x1etraceroute\x1ewdiff\x1eblkid\x1edu\x1ednf\x1edocker\x1edocker\x2dcompose\x1edocker\x2dmachine\x1eenv\x1eid\x1eip\x1eiostat\x1ejournalctl\x1ekubectl\x1elast\x1elsattr\x1elsblk\x1elspci\x1elsmod\x1elsof\x1egetfacl\x1egetsebool\x1eulimit\x1euptime\x1enmap\x1efdisk\x1efindmnt\x1efree\x1esemanage\x1esar\x1ess\x1esysctl\x1esystemctl\x1estat\x1eshowmount\x1etcpdump\x1etune2fs\x1evmstat\x1ew\x1ewho\x1esockstat SETUVAR pure_version:2\x2e1\x2e8 diff --git a/config/htop/htoprc b/config/htop/htoprc index 5214022..e5d7207 100644 --- a/config/htop/htoprc +++ b/config/htop/htoprc @@ -21,7 +21,7 @@ highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 show_merged_command=0 -tree_view=0 +tree_view=1 tree_view_always_by_pid=0 all_branches_collapsed=0 header_margin=1 diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 9bbdd14..20a831b 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -55,6 +55,9 @@ Plug 'editorconfig/editorconfig-vim' Plug 'tpope/vim-surround' Plug 'tpope/vim-unimpaired' Plug 'tpope/vim-endwise' +Plug 'tpope/vim-rsi' +Plug 'tpope/vim-abolish' +Plug 'tpope/vim-eunuch' Plug 'rstacruz/vim-closer' Plug 'godlygeek/tabular' @@ -186,17 +189,16 @@ end -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches local servers = { - 'eslint', - 'erlangls', - 'solargraph', - 'tsserver', - 'stylelint_lsp', - 'eslint', - 'zls', 'ansiblels', 'bashls', 'ccls', + 'erlangls', + 'eslint', 'gdscript', + 'solargraph', + 'stylelint_lsp', + 'tsserver', + 'zls', } -- Setup lspconfig. @@ -207,7 +209,7 @@ capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { flags = { - debounce_text_changes = 400, + debounce_text_changes = 1000, }, on_attach = on_attach, capabilities = capabilities diff --git a/gitignore_global b/gitignore_global index 75be5cb..9cb4499 100644 --- a/gitignore_global +++ b/gitignore_global @@ -26,3 +26,4 @@ report*.json /.ignore/ .gitignore.local +.envrc.container diff --git a/xinitrc b/xinitrc index 50caa27..a1120d7 100755 --- a/xinitrc +++ b/xinitrc @@ -19,6 +19,7 @@ export DOCKER_HOST=unix:///run/user/1000/podman/podman.sock # https://github.com/robbert-vdh/yabridge#environment-configuration export WINEFSYNC=1 +export SUDO_ASKPASS=/usr/bin/ssh-askpass-fullscreen # TrackPoint+Middleclick scroll xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1