From 0336c025dc6e2a317a6e0494d0aba9ce825f7a79 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Tue, 26 Dec 2023 00:39:58 -0500 Subject: [PATCH] rekahsoft-gnu: Fix spaceship-prompt after (major) update --- .guix/rekahsoft/guix-config/home.scm | 1 + channels.scm | 2 +- user-config/zsh/.config/spaceship.zsh | 73 +++++++++++++++++++++++++++ user-config/zsh/.zshrc | 41 --------------- 4 files changed, 75 insertions(+), 42 deletions(-) create mode 100644 user-config/zsh/.config/spaceship.zsh diff --git a/.guix/rekahsoft/guix-config/home.scm b/.guix/rekahsoft/guix-config/home.scm index 03d5a60..831a5cc 100644 --- a/.guix/rekahsoft/guix-config/home.scm +++ b/.guix/rekahsoft/guix-config/home.scm @@ -463,6 +463,7 @@ single certifcate used for local development with caddy.") ("rofi-pass/config" ,(local-file "../../../user-config/rofi-pass/.config/rofi-pass/config")) ("rofi/config.rasi" ,(local-file "../../../user-config/rofi/.config/rofi/config.rasi")) ("sway/config" ,(local-file "../../../user-config/sway/.config/sway/config")) + ("spaceship.zsh" ,(local-file "../../../user-config/zsh/.config/spaceship.zsh")) ("tmux/tmux.conf" ,(local-file "../../../user-config/tmux/.tmux.conf" "tmux.conf")) ("wofi/style.css" ,(local-file "../../../user-config/wofi/.config/wofi/style.css")) ("zathura/zathurarc" ,(local-file "../../../user-config/zathura/.config/zathura/zathurarc")))) diff --git a/channels.scm b/channels.scm index 4fd123e..8eb4f86 100644 --- a/channels.scm +++ b/channels.scm @@ -25,7 +25,7 @@ (url "https://git.rekahsoft.ca/rekahsoft/rekahsoft-guix.git") (branch "master") (commit - "4911f409b0ffc7339059198bea9c5a50e8ddaed3") + "3c77938ff9945edce72734907ad8973828e89158") (introduction (make-channel-introduction "d910ac4ca1e1a115934b10921bc23f50bd481043" diff --git a/user-config/zsh/.config/spaceship.zsh b/user-config/zsh/.config/spaceship.zsh new file mode 100644 index 0000000..7d46283 --- /dev/null +++ b/user-config/zsh/.config/spaceship.zsh @@ -0,0 +1,73 @@ +# Display time +SPACESHIP_TIME_SHOW=true + +# Don't display username +SPACESHIP_USER_SHOW=false + +# Do not truncate path in repos +SPACESHIP_DIR_TRUNC_REPO=false + +SPACESHIP_PROMPT_ADD_NEWLINE=false +SPACESHIP_PROMPT_SEPARATE_LINE=true +SPACESHIP_KUBECONTEXT_SYMBOL="☸️ " # Two spaces are used instead of one in prompt; this forces use of only one + +SPACESHIP_PROMPT_ASYNC=false + +SPACESHIP_PROMPT_ORDER=( + time # Time stamps section + user # Username section + dir # Current directory section + host # Hostname section + git # Git section (git_branch + git_status) + hg # Mercurial section (hg_branch + hg_status) + package # Package version + node # Node.js section + bun # Bun section + deno # Deno section + ruby # Ruby section + python # Python section + elm # Elm section + elixir # Elixir section + xcode # Xcode section + swift # Swift section + golang # Go section + perl # Perl section + php # PHP section + rust # Rust section + haskell # Haskell Stack section + scala # Scala section + kotlin # Kotlin section + java # Java section + lua # Lua section + dart # Dart section + julia # Julia section + crystal # Crystal section + docker # Docker section + docker_compose # Docker section + aws # Amazon Web Services section + gcloud # Google Cloud Platform section + azure # Azure section + venv # virtualenv section + conda # conda virtualenv section + dotnet # .NET section + ocaml # OCaml section + vlang # V section + zig # Zig section + purescript # PureScript section + erlang # Erlang section + kubectl # Kubectl context section + ansible # Ansible section + terraform # Terraform workspace section + pulumi # Pulumi stack section + ibmcloud # IBM Cloud section + nix_shell # Nix shell + gnu_screen # GNU Screen section + exec_time # Execution time + async # Async jobs indicator + line_sep # Line break + battery # Battery level and status + jobs # Background jobs indicator + exit_code # Exit code section + sudo # Sudo indicator + char # Prompt character +) diff --git a/user-config/zsh/.zshrc b/user-config/zsh/.zshrc index 0876643..87af022 100644 --- a/user-config/zsh/.zshrc +++ b/user-config/zsh/.zshrc @@ -23,47 +23,6 @@ zstyle :compinstall filename '/home/collin/.zshrc' autoload -Uz compinit compinit -SPACESHIP_PROMPT_ORDER=( - time # Time stamps section - user # Username section - dir # Current directory section - host # Hostname section - git # Git section (git_branch + git_status) -# hg # Mercurial section (hg_branch + hg_status) - package # Package version - node # Node.js section - ruby # Ruby section - elixir # Elixir section -# xcode # Xcode section - swift # Swift section - golang # Go section - php # PHP section - rust # Rust section - haskell # Haskell Stack section - julia # Julia section - docker # Docker section - aws # Amazon Web Services section - venv # virtualenv section -# conda # conda virtualenv section - pyenv # Pyenv section - dotnet # .NET section -# ember # Ember.js section -# kubecontext # Kubectl context section - terraform # Terraform workspace section - exec_time # Execution time - line_sep # Line break - battery # Battery level and status -# vi_mode # Vi-mode indicator - jobs # Background jobs indicator - exit_code # Exit code section - char # Prompt character -) - -SPACESHIP_DIR_TRUNC=0 -SPACESHIP_PROMPT_ADD_NEWLINE=false -SPACESHIP_PROMPT_SEPARATE_LINE=true -SPACESHIP_KUBECONTEXT_SYMBOL="☸️ " # Two spaces are used instead of one in prompt; this forces use of only one - autoload -U promptinit; promptinit prompt spaceship # End of lines added by compinstall