diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 59df46e..5bc5f95 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -46,6 +46,7 @@ vim.keymap.set('n', '', ":FzfLua files") vim.keymap.set('n', 'gh', ":FzfLua helptags") vim.keymap.set('n', 'gg', ":FzfLua live_grep") vim.keymap.set('n', 'xx', ":FzfLua diagnostics_workspace") +vim.keymap.set('n', 'po', ":PolydevOpen") vim.lsp.enable({ "lua_ls", "clangd" }) require('mini.pairs').setup() diff --git a/.config/starship.toml b/.config/starship.toml index a036351..b2b5331 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -1,34 +1,70 @@ format = """ +$username\ +$hostname\ $directory\ $git_branch\ $git_state\ +$git_status\ +$cmd_duration\ +$line_break\ $character""" -add_newline = false -palette = "everforest" +# add_newline = false +# palette = "everforest" [directory] -style = "fg:orange" -read_only_style = "fg:orange" -truncation_length = 3 -truncation_symbol = "…/" -format = "[ $path]($style)[$read_only]($read_only_style) " - -[git_branch] -style = "fg:green" -symbol = " " -format = "[$symbol$branch(:$remote_branch)]($style) " +style = "blue" [character] -success_symbol = '[>](bold green)' -error_symbol = '[?](bold red)' +success_symbol = "[❯](purple)" +error_symbol = "[❯](red)" +vimcmd_symbol = "[❮](green)" -[palettes.everforest] -fg = "#d3c6aa" -red = "#e67e80" -orange = "#e69875" -yellow = "#dbbc7f" -green = "#a7c080" -aqua = "#83c092" -blue = "#7fbbb3" -purple = "#d699b6" +[git_branch] +format = "[$branch]($style)" +style = "bright-black" + +[git_status] +format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)" +style = "cyan" +conflicted = "​" +untracked = "​" +modified = "​" +staged = "​" +renamed = "​" +deleted = "​" +stashed = "≡" + +[git_state] +format = '\([$state( $progress_current/$progress_total)]($style)\) ' +style = "bright-black" + +[cmd_duration] +format = "[$duration]($style) " +style = "yellow" + +# [directory] +# style = "fg:orange" +# read_only_style = "fg:orange" +# truncation_length = 3 +# truncation_symbol = "…/" +# format = "[ $path]($style)[$read_only]($read_only_style) " +# +# [git_branch] +# style = "fg:green" +# symbol = " " +# format = "[$symbol$branch(:$remote_branch)]($style) " +# +# [character] +# success_symbol = '[>](bold green)' +# error_symbol = '[?](bold red)' +# +# [palettes.everforest] +# fg = "#d3c6aa" +# red = "#e67e80" +# orange = "#e69875" +# yellow = "#dbbc7f" +# green = "#a7c080" +# aqua = "#83c092" +# blue = "#7fbbb3" +# purple = "#d699b6" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 8627453..d731c48 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -6,9 +6,13 @@ set -g focus-events on set-option -g default-terminal "tmux-256color" set-option -as terminal-features ',xterm-ghostty:RGB' set-option -g default-shell $SHELL -set -g status-style 'fg=#d3c6aa bg=default' + +set -g status-style 'fg=#859289 bg=default' set -g status-left-length 100 -set -g status-left "#[fg=#e69875, bold] #S #[fg=#d3c6aa,nobold]| " +set -g status-right-length 20 +set -g status-left "#[fg=#7fbbb3, bold] #S #[fg=#859289,nobold]- " +set -g status-right "#[fg=#859289] %m-%d-%Y #[fg=#7fbbb3] %H:%M" + set -g base-index 1 set -g pane-base-index 1 set -g detach-on-destroy off diff --git a/.zshrc b/.zshrc index 02337d3..b0c42f1 100644 --- a/.zshrc +++ b/.zshrc @@ -2,6 +2,12 @@ HISTFILE=~/.zsh_history HISTSIZE=100 SAVEHIST=200 +bindkey "^[[1;5C" forward-word +bindkey "^[[1;5D" backward-word +bindkey "^[[3~" delete-char +bindkey "^[[5~" up-line +bindkey "^[[6~" down-line + source "$HOME/.local/share/zinit/zinit.git/zinit.zsh" zinit light zsh-users/zsh-autosuggestions