From 17cf256dfcf32d298ff29115b747df2df678c7bc Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Mon, 11 Aug 2025 22:19:05 -0400 Subject: Revert to basic zsh prompt --- install.sh | 1 - .../nvim/lua/eugenetriguba/plugins/tree-sitter.lua | 1 + starship/.config/starship.toml | 190 --------------------- zsh/.zsh/prompt.sh | 10 +- 4 files changed, 10 insertions(+), 192 deletions(-) delete mode 100644 starship/.config/starship.toml diff --git a/install.sh b/install.sh index 0bf6fad..014c510 100755 --- a/install.sh +++ b/install.sh @@ -30,7 +30,6 @@ main() { stow msmtp stow atuin stow lazygit - stow starship echo "Successfully linked all dotfiles." mkdir -p ~/Mail/Gmail/INBOX ~/Mail/iCloud/INBOX ~/bin/ ~/src/ diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua index 1f57e46..07c8157 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/tree-sitter.lua @@ -2,6 +2,7 @@ vim.pack.add { { name = 'nvim-treesitter', src = 'https://github.com/nvim-treesitter/nvim-treesitter', + version = 'main', }, { name = 'nvim-treesitter-context', diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml deleted file mode 100644 index a93f141..0000000 --- a/starship/.config/starship.toml +++ /dev/null @@ -1,190 +0,0 @@ -[aws] -symbol = " " - -[buf] -symbol = " " - -[bun] -symbol = " " - -[c] -symbol = " " - -[cpp] -symbol = " " - -[cmake] -symbol = " " - -[conda] -symbol = " " - -[crystal] -symbol = " " - -[dart] -symbol = " " - -[deno] -symbol = " " - -[directory] -read_only = " 󰌾" - -[docker_context] -symbol = " " - -[elixir] -symbol = " " - -[elm] -symbol = " " - -[fennel] -symbol = " " - -[fossil_branch] -symbol = " " - -[gcloud] -symbol = " " - -[git_branch] -symbol = " " - -[git_commit] -tag_symbol = '  ' - -[golang] -symbol = " " - -[guix_shell] -symbol = " " - -[haskell] -symbol = " " - -[haxe] -symbol = " " - -[hg_branch] -symbol = " " - -[hostname] -ssh_symbol = " " - -[java] -symbol = " " - -[julia] -symbol = " " - -[kotlin] -symbol = " " - -[lua] -symbol = " " - -[memory_usage] -symbol = "󰍛 " - -[meson] -symbol = "󰔷 " - -[nim] -symbol = "󰆥 " - -[nix_shell] -symbol = " " - -[nodejs] -symbol = " " - -[ocaml] -symbol = " " - -[os.symbols] -Alpaquita = " " -Alpine = " " -AlmaLinux = " " -Amazon = " " -Android = " " -Arch = " " -Artix = " " -CachyOS = " " -CentOS = " " -Debian = " " -DragonFly = " " -Emscripten = " " -EndeavourOS = " " -Fedora = " " -FreeBSD = " " -Garuda = "󰛓 " -Gentoo = " " -HardenedBSD = "󰞌 " -Illumos = "󰈸 " -Kali = " " -Linux = " " -Mabox = " " -Macos = " " -Manjaro = " " -Mariner = " " -MidnightBSD = " " -Mint = " " -NetBSD = " " -NixOS = " " -Nobara = " " -OpenBSD = "󰈺 " -openSUSE = " " -OracleLinux = "󰌷 " -Pop = " " -Raspbian = " " -Redhat = " " -RedHatEnterprise = " " -RockyLinux = " " -Redox = "󰀘 " -Solus = "󰠳 " -SUSE = " " -Ubuntu = " " -Unknown = " " -Void = " " -Windows = "󰍲 " - -[package] -symbol = "󰏗 " - -[perl] -symbol = " " - -[php] -symbol = " " - -[pijul_channel] -symbol = " " - -[pixi] -symbol = "󰏗 " - -[python] -symbol = " " - -[rlang] -symbol = "󰟔 " - -[ruby] -symbol = " " - -[rust] -symbol = "󱘗 " - -[scala] -symbol = " " - -[swift] -symbol = " " - -[zig] -symbol = " " - -[gradle] -symbol = " " diff --git a/zsh/.zsh/prompt.sh b/zsh/.zsh/prompt.sh index 53d565f..ef015fd 100644 --- a/zsh/.zsh/prompt.sh +++ b/zsh/.zsh/prompt.sh @@ -1,3 +1,11 @@ #!/usr/bin/env zsh -eval "$(starship init zsh)" +autoload -Uz vcs_info +zstyle ":vcs_info:*" enable git svn +zstyle ':vcs_info:git:*' formats '%F{green}(%b)%f ' +precmd() { + vcs_info +} +setopt prompt_subst +NEWLINE=$'\n' +PROMPT=' %2~ ${vcs_info_msg_0_}%# ' -- cgit v1.2.3 From ce6ec9e948909a6007461c13c65a5e8ada38aa7d Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Mon, 11 Aug 2025 22:49:04 -0400 Subject: Use git and tabline from mini --- nvim/.config/nvim/lua/eugenetriguba/keymaps.lua | 4 ++++ nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua | 2 ++ 2 files changed, 6 insertions(+) diff --git a/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua b/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua index 7b65adf..6c02c02 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/keymaps.lua @@ -18,3 +18,7 @@ map('n', '', '', { desc = 'Move focus to the left window' }) map('n', '', '', { desc = 'Move focus to the right window' }) map('n', '', '', { desc = 'Move focus to the lower window' }) map('n', '', '', { desc = 'Move focus to the upper window' }) + +-- Keybindings to cycle through open tabs easier +map('n', '', 'tabprevious', { desc = 'Open tab to the left' }) +map('n', '', 'tabnext', { desc = 'Open tab to the right' }) diff --git a/nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua b/nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua index 5f8f862..d00b8de 100644 --- a/nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua +++ b/nvim/.config/nvim/lua/eugenetriguba/plugins/mini.lua @@ -6,6 +6,8 @@ vim.pack.add { } require('mini.pairs').setup() +require('mini.git').setup() +require('mini.tabline').setup() -- Better Around/Inside textobjects -- -- cgit v1.2.3