From 736d69d1719db14effe65ca765aee0d757353f26 Mon Sep 17 00:00:00 2001 From: kdeppe Date: Mon, 24 Apr 2023 19:27:34 -0400 Subject: [PATCH 01/23] fixed markdown preview installation --- meta/configs/neovim.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/configs/neovim.yaml b/meta/configs/neovim.yaml index b0c137b..4c78af1 100644 --- a/meta/configs/neovim.yaml +++ b/meta/configs/neovim.yaml @@ -3,5 +3,5 @@ ~/.local/share/nvim/site: editors/neovim/site - shell: - - command: "cd editors/neovim/site/pack/markdown/start/markdown-preview.nvim/app && if ( -z `ls bin` ) ; then ./install.sh; fi" + - command: "cd editors/neovim/site/pack/markdown/start/markdown-preview.nvim/app && if [[ -z `ls bin 2>/dev/null` ]] ; then ./install.sh; fi" #- [cd editors/neovim/site/pack/markdown/start/markdown-preview.nvim && yarn install --checkfiles && NODE_OPTIONS=--openssl-legacy-provider yarn build, building markdown preview] From d9b8c3f1ccadb8e551953995efaeb3902190c887 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Tue, 25 Apr 2023 11:20:56 -0400 Subject: [PATCH 02/23] removed polybar todo --- editors/neovim | 2 +- gui/polybar/config.ini | 2 +- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- shells/st | 2 +- shells/zsh/zshrc | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/editors/neovim b/editors/neovim index 4af034b..0f52a17 160000 --- a/editors/neovim +++ b/editors/neovim @@ -1 +1 @@ -Subproject commit 4af034b82620c67492f951be0fbbe0a024ab31e2 +Subproject commit 0f52a172cc2bfc4f5f059f181cf37e8f2f1b69c2 diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini index 1383064..d3db9c3 100644 --- a/gui/polybar/config.ini +++ b/gui/polybar/config.ini @@ -46,7 +46,7 @@ inherit = section/base-bar ; height height = 24pt ; modules -modules-left = xworkspaces focus-fast spotify spotify-len todo +modules-left = xworkspaces focus-fast spotify spotify-len ;modules-left = xworkspaces spotify spotify-len modules-center = weather-desktop modules-right = pulseaudio memory cpu temperature eth dev-bat packages seafile calendar-sync bg-selector quotes date powermenu diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index c1b5b2c..045f006 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit c1b5b2c8aab51b2a5b0d29d078e3cb53bb4c46bb +Subproject commit 045f006c50d782a6d3acbd8a07d1595322ff7e43 diff --git a/shells/st b/shells/st index 56aba76..08fb3b8 160000 --- a/shells/st +++ b/shells/st @@ -1 +1 @@ -Subproject commit 56aba76874efb3bb5914d8eaf9e356057113aea7 +Subproject commit 08fb3b8990fcd93f45dfe220b066a446cf31c7b5 diff --git a/shells/zsh/zshrc b/shells/zsh/zshrc index 9e8cc7e..660ee9d 100644 --- a/shells/zsh/zshrc +++ b/shells/zsh/zshrc @@ -28,13 +28,10 @@ export ZSH="$HOME/.oh-my-zsh" # Would you like to use another custom folder than $ZSH/custom? export ZSH_CUSTOM=$HOME/.local/share/oh-my-zsh/custom -plugins=( - zsh-autosugggestions -) - # ZSH theme ZSH_THEME="powerlevel10k/powerlevel10k" + # Which plugins would you like to load? # Standard plugins can be found in $ZSH/plugins/ # Custom plugins may be added to $ZSH_CUSTOM/plugins/ @@ -44,8 +41,11 @@ plugins=( zsh-autosuggestions git ) - + #vi-mode source $ZSH/oh-my-zsh.sh +# vi-mode settings +export KEYTIMEOUT=10 +bindkey -v # Uncomment the following line to use hyphen-insensitive completion. # Case-sensitive completion must be off. _ and - will be interchangeable. # HYPHEN_INSENSITIVE="true" From 4df2cefa8b07b177b178332d38c2ffa798d357de Mon Sep 17 00:00:00 2001 From: KeeganForelight Date: Thu, 27 Apr 2023 11:20:51 -0400 Subject: [PATCH 03/23] pulling submodule updates --- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- src/fzf | 2 +- src/timetracker | 2 +- src/weather | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index 045f006..bbea8d2 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 045f006c50d782a6d3acbd8a07d1595322ff7e43 +Subproject commit bbea8d2d06382f6f0001c9212da91a319076f06e diff --git a/src/fzf b/src/fzf index 96670d5..cf95e44 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit 96670d5f16dcf23d590eb1d83d1de351b2e8fb15 +Subproject commit cf95e44cb4ce6f42a318abba0efa77c7311c87c9 diff --git a/src/timetracker b/src/timetracker index c5672a5..613dfb9 160000 --- a/src/timetracker +++ b/src/timetracker @@ -1 +1 @@ -Subproject commit c5672a5864bc78a932de438e4f64fefcee5c6ea6 +Subproject commit 613dfb9d259166a40d0781e26b8ecd0f59648a25 diff --git a/src/weather b/src/weather index 020bbf7..d27117b 160000 --- a/src/weather +++ b/src/weather @@ -1 +1 @@ -Subproject commit 020bbf7d64cc2f0c5d2a4ab96d45b8014ef54ad2 +Subproject commit d27117b8bc4f600657c7dd94310f60e784371eac From 7b4dd169cbb500251e24681b97161924c2e13975 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 4 May 2023 20:21:51 -0400 Subject: [PATCH 04/23] cleaned up home folder by moving zsh folder around --- README.md | 3 +- meta/configs/fzf.yaml | 1 - meta/configs/oh-my-zsh.yaml | 2 +- meta/configs/tmux.sparse.yaml | 2 +- meta/configs/zsh.yaml | 5 +- meta/configs/zshenv.yaml | 2 + meta/profiles/arch | 1 + shells/zsh/p10k.sh | 1651 +++++++++++++++++++++++++++++++ shells/zsh/zshenv | 1 + shells/zsh/zshrc | 29 +- terminals/tmux/tmux.sparse.conf | 9 +- 11 files changed, 1689 insertions(+), 17 deletions(-) create mode 100644 meta/configs/zshenv.yaml create mode 100644 shells/zsh/p10k.sh create mode 100644 shells/zsh/zshenv diff --git a/README.md b/README.md index 4e9e480..6a1afce 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # dotfiles ### TODO -- Add main polybar file and create bar as needed from modules + +- port scripts to use rofi or equiv diff --git a/meta/configs/fzf.yaml b/meta/configs/fzf.yaml index 17dcce0..5dce2fe 100644 --- a/meta/configs/fzf.yaml +++ b/meta/configs/fzf.yaml @@ -2,6 +2,5 @@ - [cd src/fzf && make install, Building fzf] - link: - ~/.fzf: src/fzf ~/.local/bin/fzf: src/fzf/bin/fzf ~/.local/bin/fzf-tmux: src/fzf/bin/fzf-tmux diff --git a/meta/configs/oh-my-zsh.yaml b/meta/configs/oh-my-zsh.yaml index d9965ca..ee9e8f0 100644 --- a/meta/configs/oh-my-zsh.yaml +++ b/meta/configs/oh-my-zsh.yaml @@ -2,4 +2,4 @@ - [bin/oh-my-zsh-check.sh] - link: - ~/.local/share/oh-my-zsh: shells/oh-my-zsh + ~/.local/share/omz-custom: shells/oh-my-zsh diff --git a/meta/configs/tmux.sparse.yaml b/meta/configs/tmux.sparse.yaml index 621798b..d855201 100644 --- a/meta/configs/tmux.sparse.yaml +++ b/meta/configs/tmux.sparse.yaml @@ -1,2 +1,2 @@ - link: - ~/.tmux.conf: terminals/tmux/tmux.sparse.conf + ~/.config/tmux/tmux.conf: terminals/tmux/tmux.sparse.conf diff --git a/meta/configs/zsh.yaml b/meta/configs/zsh.yaml index 5bf9d7f..5ef9d55 100644 --- a/meta/configs/zsh.yaml +++ b/meta/configs/zsh.yaml @@ -2,5 +2,6 @@ - [bin/zsh-check] - link: - ~/.zshrc: shells/zsh/zshrc - ~/.zprofile: shells/zsh/zprofile + ~/.config/zsh/.zprofile: shells/zsh/zprofile + ~/.config/zsh/.zshrc: shells/zsh/zshrc + ~/.config/zsh/.p10k.sh: shells/zsh/p10k.sh diff --git a/meta/configs/zshenv.yaml b/meta/configs/zshenv.yaml new file mode 100644 index 0000000..bf78642 --- /dev/null +++ b/meta/configs/zshenv.yaml @@ -0,0 +1,2 @@ +- shell: + - [echo 'export ZDOTDIR="$HOME/.config/zsh"' > /etc/zsh/zshenv, "creating zshenv"] diff --git a/meta/profiles/arch b/meta/profiles/arch index fca1e2d..6b1856d 100644 --- a/meta/profiles/arch +++ b/meta/profiles/arch @@ -3,6 +3,7 @@ arch.i3 arch.nvim neovim zsh +zshenv-sudo oh-my-zsh fzf tmux.sparse diff --git a/shells/zsh/p10k.sh b/shells/zsh/p10k.sh new file mode 100644 index 0000000..cf79b78 --- /dev/null +++ b/shells/zsh/p10k.sh @@ -0,0 +1,1651 @@ +# Generated by Powerlevel10k configuration wizard on 2023-04-17 at 19:43 EDT. +# Based on romkatv/powerlevel10k/config/p10k-lean.zsh. +# Wizard options: nerdfont-complete + powerline, large icons, unicode, lean, 12h time, +# 2 lines, dotted, right frame, darkest-ornaments, compact, few icons, concise, +# transient_prompt, instant_prompt=quiet. +# Type `p10k configure` to generate another config. +# +# Config for Powerlevel10k with lean prompt style. Type `p10k configure` to generate +# your own config based on it. +# +# Tip: Looking for a nice color? Here's a one-liner to print colormap. +# +# for i in {0..255}; do print -Pn "%K{$i} %k%F{$i}${(l:3::0:)i}%f " ${${(M)$((i%6)):#3}:+$'\n'}; done + +# Temporarily change options. +'builtin' 'local' '-a' 'p10k_config_opts' +[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') +[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') +[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') +'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' + +() { + emulate -L zsh -o extended_glob + + # Unset all configuration options. This allows you to apply configuration changes without + # restarting zsh. Edit ~/.p10k.zsh and type `source ~/.p10k.zsh`. + unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR' + + # Zsh >= 5.1 is required. + [[ $ZSH_VERSION == (5.<1->*|<6->.*) ]] || return + + # The list of segments shown on the left. Fill it with the most important segments. + typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( + # =========================[ Line #1 ]========================= + # os_icon # os identifier + dir # current directory + vcs # git status + # =========================[ Line #2 ]========================= + newline # \n + prompt_char # prompt symbol + ) + + # The list of segments shown on the right. Fill it with less important segments. + # Right prompt on the last prompt line (where you are typing your commands) gets + # automatically hidden when the input line reaches it. Right prompt above the + # last prompt line gets hidden if it would overlap with left prompt. + typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( + # =========================[ Line #1 ]========================= + status # exit code of the last command + command_execution_time # duration of the last command + background_jobs # presence of background jobs + direnv # direnv status (https://direnv.net/) + asdf # asdf version manager (https://github.com/asdf-vm/asdf) + virtualenv # python virtual environment (https://docs.python.org/3/library/venv.html) + anaconda # conda environment (https://conda.io/) + pyenv # python environment (https://github.com/pyenv/pyenv) + goenv # go environment (https://github.com/syndbg/goenv) + nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) + nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) + nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) + # node_version # node.js version + # go_version # go version (https://golang.org) + # rust_version # rustc version (https://www.rust-lang.org) + # dotnet_version # .NET version (https://dotnet.microsoft.com) + # php_version # php version (https://www.php.net/) + # laravel_version # laravel php framework version (https://laravel.com/) + # java_version # java version (https://www.java.com/) + # package # name@version from package.json (https://docs.npmjs.com/files/package.json) + rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) + rvm # ruby version from rvm (https://rvm.io) + fvm # flutter version management (https://github.com/leoafarias/fvm) + luaenv # lua version from luaenv (https://github.com/cehoffman/luaenv) + jenv # java version from jenv (https://github.com/jenv/jenv) + plenv # perl version from plenv (https://github.com/tokuhirom/plenv) + perlbrew # perl version from perlbrew (https://github.com/gugod/App-perlbrew) + phpenv # php version from phpenv (https://github.com/phpenv/phpenv) + scalaenv # scala version from scalaenv (https://github.com/scalaenv/scalaenv) + haskell_stack # haskell version from stack (https://haskellstack.org/) + kubecontext # current kubernetes context (https://kubernetes.io/) + terraform # terraform workspace (https://www.terraform.io) + # terraform_version # terraform version (https://www.terraform.io) + aws # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) + aws_eb_env # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) + azure # azure account name (https://docs.microsoft.com/en-us/cli/azure) + gcloud # google cloud cli account and project (https://cloud.google.com/) + google_app_cred # google application credentials (https://cloud.google.com/docs/authentication/production) + toolbox # toolbox name (https://github.com/containers/toolbox) + context # user@hostname + nordvpn # nordvpn connection status, linux only (https://nordvpn.com/) + ranger # ranger shell (https://github.com/ranger/ranger) + nnn # nnn shell (https://github.com/jarun/nnn) + lf # lf shell (https://github.com/gokcehan/lf) + xplr # xplr shell (https://github.com/sayanarijit/xplr) + vim_shell # vim shell indicator (:sh) + midnight_commander # midnight commander shell (https://midnight-commander.org/) + nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) + # vpn_ip # virtual private network indicator + # load # CPU load + # disk_usage # disk usage + # ram # free RAM + # swap # used swap + todo # todo items (https://github.com/todotxt/todo.txt-cli) + timewarrior # timewarrior tracking status (https://timewarrior.net/) + taskwarrior # taskwarrior task count (https://taskwarrior.org/) + # cpu_arch # CPU architecture + time # current time + # =========================[ Line #2 ]========================= + newline + # ip # ip address and bandwidth usage for a specified network interface + # public_ip # public IP address + # proxy # system-wide http/https/ftp proxy + # battery # internal battery + # wifi # wifi speed + # example # example user-defined segment (see prompt_example function below) + ) + + # Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you. + typeset -g POWERLEVEL9K_MODE=nerdfont-complete + # When set to `moderate`, some icons will have an extra space after them. This is meant to avoid + # icon overlap when using non-monospace fonts. When set to `none`, spaces are not added. + typeset -g POWERLEVEL9K_ICON_PADDING=moderate + + # Basic style options that define the overall look of your prompt. You probably don't want to + # change them. + typeset -g POWERLEVEL9K_BACKGROUND= # transparent background + typeset -g POWERLEVEL9K_{LEFT,RIGHT}_{LEFT,RIGHT}_WHITESPACE= # no surrounding whitespace + typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SUBSEGMENT_SEPARATOR=' ' # separate segments with a space + typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SEGMENT_SEPARATOR= # no end-of-line symbol + + # When set to true, icons appear before content on both sides of the prompt. When set + # to false, icons go after content. If empty or not set, icons go before content in the left + # prompt and after content in the right prompt. + # + # You can also override it for a specific segment: + # + # POWERLEVEL9K_STATUS_ICON_BEFORE_CONTENT=false + # + # Or for a specific segment in specific state: + # + # POWERLEVEL9K_DIR_NOT_WRITABLE_ICON_BEFORE_CONTENT=false + typeset -g POWERLEVEL9K_ICON_BEFORE_CONTENT=true + + # Add an empty line before each prompt. + typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false + + # Connect left prompt lines with these symbols. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX= + typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX= + typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX= + # Connect right prompt lines with these symbols. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%238F─╮' + typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%238F─┤' + typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%238F─╯' + + # The left end of left prompt. + typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= + # The right end of right prompt. + typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL=' ' + + # Ruler, a.k.a. the horizontal line before each prompt. If you set it to true, you'll + # probably want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false above and + # POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' ' below. + typeset -g POWERLEVEL9K_SHOW_RULER=false + typeset -g POWERLEVEL9K_RULER_CHAR='─' # reasonable alternative: '·' + typeset -g POWERLEVEL9K_RULER_FOREGROUND=238 + + # Filler between left and right prompt on the first prompt line. You can set it to '·' or '─' + # to make it easier to see the alignment between left and right prompt and to separate prompt + # from command output. It serves the same purpose as ruler (see above) without increasing + # the number of prompt lines. You'll probably want to set POWERLEVEL9K_SHOW_RULER=false + # if using this. You might also like POWERLEVEL9K_PROMPT_ADD_NEWLINE=false for more compact + # prompt. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='·' + if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then + # The color of the filler. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238 + # Add a space between the end of left prompt and the filler. + typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=' ' + # Add a space between the filler and the start of right prompt. + typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL=' ' + # Start filler from the edge of the screen if there are no left segments on the first line. + typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}' + # End filler on the edge of the screen if there are no right segments on the first line. + typeset -g POWERLEVEL9K_EMPTY_LINE_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='%{%}' + fi + + #################################[ os_icon: os identifier ]################################## + # OS identifier color. + typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND= + # Custom icon. + # typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='⭐' + + ################################[ prompt_char: prompt symbol ]################################ + # Green prompt symbol if the last command succeeded. + typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=76 + # Red prompt symbol if the last command failed. + typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196 + # Default prompt symbol. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯' + # Prompt symbol in command vi mode. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' + # Prompt symbol in visual vi mode. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='V' + # Prompt symbol in overwrite vi mode. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶' + typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true + # No line terminator if prompt_char is the last segment. + typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='' + # No line introducer if prompt_char is the first segment. + typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= + + ##################################[ dir: current directory ]################################## + # Default current directory color. + typeset -g POWERLEVEL9K_DIR_FOREGROUND=31 + # If directory is too long, shorten some of its segments to the shortest possible unique + # prefix. The shortened directory can be tab-completed to the original. + typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique + # Replace removed segment suffixes with this symbol. + typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= + # Color of the shortened directory segments. + typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=103 + # Color of the anchor directory segments. Anchor segments are never shortened. The first + # segment is always an anchor. + typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=39 + # Display anchor directory segments in bold. + typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true + # Don't shorten directories that contain any of these files. They are anchors. + local anchor_files=( + .bzr + .citc + .git + .hg + .node-version + .python-version + .go-version + .ruby-version + .lua-version + .java-version + .perl-version + .php-version + .tool-version + .shorten_folder_marker + .svn + .terraform + CVS + Cargo.toml + composer.json + go.mod + package.json + stack.yaml + ) + typeset -g POWERLEVEL9K_SHORTEN_FOLDER_MARKER="(${(j:|:)anchor_files})" + # If set to "first" ("last"), remove everything before the first (last) subdirectory that contains + # files matching $POWERLEVEL9K_SHORTEN_FOLDER_MARKER. For example, when the current directory is + # /foo/bar/git_repo/nested_git_repo/baz, prompt will display git_repo/nested_git_repo/baz (first) + # or nested_git_repo/baz (last). This assumes that git_repo and nested_git_repo contain markers + # and other directories don't. + # + # Optionally, "first" and "last" can be followed by ":" where is an integer. + # This moves the truncation point to the right (positive offset) or to the left (negative offset) + # relative to the marker. Plain "first" and "last" are equivalent to "first:0" and "last:0" + # respectively. + typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false + # Don't shorten this many last directory segments. They are anchors. + typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1 + # Shorten directory if it's longer than this even if there is space for it. The value can + # be either absolute (e.g., '80') or a percentage of terminal width (e.g, '50%'). If empty, + # directory will be shortened only when prompt doesn't fit or when other parameters demand it + # (see POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS and POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT below). + # If set to `0`, directory will always be shortened to its minimum length. + typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80 + # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least this + # many columns for typing commands. + typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40 + # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least + # COLUMNS * POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT * 0.01 columns for typing commands. + typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT=50 + # If set to true, embed a hyperlink into the directory. Useful for quickly + # opening a directory in the file manager simply by clicking the link. + # Can also be handy when the directory is shortened, as it allows you to see + # the full directory that was used in previous commands. + typeset -g POWERLEVEL9K_DIR_HYPERLINK=false + + # Enable special styling for non-writable and non-existent directories. See POWERLEVEL9K_LOCK_ICON + # and POWERLEVEL9K_DIR_CLASSES below. + typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=v3 + + # The default icon shown next to non-writable and non-existent directories when + # POWERLEVEL9K_DIR_SHOW_WRITABLE is set to v3. + # typeset -g POWERLEVEL9K_LOCK_ICON='⭐' + + # POWERLEVEL9K_DIR_CLASSES allows you to specify custom icons and colors for different + # directories. It must be an array with 3 * N elements. Each triplet consists of: + # + # 1. A pattern against which the current directory ($PWD) is matched. Matching is done with + # extended_glob option enabled. + # 2. Directory class for the purpose of styling. + # 3. An empty string. + # + # Triplets are tried in order. The first triplet whose pattern matches $PWD wins. + # + # If POWERLEVEL9K_DIR_SHOW_WRITABLE is set to v3, non-writable and non-existent directories + # acquire class suffix _NOT_WRITABLE and NON_EXISTENT respectively. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_DIR_CLASSES=( + # '~/work(|/*)' WORK '' + # '~(|/*)' HOME '' + # '*' DEFAULT '') + # + # Whenever the current directory is ~/work or a subdirectory of ~/work, it gets styled with one + # of the following classes depending on its writability and existence: WORK, WORK_NOT_WRITABLE or + # WORK_NON_EXISTENT. + # + # Simply assigning classes to directories doesn't have any visible effects. It merely gives you an + # option to define custom colors and icons for different directory classes. + # + # # Styling for WORK. + # typeset -g POWERLEVEL9K_DIR_WORK_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_DIR_WORK_FOREGROUND=31 + # typeset -g POWERLEVEL9K_DIR_WORK_SHORTENED_FOREGROUND=103 + # typeset -g POWERLEVEL9K_DIR_WORK_ANCHOR_FOREGROUND=39 + # + # # Styling for WORK_NOT_WRITABLE. + # typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_FOREGROUND=31 + # typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_SHORTENED_FOREGROUND=103 + # typeset -g POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_ANCHOR_FOREGROUND=39 + # + # # Styling for WORK_NON_EXISTENT. + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_FOREGROUND=31 + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_SHORTENED_FOREGROUND=103 + # typeset -g POWERLEVEL9K_DIR_WORK_NON_EXISTENT_ANCHOR_FOREGROUND=39 + # + # If a styling parameter isn't explicitly defined for some class, it falls back to the classless + # parameter. For example, if POWERLEVEL9K_DIR_WORK_NOT_WRITABLE_FOREGROUND is not set, it falls + # back to POWERLEVEL9K_DIR_FOREGROUND. + # + typeset -g POWERLEVEL9K_DIR_CLASSES=() + + # Custom prefix. + # typeset -g POWERLEVEL9K_DIR_PREFIX='%fin ' + + #####################################[ vcs: git status ]###################################### + # Branch icon. Set this parameter to '\UE0A0 ' for the popular Powerline branch icon. + typeset -g POWERLEVEL9K_VCS_BRANCH_ICON= + + # Untracked files icon. It's really a question mark, your font isn't broken. + # Change the value of this parameter to show a different icon. + typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON='?' + + # Formatter for Git status. + # + # Example output: master wip ⇣42⇡42 *42 merge ~42 +42 !42 ?42. + # + # You can edit the function to customize how Git status looks. + # + # VCS_STATUS_* parameters are set by gitstatus plugin. See reference: + # https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh. + function my_git_formatter() { + emulate -L zsh + + if [[ -n $P9K_CONTENT ]]; then + # If P9K_CONTENT is not empty, use it. It's either "loading" or from vcs_info (not from + # gitstatus plugin). VCS_STATUS_* parameters are not available in this case. + typeset -g my_git_format=$P9K_CONTENT + return + fi + + if (( $1 )); then + # Styling for up-to-date Git status. + local meta='%f' # default foreground + local clean='%76F' # green foreground + local modified='%178F' # yellow foreground + local untracked='%39F' # blue foreground + local conflicted='%196F' # red foreground + else + # Styling for incomplete and stale Git status. + local meta='%244F' # grey foreground + local clean='%244F' # grey foreground + local modified='%244F' # grey foreground + local untracked='%244F' # grey foreground + local conflicted='%244F' # grey foreground + fi + + local res + + if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then + local branch=${(V)VCS_STATUS_LOCAL_BRANCH} + # If local branch name is at most 32 characters long, show it in full. + # Otherwise show the first 12 … the last 12. + # Tip: To always show local branch name in full without truncation, delete the next line. + (( $#branch > 32 )) && branch[13,-13]="…" # <-- this line + res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}${branch//\%/%%}" + fi + + if [[ -n $VCS_STATUS_TAG + # Show tag only if not on a branch. + # Tip: To always show tag, delete the next line. + && -z $VCS_STATUS_LOCAL_BRANCH # <-- this line + ]]; then + local tag=${(V)VCS_STATUS_TAG} + # If tag name is at most 32 characters long, show it in full. + # Otherwise show the first 12 … the last 12. + # Tip: To always show tag name in full without truncation, delete the next line. + (( $#tag > 32 )) && tag[13,-13]="…" # <-- this line + res+="${meta}#${clean}${tag//\%/%%}" + fi + + # Display the current Git commit if there is no branch and no tag. + # Tip: To always display the current Git commit, delete the next line. + [[ -z $VCS_STATUS_LOCAL_BRANCH && -z $VCS_STATUS_TAG ]] && # <-- this line + res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}" + + # Show tracking branch name if it differs from local branch. + if [[ -n ${VCS_STATUS_REMOTE_BRANCH:#$VCS_STATUS_LOCAL_BRANCH} ]]; then + res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" + fi + + # Display "wip" if the latest commit's summary contains "wip" or "WIP". + if [[ $VCS_STATUS_COMMIT_SUMMARY == (|*[^[:alnum:]])(wip|WIP)(|[^[:alnum:]]*) ]]; then + res+=" ${modified}wip" + fi + + # ⇣42 if behind the remote. + (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" + # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42. + (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" " + (( VCS_STATUS_COMMITS_AHEAD )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}" + # ⇠42 if behind the push remote. + (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}" + (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" " + # ⇢42 if ahead of the push remote; no leading space if also behind: ⇠42⇢42. + (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && res+="${clean}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}" + # *42 if have stashes. + (( VCS_STATUS_STASHES )) && res+=" ${clean}*${VCS_STATUS_STASHES}" + # 'merge' if the repo is in an unusual state. + [[ -n $VCS_STATUS_ACTION ]] && res+=" ${conflicted}${VCS_STATUS_ACTION}" + # ~42 if have merge conflicts. + (( VCS_STATUS_NUM_CONFLICTED )) && res+=" ${conflicted}~${VCS_STATUS_NUM_CONFLICTED}" + # +42 if have staged changes. + (( VCS_STATUS_NUM_STAGED )) && res+=" ${modified}+${VCS_STATUS_NUM_STAGED}" + # !42 if have unstaged changes. + (( VCS_STATUS_NUM_UNSTAGED )) && res+=" ${modified}!${VCS_STATUS_NUM_UNSTAGED}" + # ?42 if have untracked files. It's really a question mark, your font isn't broken. + # See POWERLEVEL9K_VCS_UNTRACKED_ICON above if you want to use a different icon. + # Remove the next line if you don't want to see untracked files at all. + (( VCS_STATUS_NUM_UNTRACKED )) && res+=" ${untracked}${(g::)POWERLEVEL9K_VCS_UNTRACKED_ICON}${VCS_STATUS_NUM_UNTRACKED}" + # "─" if the number of unstaged files is unknown. This can happen due to + # POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY (see below) being set to a non-negative number lower + # than the number of files in the Git index, or due to bash.showDirtyState being set to false + # in the repository config. The number of staged and untracked files may also be unknown + # in this case. + (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}─" + + typeset -g my_git_format=$res + } + functions -M my_git_formatter 2>/dev/null + + # Don't count the number of unstaged, untracked and conflicted files in Git repositories with + # more than this many files in the index. Negative value means infinity. + # + # If you are working in Git repositories with tens of millions of files and seeing performance + # sagging, try setting POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY to a number lower than the output + # of `git ls-files | wc -l`. Alternatively, add `bash.showDirtyState = false` to the repository's + # config: `git config bash.showDirtyState false`. + typeset -g POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY=-1 + + # Don't show Git status in prompt for repositories whose workdir matches this pattern. + # For example, if set to '~', the Git repository at $HOME/.git will be ignored. + # Multiple patterns can be combined with '|': '~(|/foo)|/bar/baz/*'. + typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~' + + # Disable the default Git status formatting. + typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true + # Install our own Git status formatter. + typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}' + typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter(0)))+${my_git_format}}' + # Enable counters for staged, unstaged, etc. + typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 + + # Icon color. + typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76 + typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244 + # Custom icon. + typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION= + # Custom prefix. + # typeset -g POWERLEVEL9K_VCS_PREFIX='%fon ' + + # Show status of repositories of these types. You can add svn and/or hg if you are + # using them. If you do, your prompt may become slow even when your current directory + # isn't in an svn or hg repository. + typeset -g POWERLEVEL9K_VCS_BACKENDS=(git) + + # These settings are used for repositories other than Git or when gitstatusd fails and + # Powerlevel10k has to fall back to using vcs_info. + typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=76 + typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=76 + typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=178 + + ##########################[ status: exit code of the last command ]########################### + # Enable OK_PIPE, ERROR_PIPE and ERROR_SIGNAL status states to allow us to enable, disable and + # style them independently from the regular OK and ERROR state. + typeset -g POWERLEVEL9K_STATUS_EXTENDED_STATES=true + + # Status on success. No content, just an icon. No need to show it if prompt_char is enabled as + # it will signify success by turning green. + typeset -g POWERLEVEL9K_STATUS_OK=false + typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND=70 + typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='✔' + + # Status when some part of a pipe command fails but the overall exit status is zero. It may look + # like this: 1|0. + typeset -g POWERLEVEL9K_STATUS_OK_PIPE=true + typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND=70 + typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='✔' + + # Status when it's just an error code (e.g., '1'). No need to show it if prompt_char is enabled as + # it will signify error by turning red. + typeset -g POWERLEVEL9K_STATUS_ERROR=false + typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND=160 + typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='✘' + + # Status when the last command was terminated by a signal. + typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL=true + typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND=160 + # Use terse signal names: "INT" instead of "SIGINT(2)". + typeset -g POWERLEVEL9K_STATUS_VERBOSE_SIGNAME=false + typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION='✘' + + # Status when some part of a pipe command fails and the overall exit status is also non-zero. + # It may look like this: 1|0. + typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE=true + typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND=160 + typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='✘' + + ###################[ command_execution_time: duration of the last command ]################### + # Show duration of the last command if takes at least this many seconds. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3 + # Show this many fractional digits. Zero means round to seconds. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 + # Execution time color. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=101 + # Duration format: 1d 2h 3m 4s. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' + # Custom icon. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION= + # Custom prefix. + # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%ftook ' + + #######################[ background_jobs: presence of background jobs ]####################### + # Don't show the number of background jobs. + typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE=false + # Background jobs color. + typeset -g POWERLEVEL9K_BACKGROUND_JOBS_FOREGROUND=70 + # Custom icon. + # typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #######################[ direnv: direnv status (https://direnv.net/) ]######################## + # Direnv color. + typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=178 + # Custom icon. + # typeset -g POWERLEVEL9K_DIRENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###############[ asdf: asdf version manager (https://github.com/asdf-vm/asdf) ]############### + # Default asdf color. Only used to display tools for which there is no color override (see below). + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_FOREGROUND. + typeset -g POWERLEVEL9K_ASDF_FOREGROUND=66 + + # There are four parameters that can be used to hide asdf tools. Each parameter describes + # conditions under which a tool gets hidden. Parameters can hide tools but not unhide them. If at + # least one parameter decides to hide a tool, that tool gets hidden. If no parameter decides to + # hide a tool, it gets shown. + # + # Special note on the difference between POWERLEVEL9K_ASDF_SOURCES and + # POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW. Consider the effect of the following commands: + # + # asdf local python 3.8.1 + # asdf global python 3.8.1 + # + # After running both commands the current python version is 3.8.1 and its source is "local" as + # it takes precedence over "global". If POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW is set to false, + # it'll hide python version in this case because 3.8.1 is the same as the global version. + # POWERLEVEL9K_ASDF_SOURCES will hide python version only if the value of this parameter doesn't + # contain "local". + + # Hide tool versions that don't come from one of these sources. + # + # Available sources: + # + # - shell `asdf current` says "set by ASDF_${TOOL}_VERSION environment variable" + # - local `asdf current` says "set by /some/not/home/directory/file" + # - global `asdf current` says "set by /home/username/file" + # + # Note: If this parameter is set to (shell local global), it won't hide tools. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SOURCES. + typeset -g POWERLEVEL9K_ASDF_SOURCES=(shell local global) + + # If set to false, hide tool versions that are the same as global. + # + # Note: The name of this parameter doesn't reflect its meaning at all. + # Note: If this parameter is set to true, it won't hide tools. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_PROMPT_ALWAYS_SHOW. + typeset -g POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW=false + + # If set to false, hide tool versions that are equal to "system". + # + # Note: If this parameter is set to true, it won't hide tools. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_SYSTEM. + typeset -g POWERLEVEL9K_ASDF_SHOW_SYSTEM=true + + # If set to non-empty value, hide tools unless there is a file matching the specified file pattern + # in the current directory, or its parent directory, or its grandparent directory, and so on. + # + # Note: If this parameter is set to empty value, it won't hide tools. + # Note: SHOW_ON_UPGLOB isn't specific to asdf. It works with all prompt segments. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_ON_UPGLOB. + # + # Example: Hide nodejs version when there is no package.json and no *.js files in the current + # directory, in `..`, in `../..` and so on. + # + # typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.js|package.json' + typeset -g POWERLEVEL9K_ASDF_SHOW_ON_UPGLOB= + + # Ruby version from asdf. + typeset -g POWERLEVEL9K_ASDF_RUBY_FOREGROUND=168 + # typeset -g POWERLEVEL9K_ASDF_RUBY_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_RUBY_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Python version from asdf. + typeset -g POWERLEVEL9K_ASDF_PYTHON_FOREGROUND=37 + # typeset -g POWERLEVEL9K_ASDF_PYTHON_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_PYTHON_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Go version from asdf. + typeset -g POWERLEVEL9K_ASDF_GOLANG_FOREGROUND=37 + # typeset -g POWERLEVEL9K_ASDF_GOLANG_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_GOLANG_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Node.js version from asdf. + typeset -g POWERLEVEL9K_ASDF_NODEJS_FOREGROUND=70 + # typeset -g POWERLEVEL9K_ASDF_NODEJS_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Rust version from asdf. + typeset -g POWERLEVEL9K_ASDF_RUST_FOREGROUND=37 + # typeset -g POWERLEVEL9K_ASDF_RUST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_RUST_SHOW_ON_UPGLOB='*.foo|*.bar' + + # .NET Core version from asdf. + typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_FOREGROUND=134 + # typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_DOTNET_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Flutter version from asdf. + typeset -g POWERLEVEL9K_ASDF_FLUTTER_FOREGROUND=38 + # typeset -g POWERLEVEL9K_ASDF_FLUTTER_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_FLUTTER_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Lua version from asdf. + typeset -g POWERLEVEL9K_ASDF_LUA_FOREGROUND=32 + # typeset -g POWERLEVEL9K_ASDF_LUA_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_LUA_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Java version from asdf. + typeset -g POWERLEVEL9K_ASDF_JAVA_FOREGROUND=32 + # typeset -g POWERLEVEL9K_ASDF_JAVA_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_JAVA_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Perl version from asdf. + typeset -g POWERLEVEL9K_ASDF_PERL_FOREGROUND=67 + # typeset -g POWERLEVEL9K_ASDF_PERL_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_PERL_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Erlang version from asdf. + typeset -g POWERLEVEL9K_ASDF_ERLANG_FOREGROUND=125 + # typeset -g POWERLEVEL9K_ASDF_ERLANG_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_ERLANG_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Elixir version from asdf. + typeset -g POWERLEVEL9K_ASDF_ELIXIR_FOREGROUND=129 + # typeset -g POWERLEVEL9K_ASDF_ELIXIR_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_ELIXIR_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Postgres version from asdf. + typeset -g POWERLEVEL9K_ASDF_POSTGRES_FOREGROUND=31 + # typeset -g POWERLEVEL9K_ASDF_POSTGRES_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_POSTGRES_SHOW_ON_UPGLOB='*.foo|*.bar' + + # PHP version from asdf. + typeset -g POWERLEVEL9K_ASDF_PHP_FOREGROUND=99 + # typeset -g POWERLEVEL9K_ASDF_PHP_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_PHP_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Haskell version from asdf. + typeset -g POWERLEVEL9K_ASDF_HASKELL_FOREGROUND=172 + # typeset -g POWERLEVEL9K_ASDF_HASKELL_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_HASKELL_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Julia version from asdf. + typeset -g POWERLEVEL9K_ASDF_JULIA_FOREGROUND=70 + # typeset -g POWERLEVEL9K_ASDF_JULIA_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_JULIA_SHOW_ON_UPGLOB='*.foo|*.bar' + + ##########[ nordvpn: nordvpn connection status, linux only (https://nordvpn.com/) ]########### + # NordVPN connection indicator color. + typeset -g POWERLEVEL9K_NORDVPN_FOREGROUND=39 + # Hide NordVPN connection indicator when not connected. + typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_CONTENT_EXPANSION= + typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_VISUAL_IDENTIFIER_EXPANSION= + # Custom icon. + # typeset -g POWERLEVEL9K_NORDVPN_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #################[ ranger: ranger shell (https://github.com/ranger/ranger) ]################## + # Ranger shell color. + typeset -g POWERLEVEL9K_RANGER_FOREGROUND=178 + # Custom icon. + # typeset -g POWERLEVEL9K_RANGER_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]####################### + # Nnn shell color. + typeset -g POWERLEVEL9K_NNN_FOREGROUND=72 + # Custom icon. + # typeset -g POWERLEVEL9K_NNN_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ######################[ lf: lf shell (https://github.com/gokcehan/lf) ]####################### + # lf shell color. + typeset -g POWERLEVEL9K_LF_FOREGROUND=72 + # Custom icon. + # typeset -g POWERLEVEL9K_LF_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##################[ xplr: xplr shell (https://github.com/sayanarijit/xplr) ]################## + # xplr shell color. + typeset -g POWERLEVEL9K_XPLR_FOREGROUND=72 + # Custom icon. + # typeset -g POWERLEVEL9K_XPLR_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########################[ vim_shell: vim shell indicator (:sh) ]########################### + # Vim shell indicator color. + typeset -g POWERLEVEL9K_VIM_SHELL_FOREGROUND=34 + # Custom icon. + # typeset -g POWERLEVEL9K_VIM_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ######[ midnight_commander: midnight commander shell (https://midnight-commander.org/) ]###### + # Midnight Commander shell color. + typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_FOREGROUND=178 + # Custom icon. + # typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #[ nix_shell: nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) ]## + # Nix shell color. + typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74 + + # Display the icon of nix_shell if PATH contains a subdirectory of /nix/store. + # typeset -g POWERLEVEL9K_NIX_SHELL_INFER_FROM_PATH=false + + # Tip: If you want to see just the icon without "pure" and "impure", uncomment the next line. + # typeset -g POWERLEVEL9K_NIX_SHELL_CONTENT_EXPANSION= + + # Custom icon. + # typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##################################[ disk_usage: disk usage ]################################## + # Colors for different levels of disk usage. + typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35 + typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_FOREGROUND=220 + typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_FOREGROUND=160 + # Thresholds for different levels of disk usage (percentage points). + typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL=90 + typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_LEVEL=95 + # If set to true, hide disk usage when below $POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL percent. + typeset -g POWERLEVEL9K_DISK_USAGE_ONLY_WARNING=false + # Custom icon. + # typeset -g POWERLEVEL9K_DISK_USAGE_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ######################################[ ram: free RAM ]####################################### + # RAM color. + typeset -g POWERLEVEL9K_RAM_FOREGROUND=66 + # Custom icon. + # typeset -g POWERLEVEL9K_RAM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #####################################[ swap: used swap ]###################################### + # Swap color. + typeset -g POWERLEVEL9K_SWAP_FOREGROUND=96 + # Custom icon. + # typeset -g POWERLEVEL9K_SWAP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ######################################[ load: CPU load ]###################################### + # Show average CPU load over this many last minutes. Valid values are 1, 5 and 15. + typeset -g POWERLEVEL9K_LOAD_WHICH=5 + # Load color when load is under 50%. + typeset -g POWERLEVEL9K_LOAD_NORMAL_FOREGROUND=66 + # Load color when load is between 50% and 70%. + typeset -g POWERLEVEL9K_LOAD_WARNING_FOREGROUND=178 + # Load color when load is over 70%. + typeset -g POWERLEVEL9K_LOAD_CRITICAL_FOREGROUND=166 + # Custom icon. + # typeset -g POWERLEVEL9K_LOAD_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################[ todo: todo items (https://github.com/todotxt/todo.txt-cli) ]################ + # Todo color. + typeset -g POWERLEVEL9K_TODO_FOREGROUND=110 + # Hide todo when the total number of tasks is zero. + typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_TOTAL=true + # Hide todo when the number of tasks after filtering is zero. + typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_FILTERED=false + + # Todo format. The following parameters are available within the expansion. + # + # - P9K_TODO_TOTAL_TASK_COUNT The total number of tasks. + # - P9K_TODO_FILTERED_TASK_COUNT The number of tasks after filtering. + # + # These variables correspond to the last line of the output of `todo.sh -p ls`: + # + # TODO: 24 of 42 tasks shown + # + # Here 24 is P9K_TODO_FILTERED_TASK_COUNT and 42 is P9K_TODO_TOTAL_TASK_COUNT. + # + # typeset -g POWERLEVEL9K_TODO_CONTENT_EXPANSION='$P9K_TODO_FILTERED_TASK_COUNT' + + # Custom icon. + # typeset -g POWERLEVEL9K_TODO_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ timewarrior: timewarrior tracking status (https://timewarrior.net/) ]############ + # Timewarrior color. + typeset -g POWERLEVEL9K_TIMEWARRIOR_FOREGROUND=110 + # If the tracked task is longer than 24 characters, truncate and append "…". + # Tip: To always display tasks without truncation, delete the following parameter. + # Tip: To hide task names and display just the icon when time tracking is enabled, set the + # value of the following parameter to "". + typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+…}' + + # Custom icon. + # typeset -g POWERLEVEL9K_TIMEWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##############[ taskwarrior: taskwarrior task count (https://taskwarrior.org/) ]############## + # Taskwarrior color. + typeset -g POWERLEVEL9K_TASKWARRIOR_FOREGROUND=74 + + # Taskwarrior segment format. The following parameters are available within the expansion. + # + # - P9K_TASKWARRIOR_PENDING_COUNT The number of pending tasks: `task +PENDING count`. + # - P9K_TASKWARRIOR_OVERDUE_COUNT The number of overdue tasks: `task +OVERDUE count`. + # + # Zero values are represented as empty parameters. + # + # The default format: + # + # '${P9K_TASKWARRIOR_OVERDUE_COUNT:+"!$P9K_TASKWARRIOR_OVERDUE_COUNT/"}$P9K_TASKWARRIOR_PENDING_COUNT' + # + # typeset -g POWERLEVEL9K_TASKWARRIOR_CONTENT_EXPANSION='$P9K_TASKWARRIOR_PENDING_COUNT' + + # Custom icon. + # typeset -g POWERLEVEL9K_TASKWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################################[ cpu_arch: CPU architecture ]################################ + # CPU architecture color. + typeset -g POWERLEVEL9K_CPU_ARCH_FOREGROUND=172 + + # Hide the segment when on a specific CPU architecture. + # typeset -g POWERLEVEL9K_CPU_ARCH_X86_64_CONTENT_EXPANSION= + # typeset -g POWERLEVEL9K_CPU_ARCH_X86_64_VISUAL_IDENTIFIER_EXPANSION= + + # Custom icon. + # typeset -g POWERLEVEL9K_CPU_ARCH_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##################################[ context: user@hostname ]################################## + # Context color when running with privileges. + typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=178 + # Context color in SSH without privileges. + typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=180 + # Default context color (no privileges, no SSH). + typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=180 + + # Context format when running with privileges: bold user@hostname. + typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%B%n@%m' + # Context format when in SSH without privileges: user@hostname. + typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_TEMPLATE='%n@%m' + # Default context format (no privileges, no SSH): user@hostname. + typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE='%n@%m' + + # Don't show context unless running with privileges or in SSH. + # Tip: Remove the next line to always show context. + typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION= + + # Custom icon. + # typeset -g POWERLEVEL9K_CONTEXT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Custom prefix. + # typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%fwith ' + + ###[ virtualenv: python virtual environment (https://docs.python.org/3/library/venv.html) ]### + # Python virtual environment color. + typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=37 + # Don't show Python version next to the virtual environment name. + typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false + # If set to "false", won't show virtualenv if pyenv is already shown. + # If set to "if-different", won't show virtualenv if it's the same as pyenv. + typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false + # Separate environment name from Python version only with a space. + typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= + # Custom icon. + # typeset -g POWERLEVEL9K_VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #####################[ anaconda: conda environment (https://conda.io/) ]###################### + # Anaconda environment color. + typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=37 + + # Anaconda segment format. The following parameters are available within the expansion. + # + # - CONDA_PREFIX Absolute path to the active Anaconda/Miniconda environment. + # - CONDA_DEFAULT_ENV Name of the active Anaconda/Miniconda environment. + # - CONDA_PROMPT_MODIFIER Configurable prompt modifier (see below). + # - P9K_ANACONDA_PYTHON_VERSION Current python version (python --version). + # + # CONDA_PROMPT_MODIFIER can be configured with the following command: + # + # conda config --set env_prompt '({default_env}) ' + # + # The last argument is a Python format string that can use the following variables: + # + # - prefix The same as CONDA_PREFIX. + # - default_env The same as CONDA_DEFAULT_ENV. + # - name The last segment of CONDA_PREFIX. + # - stacked_env Comma-separated list of names in the environment stack. The first element is + # always the same as default_env. + # + # Note: '({default_env}) ' is the default value of env_prompt. + # + # The default value of POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION expands to $CONDA_PROMPT_MODIFIER + # without the surrounding parentheses, or to the last path component of CONDA_PREFIX if the former + # is empty. + typeset -g POWERLEVEL9K_ANACONDA_CONTENT_EXPANSION='${${${${CONDA_PROMPT_MODIFIER#\(}% }%\)}:-${CONDA_PREFIX:t}}' + + # Custom icon. + # typeset -g POWERLEVEL9K_ANACONDA_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################[ pyenv: python environment (https://github.com/pyenv/pyenv) ]################ + # Pyenv color. + typeset -g POWERLEVEL9K_PYENV_FOREGROUND=37 + # Hide python version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_PYENV_SOURCES=(shell local global) + # If set to false, hide python version if it's the same as global: + # $(pyenv version-name) == $(pyenv global). + typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide python version if it's equal to "system". + typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true + + # Pyenv segment format. The following parameters are available within the expansion. + # + # - P9K_CONTENT Current pyenv environment (pyenv version-name). + # - P9K_PYENV_PYTHON_VERSION Current python version (python --version). + # + # The default format has the following logic: + # + # 1. Display just "$P9K_CONTENT" if it's equal to "$P9K_PYENV_PYTHON_VERSION" or + # starts with "$P9K_PYENV_PYTHON_VERSION/". + # 2. Otherwise display "$P9K_CONTENT $P9K_PYENV_PYTHON_VERSION". + typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+ $P9K_PYENV_PYTHON_VERSION}' + + # Custom icon. + # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################[ goenv: go environment (https://github.com/syndbg/goenv) ]################ + # Goenv color. + typeset -g POWERLEVEL9K_GOENV_FOREGROUND=37 + # Hide go version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_GOENV_SOURCES=(shell local global) + # If set to false, hide go version if it's the same as global: + # $(goenv version-name) == $(goenv global). + typeset -g POWERLEVEL9K_GOENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide go version if it's equal to "system". + typeset -g POWERLEVEL9K_GOENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_GOENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ nodenv: node.js version from nodenv (https://github.com/nodenv/nodenv) ]########## + # Nodenv color. + typeset -g POWERLEVEL9K_NODENV_FOREGROUND=70 + # Hide node version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_NODENV_SOURCES=(shell local global) + # If set to false, hide node version if it's the same as global: + # $(nodenv version-name) == $(nodenv global). + typeset -g POWERLEVEL9K_NODENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide node version if it's equal to "system". + typeset -g POWERLEVEL9K_NODENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_NODENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##############[ nvm: node.js version from nvm (https://github.com/nvm-sh/nvm) ]############### + # Nvm color. + typeset -g POWERLEVEL9K_NVM_FOREGROUND=70 + # Custom icon. + # typeset -g POWERLEVEL9K_NVM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ############[ nodeenv: node.js environment (https://github.com/ekalinin/nodeenv) ]############ + # Nodeenv color. + typeset -g POWERLEVEL9K_NODEENV_FOREGROUND=70 + # Don't show Node version next to the environment name. + typeset -g POWERLEVEL9K_NODEENV_SHOW_NODE_VERSION=false + # Separate environment name from Node version only with a space. + typeset -g POWERLEVEL9K_NODEENV_{LEFT,RIGHT}_DELIMITER= + # Custom icon. + # typeset -g POWERLEVEL9K_NODEENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##############################[ node_version: node.js version ]############################### + # Node version color. + typeset -g POWERLEVEL9K_NODE_VERSION_FOREGROUND=70 + # Show node version only when in a directory tree containing package.json. + typeset -g POWERLEVEL9K_NODE_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_NODE_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #######################[ go_version: go version (https://golang.org) ]######################## + # Go version color. + typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=37 + # Show go version only when in a go project subdirectory. + typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_GO_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #################[ rust_version: rustc version (https://www.rust-lang.org) ]################## + # Rust version color. + typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=37 + # Show rust version only when in a rust project subdirectory. + typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_RUST_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###############[ dotnet_version: .NET version (https://dotnet.microsoft.com) ]################ + # .NET version color. + typeset -g POWERLEVEL9K_DOTNET_VERSION_FOREGROUND=134 + # Show .NET version only when in a .NET project subdirectory. + typeset -g POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_DOTNET_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #####################[ php_version: php version (https://www.php.net/) ]###################### + # PHP version color. + typeset -g POWERLEVEL9K_PHP_VERSION_FOREGROUND=99 + # Show PHP version only when in a PHP project subdirectory. + typeset -g POWERLEVEL9K_PHP_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_PHP_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ laravel_version: laravel php framework version (https://laravel.com/) ]########### + # Laravel version color. + typeset -g POWERLEVEL9K_LARAVEL_VERSION_FOREGROUND=161 + # Custom icon. + # typeset -g POWERLEVEL9K_LARAVEL_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ####################[ java_version: java version (https://www.java.com/) ]#################### + # Java version color. + typeset -g POWERLEVEL9K_JAVA_VERSION_FOREGROUND=32 + # Show java version only when in a java project subdirectory. + typeset -g POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY=true + # Show brief version. + typeset -g POWERLEVEL9K_JAVA_VERSION_FULL=false + # Custom icon. + # typeset -g POWERLEVEL9K_JAVA_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###[ package: name@version from package.json (https://docs.npmjs.com/files/package.json) ]#### + # Package color. + typeset -g POWERLEVEL9K_PACKAGE_FOREGROUND=117 + # Package format. The following parameters are available within the expansion. + # + # - P9K_PACKAGE_NAME The value of `name` field in package.json. + # - P9K_PACKAGE_VERSION The value of `version` field in package.json. + # + # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}' + # Custom icon. + # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #############[ rbenv: ruby version from rbenv (https://github.com/rbenv/rbenv) ]############## + # Rbenv color. + typeset -g POWERLEVEL9K_RBENV_FOREGROUND=168 + # Hide ruby version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_RBENV_SOURCES=(shell local global) + # If set to false, hide ruby version if it's the same as global: + # $(rbenv version-name) == $(rbenv global). + typeset -g POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide ruby version if it's equal to "system". + typeset -g POWERLEVEL9K_RBENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_RBENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #######################[ rvm: ruby version from rvm (https://rvm.io) ]######################## + # Rvm color. + typeset -g POWERLEVEL9K_RVM_FOREGROUND=168 + # Don't show @gemset at the end. + typeset -g POWERLEVEL9K_RVM_SHOW_GEMSET=false + # Don't show ruby- at the front. + typeset -g POWERLEVEL9K_RVM_SHOW_PREFIX=false + # Custom icon. + # typeset -g POWERLEVEL9K_RVM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ fvm: flutter version management (https://github.com/leoafarias/fvm) ]############ + # Fvm color. + typeset -g POWERLEVEL9K_FVM_FOREGROUND=38 + # Custom icon. + # typeset -g POWERLEVEL9K_FVM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ luaenv: lua version from luaenv (https://github.com/cehoffman/luaenv) ]########### + # Lua color. + typeset -g POWERLEVEL9K_LUAENV_FOREGROUND=32 + # Hide lua version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_LUAENV_SOURCES=(shell local global) + # If set to false, hide lua version if it's the same as global: + # $(luaenv version-name) == $(luaenv global). + typeset -g POWERLEVEL9K_LUAENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide lua version if it's equal to "system". + typeset -g POWERLEVEL9K_LUAENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_LUAENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###############[ jenv: java version from jenv (https://github.com/jenv/jenv) ]################ + # Java color. + typeset -g POWERLEVEL9K_JENV_FOREGROUND=32 + # Hide java version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_JENV_SOURCES=(shell local global) + # If set to false, hide java version if it's the same as global: + # $(jenv version-name) == $(jenv global). + typeset -g POWERLEVEL9K_JENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide java version if it's equal to "system". + typeset -g POWERLEVEL9K_JENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_JENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ plenv: perl version from plenv (https://github.com/tokuhirom/plenv) ]############ + # Perl color. + typeset -g POWERLEVEL9K_PLENV_FOREGROUND=67 + # Hide perl version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_PLENV_SOURCES=(shell local global) + # If set to false, hide perl version if it's the same as global: + # $(plenv version-name) == $(plenv global). + typeset -g POWERLEVEL9K_PLENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide perl version if it's equal to "system". + typeset -g POWERLEVEL9K_PLENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_PLENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ perlbrew: perl version from perlbrew (https://github.com/gugod/App-perlbrew) ]############ + # Perlbrew color. + typeset -g POWERLEVEL9K_PERLBREW_FOREGROUND=67 + # Show perlbrew version only when in a perl project subdirectory. + typeset -g POWERLEVEL9K_PERLBREW_PROJECT_ONLY=true + # Don't show "perl-" at the front. + typeset -g POWERLEVEL9K_PERLBREW_SHOW_PREFIX=false + # Custom icon. + # typeset -g POWERLEVEL9K_PERLBREW_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ############[ phpenv: php version from phpenv (https://github.com/phpenv/phpenv) ]############ + # PHP color. + typeset -g POWERLEVEL9K_PHPENV_FOREGROUND=99 + # Hide php version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_PHPENV_SOURCES=(shell local global) + # If set to false, hide php version if it's the same as global: + # $(phpenv version-name) == $(phpenv global). + typeset -g POWERLEVEL9K_PHPENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide php version if it's equal to "system". + typeset -g POWERLEVEL9K_PHPENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_PHPENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #######[ scalaenv: scala version from scalaenv (https://github.com/scalaenv/scalaenv) ]####### + # Scala color. + typeset -g POWERLEVEL9K_SCALAENV_FOREGROUND=160 + # Hide scala version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_SCALAENV_SOURCES=(shell local global) + # If set to false, hide scala version if it's the same as global: + # $(scalaenv version-name) == $(scalaenv global). + typeset -g POWERLEVEL9K_SCALAENV_PROMPT_ALWAYS_SHOW=false + # If set to false, hide scala version if it's equal to "system". + typeset -g POWERLEVEL9K_SCALAENV_SHOW_SYSTEM=true + # Custom icon. + # typeset -g POWERLEVEL9K_SCALAENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ haskell_stack: haskell version from stack (https://haskellstack.org/) ]########### + # Haskell color. + typeset -g POWERLEVEL9K_HASKELL_STACK_FOREGROUND=172 + # Hide haskell version if it doesn't come from one of these sources. + # + # shell: version is set by STACK_YAML + # local: version is set by stack.yaml up the directory tree + # global: version is set by the implicit global project (~/.stack/global-project/stack.yaml) + typeset -g POWERLEVEL9K_HASKELL_STACK_SOURCES=(shell local) + # If set to false, hide haskell version if it's the same as in the implicit global project. + typeset -g POWERLEVEL9K_HASKELL_STACK_ALWAYS_SHOW=true + # Custom icon. + # typeset -g POWERLEVEL9K_HASKELL_STACK_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]############# + # Show kubecontext only when the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show kubecontext. + typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc|istioctl|kogito|k9s|helmfile|flux|fluxctl|stern|kubeseal|skaffold|kubent|kubecolor' + + # Kubernetes context classes for the purpose of using different colors, icons and expansions with + # different contexts. + # + # POWERLEVEL9K_KUBECONTEXT_CLASSES is an array with even number of elements. The first element + # in each pair defines a pattern against which the current kubernetes context gets matched. + # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) + # that gets matched. If you unset all POWERLEVEL9K_KUBECONTEXT_*CONTENT_EXPANSION parameters, + # you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_KUBECONTEXT_CLASSES defines the context class. Patterns are tried in order. The + # first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( + # '*prod*' PROD + # '*test*' TEST + # '*' DEFAULT) + # + # If your current kubernetes context is "deathray-testing/default", its class is TEST + # because "deathray-testing/default" doesn't match the pattern '*prod*' but does match '*test*'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' + typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( + # '*prod*' PROD # These values are examples that are unlikely + # '*test*' TEST # to match your needs. Customize them as needed. + '*' DEFAULT) + typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_FOREGROUND=134 + # typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # Use POWERLEVEL9K_KUBECONTEXT_CONTENT_EXPANSION to specify the content displayed by kubecontext + # segment. Parameter expansions are very flexible and fast, too. See reference: + # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion. + # + # Within the expansion the following parameters are always available: + # + # - P9K_CONTENT The content that would've been displayed if there was no content + # expansion defined. + # - P9K_KUBECONTEXT_NAME The current context's name. Corresponds to column NAME in the + # output of `kubectl config get-contexts`. + # - P9K_KUBECONTEXT_CLUSTER The current context's cluster. Corresponds to column CLUSTER in the + # output of `kubectl config get-contexts`. + # - P9K_KUBECONTEXT_NAMESPACE The current context's namespace. Corresponds to column NAMESPACE + # in the output of `kubectl config get-contexts`. If there is no + # namespace, the parameter is set to "default". + # - P9K_KUBECONTEXT_USER The current context's user. Corresponds to column AUTHINFO in the + # output of `kubectl config get-contexts`. + # + # If the context points to Google Kubernetes Engine (GKE) or Elastic Kubernetes Service (EKS), + # the following extra parameters are available: + # + # - P9K_KUBECONTEXT_CLOUD_NAME Either "gke" or "eks". + # - P9K_KUBECONTEXT_CLOUD_ACCOUNT Account/project ID. + # - P9K_KUBECONTEXT_CLOUD_ZONE Availability zone. + # - P9K_KUBECONTEXT_CLOUD_CLUSTER Cluster. + # + # P9K_KUBECONTEXT_CLOUD_* parameters are derived from P9K_KUBECONTEXT_CLUSTER. For example, + # if P9K_KUBECONTEXT_CLUSTER is "gke_my-account_us-east1-a_my-cluster-01": + # + # - P9K_KUBECONTEXT_CLOUD_NAME=gke + # - P9K_KUBECONTEXT_CLOUD_ACCOUNT=my-account + # - P9K_KUBECONTEXT_CLOUD_ZONE=us-east1-a + # - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01 + # + # If P9K_KUBECONTEXT_CLUSTER is "arn:aws:eks:us-east-1:123456789012:cluster/my-cluster-01": + # + # - P9K_KUBECONTEXT_CLOUD_NAME=eks + # - P9K_KUBECONTEXT_CLOUD_ACCOUNT=123456789012 + # - P9K_KUBECONTEXT_CLOUD_ZONE=us-east-1 + # - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01 + typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION= + # Show P9K_KUBECONTEXT_CLOUD_CLUSTER if it's not empty and fall back to P9K_KUBECONTEXT_NAME. + POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${P9K_KUBECONTEXT_CLOUD_CLUSTER:-${P9K_KUBECONTEXT_NAME}}' + # Append the current context's namespace if it's not "default". + POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}' + + # Custom prefix. + # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%fat ' + + ################[ terraform: terraform workspace (https://www.terraform.io) ]################# + # Don't show terraform workspace if it's literally "default". + typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT=false + # POWERLEVEL9K_TERRAFORM_CLASSES is an array with even number of elements. The first element + # in each pair defines a pattern against which the current terraform workspace gets matched. + # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) + # that gets matched. If you unset all POWERLEVEL9K_TERRAFORM_*CONTENT_EXPANSION parameters, + # you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_TERRAFORM_CLASSES defines the workspace class. Patterns are tried in order. The + # first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( + # '*prod*' PROD + # '*test*' TEST + # '*' OTHER) + # + # If your current terraform workspace is "project_test", its class is TEST because "project_test" + # doesn't match the pattern '*prod*' but does match '*test*'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_TERRAFORM_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_TERRAFORM_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_TERRAFORM_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' + typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( + # '*prod*' PROD # These values are examples that are unlikely + # '*test*' TEST # to match your needs. Customize them as needed. + '*' OTHER) + typeset -g POWERLEVEL9K_TERRAFORM_OTHER_FOREGROUND=38 + # typeset -g POWERLEVEL9K_TERRAFORM_OTHER_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #############[ terraform_version: terraform version (https://www.terraform.io) ]############## + # Terraform version color. + typeset -g POWERLEVEL9K_TERRAFORM_VERSION_FOREGROUND=38 + # Custom icon. + # typeset -g POWERLEVEL9K_TERRAFORM_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]# + # Show aws only when the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show aws. + typeset -g POWERLEVEL9K_AWS_SHOW_ON_COMMAND='aws|awless|terraform|pulumi|terragrunt' + + # POWERLEVEL9K_AWS_CLASSES is an array with even number of elements. The first element + # in each pair defines a pattern against which the current AWS profile gets matched. + # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) + # that gets matched. If you unset all POWERLEVEL9K_AWS_*CONTENT_EXPANSION parameters, + # you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_AWS_CLASSES defines the profile class. Patterns are tried in order. The + # first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_AWS_CLASSES=( + # '*prod*' PROD + # '*test*' TEST + # '*' DEFAULT) + # + # If your current AWS profile is "company_test", its class is TEST + # because "company_test" doesn't match the pattern '*prod*' but does match '*test*'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_AWS_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_AWS_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_AWS_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' + typeset -g POWERLEVEL9K_AWS_CLASSES=( + # '*prod*' PROD # These values are examples that are unlikely + # '*test*' TEST # to match your needs. Customize them as needed. + '*' DEFAULT) + typeset -g POWERLEVEL9K_AWS_DEFAULT_FOREGROUND=208 + # typeset -g POWERLEVEL9K_AWS_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # AWS segment format. The following parameters are available within the expansion. + # + # - P9K_AWS_PROFILE The name of the current AWS profile. + # - P9K_AWS_REGION The region associated with the current AWS profile. + typeset -g POWERLEVEL9K_AWS_CONTENT_EXPANSION='${P9K_AWS_PROFILE//\%/%%}${P9K_AWS_REGION:+ ${P9K_AWS_REGION//\%/%%}}' + + #[ aws_eb_env: aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) ]# + # AWS Elastic Beanstalk environment color. + typeset -g POWERLEVEL9K_AWS_EB_ENV_FOREGROUND=70 + # Custom icon. + # typeset -g POWERLEVEL9K_AWS_EB_ENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ azure: azure account name (https://docs.microsoft.com/en-us/cli/azure) ]########## + # Show azure only when the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show azure. + typeset -g POWERLEVEL9K_AZURE_SHOW_ON_COMMAND='az|terraform|pulumi|terragrunt' + # Azure account name color. + typeset -g POWERLEVEL9K_AZURE_FOREGROUND=32 + # Custom icon. + # typeset -g POWERLEVEL9K_AZURE_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ gcloud: google cloud account and project (https://cloud.google.com/) ]########### + # Show gcloud only when the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show gcloud. + typeset -g POWERLEVEL9K_GCLOUD_SHOW_ON_COMMAND='gcloud|gcs|gsutil' + # Google cloud color. + typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=32 + + # Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION and/or + # POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION if the default is too verbose or not informative + # enough. You can use the following parameters in the expansions. Each of them corresponds to the + # output of `gcloud` tool. + # + # Parameter | Source + # -------------------------|-------------------------------------------------------------------- + # P9K_GCLOUD_CONFIGURATION | gcloud config configurations list --format='value(name)' + # P9K_GCLOUD_ACCOUNT | gcloud config get-value account + # P9K_GCLOUD_PROJECT_ID | gcloud config get-value project + # P9K_GCLOUD_PROJECT_NAME | gcloud projects describe $P9K_GCLOUD_PROJECT_ID --format='value(name)' + # + # Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurrences of '%' replaced with '%%'. + # + # Obtaining project name requires sending a request to Google servers. This can take a long time + # and even fail. When project name is unknown, P9K_GCLOUD_PROJECT_NAME is not set and gcloud + # prompt segment is in state PARTIAL. When project name gets known, P9K_GCLOUD_PROJECT_NAME gets + # set and gcloud prompt segment transitions to state COMPLETE. + # + # You can customize the format, icon and colors of gcloud segment separately for states PARTIAL + # and COMPLETE. You can also hide gcloud in state PARTIAL by setting + # POWERLEVEL9K_GCLOUD_PARTIAL_VISUAL_IDENTIFIER_EXPANSION and + # POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION to empty. + typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}' + typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}' + + # Send a request to Google (by means of `gcloud projects describe ...`) to obtain project name + # this often. Negative value disables periodic polling. In this mode project name is retrieved + # only when the current configuration, account or project id changes. + typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60 + + # Custom icon. + # typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #[ google_app_cred: google application credentials (https://cloud.google.com/docs/authentication/production) ]# + # Show google_app_cred only when the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show google_app_cred. + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_SHOW_ON_COMMAND='terraform|pulumi|terragrunt' + + # Google application credentials classes for the purpose of using different colors, icons and + # expansions with different credentials. + # + # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES is an array with even number of elements. The first + # element in each pair defines a pattern against which the current kubernetes context gets + # matched. More specifically, it's P9K_CONTENT prior to the application of context expansion + # (see below) that gets matched. If you unset all POWERLEVEL9K_GOOGLE_APP_CRED_*CONTENT_EXPANSION + # parameters, you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES defines the context class. Patterns are tried in order. + # The first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( + # '*:*prod*:*' PROD + # '*:*test*:*' TEST + # '*' DEFAULT) + # + # If your current Google application credentials is "service_account deathray-testing x@y.com", + # its class is TEST because it doesn't match the pattern '* *prod* *' but does match '* *test* *'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_CONTENT_EXPANSION='$P9K_GOOGLE_APP_CRED_PROJECT_ID' + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( + # '*:*prod*:*' PROD # These values are examples that are unlikely + # '*:*test*:*' TEST # to match your needs. Customize them as needed. + '*' DEFAULT) + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_FOREGROUND=32 + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # Use POWERLEVEL9K_GOOGLE_APP_CRED_CONTENT_EXPANSION to specify the content displayed by + # google_app_cred segment. Parameter expansions are very flexible and fast, too. See reference: + # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion. + # + # You can use the following parameters in the expansion. Each of them corresponds to one of the + # fields in the JSON file pointed to by GOOGLE_APPLICATION_CREDENTIALS. + # + # Parameter | JSON key file field + # ---------------------------------+--------------- + # P9K_GOOGLE_APP_CRED_TYPE | type + # P9K_GOOGLE_APP_CRED_PROJECT_ID | project_id + # P9K_GOOGLE_APP_CRED_CLIENT_EMAIL | client_email + # + # Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurrences of '%' replaced by '%%'. + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_CONTENT_EXPANSION='${P9K_GOOGLE_APP_CRED_PROJECT_ID//\%/%%}' + + ##############[ toolbox: toolbox name (https://github.com/containers/toolbox) ]############### + # Toolbox color. + typeset -g POWERLEVEL9K_TOOLBOX_FOREGROUND=178 + # Don't display the name of the toolbox if it matches fedora-toolbox-*. + typeset -g POWERLEVEL9K_TOOLBOX_CONTENT_EXPANSION='${P9K_TOOLBOX_NAME:#fedora-toolbox-*}' + # Custom icon. + # typeset -g POWERLEVEL9K_TOOLBOX_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Custom prefix. + # typeset -g POWERLEVEL9K_TOOLBOX_PREFIX='%fin ' + + ###############################[ public_ip: public IP address ]############################### + # Public IP color. + typeset -g POWERLEVEL9K_PUBLIC_IP_FOREGROUND=94 + # Custom icon. + # typeset -g POWERLEVEL9K_PUBLIC_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ########################[ vpn_ip: virtual private network indicator ]######################### + # VPN IP color. + typeset -g POWERLEVEL9K_VPN_IP_FOREGROUND=81 + # When on VPN, show just an icon without the IP address. + # Tip: To display the private IP address when on VPN, remove the next line. + typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION= + # Regular expression for the VPN network interface. Run `ifconfig` or `ip -4 a show` while on VPN + # to see the name of the interface. + typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(gpd|wg|(.*tun)|tailscale)[0-9]*|(zt.*)' + # If set to true, show one segment per matching network interface. If set to false, show only + # one segment corresponding to the first matching network interface. + # Tip: If you set it to true, you'll probably want to unset POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION. + typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=false + # Custom icon. + # typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ ip: ip address and bandwidth usage for a specified network interface ]########### + # IP color. + typeset -g POWERLEVEL9K_IP_FOREGROUND=38 + # The following parameters are accessible within the expansion: + # + # Parameter | Meaning + # ----------------------+------------------------------------------- + # P9K_IP_IP | IP address + # P9K_IP_INTERFACE | network interface + # P9K_IP_RX_BYTES | total number of bytes received + # P9K_IP_TX_BYTES | total number of bytes sent + # P9K_IP_RX_BYTES_DELTA | number of bytes received since last prompt + # P9K_IP_TX_BYTES_DELTA | number of bytes sent since last prompt + # P9K_IP_RX_RATE | receive rate (since last prompt) + # P9K_IP_TX_RATE | send rate (since last prompt) + typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='$P9K_IP_IP${P9K_IP_RX_RATE:+ %70F⇣$P9K_IP_RX_RATE}${P9K_IP_TX_RATE:+ %215F⇡$P9K_IP_TX_RATE}' + # Show information for the first network interface whose name matches this regular expression. + # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. + typeset -g POWERLEVEL9K_IP_INTERFACE='[ew].*' + # Custom icon. + # typeset -g POWERLEVEL9K_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #########################[ proxy: system-wide http/https/ftp proxy ]########################## + # Proxy color. + typeset -g POWERLEVEL9K_PROXY_FOREGROUND=68 + # Custom icon. + # typeset -g POWERLEVEL9K_PROXY_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################################[ battery: internal battery ]################################# + # Show battery in red when it's below this level and not connected to power supply. + typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20 + typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160 + # Show battery in green when it's charging or fully charged. + typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70 + # Show battery in yellow when it's discharging. + typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178 + # Battery pictograms going from low to high level of charge. + typeset -g POWERLEVEL9K_BATTERY_STAGES='\uf58d\uf579\uf57a\uf57b\uf57c\uf57d\uf57e\uf57f\uf580\uf581\uf578' + # Don't show the remaining time to charge/discharge. + typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false + + #####################################[ wifi: wifi speed ]##################################### + # WiFi color. + typeset -g POWERLEVEL9K_WIFI_FOREGROUND=68 + # Custom icon. + # typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # Use different colors and icons depending on signal strength ($P9K_WIFI_BARS). + # + # # Wifi colors and icons for different signal strength levels (low to high). + # typeset -g my_wifi_fg=(68 68 68 68 68) # <-- change these values + # typeset -g my_wifi_icon=('WiFi' 'WiFi' 'WiFi' 'WiFi' 'WiFi') # <-- change these values + # + # typeset -g POWERLEVEL9K_WIFI_CONTENT_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}$P9K_WIFI_LAST_TX_RATE Mbps' + # typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}${my_wifi_icon[P9K_WIFI_BARS+1]}' + # + # The following parameters are accessible within the expansions: + # + # Parameter | Meaning + # ----------------------+--------------- + # P9K_WIFI_SSID | service set identifier, a.k.a. network name + # P9K_WIFI_LINK_AUTH | authentication protocol such as "wpa2-psk" or "none"; empty if unknown + # P9K_WIFI_LAST_TX_RATE | wireless transmit rate in megabits per second + # P9K_WIFI_RSSI | signal strength in dBm, from -120 to 0 + # P9K_WIFI_NOISE | noise in dBm, from -120 to 0 + # P9K_WIFI_BARS | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE) + + ####################################[ time: current time ]#################################### + # Current time color. + typeset -g POWERLEVEL9K_TIME_FOREGROUND=66 + # Format for the current time: 09:51:02. See `man 3 strftime`. + typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%I:%M:%S %p}' + # If set to true, time will update when you hit enter. This way prompts for the past + # commands will contain the start times of their commands as opposed to the default + # behavior where they contain the end times of their preceding commands. + typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false + # Custom icon. + typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION= + # Custom prefix. + # typeset -g POWERLEVEL9K_TIME_PREFIX='%fat ' + + # Example of a user-defined prompt segment. Function prompt_example will be called on every + # prompt if `example` prompt segment is added to POWERLEVEL9K_LEFT_PROMPT_ELEMENTS or + # POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS. It displays an icon and orange text greeting the user. + # + # Type `p10k help segment` for documentation and a more sophisticated example. + function prompt_example() { + p10k segment -f 208 -i '⭐' -t 'hello, %n' + } + + # User-defined prompt segments may optionally provide an instant_prompt_* function. Its job + # is to generate the prompt segment for display in instant prompt. See + # https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt. + # + # Powerlevel10k will call instant_prompt_* at the same time as the regular prompt_* function + # and will record all `p10k segment` calls it makes. When displaying instant prompt, Powerlevel10k + # will replay these calls without actually calling instant_prompt_*. It is imperative that + # instant_prompt_* always makes the same `p10k segment` calls regardless of environment. If this + # rule is not observed, the content of instant prompt will be incorrect. + # + # Usually, you should either not define instant_prompt_* or simply call prompt_* from it. If + # instant_prompt_* is not defined for a segment, the segment won't be shown in instant prompt. + function instant_prompt_example() { + # Since prompt_example always makes the same `p10k segment` calls, we can call it from + # instant_prompt_example. This will give us the same `example` prompt segment in the instant + # and regular prompts. + prompt_example + } + + # User-defined prompt segments can be customized the same way as built-in segments. + # typeset -g POWERLEVEL9K_EXAMPLE_FOREGROUND=208 + # typeset -g POWERLEVEL9K_EXAMPLE_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # Transient prompt works similarly to the builtin transient_rprompt option. It trims down prompt + # when accepting a command line. Supported values: + # + # - off: Don't change prompt when accepting a command line. + # - always: Trim down prompt when accepting a command line. + # - same-dir: Trim down prompt when accepting a command line unless this is the first command + # typed after changing current working directory. + typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=always + + # Instant prompt mode. + # + # - off: Disable instant prompt. Choose this if you've tried instant prompt and found + # it incompatible with your zsh configuration files. + # - quiet: Enable instant prompt and don't print warnings when detecting console output + # during zsh initialization. Choose this if you've read and understood + # https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt. + # - verbose: Enable instant prompt and print a warning when detecting console output during + # zsh initialization. Choose this if you've never tried instant prompt, haven't + # seen the warning, or if you are unsure what this all means. + typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet + + # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. + # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload + # can slow down prompt by 1-2 milliseconds, so it's better to keep it turned off unless you + # really need it. + typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true + + # If p10k is already loaded, reload configuration. + # This works even with POWERLEVEL9K_DISABLE_HOT_RELOAD=true. + (( ! $+functions[p10k] )) || p10k reload +} + +# Tell `p10k configure` which file it should overwrite. +typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} + +(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} +'builtin' 'unset' 'p10k_config_opts' diff --git a/shells/zsh/zshenv b/shells/zsh/zshenv new file mode 100644 index 0000000..826714b --- /dev/null +++ b/shells/zsh/zshenv @@ -0,0 +1 @@ +export ZDOTDIR="$HOME/.config/zsh" diff --git a/shells/zsh/zshrc b/shells/zsh/zshrc index 660ee9d..874be23 100644 --- a/shells/zsh/zshrc +++ b/shells/zsh/zshrc @@ -8,6 +8,13 @@ fi export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock ssh-add -l > /dev/null || ssh-add ~/.ssh/id_ed25519 +# Path to your oh-my-zsh installation. +# export ZSH="$HOME/.oh-my-zsh" +export ZSH="$HOME/.local/share/oh-my-zsh" + +# Would you like to use another custom folder than $ZSH/custom? +export ZSH_CUSTOM="$HOME/.local/share/omz-custom/custom" +# export ZSH_CUSTOM=$HOME/.local/share/omz-custom # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # Initialization code that may require console input (password prompts, [y/n] # confirmations, etc.) must go above this block; everything else may go below. @@ -21,12 +28,18 @@ fi # fixing gopath and binaries export GOPATH="$HOME/.local/share/go" +# moving cargo cache dir +export CARGO_HOME="$HOME/.local/share/cargo" +export RUSTUP_HOME="$HOME/.local/sare/rustup" + # Path to your oh-my-zsh installation. -export ZSH="$HOME/.oh-my-zsh" +# export ZSH="$HOME/.oh-my-zsh" +export ZSH="$HOME/.local/share/oh-my-zsh" # Would you like to use another custom folder than $ZSH/custom? -export ZSH_CUSTOM=$HOME/.local/share/oh-my-zsh/custom +export ZSH_CUSTOM="$HOME/.local/share/omz-custom/custom" +# export ZSH_CUSTOM=$HOME/.local/share/omz-custom # ZSH theme ZSH_THEME="powerlevel10k/powerlevel10k" @@ -71,7 +84,7 @@ bindkey -v # if [[ -n $SSH_CONNECTION ]]; then # export EDITOR='vim' # else -# export EDITOR='mvim' +# export EDITOR='nvim' # fi # Compilation flags @@ -82,18 +95,20 @@ bindkey -v alias vim="nvim" -# helpful aliasis -#alias ifconfig="/sbin/ifconfig" - # bb ip remove work related alias bbrm='ssh-keygen -f "/home/kdeppe/.ssh/known_hosts" -R "192.168.7.2"' # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +export POWERLEVEL9K_CONFIG_FILE="$HOME/.config/zsh/.p10k.sh" + +[[ ! -f "$POWERLEVEL9K_CONFIG_FILE" ]] || source "$POWERLEVEL9K_CONFIG_FILE" # home and clear alias c="cd && clear" +# colorize ls +alias ls="ls --color=auto" + # water tracking alias alias nalgene="water 32" alias tt="timetracker" diff --git a/terminals/tmux/tmux.sparse.conf b/terminals/tmux/tmux.sparse.conf index 7681efe..5d64d0a 100644 --- a/terminals/tmux/tmux.sparse.conf +++ b/terminals/tmux/tmux.sparse.conf @@ -57,9 +57,10 @@ set -g status-left "" # set -g @continuum-boot 'on' #set -g @continuum-systemd-start-cmd 'new-session -d -s doormat' +set-environment -g TMUX_PLUGIN_MANAGER_PATH "$HOME/.local/share/tmux/plugins" -# auto install plugins -if "test ! -d ~/.tmux/plugins/tpm" \ - "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'" +# auto install plugins at correct directory +if "test ! -d ~/.local/share/tmux/plugins/tpm" \ + "run 'git clone https://github.com/tmux-plugins/tpm ~/.local/share/tmux/plugins/tpm && ~/.local/share/tmux/plugins/tpm/bin/install_plugins'" # run tpm -run '~/.tmux/plugins/tpm/tpm' +run '~/.local/share/tmux/plugins/tpm/tpm' From db00b331ac58389a03ec6b4dabf5dccbac839c4e Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 4 May 2023 20:22:15 -0400 Subject: [PATCH 05/23] more recent commits --- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- src/fzf | 2 +- src/timetracker | 2 +- src/weather | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index bbea8d2..045f006 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit bbea8d2d06382f6f0001c9212da91a319076f06e +Subproject commit 045f006c50d782a6d3acbd8a07d1595322ff7e43 diff --git a/src/fzf b/src/fzf index cf95e44..96670d5 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit cf95e44cb4ce6f42a318abba0efa77c7311c87c9 +Subproject commit 96670d5f16dcf23d590eb1d83d1de351b2e8fb15 diff --git a/src/timetracker b/src/timetracker index 613dfb9..c5672a5 160000 --- a/src/timetracker +++ b/src/timetracker @@ -1 +1 @@ -Subproject commit 613dfb9d259166a40d0781e26b8ecd0f59648a25 +Subproject commit c5672a5864bc78a932de438e4f64fefcee5c6ea6 diff --git a/src/weather b/src/weather index d27117b..020bbf7 160000 --- a/src/weather +++ b/src/weather @@ -1 +1 @@ -Subproject commit d27117b8bc4f600657c7dd94310f60e784371eac +Subproject commit 020bbf7d64cc2f0c5d2a4ab96d45b8014ef54ad2 From 53fa33d23c37dfd26a3dce6a1b46c7d6b3f1dcad Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Fri, 5 May 2023 19:50:00 -0400 Subject: [PATCH 06/23] moved rofi files --- bin/rofi-files | 49 -------------------- editors/neovim | 2 +- gui/rofi | 2 +- meta/configs/scripts.yaml | 1 - shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- src/fzf | 2 +- src/timetracker | 2 +- src/tmux-mem-cpu-load | 2 +- src/weather | 2 +- 9 files changed, 7 insertions(+), 57 deletions(-) delete mode 100755 bin/rofi-files diff --git a/bin/rofi-files b/bin/rofi-files deleted file mode 100755 index c9bfe4e..0000000 --- a/bin/rofi-files +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# getting focused pwd -PID=$(xdotool getwindowfocus getwindowpid) -child=$PID -children=() -while [ -n "$child" ] ; do - children+=($child) - child=$(pgrep -P $child) -done - -last_ps=$(ps ${children[-1]} | grep -v PID | awk '{print $5}') - -if [ "$last_ps" == "tmux" ] ; then - current_pane=$(tmux list-panes | grep '(active)' | grep -o '^[0-9]') - cwd=$(tmux display-message -p -t $current_pane -F '#{pane_current_path}') -else - cwd=$(readlink -e /proc/${children[-1]}/cwd) -fi - -# change to the directory -cd $cwd -files=$(find * -type f) - -selection=$(echo "$files" | rofi-dmenu) - -# exit on quit -if [ -z "$selection" ] ; then - exit 0 -fi - -# grab extension -extension=$(echo "$selection" | grep -o '.\([a-zA-Z]\+\)$') - -# get proper opener -case "$extension" in - '.pdf') prg="zathura" ;; - '.md') prg="vim" ;; - '.png') prg="feh" ;; - '.jpg') prg="feh" ;; - '.jpeg') prg="feh" ;; - *) prg="xdg-open" ;; -esac - -if [[ "$1" == '-S' && "$prg" =~ [feh|zathura] ]] ; then - swallow $prg "$selection" -else - $prg "$selection" -fi diff --git a/editors/neovim b/editors/neovim index 0f52a17..1ff3319 160000 --- a/editors/neovim +++ b/editors/neovim @@ -1 +1 @@ -Subproject commit 0f52a172cc2bfc4f5f059f181cf37e8f2f1b69c2 +Subproject commit 1ff331968225f5854d4790de73d2b8e2af545171 diff --git a/gui/rofi b/gui/rofi index dbf546e..7dd2a2e 160000 --- a/gui/rofi +++ b/gui/rofi @@ -1 +1 @@ -Subproject commit dbf546e61c0ca848f2474db55b601dead6d41f7e +Subproject commit 7dd2a2e4a6ad4423a5e8889550b53556711e8ce4 diff --git a/meta/configs/scripts.yaml b/meta/configs/scripts.yaml index de8d9b0..9422c89 100644 --- a/meta/configs/scripts.yaml +++ b/meta/configs/scripts.yaml @@ -8,7 +8,6 @@ - link: ~/.local/bin/ssh_agent_check: bin/ssh_agent_check ~/.local/bin/poly_spotify: bin/poly_spotify - ~/.local/bin/rofi-files: bin/rofi-files ~/.local/bin/i3-scratchpad.sh: bin/i3-scratchpad.sh ~/.local/bin/todo_display.sh: bin/todo_display.sh ~/.local/bin/display_uptime: bin/display_uptime diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index 045f006..0af598c 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 045f006c50d782a6d3acbd8a07d1595322ff7e43 +Subproject commit 0af598cbed78660066f8a8f4465844501ba5695b diff --git a/src/fzf b/src/fzf index 96670d5..9499910 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit 96670d5f16dcf23d590eb1d83d1de351b2e8fb15 +Subproject commit 94999101e358385f3ca67a6ec9512f549196b802 diff --git a/src/timetracker b/src/timetracker index c5672a5..613dfb9 160000 --- a/src/timetracker +++ b/src/timetracker @@ -1 +1 @@ -Subproject commit c5672a5864bc78a932de438e4f64fefcee5c6ea6 +Subproject commit 613dfb9d259166a40d0781e26b8ecd0f59648a25 diff --git a/src/tmux-mem-cpu-load b/src/tmux-mem-cpu-load index 6d96a8a..a991497 160000 --- a/src/tmux-mem-cpu-load +++ b/src/tmux-mem-cpu-load @@ -1 +1 @@ -Subproject commit 6d96a8a4906e91f44ddf97645d5c3c1980212402 +Subproject commit a991497b9ff7ca59148d00105a0b5fe4eb8e48e3 diff --git a/src/weather b/src/weather index 020bbf7..d27117b 160000 --- a/src/weather +++ b/src/weather @@ -1 +1 @@ -Subproject commit 020bbf7d64cc2f0c5d2a4ab96d45b8014ef54ad2 +Subproject commit d27117b8bc4f600657c7dd94310f60e784371eac From 8f5ac5b948db98cf95d666bb4f95266c54215be9 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Fri, 5 May 2023 19:52:41 -0400 Subject: [PATCH 07/23] missed ln --- gui/rofi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/rofi b/gui/rofi index 7dd2a2e..3075fcf 160000 --- a/gui/rofi +++ b/gui/rofi @@ -1 +1 @@ -Subproject commit 7dd2a2e4a6ad4423a5e8889550b53556711e8ce4 +Subproject commit 3075fcf966ecada9696fee3cb8cb6a9f507d552b From 13994fa458890fcf0e81c3ff2785afaea387f516 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Sat, 6 May 2023 18:24:09 -0400 Subject: [PATCH 08/23] VPN status check --- bin/vpn_status.sh | 25 +++++++++++++++++++++++++ gui/polybar/config.ini | 12 +++++++++--- meta/configs/scripts.yaml | 1 + passwords/gnupg/pubring.kbx | Bin 17548 -> 21702 bytes passwords/gnupg/pubring.kbx~ | Bin 16174 -> 17548 bytes 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100755 bin/vpn_status.sh diff --git a/bin/vpn_status.sh b/bin/vpn_status.sh new file mode 100755 index 0000000..671aecd --- /dev/null +++ b/bin/vpn_status.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# checks mullvad status for monitoring in polybar + +CONNECTED=$(printf '%s%s' '%{F#0F0}' $(echo -e '\Uf0318')) # green +DISCONNECTED=$(printf '%s%s' '%{F#F00}' $(echo -e '\Uf0319')) # red + +# check that its installed +if ! command -v mullvad &>/dev/null ; then + echo "Seafile not downloaded to device!">&2 + echo "$DISCONNECTED" + exit 1 +fi + +# getting vpn status +VPN_DISCONNECTED=$(mullvad status | grep Disconnected) + +if [[ -n "$VPN_DISCONNECTED" ]] ; then + # vpn is disconnected + echo "$DISCONNECTED" + exit 0 +fi + +# connected +echo "$CONNECTED" diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini index d3db9c3..f56977b 100644 --- a/gui/polybar/config.ini +++ b/gui/polybar/config.ini @@ -6,7 +6,7 @@ foreground = #DDD primary = #F0C674 secondary = #8ABEB7 disabled = #707880 -alert = #A54242 +alert = #A54242S [section/base-bar] ; base bar settings @@ -38,7 +38,7 @@ font-0 = Hack Nerd Font:size=10;2 height = 14pt ; modules modules-left = xworkspaces weather-thinkpad -modules-right = battery pulseaudio memory cpu wlan uptime seafile calendar-sync bg-selector date-tp powermenu +modules-right = battery pulseaudio memory cpu wlan vpn uptime seafile calendar-sync bg-selector date-tp powermenu [bar/desktop-bar] ; desktop bar config @@ -49,7 +49,7 @@ height = 24pt modules-left = xworkspaces focus-fast spotify spotify-len ;modules-left = xworkspaces spotify spotify-len modules-center = weather-desktop -modules-right = pulseaudio memory cpu temperature eth dev-bat packages seafile calendar-sync bg-selector quotes date powermenu +modules-right = pulseaudio memory cpu temperature eth vpn dev-bat packages seafile calendar-sync bg-selector quotes date powermenu [bar/work-bar] ; desktop bar config @@ -303,5 +303,11 @@ type = custom/script interval = 600 exec = printf "%s %s\n" `echo -e '\ueb29'` `pacman -Qu | wc -l` +[module/vpn] +; custom vpn script +type = custom/script +exec = vpn_status.sh +interval = 30 + [settings] screenchange-reload = true diff --git a/meta/configs/scripts.yaml b/meta/configs/scripts.yaml index 9422c89..40ec5c0 100644 --- a/meta/configs/scripts.yaml +++ b/meta/configs/scripts.yaml @@ -14,6 +14,7 @@ ~/.local/bin/markdown-preview.sh: bin/markdown-preview.sh ~/.local/bin/docker_check: bin/docker_check ~/.local/bin/seafile_check: bin/seafile_check + ~/.local/bin/vpn_status.sh: bin/vpn_status.sh ~/.local/bin/watertracker: src/watertracker/watertracker ~/.local/bin/device_battery.sh: src/device-battery/device_battery.sh ~/.local/bin/weather: src/weather/weather diff --git a/passwords/gnupg/pubring.kbx b/passwords/gnupg/pubring.kbx index 86948478a7e62b7157729486f4d42e9fdaba756c..84b72d89b0f0fc7bbc105e339749c06bb787b1fb 100644 GIT binary patch delta 4155 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 UB-7BL*=n`OdjRRrq*r734=a(ww*UYD delta 9 QcmX@MlCh_gaYK&_02Q+Y2LJ#7 diff --git a/passwords/gnupg/pubring.kbx~ b/passwords/gnupg/pubring.kbx~ index 8236d67f71b82877e0854b7e0f3d936423c01c47..86948478a7e62b7157729486f4d42e9fdaba756c 100644 GIT binary patch delta 1356 zcmYk4do z#HhuLisX_qh%VT&TMWgf)w&Czm>u?X&OU#=@AJOzdH;Ambt!o{2rkY(6acY62m!X0 z0s!(EfB6Aa_xvx6?xaSw!EZOgjrt4s07tLV6ASpzDr_vzZ$g<-a3ED#lfnzpYV=6Zfj8$!=AdHg(kgO6Mklv zQs6lX8$!v{1FxgO_6n-rgyEvOoA3QRzPzIMYLcQ~hrLY7ov1!UGdd!iE7yRpTx9O| zDbb-?^|8)%g7R9r(0n!ynOwk>7`fo&g<3T@+6-^1ut$5H%6j2rcOcHah8OKE!PDL5 z)+Xarc2_+>5fNO&La%U%>gyks3q75vdeAt|))eA+&P{vICJyiV)BggSJD5)M4>mQj!ud z1gk(WtO_9@O$3Ba1=3Oq-#9zv3CcMam9Q-*v0oQ=PsVg;7?ypf?CeVeEFIET7`d1b zFts}&$i-wLtjMTqgDVbT(L2x#$!>FHsUQiixOL5hAIWSHcpF@*nK07=Zmj`>C4#h~ zR4rD-V4Ad*a~i6TFC87n8Yul4{H_~va?AYTF`Z0)u=be^tP}rM?r;Szh%!frt32=% znF|ue<8v}HX!iAEr57ZQJ+! z#LLcDd{`DHXvcuU+=T{i~fpN;J_~T6)!vkf1@a1sKpHnMSnJzg}&IiX% ztnRlOip-SP=u)dCM$EgkCFjS%^BZUYOGs>4pqXfMMn3^8)_81;AI0nXRQJqYt<5@Y z>pF)q%ClCS;XM(o*}5JOguzLY2E(2K{0|%CPZ^9pQyCKhMkW8R6?K+R-{N!Ts_7HE zZdwW69Fo_ywrDC$Q^eO6M4mzJLkUt%t z%|6v>psmWQzJ?t!rKuDv86C>=T#3c^zwRehhQ9IC_Eb$4(qAYM8aT+OAzo-D z-m;B%VK#c1_M2x+)g;}SK{jjS;u^wek~(lvuVKQcVP()DC=>kh;wOIeX9wZX|`2LF0ppb# z38^jT2zl0at$<~?*VID?weSklgy`Yjcc(}B(hRubd;a6B^0E7D_^<2w#u|oF2Zl6o J&Rk8ee*s6fQSbl& delta 8 PcmeC_WL#IbLC+ol5H Date: Sat, 6 May 2023 18:35:06 -0400 Subject: [PATCH 09/23] made VPN continuous --- bin/vpn_status.sh | 21 ++++++++++++--------- gui/polybar/config.ini | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/bin/vpn_status.sh b/bin/vpn_status.sh index 671aecd..71e3f6f 100755 --- a/bin/vpn_status.sh +++ b/bin/vpn_status.sh @@ -12,14 +12,17 @@ if ! command -v mullvad &>/dev/null ; then exit 1 fi -# getting vpn status -VPN_DISCONNECTED=$(mullvad status | grep Disconnected) +# reading vpn status as continous output +while read VPN_STATUS; do -if [[ -n "$VPN_DISCONNECTED" ]] ; then - # vpn is disconnected - echo "$DISCONNECTED" - exit 0 -fi + VPN_DISCONNECTED=$(echo "$VPN_STATUS" | grep Disconnect); + + if [[ -n "$VPN_DISCONNECTED" ]] ; then + # vpn is disconnected + echo "$DISCONNECTED" + continue + fi -# connected -echo "$CONNECTED" + # connected + echo "$CONNECTED" +done < <(mullvad status listen) diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini index f56977b..b9a5db6 100644 --- a/gui/polybar/config.ini +++ b/gui/polybar/config.ini @@ -307,7 +307,7 @@ exec = printf "%s %s\n" `echo -e '\ueb29'` `pacman -Qu | wc -l` ; custom vpn script type = custom/script exec = vpn_status.sh -interval = 30 +tail = true [settings] screenchange-reload = true From dc9af7f67a31f08813b3f503d9af78e0f583731d Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 13:30:33 -0400 Subject: [PATCH 10/23] bare tmux/nvim setup for server profiles --- gui/polybar/config.ini | 8 +++++++- meta/profiles/bare | 5 +++++ terminals/tmux/tmux.sparse.conf | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta/profiles/bare diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini index b9a5db6..106d033 100644 --- a/gui/polybar/config.ini +++ b/gui/polybar/config.ini @@ -46,7 +46,7 @@ inherit = section/base-bar ; height height = 24pt ; modules -modules-left = xworkspaces focus-fast spotify spotify-len +modules-left = xworkspaces focus-fast spotify spotify-len ;modules-left = xworkspaces spotify spotify-len modules-center = weather-desktop modules-right = pulseaudio memory cpu temperature eth vpn dev-bat packages seafile calendar-sync bg-selector quotes date powermenu @@ -309,5 +309,11 @@ type = custom/script exec = vpn_status.sh tail = true +[module/crypto] +; custom crypto script +type = custom/script +exec = /home/spinach/sb-ticker 20 +tail = true + [settings] screenchange-reload = true diff --git a/meta/profiles/bare b/meta/profiles/bare new file mode 100644 index 0000000..2e3b265 --- /dev/null +++ b/meta/profiles/bare @@ -0,0 +1,5 @@ +tmux.sparse +zsh +oh-my-zsh +neovim +clean diff --git a/terminals/tmux/tmux.sparse.conf b/terminals/tmux/tmux.sparse.conf index 5d64d0a..fd93989 100644 --- a/terminals/tmux/tmux.sparse.conf +++ b/terminals/tmux/tmux.sparse.conf @@ -42,6 +42,8 @@ set -g status-style "bg=black, fg=brightWhite" set -g status-right "%a, %b %d %l:%M %P " set -g status-right-length 100 set -g status-left "" +# change active window color +set-window-option -g window-status-current-style "bg=white, fg=black" # set -g default-terminal "${TERM}" # set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support From 4cf51ac72fcd75bea8b9e0dc6a503b5467df521b Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 13:32:13 -0400 Subject: [PATCH 11/23] basic zsh config --- meta/configs/zsh.basic.yaml | 7 +++++++ meta/profiles/bare | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meta/configs/zsh.basic.yaml diff --git a/meta/configs/zsh.basic.yaml b/meta/configs/zsh.basic.yaml new file mode 100644 index 0000000..67c7477 --- /dev/null +++ b/meta/configs/zsh.basic.yaml @@ -0,0 +1,7 @@ +- shell: + - [bin/zsh-check] + +- link: + ~/.zprofile: shells/zsh/zprofile + ~/.zshrc: shells/zsh/zshrc + ~/.p10k.sh: shells/zsh/p10k.sh diff --git a/meta/profiles/bare b/meta/profiles/bare index 2e3b265..8762780 100644 --- a/meta/profiles/bare +++ b/meta/profiles/bare @@ -1,5 +1,5 @@ tmux.sparse -zsh +zsh.basic oh-my-zsh neovim clean From 77da97e2b4f2fb8b204148202fa43002eeced216 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 13:35:00 -0400 Subject: [PATCH 12/23] fixing fresh zsh --- meta/configs/zsh.basic.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/configs/zsh.basic.yaml b/meta/configs/zsh.basic.yaml index 67c7477..13819c1 100644 --- a/meta/configs/zsh.basic.yaml +++ b/meta/configs/zsh.basic.yaml @@ -1,4 +1,6 @@ - shell: + - stdout: true + - stdin: true - [bin/zsh-check] - link: From 62c79c2a032e132f1b8a4f3720079f4624b27821 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 13:36:30 -0400 Subject: [PATCH 13/23] fixing fresh zsh --- meta/configs/zsh.basic.yaml | 6 +++--- meta/configs/zsh.yaml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/configs/zsh.basic.yaml b/meta/configs/zsh.basic.yaml index 13819c1..7bc6683 100644 --- a/meta/configs/zsh.basic.yaml +++ b/meta/configs/zsh.basic.yaml @@ -1,7 +1,7 @@ - shell: - - stdout: true - - stdin: true - - [bin/zsh-check] + - command: bin/zsh-check + stdin: true + stdout: true - link: ~/.zprofile: shells/zsh/zprofile diff --git a/meta/configs/zsh.yaml b/meta/configs/zsh.yaml index 5ef9d55..b51ad49 100644 --- a/meta/configs/zsh.yaml +++ b/meta/configs/zsh.yaml @@ -1,5 +1,7 @@ - shell: - - [bin/zsh-check] + - command: bin/zsh-check + stdin: true + stdout: true - link: ~/.config/zsh/.zprofile: shells/zsh/zprofile From 7f79aa51f066e9b6a4082b42679b00e83ccde248 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 13:38:09 -0400 Subject: [PATCH 14/23] fixing fresh zsh --- meta/configs/zsh.basic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/configs/zsh.basic.yaml b/meta/configs/zsh.basic.yaml index 7bc6683..b0406e6 100644 --- a/meta/configs/zsh.basic.yaml +++ b/meta/configs/zsh.basic.yaml @@ -1,5 +1,5 @@ - shell: - - command: bin/zsh-check + - command: chsh -s $(which zsh) stdin: true stdout: true From 674d07ba554ec1e99552ec8f3703511fe1276b72 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 13:44:35 -0400 Subject: [PATCH 15/23] adding basic zshrc --- meta/configs/zsh.basic.yaml | 3 +- shells/zsh/zshrc.basic | 104 ++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 shells/zsh/zshrc.basic diff --git a/meta/configs/zsh.basic.yaml b/meta/configs/zsh.basic.yaml index b0406e6..4435c52 100644 --- a/meta/configs/zsh.basic.yaml +++ b/meta/configs/zsh.basic.yaml @@ -2,8 +2,9 @@ - command: chsh -s $(which zsh) stdin: true stdout: true + stderr: true - link: ~/.zprofile: shells/zsh/zprofile - ~/.zshrc: shells/zsh/zshrc + ~/.zshrc: shells/zsh/zshrc.basic ~/.p10k.sh: shells/zsh/p10k.sh diff --git a/shells/zsh/zshrc.basic b/shells/zsh/zshrc.basic new file mode 100644 index 0000000..8adace2 --- /dev/null +++ b/shells/zsh/zshrc.basic @@ -0,0 +1,104 @@ +# Path to your oh-my-zsh installation. +# export ZSH="$HOME/.oh-my-zsh" +export ZSH="$HOME/.local/share/oh-my-zsh" + +# Would you like to use another custom folder than $ZSH/custom? +export ZSH_CUSTOM="$HOME/.local/share/omz-custom/custom" +# export ZSH_CUSTOM=$HOME/.local/share/omz-custom +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +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 + +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH + +# fixing gopath and binaries +export GOPATH="$HOME/.local/share/go" + +# moving cargo cache dir +export CARGO_HOME="$HOME/.local/share/cargo" +export RUSTUP_HOME="$HOME/.local/sare/rustup" + + +# Path to your oh-my-zsh installation. +# export ZSH="$HOME/.oh-my-zsh" +export ZSH="$HOME/.local/share/oh-my-zsh" + +# Would you like to use another custom folder than $ZSH/custom? +export ZSH_CUSTOM="$HOME/.local/share/omz-custom/custom" +# export ZSH_CUSTOM=$HOME/.local/share/omz-custom + +# ZSH theme +ZSH_THEME="powerlevel10k/powerlevel10k" + + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=( + zsh-autosuggestions + git +) + #vi-mode +source $ZSH/oh-my-zsh.sh +# vi-mode settings +export KEYTIMEOUT=10 +bindkey -v +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + + + +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='nvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# +# switching to neovim +alias vim="nvim" + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +export POWERLEVEL9K_CONFIG_FILE="$HOME/.config/zsh/.p10k.sh" + +[[ ! -f "$POWERLEVEL9K_CONFIG_FILE" ]] || source "$POWERLEVEL9K_CONFIG_FILE" + +# home and clear +alias c="cd && clear" + +# colorize ls +alias ls="ls --color=auto" + +export FZF_DEFAULT_OPTS='--layout=reverse --border' + +# git aliases +alias gadd="git add ." +alias gbug="git add . && git commit -m 'bug fixes'" +alias gp="git push" +alias glog="git log --pretty --oneline --graph --all --decorate" From 1788b74c00fd533cea84dab27aa7d6ccb80ebe5f Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 14:09:07 -0400 Subject: [PATCH 16/23] basic zsh path fix --- shells/zsh/zshrc.basic | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shells/zsh/zshrc.basic b/shells/zsh/zshrc.basic index 8adace2..5142abf 100644 --- a/shells/zsh/zshrc.basic +++ b/shells/zsh/zshrc.basic @@ -2,6 +2,9 @@ # export ZSH="$HOME/.oh-my-zsh" export ZSH="$HOME/.local/share/oh-my-zsh" +# path fix for deb +export PATH=$PATH:/usr/local/bin + # Would you like to use another custom folder than $ZSH/custom? export ZSH_CUSTOM="$HOME/.local/share/omz-custom/custom" # export ZSH_CUSTOM=$HOME/.local/share/omz-custom From e7cf2a45fd5a202798226cbd363aca06f998793c Mon Sep 17 00:00:00 2001 From: spinach Date: Thu, 18 May 2023 14:18:49 -0400 Subject: [PATCH 17/23] tmux suspend --- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- src/fzf | 2 +- src/tmux-mem-cpu-load | 2 +- terminals/tmux/tmux.sparse.conf | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index 0af598c..a69aa22 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 0af598cbed78660066f8a8f4465844501ba5695b +Subproject commit a69aa22fa8a4fe0927bb73716c2f7c9d2580a51d diff --git a/src/fzf b/src/fzf index 9499910..607eacf 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit 94999101e358385f3ca67a6ec9512f549196b802 +Subproject commit 607eacf8c73f60d778c4a0bf303f1593704b17c3 diff --git a/src/tmux-mem-cpu-load b/src/tmux-mem-cpu-load index a991497..451300e 160000 --- a/src/tmux-mem-cpu-load +++ b/src/tmux-mem-cpu-load @@ -1 +1 @@ -Subproject commit a991497b9ff7ca59148d00105a0b5fe4eb8e48e3 +Subproject commit 451300eda243251b60d13da6d028b9ff4e8b92cb diff --git a/terminals/tmux/tmux.sparse.conf b/terminals/tmux/tmux.sparse.conf index fd93989..c17259b 100644 --- a/terminals/tmux/tmux.sparse.conf +++ b/terminals/tmux/tmux.sparse.conf @@ -32,6 +32,11 @@ bind-key a attach -c "#{pane_current_path}" # setting up TPM set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' +# adding tmux ssh support +set -g @plugin 'MunifTanjim/tmux-mode-indicator' +set -g @plugin 'MunifTanjim/tmux-suspend' +# suspend key +set -g @suspend_key 'F12' # clock settings set -g clock-mode-colour white @@ -39,7 +44,7 @@ set -g clock-mode-colour white # status config set -g status-interval 10 set -g status-style "bg=black, fg=brightWhite" -set -g status-right "%a, %b %d %l:%M %P " +set -g status-right "%a, %b %d %l:%M %P #{tmux_mode_indicator}" set -g status-right-length 100 set -g status-left "" # change active window color From febb5f9502bba2750af2a34f0d7712e04a1149ed Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 18 May 2023 14:31:20 -0400 Subject: [PATCH 18/23] tmux suspend and colors --- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- src/fzf | 2 +- src/tmux-mem-cpu-load | 2 +- terminals/tmux/tmux.sparse.conf | 7 +++++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index a69aa22..0af598c 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit a69aa22fa8a4fe0927bb73716c2f7c9d2580a51d +Subproject commit 0af598cbed78660066f8a8f4465844501ba5695b diff --git a/src/fzf b/src/fzf index 607eacf..9499910 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit 607eacf8c73f60d778c4a0bf303f1593704b17c3 +Subproject commit 94999101e358385f3ca67a6ec9512f549196b802 diff --git a/src/tmux-mem-cpu-load b/src/tmux-mem-cpu-load index 451300e..a991497 160000 --- a/src/tmux-mem-cpu-load +++ b/src/tmux-mem-cpu-load @@ -1 +1 @@ -Subproject commit 451300eda243251b60d13da6d028b9ff4e8b92cb +Subproject commit a991497b9ff7ca59148d00105a0b5fe4eb8e48e3 diff --git a/terminals/tmux/tmux.sparse.conf b/terminals/tmux/tmux.sparse.conf index c17259b..390926a 100644 --- a/terminals/tmux/tmux.sparse.conf +++ b/terminals/tmux/tmux.sparse.conf @@ -37,6 +37,13 @@ set -g @plugin 'MunifTanjim/tmux-mode-indicator' set -g @plugin 'MunifTanjim/tmux-suspend' # suspend key set -g @suspend_key 'F12' +# suspend cutom colors +set -g @suspend_suspended_options " \ + window-status-current-style::bg=color94 dim\\,fg=black, \ + @mode_indicator_custom_prompt:: ---- , \ + @mode_indicator_custom_mode_style::bg=brightblack\\,fg=black, \ + status-style::bg=color94 dim\\,fg=black bold dim, \ +" # clock settings set -g clock-mode-colour white From 9307080d397abda17786fc2907a77221b93db6f7 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Sat, 20 May 2023 15:42:16 -0400 Subject: [PATCH 19/23] added calculator for rofi --- gui/i3/base.conf | 3 ++- gui/rofi | 2 +- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- src/fzf | 2 +- src/tmux-mem-cpu-load | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gui/i3/base.conf b/gui/i3/base.conf index 853c233..4699ffd 100644 --- a/gui/i3/base.conf +++ b/gui/i3/base.conf @@ -53,6 +53,7 @@ bindsym $mod+d exec --no-startup-id rofi-launcher bindsym $mod+o exec --no-startup-id rofi-files bindsym $mod+Shift+o exec --no-startup-id rofi-files -S +bindsym $mod+space exec --no-startup-id rofi-calc # setting up a vimscratch pad to use vimwiki for_window [instance="todo"] move window to scratchpad @@ -108,7 +109,7 @@ bindsym $mod+e layout toggle split bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle +# bindsym $mod+space focus mode_toggle # focus the parent container bindsym $mod+a focus parent diff --git a/gui/rofi b/gui/rofi index 3075fcf..bcf7a4d 160000 --- a/gui/rofi +++ b/gui/rofi @@ -1 +1 @@ -Subproject commit 3075fcf966ecada9696fee3cb8cb6a9f507d552b +Subproject commit bcf7a4d38dc941e816e1f491b63417e959ba4c0a diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index 0af598c..951d695 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 0af598cbed78660066f8a8f4465844501ba5695b +Subproject commit 951d6957895b1887567b3ea7e548f9533daa3c83 diff --git a/src/fzf b/src/fzf index 9499910..86e4f4a 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit 94999101e358385f3ca67a6ec9512f549196b802 +Subproject commit 86e4f4a84180da7f5b99c3db8043cb9d92cb9189 diff --git a/src/tmux-mem-cpu-load b/src/tmux-mem-cpu-load index a991497..451300e 160000 --- a/src/tmux-mem-cpu-load +++ b/src/tmux-mem-cpu-load @@ -1 +1 @@ -Subproject commit a991497b9ff7ca59148d00105a0b5fe4eb8e48e3 +Subproject commit 451300eda243251b60d13da6d028b9ff4e8b92cb From cd35b18e0746d35255630cfe82ac3f8cd369ed40 Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Sat, 20 May 2023 15:42:33 -0400 Subject: [PATCH 20/23] added calculator for rofi --- arch/i3 | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/i3 b/arch/i3 index 49a74bc..9b902aa 100644 --- a/arch/i3 +++ b/arch/i3 @@ -3,6 +3,7 @@ polybar feh imagemagick rofi +rofi-calc mpv mpd mpc From b1ee062e3b6e4d31359a6ee8dabdba4b87bf0f69 Mon Sep 17 00:00:00 2001 From: KeeganForelight Date: Fri, 16 Jun 2023 17:36:09 -0400 Subject: [PATCH 21/23] shortened work bar --- gui/polybar/config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini index 106d033..b5bf633 100644 --- a/gui/polybar/config.ini +++ b/gui/polybar/config.ini @@ -59,7 +59,7 @@ height = 18pt ; modules modules-left = xworkspaces focus-fast modules-center = weather-desktop -modules-right = memory cpu temperature eth seafile bg-selector date powermenu +modules-right = memory cpu eth seafile bg-selector date-tp powermenu [module/xworkspaces] type = internal/xworkspaces From 871d9953cf6d2f4256464d41499447e0cc9a29cc Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Thu, 22 Jun 2023 17:04:01 -0400 Subject: [PATCH 22/23] minor changes to display layout --- gui/i3/desktop.conf | 4 ++-- gui/polybar/config.ini | 2 +- passwords/gnupg/pubring.kbx | Bin 21702 -> 37178 bytes passwords/gnupg/pubring.kbx~ | Bin 17548 -> 21702 bytes passwords/gnupg/trustdb.gpg | Bin 1280 -> 1280 bytes shells/zsh/zshrc | 3 +++ 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/i3/desktop.conf b/gui/i3/desktop.conf index e23ce88..d0531f0 100644 --- a/gui/i3/desktop.conf +++ b/gui/i3/desktop.conf @@ -1,8 +1,8 @@ include base.conf # binding workspaces -workspace 1 output DP-2 -workspace 2 output DP-0 +workspace 1 output DP-0 +workspace 2 output DP-2 # poly bar exec_always --no-startup-id polybar-launch.sh desktop-bar diff --git a/gui/polybar/config.ini b/gui/polybar/config.ini index 106d033..1e0ec67 100644 --- a/gui/polybar/config.ini +++ b/gui/polybar/config.ini @@ -49,7 +49,7 @@ height = 24pt modules-left = xworkspaces focus-fast spotify spotify-len ;modules-left = xworkspaces spotify spotify-len modules-center = weather-desktop -modules-right = pulseaudio memory cpu temperature eth vpn dev-bat packages seafile calendar-sync bg-selector quotes date powermenu +modules-right = pulseaudio memory cpu temperature wlan eth vpn dev-bat packages seafile calendar-sync bg-selector quotes date powermenu [bar/work-bar] ; desktop bar config diff --git a/passwords/gnupg/pubring.kbx b/passwords/gnupg/pubring.kbx index 84b72d89b0f0fc7bbc105e339749c06bb787b1fb..0e1a1c4381ea1d220783087895dafb7a22092f32 100644 GIT binary patch delta 15340 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%0AocdD#EYgosB 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 delta 9 QcmdnBi0Rl$#tp|p02h`7nE(I) diff --git a/passwords/gnupg/pubring.kbx~ b/passwords/gnupg/pubring.kbx~ index 86948478a7e62b7157729486f4d42e9fdaba756c..84b72d89b0f0fc7bbc105e339749c06bb787b1fb 100644 GIT binary patch delta 4155 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 UB-7BL*=n`OdjRRrq*r734=a(ww*UYD delta 9 QcmX@MlCh_gaYK&_02Q+Y2LJ#7 diff --git a/passwords/gnupg/trustdb.gpg b/passwords/gnupg/trustdb.gpg index c955ef1dc44c25a9c657f568c395e40f9d8c5639..1a5f0d2fc03031b31cef65c418d67249d8f7390c 100644 GIT binary patch delta 28 jcmZqRYTy!JOfN`hW@cn%WMW`QDW29g(NKJ&`b`!9R*MGo delta 28 jcmZqRYTy!JOfN`hW@cn%WMW`Q{Ni;cT}lV3 diff --git a/shells/zsh/zshrc b/shells/zsh/zshrc index 874be23..5b0a561 100644 --- a/shells/zsh/zshrc +++ b/shells/zsh/zshrc @@ -129,3 +129,6 @@ alias gadd="git add ." alias gbug="git add . && git commit -m 'bug fixes'" alias gp="git push" alias glog="git log --pretty --oneline --graph --all --decorate" + +# copying with progress +alias cpr="rsync -r -hh --info=stats1,progress2" From 5f5930c98265b41ba66ec7a31103933dc50f19ee Mon Sep 17 00:00:00 2001 From: spinach <19keegandeppe@gmail.com> Date: Mon, 4 Dec 2023 16:54:11 -0500 Subject: [PATCH 23/23] updating across the board --- editors/neovim | 2 +- meta/dotbot | 2 +- shells/oh-my-zsh/custom/plugins/zsh-autosuggestions | 2 +- shells/oh-my-zsh/custom/themes/powerlevel10k | 2 +- src/fzf | 2 +- src/tmux-mem-cpu-load | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/editors/neovim b/editors/neovim index 1ff3319..aa50bff 160000 --- a/editors/neovim +++ b/editors/neovim @@ -1 +1 @@ -Subproject commit 1ff331968225f5854d4790de73d2b8e2af545171 +Subproject commit aa50bff9b5cf24bcda810c1d77b03a5c804ea400 diff --git a/meta/dotbot b/meta/dotbot index 328bcb3..3f9e409 160000 --- a/meta/dotbot +++ b/meta/dotbot @@ -1 +1 @@ -Subproject commit 328bcb32590e5057b09bd27a40bc2fb21385fbf3 +Subproject commit 3f9e409669172ad662e82fca791f0ad16dce5edd diff --git a/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions b/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions index a411ef3..c3d4e57 160000 --- a/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions +++ b/shells/oh-my-zsh/custom/plugins/zsh-autosuggestions @@ -1 +1 @@ -Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8 +Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5 diff --git a/shells/oh-my-zsh/custom/themes/powerlevel10k b/shells/oh-my-zsh/custom/themes/powerlevel10k index 951d695..b9a2d84 160000 --- a/shells/oh-my-zsh/custom/themes/powerlevel10k +++ b/shells/oh-my-zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 951d6957895b1887567b3ea7e548f9533daa3c83 +Subproject commit b9a2d846efff427fd13b7e95d83a5761666329ac diff --git a/src/fzf b/src/fzf index 86e4f4a..d21d5c9 160000 --- a/src/fzf +++ b/src/fzf @@ -1 +1 @@ -Subproject commit 86e4f4a84180da7f5b99c3db8043cb9d92cb9189 +Subproject commit d21d5c9510170d74a7f959309da720b6df72ca01 diff --git a/src/tmux-mem-cpu-load b/src/tmux-mem-cpu-load index 451300e..9a9abc5 160000 --- a/src/tmux-mem-cpu-load +++ b/src/tmux-mem-cpu-load @@ -1 +1 @@ -Subproject commit 451300eda243251b60d13da6d028b9ff4e8b92cb +Subproject commit 9a9abc5d13d94aa404c02d19b7184143d020ecb7