From ad3bde2ba3aaf8b3a44d3bc200b681c554369334 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Wed, 4 Sep 2024 06:18:00 +0200 Subject: [PATCH] Minor tweaks --- .config/omp.toml | 88 ++++++++++++++++-------------------------------- .zshrc | 6 +++- 2 files changed, 34 insertions(+), 60 deletions(-) diff --git a/.config/omp.toml b/.config/omp.toml index 4baec4d..c82bf25 100644 --- a/.config/omp.toml +++ b/.config/omp.toml @@ -1,3 +1,4 @@ + version = 2 final_space = true console_title_template = '{{ .Shell }} in {{ .Folder }}' @@ -6,34 +7,30 @@ console_title_template = '{{ .Shell }} in {{ .Folder }}' type = 'prompt' alignment = 'left' newline = true - + [[blocks.segments]] - type = 'session' + type = 'path' style = 'diamond' leading_diamond = '' trailing_diamond = '' - template = ' {{ if .SSHSession }} {{ end }}{{ .UserName }} ' - background = 'p:cyan' - foreground = 'p:black' - - [[blocks.segments]] - type = 'path' - style = 'powerline' - powerline_symbol = '' - template = '  {{ path .Path .Location }} ' + template = '{{ path .Path .Location }} ' background = 'p:beige' foreground = 'p:black' [blocks.segments.properties] - style = 'folder' + style = 'agnoster_full' + [blocks.segments.properties.mapped_locations] + "~" = "" + "~/Downloads" = "󰇚" + "~/Workspace" = " " [[blocks.segments]] type = 'git' - style = 'powerline' - powerline_symbol = '' - foreground_templates = ['{{ if or (.Working.Changed) (.Staging.Changed) }}p:black{{ end }}', '{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:white{{ end }}', '{{ if gt .Ahead 0 }}p:white{{ end }}'] + style = 'diamond' + trailing_diamond = '' + leading_diamond = '' background_templates = ['{{ if or (.Working.Changed) (.Staging.Changed) }}p:yellow{{ end }}', '{{ if and (gt .Ahead 0) (gt .Behind 0) }}p:red{{ end }}', '{{ if gt .Ahead 0 }}#49416D{{ end }}', '{{ if gt .Behind 0 }}#7A306C{{ end }}'] - template = ' {{ if .UpstreamURL }}{{ url .UpstreamIcon .UpstreamURL }} {{ end }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }} ' + template = ' {{ if .UpstreamURL }}{{ .UpstreamIcon }}{{ end }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }} ' background = 'p:green' foreground = 'p:black' @@ -50,27 +47,13 @@ console_title_template = '{{ .Shell }} in {{ .Folder }}' background = 'p:yellow' foreground = 'p:white' - [[blocks.segments]] - type = 'status' - style = 'diamond' - background_templates = ['{{ if gt .Code 0 }}p:red{{ end }}'] - leading_diamond = '' - trailing_diamond = '' - template = ' {{ if gt .Code 0 }}{{ else }}{{ end }} ' - background = 'p:blue' - foreground = 'p:black' - - [blocks.segments.properties] - always_enabled = true - -[[blocks]] - type = 'rprompt' - [[blocks.segments]] type = 'node' - style = 'plain' - template = ' ' - background = 'transparent' + style = 'diamond' + trailing_diamond = '' + leading_diamond = '' + template = 'JS  ' + background = 'p:gray' foreground = 'p:green' [blocks.segments.properties] @@ -80,35 +63,21 @@ console_title_template = '{{ .Shell }} in {{ .Folder }}' [[blocks.segments]] type = 'go' - style = 'plain' - template = ' ' - background = 'transparent' - foreground = 'p:blue' - - [blocks.segments.properties] - fetch_version = false - - [[blocks.segments]] - type = 'python' - style = 'plain' - template = ' ' - background = 'transparent' - foreground = 'p:yellow' - - [blocks.segments.properties] - display_mode = 'files' - fetch_version = false - fetch_virtual_env = false + style = 'diamond' + trailing_diamond = '' + leading_diamond = '' + template = 'Go  ' + background = 'p:gray' + foreground = 'p:cyan' [transient_prompt] - foreground_templates = [ - "{{if gt .Code 0}}p:red{{end}}", - "{{if eq .Code 0}}p:green{{end}}" - ] + foreground = "p:green" + foreground_templates = ["{{if gt .Code 0}}p:red{{end}}",] background = 'transparent' - template = ' ' + template = '{{ if gt .Code 0 }}{{ else }}{{ end }} ' [palette] black = '#11111b' + gray = '#6c7086' blue = '#89b4fa' cyan = '#74c7ec' green = '#a6e3a1' @@ -117,3 +86,4 @@ console_title_template = '{{ .Shell }} in {{ .Folder }}' white = '#cdd6f4' yellow = '#f9e2af' beige = '#f2cdcd' + diff --git a/.zshrc b/.zshrc index 0b7ed1b..e662f8d 100644 --- a/.zshrc +++ b/.zshrc @@ -27,6 +27,10 @@ SAVEHIST=1000 # Disable Bell unsetopt beep +# Keybinding +bindkey '\e[1;5C]' forward-word +bindkey '\e[1;5D]' backward-word + # Git ######################################################### case "$HOSTNAME" in @@ -60,7 +64,7 @@ export JUST_UNSTABLE=1 # Aliases ######################################################### alias edit-nvim-conf="nvim ~/.config/nvim" -alias edit-bash-conf="nvim ~/.bashrc" +alias edit-zsh-conf="nvim ~/.zshrc" alias todo="nvim ~/Documents/Notes/Todo.md" alias nano="nvim"