From 502ad0831dad057656855fa1dd59eff848170c61 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 12 Jan 2024 22:51:03 +0100 Subject: [PATCH 01/23] Adapt zsh config on Mac --- dot_zshrc.tmpl | 63 ++++++++++---------------------------------------- 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 57f5fc0..e778a58 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -1,4 +1,4 @@ -eval $(keychain --eval --agents ssh id_rsa) +eval $(keychain --eval --agents ssh id_ed25519) [ -f ~/.keychain/$HOSTNAME-sh ] && . ~/.keychain/$HOSTNAME-sh 2>/dev/null if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then @@ -6,7 +6,6 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] fi ZSH=$HOME/.oh-my-zsh -ZSH_THEME="powerlevel10k/powerlevel10k" ZSH_DISABLE_COMPFIX="true" # CASE_SENSITIVE="true" @@ -23,67 +22,29 @@ zle -N zle-line-init zle -N zle-keymap-select export KEYTIMEOUT=1 -function ll { - cd "$(llama "$@")" -} - plugins={{ .plugins }} source $ZSH/oh-my-zsh.sh -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh export PATH=/usr/local/bin:/usr/local/sbin:$PATH export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 export EDITOR='nvim' export GOPATH=$HOME/go -export GPG_TTY=$TTY - -{{- if eq .chezmoi.os "openbsd" }} -export PORTSDIR_PATH=/usr/ports/:/usr/ports/openbsd-wip -export PATH="$HOME/dev/src/ltex-ls-15.2.0/bin:$HOME/local/bin:$HOME/perl5/bin:$HOME/gems/bin:$HOME/.cargo/bin:$HOME/.yarn/bin:$PATH" -export PERL5LIB=$HOME/perl5/lib/perl5 -export PERL_LOCAL_LIB_ROOT=$HOME/perl5 -export PERL_MB_OPT='--install_base "/home/jan/perl5"' -export PERL_MM_OPT='INSTALL_BASE=/home/jan/perl5' -export JAVA_HOME=/usr/local/jdk-11/ -export PMIX_MCA_gds='hash' - -alias top='htop' -alias ctags='uctags' -alias make='gmake' -alias tar='gtar' -alias man='manpager.sh' -alias mutt='neomutt' -alias dvim='doas nvim' -alias ic='doas ifconfig' -alias pq='doas pkg_info -Q' -alias pa='doas pkg_add' -alias pd='doas pkg_delete' -alias lpr='/usr/local/bin/lpr' -alias gpget='gopass -c' -alias ruby='ruby30' -alias gem='gem30' -alias bundle='bundle30' -alias mnt-net='doas mount_nfs -3 -a 4 -T -r 32768 -o noatime,nodev,noexec 192.168.178.10:/volume1/Data /mnt/nfs' -alias umnt-net='doas umount /mnt/nfs' -alias mnt-usb='doas mount /dev/sd1i /mnt/usb' -alias umnt-usb='doas umount /mnt/usb' -alias mnt-secret='doas mount dev/sd1c /mnt/encrypted_usb' -alias umnt-secret='doas unmount /mnt/encrypted_usb' -alias bkp-home='doas restic -r /mnt/nfs/BSD/restic-repo --verbose backup --one-file-system /home/jan --exclude /home/jan/data' -alias bkp-etc='doas restic -r /mnt/nfs/BSD/restic-repo --verbose backup /etc' -alias bkp-list='doas restic -r /mnt/nfs/BSD/restic-repo snapshots' -{{- else }} +{{ if eq .chezmoi.os "darwin" }} +source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme source $HOME/perl5/perlbrew/etc/bashrc -export PATH=$HOME/local/bin:$GOPATH/bin:$PATH {{- if eq .chezmoi.arch "arm64" }} export PATH=/opt/homebrew/bin:$PATH -{{- else }} -export PATH=/usr/local/opt/sqlite/bin:/usr/local/opt/ruby/bin:/usr/local/opt/mariadb@10.4/bin:$PATH -{{- end }} -{{- end }} +{{ end }} +{{ end }} + +alias ld='eza -lD' +alias lf='eza -lF --color=always | grep -v /' +alias lh='eza -dl .* --group-directories-first' +alias ll='eza -al --group-directories-first' +alias ls='eza -alF --color=always --sort=size | grep -v /' +alias lt='eza -al --sort=modified' -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh From 3bab66761575e4e70184c334d6b15c3af2e9dbbb Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Sat, 13 Jan 2024 22:33:54 +0100 Subject: [PATCH 02/23] Switch to tmux catpuccin theme --- dot_tmux.conf.tmpl | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index e0898ce..0025a80 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -71,24 +71,33 @@ setw -g aggressive-resize on set -g default-command {{ .shell }} set -g default-shell {{ .shell }} -# status bar set-option -g status-position top -set -g status-bg 'colour235' -set -g status-fg 'colour223' -set -g status-justify 'centre' -set -g status-left-length '100' -set -g status 'on' -set -g status-right-length '100' -set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour222,bg=colour238] #W #[fg=colour8,bg=colour237] #(whoami) ' -set -g status-right '#[fg=colour8,bg=colour237] %H:%M %a %d #[fg=colour222,bg=colour238] #h #[fg=colour232,bg=colour154] {{ .status }} ' -setw -g window-status-format '#[default] #I #W ' -setw -g window-status-current-format '#[fg=colour222,bg=colour238] #I #W #F ' +set -g @catppuccin_window_left_separator "" +set -g @catppuccin_window_right_separator " " +set -g @catppuccin_window_middle_separator " █" +set -g @catppuccin_window_number_position "right" + +set -g @catppuccin_window_default_fill "number" +set -g @catppuccin_window_default_text "#W" + +set -g @catppuccin_window_current_fill "number" +set -g @catppuccin_window_current_text "#W" + +set -g @catppuccin_status_modules_right "directory user host session" +set -g @catppuccin_status_left_separator " " +set -g @catppuccin_status_right_separator "" +set -g @catppuccin_status_right_separator_inverse "no" +set -g @catppuccin_status_fill "icon" +set -g @catppuccin_status_connect_separator "no" + +set -g @catppuccin_directory_text "#{pane_current_path}" # List of plugins set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-logging' set -g @plugin 'olimorris/tmux-pomodoro-plus' set -g @plugin "jlipps/tmux-safekill" +set -g @plugin 'catppuccin/tmux' {{- if eq .chezmoi.os "openbsd" }} set -g @plugin 'tmux-plugins/tmux-battery' {{- end }} From 10241e63cc16fb1dc33a435cccde4efb6a55dc0c Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Sun, 14 Jan 2024 08:36:11 +0100 Subject: [PATCH 03/23] Switch to startship prompt --- dot_config/kitty/kitty.conf | 27 ++++++++++++++++++++++++--- dot_zshrc.tmpl | 7 +------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 105f989..8bdce28 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -7,11 +7,11 @@ #: characters. # font_family Source Code Pro -font_family BrutalistMono Nerd Font Regular +font_family BrutalistMono Book # font_family Fira Code Medium # font_family Fira Code # font_family Hack Regular -bold_font BrutalistMono Nerd Font Regular +bold_font BrutalistMono Book # italic_font auto # bold_italic_font auto @@ -41,7 +41,28 @@ text_composition_strategy 1.0 #: than 100% to reduce sizes (but this might cause rendering #: artifacts). -# symbol_map U+E0A0-U+E0A2,U+E0B0-U+E0B3 PowerlineSymbols +# Seti-UI + Custom +symbol_map U+E5FA-U+E62B Symbols Nerd Font +# Devicons +symbol_map U+E700-U+E7C5 Symbols Nerd Font +# Font Awesome +symbol_map U+F000-U+F2E0 Symbols Nerd Font +# Font Awesome Extension +symbol_map U+E200-U+E2A9 Symbols Nerd Font +# Material Design Icons +symbol_map U+F500-U+FD46 Symbols Nerd Font +# Weather +symbol_map U+E300-U+E3EB Symbols Nerd Font +# Octicons +symbol_map U+F400-U+F4A8,U+2665,U+26A1,U+F27C Symbols Nerd Font +# Powerline Extra Symbols +symbol_map U+E0A3,U+E0B4-U+E0C8,U+E0CC-U+E0D2,U+E0D4 Symbols Nerd Font +# IEC Power Symbols +symbol_map U+23FB-U+23FE,U+2b58 Symbols Nerd Font +# Font Logos +symbol_map U+F300-U+F313 Symbols Nerd Font +# Pomicons +symbol_map U+E000-U+E00D Symbols Nerd Font #: Map the specified unicode codepoints to a particular font. Useful #: if you need special rendering for some symbols, such as for diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index e778a58..542b560 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -1,10 +1,6 @@ eval $(keychain --eval --agents ssh id_ed25519) [ -f ~/.keychain/$HOSTNAME-sh ] && . ~/.keychain/$HOSTNAME-sh 2>/dev/null -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - ZSH=$HOME/.oh-my-zsh ZSH_DISABLE_COMPFIX="true" @@ -33,7 +29,6 @@ export EDITOR='nvim' export GOPATH=$HOME/go {{ if eq .chezmoi.os "darwin" }} -source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme source $HOME/perl5/perlbrew/etc/bashrc {{- if eq .chezmoi.arch "arm64" }} export PATH=/opt/homebrew/bin:$PATH @@ -47,4 +42,4 @@ alias ll='eza -al --group-directories-first' alias ls='eza -alF --color=always --sort=size | grep -v /' alias lt='eza -al --sort=modified' -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +eval "$(starship init zsh)" From d0e13917445fcdbe576d83b637ef6863f4c34905 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Sun, 14 Jan 2024 09:08:28 +0100 Subject: [PATCH 04/23] Separate Nerd Font symbols. Add nonicons. --- dot_config/kitty/kitty.conf | 2 ++ dot_config/nvim/lua/plugins/colorscheme.lua | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 8bdce28..7e4c1a1 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -63,6 +63,8 @@ symbol_map U+23FB-U+23FE,U+2b58 Symbols Nerd Font symbol_map U+F300-U+F313 Symbols Nerd Font # Pomicons symbol_map U+E000-U+E00D Symbols Nerd Font +# nonicons +symbol_map U+f101-U+f25c nonicons #: Map the specified unicode codepoints to a particular font. Useful #: if you need special rendering for some symbols, such as for diff --git a/dot_config/nvim/lua/plugins/colorscheme.lua b/dot_config/nvim/lua/plugins/colorscheme.lua index 8800c77..19be741 100644 --- a/dot_config/nvim/lua/plugins/colorscheme.lua +++ b/dot_config/nvim/lua/plugins/colorscheme.lua @@ -10,6 +10,11 @@ return { "rebelot/kanagawa.nvim", }, + -- nonicons + { + "yamatsum/nvim-nonicons", + }, + -- Configure LazyVim to load gruvbox { "LazyVim/LazyVim", From f1d9ada08bd711e4f239ba2bcabd4db6009b61f2 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 15 Jan 2024 05:36:22 +0100 Subject: [PATCH 05/23] make ssh key for keychain an option --- dot_zshrc.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 542b560..f6273a6 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -1,4 +1,4 @@ -eval $(keychain --eval --agents ssh id_ed25519) +eval $(keychain --eval --agents ssh {{ .sshkey }}) [ -f ~/.keychain/$HOSTNAME-sh ] && . ~/.keychain/$HOSTNAME-sh 2>/dev/null ZSH=$HOME/.oh-my-zsh From 59c90640543cb20f466c67540c6b29c1598aab93 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 15 Jan 2024 05:38:27 +0100 Subject: [PATCH 06/23] Add zoxide. Fix Nerd Fonts in Kitty --- dot_config/kitty/kitty.conf | 42 ++++++++++++++------- dot_config/nvim/lua/plugins/colorscheme.lua | 5 --- dot_config/nvim/lua/plugins/telescope.lua | 2 +- dot_config/nvim/lua/plugins/ui.lua | 10 +++++ dot_zshrc.tmpl | 1 + 5 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 dot_config/nvim/lua/plugins/ui.lua diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 7e4c1a1..fea916b 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -40,29 +40,43 @@ text_composition_strategy 1.0 #: unmodified values. You can use negative pixels or percentages less #: than 100% to reduce sizes (but this might cause rendering #: artifacts). - -# Seti-UI + Custom -symbol_map U+E5FA-U+E62B Symbols Nerd Font +# https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points +symbol_map U+E5FA-U+E62B Symbols Nerd Font Mono # Devicons -symbol_map U+E700-U+E7C5 Symbols Nerd Font +symbol_map U+e700-U+e7c5 Symbols Nerd Font Mono # Font Awesome -symbol_map U+F000-U+F2E0 Symbols Nerd Font +symbol_map U+f000-U+f2e0 Symbols Nerd Font Mono # Font Awesome Extension -symbol_map U+E200-U+E2A9 Symbols Nerd Font +symbol_map U+e200-U+e2a9 Symbols Nerd Font Mono # Material Design Icons -symbol_map U+F500-U+FD46 Symbols Nerd Font +symbol_map U+f0001-U+f1af0 Symbols Nerd Font Mono # Weather -symbol_map U+E300-U+E3EB Symbols Nerd Font +symbol_map U+e300-U+e3e3 Symbols Nerd Font Mono # Octicons -symbol_map U+F400-U+F4A8,U+2665,U+26A1,U+F27C Symbols Nerd Font +symbol_map U+f400-U+f532 Symbols Nerd Font Mono +symbol_map U+2665 Symbols Nerd Font Mono +symbol_map U+26A1 Symbols Nerd Font Mono +# [Powerline Symbols] +symbol_map U+e0a0-U+e0a2 Symbols Nerd Font Mono +symbol_map U+e0b0-U+e0b3 Symbols Nerd Font Mono # Powerline Extra Symbols -symbol_map U+E0A3,U+E0B4-U+E0C8,U+E0CC-U+E0D2,U+E0D4 Symbols Nerd Font +symbol_map U+e0b4-U+e0c8 Symbols Nerd Font Mono +symbol_map U+e0cc-U+e0d4 Symbols Nerd Font Mono +symbol_map U+e0a3 Symbols Nerd Font Mono +symbol_map U+e0ca Symbols Nerd Font Mono # IEC Power Symbols -symbol_map U+23FB-U+23FE,U+2b58 Symbols Nerd Font -# Font Logos -symbol_map U+F300-U+F313 Symbols Nerd Font +symbol_map U+23fb-U+23fe Symbols Nerd Font Mono +symbol_map U+2b58 Symbols Nerd Font Mono +# Font Logos (Formerly Font Linux) +symbol_map U+f300-U+f32f Symbols Nerd Font Mono # Pomicons -symbol_map U+E000-U+E00D Symbols Nerd Font +symbol_map U+e000-U+e00a Symbols Nerd Font Mono +# Codicons +symbol_map U+ea60-U+ebeb Symbols Nerd Font Mono +# Heavy Angle Brackets +symbol_map U+e276c-U+2771 Symbols Nerd Font Mono +# Box Drawing +symbol_map U+2500-U+259f Symbols Nerd Font Mono # nonicons symbol_map U+f101-U+f25c nonicons diff --git a/dot_config/nvim/lua/plugins/colorscheme.lua b/dot_config/nvim/lua/plugins/colorscheme.lua index 19be741..8800c77 100644 --- a/dot_config/nvim/lua/plugins/colorscheme.lua +++ b/dot_config/nvim/lua/plugins/colorscheme.lua @@ -10,11 +10,6 @@ return { "rebelot/kanagawa.nvim", }, - -- nonicons - { - "yamatsum/nvim-nonicons", - }, - -- Configure LazyVim to load gruvbox { "LazyVim/LazyVim", diff --git a/dot_config/nvim/lua/plugins/telescope.lua b/dot_config/nvim/lua/plugins/telescope.lua index d0495ff..e43b36f 100644 --- a/dot_config/nvim/lua/plugins/telescope.lua +++ b/dot_config/nvim/lua/plugins/telescope.lua @@ -2,7 +2,7 @@ return { -- add telescope-fzf-native { - "telescope.nvim", + "nvim-telescope/telescope.nvim", dependencies = { "nvim-telescope/telescope-fzf-native.nvim", build = "make", diff --git a/dot_config/nvim/lua/plugins/ui.lua b/dot_config/nvim/lua/plugins/ui.lua new file mode 100644 index 0000000..2cc8744 --- /dev/null +++ b/dot_config/nvim/lua/plugins/ui.lua @@ -0,0 +1,10 @@ +return { + -- change lualine + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + opts.sections.lualine_b = { { "branch", icon = " " } } + end, + }, +} diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 542b560..e1ba59d 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -42,4 +42,5 @@ alias ll='eza -al --group-directories-first' alias ls='eza -alF --color=always --sort=size | grep -v /' alias lt='eza -al --sort=modified' +eval "$(zoxide init zsh)" eval "$(starship init zsh)" From 78a0397f714998a957be54f2257185d90ea1b724 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 15 Jan 2024 05:45:51 +0100 Subject: [PATCH 07/23] Add starship configuration --- dot_config/starship.toml | 177 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 dot_config/starship.toml diff --git a/dot_config/starship.toml b/dot_config/starship.toml new file mode 100644 index 0000000..b54b382 --- /dev/null +++ b/dot_config/starship.toml @@ -0,0 +1,177 @@ +[buf] +symbol = " " + +[golang] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[c] +symbol = " " +format = '\[[$symbol($version(-$name))]($style)\]' + +[cmd_duration] +format = '\[[󰔛 $duration]($style)\]' + +[conda] +symbol = " " +format = '\[[$symbol$environment]($style)\]' + +[directory] +read_only = " 󰌾" +format = '[$before_root_path]($before_repo_root_style)[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ' + +[directory.substitutions] +"Android" = "" +"Desktop" = "" +"Documents" = "󰈙" +"Downloads" = "󰇚" +"Dropbox" = "" +"Games" = "" +"Music" = "" +"Pictures" = "" +"Videos" = "" + +[docker_context] +symbol = " " +format = '\[[$symbol$context]($style)\]' + +[fennel] +format = '\[[$symbol($version)]($style)\]' + +[fossil_branch] +symbol = " " +format = '\[[$symbol$branch]($style)\]' + +[git_branch] +symbol = " " +format = '\[[$symbol$branch]($style)\]' + +[git_status] +format = '([\[$all_status$ahead_behind\]]($style))' + +[haskell] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[hg_branch] +symbol = " " +format = '\[[$symbol$branch]($style)\]' + +[hostname] +ssh_symbol = "󰣀 " +ssh_only = false +format = '[$ssh_symbol$hostname]($style):' +style = 'bright-green' + +[julia] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[lua] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[memory_usage] +symbol = "󰍛 " +format = '\[$symbol[$ram( | $swap)]($style)\]' + +[meson] +symbol = "󰔷 " +format = '\[[$symbol$project]($style)\]' + +[nodejs] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[perl] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[os] +format = '\[[$symbol]($style)\]' + +[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 = "󰏗 " +format = '\[[$symbol$version]($style)\]' + +[php] +format = '\[[$symbol($version)]($style)\]' + +[python] +symbol = " " +format = '\[[${symbol}${pyenv_prefix}(${version})(\($virtualenv\))]($style)\]' + +[ruby] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[rust] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[scala] +symbol = " " +format = '\[[$symbol($version)]($style)\]' + +[sudo] +format = '\[[as $symbol]($style)\]' + +[swift] +format = '\[[$symbol($version)]($style)\]' + +[time] +format = '\[[$time]($style)\]' + +[username] +format = '[$user@]($style)' +show_always = true +style_user = 'bright-green' +style_root = 'bright red' + +[zig] +format = '\[[$symbol($version)]($style)\]' + +[solidity] +format = '\[[$symbol($version)]($style)\]' + From d81814c704609a19309403078130a90343ac1a4f Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 15 Jan 2024 09:01:44 +0100 Subject: [PATCH 08/23] Introduce eza ls replacement --- dot_zshrc.tmpl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 0a9768e..121a6c5 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -35,12 +35,5 @@ export PATH=/opt/homebrew/bin:$PATH {{ end }} {{ end }} -alias ld='eza -lD' -alias lf='eza -lF --color=always | grep -v /' -alias lh='eza -dl .* --group-directories-first' -alias ll='eza -al --group-directories-first' -alias ls='eza -alF --color=always --sort=size | grep -v /' -alias lt='eza -al --sort=modified' - eval "$(zoxide init zsh)" eval "$(starship init zsh)" From 28400af44bff5414e13db7fecbc88e0fc7deaab9 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 15 Jan 2024 20:39:11 +0100 Subject: [PATCH 09/23] Adopt starship config --- dot_config/starship.toml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dot_config/starship.toml b/dot_config/starship.toml index b54b382..572ef7e 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -165,13 +165,6 @@ format = '\[[$time]($style)\]' [username] format = '[$user@]($style)' -show_always = true +show_always = false style_user = 'bright-green' style_root = 'bright red' - -[zig] -format = '\[[$symbol($version)]($style)\]' - -[solidity] -format = '\[[$symbol($version)]($style)\]' - From 679b0687d4dab3cf8584a192c65e56b84a3cb4be Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 16 Jan 2024 08:37:15 +0100 Subject: [PATCH 10/23] Adopt prompt. Set kitty color scheme --- dot_config/kitty/current-theme.conf | 80 ++++++++++ dot_config/kitty/kitty.conf | 223 ++-------------------------- dot_config/starship.toml | 61 +------- 3 files changed, 91 insertions(+), 273 deletions(-) create mode 100644 dot_config/kitty/current-theme.conf diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf new file mode 100644 index 0000000..2533db7 --- /dev/null +++ b/dot_config/kitty/current-theme.conf @@ -0,0 +1,80 @@ +# vim:ft=kitty + +## name: Catppuccin-Mocha +## author: Pocco81 (https://github.com/Pocco81) +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #CDD6F4 +background #1E1E2E +selection_foreground #1E1E2E +selection_background #F5E0DC + +# Cursor colors +cursor #F5E0DC +cursor_text_color #1E1E2E + +# URL underline color when hovering with mouse +url_color #F5E0DC + +# Kitty window border colors +active_border_color #B4BEFE +inactive_border_color #6C7086 +bell_border_color #F9E2AF + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system + +# Tab bar colors +active_tab_foreground #11111B +active_tab_background #CBA6F7 +inactive_tab_foreground #CDD6F4 +inactive_tab_background #181825 +tab_bar_background #11111B + +# Colors for marks (marked text in the terminal) +mark1_foreground #1E1E2E +mark1_background #B4BEFE +mark2_foreground #1E1E2E +mark2_background #CBA6F7 +mark3_foreground #1E1E2E +mark3_background #74C7EC + +# The 16 terminal colors + +# black +color0 #45475A +color8 #585B70 + +# red +color1 #F38BA8 +color9 #F38BA8 + +# green +color2 #A6E3A1 +color10 #A6E3A1 + +# yellow +color3 #F9E2AF +color11 #F9E2AF + +# blue +color4 #89B4FA +color12 #89B4FA + +# magenta +color5 #F5C2E7 +color13 #F5C2E7 + +# cyan +color6 #94E2D5 +color14 #94E2D5 + +# white +color7 #BAC2DE +color15 #A6ADC8 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index fea916b..61f0721 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -1,45 +1,14 @@ # vim:fileencoding=utf-8:ft=conf:foldmethod=marker #: Fonts {{{ - -#: kitty has very powerful font management. You can configure -#: individual font faces and even specify special fonts for particular -#: characters. - -# font_family Source Code Pro font_family BrutalistMono Book -# font_family Fira Code Medium -# font_family Fira Code -# font_family Hack Regular bold_font BrutalistMono Book # italic_font auto # bold_italic_font auto - -#: You can specify different fonts for the bold/italic/bold-italic -#: variants. By default they are derived automatically, by the OSes -#: font system. Setting them manually is useful for font families that -#: have many weight variants like Book, Medium, Thick, etc. For -#: example:: - -#: font_family Operator Mono Book -#: bold_font Operator Mono Medium -#: italic_font Operator Mono Book Italic -#: bold_italic_font Operator Mono Medium Italic - font_size 16.0 text_composition_strategy 1.0 -#: Font size (in pts) -# adjust_line_height 0 -# adjust_column_width 0 - -#: Change the size of each character cell kitty renders. You can use -#: either numbers, which are interpreted as pixels or percentages -#: (number followed by %), which are interpreted as percentages of the -#: unmodified values. You can use negative pixels or percentages less -#: than 100% to reduce sizes (but this might cause rendering -#: artifacts). # https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points symbol_map U+E5FA-U+E62B Symbols Nerd Font Mono # Devicons @@ -80,32 +49,12 @@ symbol_map U+2500-U+259f Symbols Nerd Font Mono # nonicons symbol_map U+f101-U+f25c nonicons -#: Map the specified unicode codepoints to a particular font. Useful -#: if you need special rendering for some symbols, such as for -#: Powerline. Avoids the need for patched fonts. Each unicode code -#: point is specified in the form U+. You -#: can specify multiple code points, separated by commas and ranges -#: separated by hyphens. symbol_map itself can be specified multiple -#: times. Syntax is:: - -#: symbol_map codepoints Font Family Name - -# box_drawing_scale 0.001, 1, 1.5, 2 - -#: Change the sizes of the lines used for the box drawing unicode -#: characters These values are in pts. They will be scaled by the -#: monitor DPI to arrive at a pixel value. There must be four values -#: corresponding to thin, normal, thick, and very thick lines. - #: }}} #: Cursor customization {{{ - -cursor #32cd32 - +# cursor #32cd32 #: Default cursor color - -cursor_text_color #000000 +# cursor_text_color #000000 #: Choose the color of text under the cursor. If you want it rendered #: with the background color of the cell underneath instead, use the @@ -118,12 +67,6 @@ cursor_text_color #000000 # cursor_blink_interval 0.5 # cursor_stop_blinking_after 15.0 -#: The interval (in seconds) at which to blink the cursor. Set to zero -#: to disable blinking. Note that numbers smaller than repaint_delay -#: will be limited to repaint_delay. Stop blinking cursor after the -#: specified number of seconds of keyboard inactivity. Set to zero to -#: never stop blinking. - #: }}} #: Scrollback {{{ @@ -240,31 +183,6 @@ sync_to_monitor yes #: }}} -#: Terminal bell {{{ - -# enable_audio_bell yes - -#: Enable/disable the audio bell. Useful in environments that require -#: silence. - -# visual_bell_duration 0.0 - -#: Visual bell duration. Flash the screen when a bell occurs for the -#: specified number of seconds. Set to zero to disable. - -# window_alert_on_bell yes - -#: Request window attention on bell. Makes the dock icon bounce on -#: macOS or the taskbar flash on linux. - -# bell_on_tab yes - -#: Show a bell symbol on the tab if a bell occurs in one of the -#: windows in the tab and the window is not the currently focused -#: window - -#: }}} - #: Window layout {{{ # remember_window_size yes @@ -322,12 +240,10 @@ enabled_layouts Horizontal,Stack #: The window padding (in pts) (blank area between the text and the #: window border) - -active_border_color #d65d0e +# active_border_color #d65d0e #: The color for the border of the active window - -inactive_border_color #d5c4a1 +# inactive_border_color #d5c4a1 #: The color for the border of inactive windows @@ -347,111 +263,10 @@ inactive_border_color #d5c4a1 tab_bar_edge top -# tab_bar_margin_width 0.0 - -#: The margin to the left and right of the tab bar (in pts) - tab_bar_style separator -# tab_fade 0.25 0.5 0.75 1 - tab_separator " ┇" -#: The separator between tabs in the tab bar when using separator as -#: the tab_bar_style. - -active_tab_foreground #d65d0e -active_tab_background #665c54 -# active_tab_font_style bold-italic -inactive_tab_foreground #ebdbb2 -inactive_tab_background #32302f -# inactive_tab_font_style normal - -#: Tab bar colors and styles - -#: }}} - -#: Color scheme {{{ - -foreground #ebdbb2 -background #1b1b1b - -#: The foreground and background colors - -# background_opacity 1.0 -# dynamic_background_opacity no - -#: The opacity of the background. A number between 0 and 1, where 1 is -#: opaque and 0 is fully transparent. This will only work if -#: supported by the OS (for instance, when using a compositor under -#: X11). Note that it only sets the default background color's -#: opacity. This is so that things like the status bar in vim, -#: powerline prompts, etc. still look good. But it means that if you -#: use a color theme with a background color in your editor, it will -#: not be rendered as transparent. Instead you should change the -#: default background color in your kitty config and not use a -#: background color in the editor color scheme. Or use the escape -#: codes to set the terminals default colors in a shell script to -#: launch your editor. Be aware that using a value less than 1.0 is a -#: (possibly significant) performance hit. If you want to dynamically -#: change transparency of windows set dynamic_background_opacity to -#: yes (this is off by default as it has a performance cost) - -# dim_opacity 0.75 - -#: How much to dim text that has the DIM/FAINT attribute set. One -#: means no dimming and zero means fully dimmed (i.e. invisible). - -selection_foreground #bdae93 -selection_background #3c3836 - -#: The foreground and background for text selected with the mouse - - -#: The 16 terminal colors. There are 8 basic colors, each color has a -#: dull and bright version. You can also set the remaining colors from -#: the 256 color table as color16 to color255. - -color0 #282828 -color8 #928374 - -#: black - -color1 #cc241d -color9 #fb4934 - -#: red - -color2 #98971a -color10 #b8bb26 - -#: green - -color3 #d79921 -color11 #fabd2f - -#: yellow - -color4 #458588 -color12 #83a598 - -#: blue - -color5 #b16286 -color13 #d3869b - -#: magenta - -color6 #689d6a -color14 #8ec07c - -#: cyan - -color7 #a89984 -color15 #ebdbb2 - -#: white - #: }}} #: Advanced {{{ @@ -537,30 +352,6 @@ color15 #ebdbb2 #: OS specific tweaks {{{ -# macos_titlebar_color system - -#: Change the color of the kitty window's titlebar on macOS. A value -#: of system means to use the default system color, a value of -#: background means to use the background color of the currently -#: active window and finally you can use an arbitrary color, such as -#: #12af59 or red. WARNING: This option works by using a hack, as -#: there is no proper Cocoa API for it. It sets the background color -#: of the entire window and makes the titlebar transparent. As such it -#: is incompatible with background_opacity. If you want to use both, -#: you are probably better off just hiding the titlebar with -#: macos_hide_titlebar. - -# macos_hide_titlebar no - -#: Hide the kitty window's title bar on macOS. - -# x11_hide_window_decorations no - -#: Hide the window decorations (title bar and window borders) on X11 -#: and Wayland. Whether this works and exactly what effect it has -#: depends on the window manager, as it is the job of the window -#: manager/compositor to draw window decorations. - macos_option_as_alt yes #: Use the option key as an alt key. With this set to no, kitty will @@ -933,3 +724,9 @@ macos_custom_beam_cursor yes #: }}} # }}} + + +# BEGIN_KITTY_THEME +# Catppuccin-Mocha +include current-theme.conf +# END_KITTY_THEME diff --git a/dot_config/starship.toml b/dot_config/starship.toml index 572ef7e..686fe96 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -1,5 +1,3 @@ -[buf] -symbol = " " [golang] symbol = " " @@ -12,10 +10,6 @@ format = '\[[$symbol($version(-$name))]($style)\]' [cmd_duration] format = '\[[󰔛 $duration]($style)\]' -[conda] -symbol = " " -format = '\[[$symbol$environment]($style)\]' - [directory] read_only = " 󰌾" format = '[$before_root_path]($before_repo_root_style)[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ' @@ -53,13 +47,9 @@ format = '([\[$all_status$ahead_behind\]]($style))' symbol = " " format = '\[[$symbol($version)]($style)\]' -[hg_branch] -symbol = " " -format = '\[[$symbol$branch]($style)\]' - [hostname] ssh_symbol = "󰣀 " -ssh_only = false +ssh_only = true format = '[$ssh_symbol$hostname]($style):' style = 'bright-green' @@ -75,10 +65,6 @@ format = '\[[$symbol($version)]($style)\]' symbol = "󰍛 " format = '\[$symbol[$ram( | $swap)]($style)\]' -[meson] -symbol = "󰔷 " -format = '\[[$symbol$project]($style)\]' - [nodejs] symbol = " " format = '\[[$symbol($version)]($style)\]' @@ -87,50 +73,6 @@ format = '\[[$symbol($version)]($style)\]' symbol = " " format = '\[[$symbol($version)]($style)\]' -[os] -format = '\[[$symbol]($style)\]' - -[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 = "󰏗 " format = '\[[$symbol$version]($style)\]' @@ -165,6 +107,5 @@ format = '\[[$time]($style)\]' [username] format = '[$user@]($style)' -show_always = false style_user = 'bright-green' style_root = 'bright red' From f394ec67f7508044357f853ff78509b5f2fbfe75 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 22 Jan 2024 14:41:36 +0100 Subject: [PATCH 11/23] Add tmux resurrect and continuum plugins --- dot_config/starship.toml | 1 + dot_tmux.conf.tmpl | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dot_config/starship.toml b/dot_config/starship.toml index 686fe96..a1fd572 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -1,3 +1,4 @@ +command_timeout = 10000 [golang] symbol = " " diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 0025a80..1a30299 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -95,8 +95,10 @@ set -g @catppuccin_directory_text "#{pane_current_path}" # List of plugins set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-logging' +set -g @plugin 'tmux-plugins/tmux-resurrect' +set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'olimorris/tmux-pomodoro-plus' -set -g @plugin "jlipps/tmux-safekill" +set -g @plugin 'jlipps/tmux-safekill' set -g @plugin 'catppuccin/tmux' {{- if eq .chezmoi.os "openbsd" }} set -g @plugin 'tmux-plugins/tmux-battery' From 19c959f1b04ba25d749d1821b810b1932c5b626e Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 22 Jan 2024 17:26:01 +0100 Subject: [PATCH 12/23] nvim mrkdown autocmds. chezmoi aliases --- dot_config/nvim/lua/config/autocmds.lua | 13 +++++++++++++ dot_zshrc.tmpl | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/dot_config/nvim/lua/config/autocmds.lua b/dot_config/nvim/lua/config/autocmds.lua index 5f87d5a..5b11f88 100644 --- a/dot_config/nvim/lua/config/autocmds.lua +++ b/dot_config/nvim/lua/config/autocmds.lua @@ -8,3 +8,16 @@ vim.api.nvim_create_autocmd("FileType", { vim.opt_local.spell = true end, }) + +vim.api.nvim_create_autocmd("FileType", { + pattern = { "markdown" }, + callback = function() + vim.opt_local.textwidth = 80 + vim.opt_local.wrap = true + vim.opt_local.spell = true + vim.opt_local.tabstop = 2 + vim.opt_local.softtabstop = 2 + vim.opt_local.shiftwidth = 2 + vim.opt_local.expandtab = true + end, +}) diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 121a6c5..f0e1c7c 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -20,6 +20,11 @@ export KEYTIMEOUT=1 plugins={{ .plugins }} +#chezmoi aliases +alias ccd= 'chezmoi cd' +alias cdi= 'chezmoi diff' +alias cap= 'chezmoi apply' + source $ZSH/oh-my-zsh.sh export PATH=/usr/local/bin:/usr/local/sbin:$PATH From b6f53da99e4853f5267a5e263c519014e1a5e050 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Wed, 24 Jan 2024 07:07:09 +0100 Subject: [PATCH 13/23] Fix icon font rendering --- dot_config/kitty/kitty.conf | 45 ++----------------------------------- dot_config/starship.toml | 4 ++-- 2 files changed, 4 insertions(+), 45 deletions(-) diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf index 61f0721..67d84e1 100644 --- a/dot_config/kitty/kitty.conf +++ b/dot_config/kitty/kitty.conf @@ -1,54 +1,13 @@ # vim:fileencoding=utf-8:ft=conf:foldmethod=marker #: Fonts {{{ -font_family BrutalistMono Book -bold_font BrutalistMono Book +font_family BrutalistMono Nerd Font Regular +bold_font BrutalistMono Nerd Font Regular # italic_font auto # bold_italic_font auto font_size 16.0 text_composition_strategy 1.0 - -# https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points -symbol_map U+E5FA-U+E62B Symbols Nerd Font Mono -# Devicons -symbol_map U+e700-U+e7c5 Symbols Nerd Font Mono -# Font Awesome -symbol_map U+f000-U+f2e0 Symbols Nerd Font Mono -# Font Awesome Extension -symbol_map U+e200-U+e2a9 Symbols Nerd Font Mono -# Material Design Icons -symbol_map U+f0001-U+f1af0 Symbols Nerd Font Mono -# Weather -symbol_map U+e300-U+e3e3 Symbols Nerd Font Mono -# Octicons -symbol_map U+f400-U+f532 Symbols Nerd Font Mono -symbol_map U+2665 Symbols Nerd Font Mono -symbol_map U+26A1 Symbols Nerd Font Mono -# [Powerline Symbols] -symbol_map U+e0a0-U+e0a2 Symbols Nerd Font Mono -symbol_map U+e0b0-U+e0b3 Symbols Nerd Font Mono -# Powerline Extra Symbols -symbol_map U+e0b4-U+e0c8 Symbols Nerd Font Mono -symbol_map U+e0cc-U+e0d4 Symbols Nerd Font Mono -symbol_map U+e0a3 Symbols Nerd Font Mono -symbol_map U+e0ca Symbols Nerd Font Mono -# IEC Power Symbols -symbol_map U+23fb-U+23fe Symbols Nerd Font Mono -symbol_map U+2b58 Symbols Nerd Font Mono -# Font Logos (Formerly Font Linux) -symbol_map U+f300-U+f32f Symbols Nerd Font Mono -# Pomicons -symbol_map U+e000-U+e00a Symbols Nerd Font Mono -# Codicons -symbol_map U+ea60-U+ebeb Symbols Nerd Font Mono -# Heavy Angle Brackets -symbol_map U+e276c-U+2771 Symbols Nerd Font Mono -# Box Drawing -symbol_map U+2500-U+259f Symbols Nerd Font Mono -# nonicons -symbol_map U+f101-U+f25c nonicons - #: }}} #: Cursor customization {{{ diff --git a/dot_config/starship.toml b/dot_config/starship.toml index 686fe96..2455dc6 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -33,11 +33,11 @@ format = '\[[$symbol$context]($style)\]' format = '\[[$symbol($version)]($style)\]' [fossil_branch] -symbol = " " +symbol = " " format = '\[[$symbol$branch]($style)\]' [git_branch] -symbol = " " +symbol = " " format = '\[[$symbol$branch]($style)\]' [git_status] From 27db0a8a6504a82a928ff57f788a52688e87806f Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Wed, 24 Jan 2024 09:06:22 +0100 Subject: [PATCH 14/23] Add more nonicons. Fix chezmoi aliases --- dot_config/starship.toml | 27 ++++++++++----------------- dot_zshrc.tmpl | 6 +++--- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dot_config/starship.toml b/dot_config/starship.toml index b33919e..5c64d7d 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -5,14 +5,14 @@ symbol = " " format = '\[[$symbol($version)]($style)\]' [c] -symbol = " " +symbol = " " format = '\[[$symbol($version(-$name))]($style)\]' [cmd_duration] -format = '\[[󰔛 $duration]($style)\]' +format = '\[[ $duration]($style)\]' [directory] -read_only = " 󰌾" +read_only = " " format = '[$before_root_path]($before_repo_root_style)[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ' [directory.substitutions] @@ -44,10 +44,6 @@ format = '\[[$symbol$branch]($style)\]' [git_status] format = '([\[$all_status$ahead_behind\]]($style))' -[haskell] -symbol = " " -format = '\[[$symbol($version)]($style)\]' - [hostname] ssh_symbol = "󰣀 " ssh_only = true @@ -59,7 +55,7 @@ symbol = " " format = '\[[$symbol($version)]($style)\]' [lua] -symbol = " " +symbol = " " format = '\[[$symbol($version)]($style)\]' [memory_usage] @@ -67,7 +63,7 @@ symbol = "󰍛 " format = '\[$symbol[$ram( | $swap)]($style)\]' [nodejs] -symbol = " " +symbol = " " format = '\[[$symbol($version)]($style)\]' [perl] @@ -75,26 +71,23 @@ symbol = " " format = '\[[$symbol($version)]($style)\]' [package] -symbol = "󰏗 " +symbol = " " format = '\[[$symbol$version]($style)\]' [php] +symbol = " " format = '\[[$symbol($version)]($style)\]' [python] -symbol = " " +symbol = " " format = '\[[${symbol}${pyenv_prefix}(${version})(\($virtualenv\))]($style)\]' [ruby] -symbol = " " +symbol = " " format = '\[[$symbol($version)]($style)\]' [rust] -symbol = " " -format = '\[[$symbol($version)]($style)\]' - -[scala] -symbol = " " +symbol = " " format = '\[[$symbol($version)]($style)\]' [sudo] diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index f0e1c7c..33b1a6a 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -21,9 +21,9 @@ export KEYTIMEOUT=1 plugins={{ .plugins }} #chezmoi aliases -alias ccd= 'chezmoi cd' -alias cdi= 'chezmoi diff' -alias cap= 'chezmoi apply' +alias ccd='chezmoi cd' +alias cdi='chezmoi diff' +alias cap='chezmoi apply' source $ZSH/oh-my-zsh.sh From 94b03f2b0ce0902feb603cfdadfa827071a990d4 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Thu, 25 Jan 2024 15:52:56 +0100 Subject: [PATCH 15/23] Enable support for unit testing and debugging --- dot_config/nvim/lua/config/keymaps.lua | 7 +++++++ dot_config/nvim/lua/config/lazy.lua | 2 ++ 2 files changed, 9 insertions(+) diff --git a/dot_config/nvim/lua/config/keymaps.lua b/dot_config/nvim/lua/config/keymaps.lua index 54f5a2a..047eb6e 100644 --- a/dot_config/nvim/lua/config/keymaps.lua +++ b/dot_config/nvim/lua/config/keymaps.lua @@ -10,3 +10,10 @@ map("v", "Q", "norm @q") -- Easier in-file navigation with Tab and S-Tab map("n", "", "") map("n", "", "") + +-- Testing +map("n", "tr", "require('neotest').run.run()") +map("n", "td", "require('dap-go').debug_test()") +map("n", "to", "require('neotest').output.open({enter = true})") +map("n", "tS", "require('neotest').run.stop()") +map("n", "ts", "require('neotest').summary.toggle()") diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index eac5f8b..8bda5d3 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -12,6 +12,8 @@ require("lazy").setup({ { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here { import = "lazyvim.plugins.extras.editor.leap" }, + { import = "lazyvim.plugins.extras.test.core" }, + { import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.lang.go" }, { import = "lazyvim.plugins.extras.lang.json" }, { import = "lazyvim.plugins.extras.lang.clangd" }, From ffd5e69cf62f8d0fdb0abbb981ca7df6b26ec55a Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 26 Jan 2024 08:33:29 +0100 Subject: [PATCH 16/23] Add nvim plugins --- dot_config/nvim/lua/config/lazy.lua | 2 ++ dot_config/nvim/lua/plugins/ui.lua | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index 8bda5d3..b3b2342 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -16,7 +16,9 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.lang.go" }, { import = "lazyvim.plugins.extras.lang.json" }, + { import = "lazyvim.plugins.extras.lang.markdown" }, { import = "lazyvim.plugins.extras.lang.clangd" }, + { import = "lazyvim.plugins.extras.lang.tex" }, -- import/override with your plugins { import = "plugins" }, }, diff --git a/dot_config/nvim/lua/plugins/ui.lua b/dot_config/nvim/lua/plugins/ui.lua index 2cc8744..e0bd4ac 100644 --- a/dot_config/nvim/lua/plugins/ui.lua +++ b/dot_config/nvim/lua/plugins/ui.lua @@ -7,4 +7,23 @@ return { opts.sections.lualine_b = { { "branch", icon = " " } } end, }, + { + "NvChad/nvim-colorizer.lua", + opts = function(_, opts) + opts.filetypes = { + "html", + "css", + "scss", + "javascript", + "typescript", + "typescriptreact", + "javascriptreact", + "lua", + } + opts.user_default_options = { + mode = "background", + tailwind = false, -- Enable tailwind colors + } + end, + }, } From d8243968a167c54d648d80bd92a63f475daf9ed3 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 26 Jan 2024 09:00:48 +0100 Subject: [PATCH 17/23] change highlite for vim-illuminate --- dot_config/nvim/lua/plugins/ui.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dot_config/nvim/lua/plugins/ui.lua b/dot_config/nvim/lua/plugins/ui.lua index e0bd4ac..b40264b 100644 --- a/dot_config/nvim/lua/plugins/ui.lua +++ b/dot_config/nvim/lua/plugins/ui.lua @@ -7,6 +7,15 @@ return { opts.sections.lualine_b = { { "branch", icon = " " } } end, }, + { + "RRethy/vim-illuminate", + config = function() + -- change the highlight style + vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "Visual" }) + vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "Visual" }) + vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "Visual" }) + end, + }, { "NvChad/nvim-colorizer.lua", opts = function(_, opts) From 214f2c457b218272103a35b41678efa77971abec Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 5 Feb 2024 21:07:29 +0100 Subject: [PATCH 18/23] Remove obsolete tmux plugins --- dot_tmux.conf.tmpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 1a30299..1b18017 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -96,9 +96,6 @@ set -g @catppuccin_directory_text "#{pane_current_path}" set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-logging' set -g @plugin 'tmux-plugins/tmux-resurrect' -set -g @plugin 'tmux-plugins/tmux-continuum' -set -g @plugin 'olimorris/tmux-pomodoro-plus' -set -g @plugin 'jlipps/tmux-safekill' set -g @plugin 'catppuccin/tmux' {{- if eq .chezmoi.os "openbsd" }} set -g @plugin 'tmux-plugins/tmux-battery' From d879004fd1720aeb274bed2f11428f4fab30f0f5 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Wed, 7 Feb 2024 17:23:52 +0100 Subject: [PATCH 19/23] Add rust support nvim --- dot_config/nvim/lua/config/lazy.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index b3b2342..85fd100 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -15,6 +15,7 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.test.core" }, { import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.lang.go" }, + { import = "lazyvim.plugins.extras.lang.rust" }, { import = "lazyvim.plugins.extras.lang.json" }, { import = "lazyvim.plugins.extras.lang.markdown" }, { import = "lazyvim.plugins.extras.lang.clangd" }, From 947c82eb334b05e736e51e637f0f235c3cd032db Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 12 Feb 2024 14:28:41 +0100 Subject: [PATCH 20/23] Update tmux.conf --- dot_tmux.conf.tmpl | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 1b18017..399c731 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -39,35 +39,13 @@ setw -g mode-keys vi # don't allow tmux to rename the window based on commands running set-option -wg automatic-rename off -# address vim mode switching delay (http://superuser.com/a/252717/65504) -set -s escape-time 0 - -# increase scrollback buffer size -set -g history-limit 50000 - -# tmux messages are displayed for 4 seconds -set -g display-time 4000 - -# refresh 'status-left' and 'status-right' more often -set -g status-interval 5 - # upgrade $TERM set -g default-terminal "tmux-256color" set-option -sa terminal-features ',{{ .term }}:RGB' -# emacs key bindings in tmux command prompt (prefix + :) are better than -# vi keys, even for vim users -set -g status-keys emacs - # Enable mouse mode (tmux 2.1 and above) set -g mouse on -# focus events enabled for terminals that support them -set -g focus-events on - -# super useful when using "grouped sessions" and multi-monitor setup -setw -g aggressive-resize on - set -g default-command {{ .shell }} set -g default-shell {{ .shell }} @@ -83,7 +61,7 @@ set -g @catppuccin_window_default_text "#W" set -g @catppuccin_window_current_fill "number" set -g @catppuccin_window_current_text "#W" -set -g @catppuccin_status_modules_right "directory user host session" +set -g @catppuccin_status_modules_right "directory user host date_time session" set -g @catppuccin_status_left_separator " " set -g @catppuccin_status_right_separator "" set -g @catppuccin_status_right_separator_inverse "no" @@ -91,8 +69,11 @@ set -g @catppuccin_status_fill "icon" set -g @catppuccin_status_connect_separator "no" set -g @catppuccin_directory_text "#{pane_current_path}" +set -g @catppuccin_date_time_icon " " +set -g @catppuccin_date_time_text "%H:%M" # List of plugins +set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-logging' set -g @plugin 'tmux-plugins/tmux-resurrect' From fceac819a4e4a18fcc767721d38a3b44d8e37a43 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 12 Feb 2024 15:10:21 +0100 Subject: [PATCH 21/23] Update tmux.conf --- dot_tmux.conf.tmpl | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 1b18017..09076eb 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -39,35 +39,13 @@ setw -g mode-keys vi # don't allow tmux to rename the window based on commands running set-option -wg automatic-rename off -# address vim mode switching delay (http://superuser.com/a/252717/65504) -set -s escape-time 0 - -# increase scrollback buffer size -set -g history-limit 50000 - -# tmux messages are displayed for 4 seconds -set -g display-time 4000 - -# refresh 'status-left' and 'status-right' more often -set -g status-interval 5 - # upgrade $TERM set -g default-terminal "tmux-256color" set-option -sa terminal-features ',{{ .term }}:RGB' -# emacs key bindings in tmux command prompt (prefix + :) are better than -# vi keys, even for vim users -set -g status-keys emacs - # Enable mouse mode (tmux 2.1 and above) set -g mouse on -# focus events enabled for terminals that support them -set -g focus-events on - -# super useful when using "grouped sessions" and multi-monitor setup -setw -g aggressive-resize on - set -g default-command {{ .shell }} set -g default-shell {{ .shell }} @@ -93,6 +71,8 @@ set -g @catppuccin_status_connect_separator "no" set -g @catppuccin_directory_text "#{pane_current_path}" # List of plugins +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-logging' set -g @plugin 'tmux-plugins/tmux-resurrect' From bc5ec8c33677aacdd4f31a23f5b9a38def683566 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 12 Feb 2024 15:12:50 +0100 Subject: [PATCH 22/23] Merge --- dot_tmux.conf.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 09076eb..b2ab0f0 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -61,7 +61,7 @@ set -g @catppuccin_window_default_text "#W" set -g @catppuccin_window_current_fill "number" set -g @catppuccin_window_current_text "#W" -set -g @catppuccin_status_modules_right "directory user host session" +set -g @catppuccin_status_modules_right "directory user host date_time session" set -g @catppuccin_status_left_separator " " set -g @catppuccin_status_right_separator "" set -g @catppuccin_status_right_separator_inverse "no" @@ -69,6 +69,8 @@ set -g @catppuccin_status_fill "icon" set -g @catppuccin_status_connect_separator "no" set -g @catppuccin_directory_text "#{pane_current_path}" +set -g @catppuccin_date_time_icon " " +set -g @catppuccin_date_time_text "%H:%M" # List of plugins set -g @plugin 'tmux-plugins/tmux-sensible' From b65a36a66505545d7857f131e3710918bf255bab Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 12 Feb 2024 21:11:45 +0100 Subject: [PATCH 23/23] Update tmux status icons --- dot_tmux.conf.tmpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index b2ab0f0..3e8fa84 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -69,7 +69,12 @@ set -g @catppuccin_status_fill "icon" set -g @catppuccin_status_connect_separator "no" set -g @catppuccin_directory_text "#{pane_current_path}" +set -g @catppuccin_host_text "#{host_short}" +set -g @catppuccin_directory_icon " " +set -g @catppuccin_user_icon " " +set -g @catppuccin_host_icon " " set -g @catppuccin_date_time_icon " " +set -g @catppuccin_session_icon " " set -g @catppuccin_date_time_text "%H:%M" # List of plugins