From 6df1940eb8634c2fe89aa20a1729028d0019115f Mon Sep 17 00:00:00 2001 From: aleidk Date: Wed, 13 Nov 2024 13:06:15 -0300 Subject: [PATCH] fix nvim-tmux navigation inside distrobox --- config/nvim/lua/aleidk/plugins/lsp.lua | 3 +- config/nvim/lua/aleidk/plugins/mason.lua | 11 +- config/starship.toml | 193 +++++++---------------- config/tmux/tmux.conf | 2 +- config/zsh/aliases/aliases.zsh | 1 + config/zsh/zprofile | 4 +- 6 files changed, 64 insertions(+), 150 deletions(-) diff --git a/config/nvim/lua/aleidk/plugins/lsp.lua b/config/nvim/lua/aleidk/plugins/lsp.lua index 8512c8d..4a4c40d 100644 --- a/config/nvim/lua/aleidk/plugins/lsp.lua +++ b/config/nvim/lua/aleidk/plugins/lsp.lua @@ -158,7 +158,8 @@ return { mason_lspconfig.setup({ ensure_installed = vim.tbl_keys(servers), - automatic_installation = { exclude = { "astro", "phpactor", "gopls", "rust_analyzer", "sqlls" } }, + -- automatic_installation = { exclude = { "astro", "phpactor", "rust_analyzer", "sqlls" } }, + automatic_installation = false, }) mason_lspconfig.setup_handlers({ diff --git a/config/nvim/lua/aleidk/plugins/mason.lua b/config/nvim/lua/aleidk/plugins/mason.lua index cee4bfd..6353e53 100644 --- a/config/nvim/lua/aleidk/plugins/mason.lua +++ b/config/nvim/lua/aleidk/plugins/mason.lua @@ -4,15 +4,6 @@ return { keys = { { "um", "Mason", desc = "Mason" } }, build = ":MasonUpdate", opts = { - ensure_installed = { - "blue", - "ruff", - "eslint_d", - "markdownlint", - "nimlsp", - "prettierd", - "shellcheck", - "stylua", - }, + ensure_installed = {}, }, } diff --git a/config/starship.toml b/config/starship.toml index 8b3da4d..cf03107 100644 --- a/config/starship.toml +++ b/config/starship.toml @@ -1,149 +1,70 @@ # Get editor completions based on the config schema "$schema" = 'https://starship.rs/config-schema.json' +palette = "catppuccin_macchiato" + +format = "$directory\n$container$character" +right_format = "$all" + # Inserts a blank line between shell prompts -add_newline = true +add_newline = false -# Replace the '❯' symbol in the prompt with '➜' [character] # The name of the module we are configuring is 'character' -success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green' +success_symbol = '[➜](bold green)' +error_symbol = '[➜](bold red)' -[aws] -symbol = " " - -[buf] -symbol = " " - -[c] -symbol = " " - -[conda] -symbol = " " - -[dart] -symbol = " " - -[directory] -read_only = " " - -[docker_context] -symbol = " " - -[elixir] -symbol = " " - -[elm] -symbol = " " - -[fossil_branch] -symbol = " " +[container] +symbol = "󰆧" +style = 'mauve' +format = '[$symbol \[$name\]]($style) ' [git_branch] -symbol = " " +symbol = "󰘬 " +format = '[$symbol$branch(:$remote_branch)]($style) ' + +[git_status] +style = '' +format = '([\[${all_status}${ahead_behind}\]]($style))' + +conflicted = ' ' +ahead = ' ' +behind = ' ' +diverged = ' ' +up_to_date = '[ ](green)' +untracked = ' ' +stashed = '󰮄 ' +modified = '[ \($count\)](peach) ' +staged = '[ \($count\)](green) ' +renamed = ' ' +deleted = '[ \($count\)](red) ' [golang] symbol = " " -[guix_shell] -symbol = " " - -[haskell] -symbol = " " - -[haxe] -symbol = "⌘ " - -[hg_branch] -symbol = " " - -[hostname] -ssh_symbol = " " - -[java] -symbol = " " - -[julia] -symbol = " " - -[lua] -symbol = " " - -[memory_usage] -symbol = " " - -[meson] -symbol = "喝 " - -[nim] -symbol = " " - -[nix_shell] -symbol = " " - -[nodejs] -symbol = " " - -[os.symbols] -Alpaquita = " " -Alpine = " " -Amazon = " " -Android = " " -Arch = " " -Artix = " " -CentOS = " " -Debian = " " -DragonFly = " " -Emscripten = " " -EndeavourOS = " " -Fedora = " " -FreeBSD = " " -Garuda = "﯑ " -Gentoo = " " -HardenedBSD = "ﲊ " -Illumos = " " -Linux = " " -Mabox = " " -Macos = " " -Manjaro = " " -Mariner = " " -MidnightBSD = " " -Mint = " " -NetBSD = " " -NixOS = " " -OpenBSD = " " -openSUSE = " " -OracleLinux = " " -Pop = " " -Raspbian = " " -Redhat = " " -RedHatEnterprise = " " -Redox = " " -Solus = "ﴱ " -SUSE = " " -Ubuntu = " " -Unknown = " " -Windows = " " - -[package] -symbol = " " - -[pijul_channel] -symbol = "🪺 " - -[python] -symbol = " " - -[rlang] -symbol = "ﳒ " - -[ruby] -symbol = " " - -[rust] -symbol = " " - -[scala] -symbol = " " - -[spack] -symbol = "🅢 " +[palettes.catppuccin_macchiato] +rosewater = "#f4dbd6" +flamingo = "#f0c6c6" +pink = "#f5bde6" +mauve = "#c6a0f6" +red = "#ed8796" +maroon = "#ee99a0" +peach = "#f5a97f" +yellow = "#eed49f" +green = "#a6da95" +teal = "#8bd5ca" +sky = "#91d7e3" +sapphire = "#7dc4e4" +blue = "#8aadf4" +lavender = "#b7bdf8" +text = "#cad3f5" +subtext1 = "#b8c0e0" +subtext0 = "#a5adcb" +overlay2 = "#939ab7" +overlay1 = "#8087a2" +overlay0 = "#6e738d" +surface2 = "#5b6078" +surface1 = "#494d64" +surface0 = "#363a4f" +base = "#24273a" +mantle = "#1e2030" +crust = "#181926" diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index c24df25..b65e8b1 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -188,7 +188,7 @@ TMUX_FZF_LAUNCH_KEY="w" TMUX_FZF_OPTIONS="-p -w 80% -h 60% -m" # Tmux Management -bind-key "f" run-shell "~/.local/share/chezmoi/scripts/fzf-tmux-sessions" +bind-key "f" run-shell "~/Repos/Private/dots/scripts/fzf-tmux-sessions" bind-key "F" run-shell -b "$HOME/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch" # bind-key "F" run-shell -b "$HOME/.config/tmux/plugins/tmux-fzf/scripts/window.sh switch" diff --git a/config/zsh/aliases/aliases.zsh b/config/zsh/aliases/aliases.zsh index d0b7088..4f0a39a 100644 --- a/config/zsh/aliases/aliases.zsh +++ b/config/zsh/aliases/aliases.zsh @@ -45,6 +45,7 @@ alias \ pps="podman ps --format 'table {{.ID}}\t{{.Names}}\t{{.State}}\t{{.Status}}\t{{.RunningFor}}'" alias tm="fzf-tmux-sessions" +alias tmux="tmux -L $(hostname)" # allow to seamlessly create new servers inside containers # Misc alias \ diff --git a/config/zsh/zprofile b/config/zsh/zprofile index cf0977d..cd1614c 100644 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -16,8 +16,8 @@ export NPM_PACKAGES="$HOME/.npm-packages" export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}" export PNPM_HOME="$HOME/.local/share/pnpm" export ESLINT_USE_FLAT_CONFIG=true -. "$HOME/.cargo/env" -source "$HOME/.rye/env" +# . "$HOME/.cargo/env" +# source "$HOME/.rye/env" # Unset manpath so we can inherit from /etc/manpath via the `manpath` # command