diff --git a/hosts/pinwheel/configs/.p10k.zsh b/hosts/pinwheel/configs/.p10k.zsh deleted file mode 100644 index 74335ad..0000000 --- a/hosts/pinwheel/configs/.p10k.zsh +++ /dev/null @@ -1,193 +0,0 @@ -# Generated by Powerlevel10k configuration wizard on 2023-08-08 at 16:04 CEST. -# Based on romkatv/powerlevel10k/config/p10k-pure.zsh. -# Wizard options: nerdfont-v3 + powerline, small icons, pure, snazzy, 1 line, compact, -# instant_prompt=verbose. -# Type `p10k configure` to generate another config. -# -# Config file for Powerlevel10k with the style of Pure (https://github.com/sindresorhus/pure). -# -# Differences from Pure: -# -# - Git: -# - `@c4d3ec2c` instead of something like `v1.4.0~11` when in detached HEAD state. -# - No automatic `git fetch` (the same as in Pure with `PURE_GIT_PULL=0`). -# -# Apart from the differences listed above, the replication of Pure prompt is exact. This includes -# even the questionable parts. For example, just like in Pure, there is no indication of Git status -# being stale; prompt symbol is the same in command, visual and overwrite vi modes; when prompt -# doesn't fit on one line, it wraps around with no attempt to shorten it. -# -# If you like the general style of Pure but not particularly attached to all its quirks, type -# `p10k configure` and pick "Lean" style. This will give you slick minimalist prompt while taking -# advantage of Powerlevel10k features that aren't present in Pure. - -# 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. - unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR' - - # Zsh >= 5.1 is required. - [[ $ZSH_VERSION == (5.<1->*|<6->.*) ]] || return - - # Prompt colors. - local grey='242' - local red='#FF5C57' - local yellow='#F3F99D' - local blue='#57C7FF' - local magenta='#FF6AC1' - local cyan='#9AEDFE' - local white='#F1F1F0' - - # Left prompt segments. - typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( - context # user@host - dir # current directory - vcs # git status - command_execution_time # previous command duration - virtualenv # python virtual environment - prompt_char # prompt symbol - ) - - # Right prompt segments. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( - # command_execution_time # previous command duration - # virtualenv # python virtual environment - # context # user@host - # time # current time - ) - - # Basic style options that define the overall prompt look. - 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 - typeset -g POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION= # no segment icons - - # Add an empty line before each prompt except the first. This doesn't emulate the bug - # in Pure that makes prompt drift down whenever you use the Alt-C binding from fzf or similar. - typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false - - # Magenta prompt symbol if the last command succeeded. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS}_FOREGROUND=$magenta - # Red prompt symbol if the last command failed. - typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS}_FOREGROUND=$red - # 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 is the same as in command mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='❮' - # Prompt symbol in overwrite vi mode is the same as in command mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=false - - # Grey Python Virtual Environment. - typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=$grey - # Don't show Python version. - typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false - typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= - - # Blue current directory. - typeset -g POWERLEVEL9K_DIR_FOREGROUND=$blue - - # Context format when root: user@host. The first part white, the rest grey. - typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE="%F{$white}%n%f%F{$grey}@%m%f" - # Context format when not root: user@host. The whole thing grey. - typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE="%F{$grey}%n@%m%f" - # Don't show context unless root or in SSH. - typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION= - - # Show previous command duration only if it's >= 5s. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=5 - # Don't show fractional seconds. Thus, 7s rather than 7.3s. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 - # Duration format: 1d 2h 3m 4s. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' - # Yellow previous command duration. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=$yellow - - # Grey Git prompt. This makes stale prompts indistinguishable from up-to-date ones. - typeset -g POWERLEVEL9K_VCS_FOREGROUND=$grey - - # Disable async loading indicator to make directories that aren't Git repositories - # indistinguishable from large Git repositories without known state. - typeset -g POWERLEVEL9K_VCS_LOADING_TEXT= - - # Don't wait for Git status even for a millisecond, so that prompt always updates - # asynchronously when Git state changes. - typeset -g POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS=0 - - # Cyan ahead/behind arrows. - typeset -g POWERLEVEL9K_VCS_{INCOMING,OUTGOING}_CHANGESFORMAT_FOREGROUND=$cyan - # Don't show remote branch, current tag or stashes. - typeset -g POWERLEVEL9K_VCS_GIT_HOOKS=(vcs-detect-changes git-untracked git-aheadbehind) - # Don't show the branch icon. - typeset -g POWERLEVEL9K_VCS_BRANCH_ICON= - # When in detached HEAD state, show @commit where branch normally goes. - typeset -g POWERLEVEL9K_VCS_COMMIT_ICON='@' - # Don't show staged, unstaged, untracked indicators. - typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED}_ICON= - # Show '*' when there are staged, unstaged or untracked files. - typeset -g POWERLEVEL9K_VCS_DIRTY_ICON='*' - # Show '⇣' if local branch is behind remote. - typeset -g POWERLEVEL9K_VCS_INCOMING_CHANGES_ICON=':⇣' - # Show '⇡' if local branch is ahead of remote. - typeset -g POWERLEVEL9K_VCS_OUTGOING_CHANGES_ICON=':⇡' - # Don't show the number of commits next to the ahead/behind arrows. - typeset -g POWERLEVEL9K_VCS_{COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=1 - # Remove space between '⇣' and '⇡' and all trailing spaces. - typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${${${P9K_CONTENT/⇣* :⇡/⇣⇡}// }//:/ }' - - # Grey current time. - typeset -g POWERLEVEL9K_TIME_FOREGROUND=$grey - # Format for the current time: 09:51:02. See `man 3 strftime`. - typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' - # 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 rather than the end times of - # their preceding commands. - typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false - - # 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=off - - # 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=verbose - - # 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/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix index 735a677..ae4cc22 100644 --- a/hosts/pinwheel/configuration.nix +++ b/hosts/pinwheel/configuration.nix @@ -13,6 +13,7 @@ ./modules/age ./modules/ssh ./modules/git + ./modules/zsh ./modules/vim ./modules/syncthing ./modules/firefox @@ -72,7 +73,6 @@ isNormalUser = true; description = "alex"; extraGroups = [ "networkmanager" "wheel" ]; - shell = pkgs.zsh; packages = with pkgs; []; }; @@ -85,9 +85,6 @@ agenix.packages."${system}".default ]; - programs.zsh.enable = true; - environment.pathsToLink = [ "/share/zsh" ]; - fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk diff --git a/hosts/pinwheel/home.nix b/hosts/pinwheel/home.nix index ec03cd8..05788d0 100644 --- a/hosts/pinwheel/home.nix +++ b/hosts/pinwheel/home.nix @@ -23,57 +23,6 @@ }; }; - programs.zsh = { - enable = true; - - enableAutosuggestions = true; - enableCompletion = true; - defaultKeymap = "viins"; - - history = { - ignoreDups = true; - size = 100000; - save = 100000; - }; - - plugins = [ - { - name = "powerlevel10k"; - src = pkgs.zsh-powerlevel10k; - file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; - } - { - name = "zsh-syntax-highlighting"; - src = pkgs.zsh-syntax-highlighting; - } - { - name = "zsh-autosuggestions"; - src = pkgs.zsh-autosuggestions; - } - { - name = "zsh-syntax-completions"; - src = pkgs.zsh-completions; - } - { - name = "powerlevel10k-config"; - src = ./configs/p10k-config; - file = "p10k.zsh"; - } - ]; - - envExtra = lib.strings.concatStringsSep "\n" [ - "EDITOR=vim" - "BROWSER=firefox" - ]; - - initExtra = lib.strings.concatStringsSep "\n" [ - "export KEYTIMEOUT=1" - "bindkey -v '^?' backward-delete-char" - "bindkey '^a' beginning-of-line" - "bindkey '^e' end-of-line" - ]; - }; - programs.tmux = { enable = true; diff --git a/hosts/pinwheel/modules/zsh/default.nix b/hosts/pinwheel/modules/zsh/default.nix new file mode 100644 index 0000000..2b2bc91 --- /dev/null +++ b/hosts/pinwheel/modules/zsh/default.nix @@ -0,0 +1,60 @@ +{ home-manager, pkgs, lib, ... }: +{ + home-manager.users.alex = { + programs.zsh = { + enable = true; + + enableAutosuggestions = true; + enableCompletion = true; + defaultKeymap = "viins"; + + history = { + ignoreDups = true; + size = 100000; + save = 100000; + }; + + plugins = [ + { + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + } + { + name = "zsh-syntax-highlighting"; + src = pkgs.zsh-syntax-highlighting; + } + { + name = "zsh-autosuggestions"; + src = pkgs.zsh-autosuggestions; + } + { + name = "zsh-syntax-completions"; + src = pkgs.zsh-completions; + } + { + name = "powerlevel10k-config"; + src = ./p10k-config; + file = "p10k.zsh"; + } + ]; + + envExtra = lib.strings.concatStringsSep "\n" [ + "EDITOR=vim" + "BROWSER=firefox" + ]; + + initExtra = lib.strings.concatStringsSep "\n" [ + "export KEYTIMEOUT=1" + "bindkey -v '^?' backward-delete-char" + "bindkey '^a' beginning-of-line" + "bindkey '^e' end-of-line" + ]; + }; + }; + + users.users.alex.shell = pkgs.zsh; + + programs.zsh.enable = true; + environment.pathsToLink = [ "/share/zsh" ]; +} diff --git a/hosts/pinwheel/configs/p10k-config/.p10k.zsh b/hosts/pinwheel/modules/zsh/p10k-config/.p10k.zsh similarity index 100% rename from hosts/pinwheel/configs/p10k-config/.p10k.zsh rename to hosts/pinwheel/modules/zsh/p10k-config/.p10k.zsh diff --git a/hosts/pinwheel/configs/p10k-config/p10k.zsh b/hosts/pinwheel/modules/zsh/p10k-config/p10k.zsh similarity index 100% rename from hosts/pinwheel/configs/p10k-config/p10k.zsh rename to hosts/pinwheel/modules/zsh/p10k-config/p10k.zsh