diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml index 1590568..7be547b 100644 --- a/alacritty/.config/alacritty/alacritty.toml +++ b/alacritty/.config/alacritty/alacritty.toml @@ -114,7 +114,7 @@ hide_when_typing = true semantic_escape_chars = ",│`|:\"' ()[]{}<>" [terminal.shell] -args = ["-l", "-c", "/opt/homebrew/bin/tmux attach || /opt/homebrew/bin/tmux"] +args = ["-l", "-c", "tmux attach || tmux"] program = "/bin/bash" [window] diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml deleted file mode 100644 index 085dd58..0000000 --- a/alacritty/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,83 +0,0 @@ -env: - TERM: xterm-256color -window: - dimensions: - columns: 80 - lines: 24 - padding: - x: 0 - y: 0 - decorations: none - startup_mode: Maximized - dynamic_title: true -draw_bold_text_with_bright_colors: true -font: - normal: - family: Fira Code - style: Medium - bold: - family: Fira Code - style: Bold - italic: - family: Fira Code - style: Light - size: 24.0 - offset: - x: 0 - y: 0 - glyph_offset: - x: 0 - y: 0 - -colors: - primary: - background: "0x2E3440" - foreground: "0xD8DEE9" - cursor: - text: "0x2E3440" - cursor: "0xD8DEE9" - normal: - black: "0x3B4252" - red: "0xBF616A" - green: "0xA3BE8C" - yellow: "0xEBCB8B" - blue: "0x81A1C1" - magenta: "0xB48EAD" - cyan: "0x88C0D0" - white: "0xE5E9F0" - bright: - black: "0x4C566A" - red: "0xBF616A" - green: "0xA3BE8C" - yellow: "0xEBCB8B" - blue: "0x81A1C1" - magenta: "0xB48EAD" - cyan: "0x8FBCBB" - white: "0xECEFF4" - -mouse: - hide_when_typing: true -selection: - semantic_escape_chars: ',│`|:"'' ()[]{}<>' -cursor: - style: Block - unfocused_hollow: true -live_config_reload: true -shell: - program: /bin/bash - args: - - -l - - -c - - "/opt/homebrew/bin/tmux attach || /opt/homebrew/bin/tmux" - -key_bindings: - - { key: V, mods: Command, action: Paste } - - { key: C, mods: Command, action: Copy } - - { key: Paste, action: Paste } - - { key: Copy, action: Copy } - - { key: Q, mods: Command, action: Quit } - - { key: W, mods: Command, action: Quit } - - { key: Key0, mods: Command, action: ResetFontSize } - - { key: Equals, mods: Command, action: IncreaseFontSize } - - { key: Minus, mods: Command, action: DecreaseFontSize } - - { key: F18, chars: "\x02" } # Ctrl + B diff --git a/bash/.bashrc b/bash/.bashrc index 0826bb4..7ce5419 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -19,7 +19,7 @@ HISTCONTROL=ignoreboth HISTIGNORE='ls:ll:ls -alh:pwd:clear:history' HISTIGNORE=$HISTIGNORE':gcom:gcob:gd:gdc:gc:gca:gcw:gs:ga:grm:gup:gp:gpf:gpt:gb:gg:gl:gr:gr1:gh' HISTIGNORE=$HISTIGNORE':v:vi:nvim' -HISTIGNORE=$HISTIGNORE':k:kp:ks:kl:kgp:d:dc:dcu:dcd:dcr:dcl:dcs' +HISTIGNORE=$HISTIGNORE':k:s:p:y:kp:ks:kl:kgp:d:dc:dcu:dcd:dcr:dcl:dcs' # Immediately store command to the history PROMPT_COMMAND='history -a' @@ -36,6 +36,9 @@ export KUBE_TMUX_NS_ENABLE=false export BASH_SILENCE_DEPRECATION_WARNING=1 export HOMEBREW_NO_ENV_HINTS=true export RUBY_CONFIGURE_OPTS="--with-openssl-dir=/opt/homebrew/opt/openssl@1.1" +# Fix for the following error in some Ruby version +# objc[12590]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called. +export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib # export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" export EDITOR=nvim @@ -50,10 +53,6 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS --bind=ctrl-d:preview-page-down --bind=ctrl-u:preview-page-up" -# Fix for the following error in some Ruby version -# objc[12590]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called. -export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - alias ~='cd ~' alias l='eza' alias ls='eza' @@ -69,10 +68,17 @@ alias ..='cd ..' alias ...='cd ../..' alias md='mkdir -p' +alias pacman='sudo pacman' +alias p='sudo pacman' +alias s='sudo systemctl' +alias y='yay --noconfirm --answerdiff=None --answeredit=None' +alias yay='yay --noconfirm --answerdiff=None --answeredit=None' + + alias gco='git checkout' alias gcom='git checkout master' alias gcob='git checkout -b' -# TODO: git checkout --track origin/$1 +# TODO: git checkout --track origin/$1^W man git-switch --guess # alias gcot='git checkout' alias gd='git diff' alias gdc='git diff --cached' @@ -88,7 +94,7 @@ alias gp='git push' alias gpf='git push -f' alias gpt='git push origin --tags' alias gb='git branch' -alias gg='git go' +alias gg='git go' # checkout or create alias gl='git lg' alias gr='git reset' alias gr1='git reset HEAD~1' @@ -114,6 +120,11 @@ alias dcr='docker-compose restart' alias dcl='docker-compose logs -tf --tail="50"' alias dcs='docker-compose ps' +alias tf='tofu' +alias tfp='tofu plan' +alias tfa='tofu apply' +alias tff='tofu fmt' + alias k='kubectl' alias kp='kubectx matic-production' alias ks='kubectx matic-staging' @@ -143,6 +154,8 @@ alias proxy='kubectl port-forward -n staging svc/tinyproxy-svc 8888:8888' # Experimental alias ports='lsof -iTCP -sTCP:LISTEN -n -P' +alias ssn='sudo shutdown now' + o() { files="$(fzf --print0 --preview "bat --theme ansi --color always {}")" if [ -z "$files" ]; then diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index c49b3cb..19bc385 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,24 +1,24 @@ { - "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "LuaSnip": { "branch": "master", "commit": "776a29c3e1ac61029ac3f57ac6b5937df2340162" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-git": { "branch": "main", "commit": "b24309c386c9666c549a1abaedd4956541676d06" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, - "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "nord": { "branch": "main", "commit": "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c" }, - "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" }, - "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, - "nvim-lspconfig": { "branch": "master", "commit": "b1729954329236f59d075bec79fdee7a6f3ce88b" }, - "nvim-treesitter": { "branch": "master", "commit": "5874cac1b76c97ebb3fc03225bd7215d4e671cd2" }, - "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c2682b0d9732bf52cbc34862056f143e71dc4a6d" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "nord": { "branch": "main", "commit": "57fb474a1d628bdf9d1e7964719464ed5675d7c7" }, + "nvim-bqf": { "branch": "main", "commit": "e20417d5e589e03eaaaadc4687904528500608be" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "oil.nvim": { "branch": "master", "commit": "5b6068aad7d2057dd399fac73b7fb2cdf23ccd6e" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" } + "vim-tmux-navigator": { "branch": "master", "commit": "97e58f2b3b4f8fd30ce149302f10202f363cc361" } } diff --git a/nvim/.config/nvim/lua/config/mappings.lua b/nvim/.config/nvim/lua/config/mappings.lua index d69e521..8a1b44a 100644 --- a/nvim/.config/nvim/lua/config/mappings.lua +++ b/nvim/.config/nvim/lua/config/mappings.lua @@ -110,6 +110,7 @@ nmap('W', ':TrimWhitespace') nmap('q', ':copen') -- pick one (comma makes more sense?) +-- neovim devs have chosen for me https://neovim.io/doc/user/news-0.11.html nmap(']q', ':cnext') nmap('[q', ':cprev') nmap(',w', ':cnext') diff --git a/nvim/.config/nvim/lua/config/settings.lua b/nvim/.config/nvim/lua/config/settings.lua index d03f1d9..985bed9 100644 --- a/nvim/.config/nvim/lua/config/settings.lua +++ b/nvim/.config/nvim/lua/config/settings.lua @@ -21,7 +21,7 @@ opt.visualbell = false -- No visual bell opt.backup = false -- No backups opt.writebackup = false -- No backups opt.swapfile = false -- No backups -opt.mouse = 'a' -- Support mouse (for proper mouse highlight) +opt.mouse = '' -- Disable mouse opt.list = true -- List mode opt.timeoutlen = 1000 -- Delay for mappings opt.ttimeoutlen = 0 -- Delay between modes @@ -35,10 +35,10 @@ opt.timeoutlen = 1000 opt.ttimeoutlen = 10 opt.listchars = { - nbsp = '⦸', -- CIRCLED REVERSE SOLIDUS (U+29B8, UTF-8: E2 A6 B8) - extends = '»', -- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK (U+00BB, UTF-8: C2 BB) + nbsp = '⦸', -- CIRCLED REVERSE SOLIDUS (U+29B8, UTF-8: E2 A6 B8) + extends = '»', -- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK (U+00BB, UTF-8: C2 BB) precedes = '«', -- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK (U+00AB, UTF-8: C2 AB) - trail = '•', -- BULLET (U+2022, UTF-8: E2 80 A2) + trail = '•', -- BULLET (U+2022, UTF-8: E2 80 A2) space = ' ', tab = '→ ' } @@ -128,3 +128,5 @@ vim.api.nvim_create_autocmd({ 'InsertEnter', 'WinLeave' }, { -- Experimental opt.iskeyword:prepend { '-' } -- treat dash separated words as a word textobject + +vim.cmd('syntax on') diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index 0a5d2f9..5e8b73b 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -128,20 +128,20 @@ return { opts = { ensure_installed = { 'lua_ls', - 'dockerls', - 'docker_compose_language_service', - 'yamlls', - 'jsonls', - 'html', - 'cssls', - 'gopls', + -- 'dockerls', + -- 'docker_compose_language_service', + -- 'yamlls', + -- 'jsonls', + -- 'html', + -- 'cssls', + -- 'gopls', 'clangd', 'texlab', - 'ts_ls', - 'vtsls', + -- 'ts_ls', + -- 'vtsls', 'terraformls', 'helm_ls', - 'bashls' + -- 'bashls' }, handlers = { function(server_name)