From: Ruben Beltran del Rio Date: Mon, 17 Feb 2025 09:39:50 +0000 (+0100) Subject: Merge branch 'main' of git.sr.ht:~rbdr/dotfiles X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/f11b7c6e10afdaa1a23a1c768dd0d5034bc53964?hp=8c7856b8ac5a97314ab8e47902fe7788c0e45b57 Merge branch 'main' of git.sr.ht:~rbdr/dotfiles --- diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 1771500..3ddc8c4 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,28 +1,28 @@ { "LargeFile": { "branch": "master", "commit": "3941a37b2b0288524300348a39521a46539bf9f6" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, - "coq_nvim": { "branch": "coq", "commit": "976012b0c13763a47edbd55492ba53b03b498cdd" }, - "fzf-lua": { "branch": "main", "commit": "60428a8dc931639ee5e88756b2d7bc896cdc20c7" }, + "coq_nvim": { "branch": "coq", "commit": "9e77f1f6196c4d4c17160aae82e18ae3f4916ce6" }, + "fzf-lua": { "branch": "main", "commit": "471e33e9afa31c3b9ee22023913959eef8980b8f" }, "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" }, - "lazy.nvim": { "branch": "main", "commit": "72aa3a2624be5dc240646084f7b6a38eb99eb2ce" }, + "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "neogen": { "branch": "main", "commit": "dd0301bfba1f83a3bc009b5430fce7aa3cee6941" }, + "neogen": { "branch": "main", "commit": "d633d2ef572479792f6a09665fe5e897ed49f85c" }, "nota.nvim": { "branch": "main", "commit": "503bfaa93968986a9df5376c4543207c70dd2a07" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" }, - "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, + "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, + "nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" }, + "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "556ac68cd33973a38d3f2abac47f361432593fe2" }, - "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, - "oil.nvim": { "branch": "master", "commit": "c12fad2d225d8f81fadd48521d253607fe25465c" }, + "nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-treesitter": { "branch": "master", "commit": "2cade9e3d105732b794bc37e7cb2dc53b1cf99dc" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "cb718aab7fa66e43187674e875713097492a6618" }, + "oil.nvim": { "branch": "master", "commit": "975a77cce3c8cb742bc1b3629f4328f5ca977dad" }, "oleoboard.nvim": { "branch": "main", "commit": "3652b39db3a8faca3fb767ace799479124bc79f3" }, "snes-syntax-vim": { "branch": "master", "commit": "a6a699c8905f7b6119bf91e44f960667d9f03d59" }, "tree-sitter-api-notation": { "branch": "main", "commit": "3113c6077d9ed1e662a891714ac00e1ee3bb7657" }, "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" }, - "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" }, + "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" }, "vim-indent-object": { "branch": "master", "commit": "8ab36d5ec2a3a60468437a95e142ce994df598c6" }, "vim-togglelist": { "branch": "master", "commit": "48f0d30292efdf20edc883e61b121e6123e03df7" }, - "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } + "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" } } diff --git a/provisioning/apt_nice b/provisioning/apt_nice new file mode 100644 index 0000000..e361514 --- /dev/null +++ b/provisioning/apt_nice @@ -0,0 +1,2 @@ +-y +tmuxp diff --git a/provisioning/brew_cask_essential b/provisioning/brew_cask_essential index 7d5e720..d0b6eca 100644 --- a/provisioning/brew_cask_essential +++ b/provisioning/brew_cask_essential @@ -2,9 +2,8 @@ alt-tab bitwarden captura -cardhop clipy -fantastical +busycal firefox kitty mailmate@beta diff --git a/provisioning/brew_cask_nice b/provisioning/brew_cask_nice index f9fcad4..79a62d6 100644 --- a/provisioning/brew_cask_nice +++ b/provisioning/brew_cask_nice @@ -24,6 +24,7 @@ rapidapi sf-symbols signal sqlpro-studio +swift-bar swinsian syntax-highlight tailscale diff --git a/provisioning/brew_essential b/provisioning/brew_essential index 0b4134c..a39643b 100644 --- a/provisioning/brew_essential +++ b/provisioning/brew_essential @@ -1,3 +1,4 @@ +age asdf bat chafa diff --git a/provisioning/brew_nice b/provisioning/brew_nice index e31f378..c92135f 100644 --- a/provisioning/brew_nice +++ b/provisioning/brew_nice @@ -20,5 +20,6 @@ pulumi ranger telnet tldr +tmuxp weechat keith/formulae/contacts-cli diff --git a/provisioning/dnf_nice b/provisioning/dnf_nice index d075098..5e28e2d 100644 --- a/provisioning/dnf_nice +++ b/provisioning/dnf_nice @@ -2,3 +2,4 @@ aerc pandoc tuba +tmuxp diff --git a/provisioning/pacman_nice b/provisioning/pacman_nice index 8d51da1..3c80000 100644 --- a/provisioning/pacman_nice +++ b/provisioning/pacman_nice @@ -1,3 +1,4 @@ --noconfirm aerc pandoc-cli +tmuxp diff --git a/runcoms/zshrc b/runcoms/zshrc index d0bf0c6..1c4325e 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -66,7 +66,6 @@ if [[ -s "/opt/homebrew/bin/brew" ]]; then export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH export FZF_VIM_PATH=/opt/homebrew/opt/fzf . /opt/homebrew/etc/profile.d/z.sh - . /opt/homebrew/opt/asdf/libexec/asdf.sh else # Z (Linux) if [[ -s "/usr/libexec/z.sh" ]]; then diff --git a/zsh/modules/aliases.zsh b/zsh/modules/aliases.zsh index 0ff13f2..d0b98f3 100644 --- a/zsh/modules/aliases.zsh +++ b/zsh/modules/aliases.zsh @@ -28,4 +28,4 @@ alias gm='git merge' alias gp='git push' # JS friendly tree -alias arbol="tree -I 'node_modules|bower_components|doc|__pycache__|\.pyc'" +alias arbol="git ls-tree -r --name-only HEAD | tree --fromfile"