From 9153af880963553e7e19207270521a7b13223d7e Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 28 Jan 2023 22:05:02 +0100
Subject: [PATCH 01/46] terminal-life: switch from zsh to bash & starship

---
 modules/terminal-life/bash/default.nix  |  71 +++++++++++
 modules/terminal-life/default.nix       |  22 ++--
 modules/terminal-life/fzf/default.nix   |   2 +-
 modules/terminal-life/starship.toml     | 128 +++++++++++++++++++
 modules/terminal-life/starship.toml.nix | 159 ++++++++++++++++++++++++
 overlays/blesh.nix                      |  13 ++
 pkgs/sway-launcher.nix                  |   3 +-
 profiles/base-user/default.nix          |   1 -
 profiles/base-user/home.nix             |   1 -
 9 files changed, 385 insertions(+), 15 deletions(-)
 create mode 100644 modules/terminal-life/bash/default.nix
 create mode 100644 modules/terminal-life/starship.toml
 create mode 100644 modules/terminal-life/starship.toml.nix
 create mode 100644 overlays/blesh.nix

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
new file mode 100644
index 00000000..05ea4ecc
--- /dev/null
+++ b/modules/terminal-life/bash/default.nix
@@ -0,0 +1,71 @@
+{
+  config,
+  pkgs,
+  self,
+  ...
+}: let
+  psCfg = config.pub-solar;
+  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
+in {
+  enable = true;
+
+  historyControl = ["ignorespace"];
+
+  # Run when initializing a login shell
+  profileExtra = ''
+    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
+  '';
+
+  # Run when initializing an interactive shell
+  initExtra = ''
+    # If a command is not found, show me where it is
+    source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
+
+    # Helps you navigate directories faster
+    # https://github.com/gsamokovarov/jump
+    eval "$(${pkgs.jump}/bin/jump shell --bind=z)"
+
+    eval "$(${pkgs.direnv}/bin/direnv hook bash)"
+
+    # Syntax highlighting, auto suggestions, vim modes, etc.
+    # https://github.com/akinomyoga/ble.sh/wiki/Manual-A1-Installation#user-content-nixpkgs
+    source "$(blesh-share)" --attach=none
+    [[ ''${BLE_VERSION-} ]] && ble-attach
+    # ctrl + space to accept autocomplete suggestion
+    ble-bind -m 'auto_complete' -f 'C-@' 'auto_complete/insert-on-end'
+    # Meta (Alt) + Backspace to delete a word
+    ble-bind -m 'emacs' -f 'M-C-?' 'kill-backward-cword'
+    # Meta (Alt) + p to jump one word backwards
+    ble-bind -m 'emacs' -f M-p '@nomarked backward-cword'
+    # Meta (Alt) + n to jump one word forwards
+    ble-bind -m 'emacs' -f M-n '@nomarked forward-cword'
+    # Arrow up and Ctrl + p searches history for entered input
+    ble-bind -f up 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -f C-p 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    # Arrow down and Ctrl + n searches history for entered input
+    ble-bind -f down 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+
+    bleopt filename_ls_colors="$LS_COLORS"
+
+    source ${config.age.secrets.environment-secrets.path}
+  '';
+
+  shellAliases = {
+    nano = "nvim";
+    vi = "nvim";
+    vim = "nvim";
+    mutt = "neomutt";
+    ls = "exa";
+    la = "exa --group-directories-first -lag";
+    fm = "vifm .";
+    vifm = "vifm .";
+    wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
+    irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
+    drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
+    no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
+    # fix nixos-option
+    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
+    myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
+  };
+}
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 3b58243f..a47c4d2b 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -24,27 +24,29 @@ in {
   config = mkIf cfg.enable {
     programs.command-not-found.enable = false;
 
-    # Needed to get zsh completion for system packages (e.g. systemd).
-    environment.pathsToLink = ["/share/zsh"];
-
-    environment.shells = with pkgs; [
-      zsh
-    ];
-
     environment.systemPackages = with pkgs; [
       screen
     ];
 
+    # Starship is a fast and featureful shell prompt
+    # starship.toml has sane defaults that can be changed there
+    programs.starship = {
+      enable = true;
+      settings = import ./starship.toml.nix;
+    };
+
     home-manager = with pkgs;
       pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
         home.packages = [
           ack
           asciinema
           bat
+          blesh
           exa
           fd
           gh
           glow
+          jump
           nnn
           powerline
           silver-searcher
@@ -52,18 +54,18 @@ in {
           watson
         ];
 
-        programs.neovim = import ./nvim {
+        programs.bash = import ./bash {
           inherit config;
           inherit pkgs;
+          inherit self;
         };
         programs.fzf = import ./fzf {
           inherit config;
           inherit pkgs;
         };
-        programs.zsh = import ./zsh {
+        programs.neovim = import ./nvim {
           inherit config;
           inherit pkgs;
-          inherit self;
         };
       };
   };
diff --git a/modules/terminal-life/fzf/default.nix b/modules/terminal-life/fzf/default.nix
index 0cc6fd94..372e768d 100644
--- a/modules/terminal-life/fzf/default.nix
+++ b/modules/terminal-life/fzf/default.nix
@@ -10,5 +10,5 @@
     "--color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062"
     "--color=marker:#ef9062,fg+:#303030,prompt:#e5c463,hl+:#7accd7"
   ];
-  enableZshIntegration = true;
+  enableBashIntegration = true;
 }
diff --git a/modules/terminal-life/starship.toml b/modules/terminal-life/starship.toml
new file mode 100644
index 00000000..1ef9ab70
--- /dev/null
+++ b/modules/terminal-life/starship.toml
@@ -0,0 +1,128 @@
+format = """
+[](#9A348E)\
+$character \
+[](bg:#DA627D fg:#9A348E)\
+$directory\
+[](fg:#DA627D bg:#FCA17D)\
+$git_branch\
+$git_status\
+[](fg:#FCA17D bg:#86BBD8)\
+$c\
+$deno\
+$golang\
+$haskell\
+$nix_shell\
+$nodejs\
+$php\
+$python\
+$ruby\
+$rust\
+$terraform\
+[](fg:#86BBD8 bg:#06969A)\
+$docker_context\
+[](fg:#06969A bg:#33658A)\
+$container \
+[](fg:#06969A bg:#33658A)\
+$time\
+[ ](fg:#33658A)\
+"""
+
+# Disable the blank line at the start of the prompt
+# add_newline = false
+
+# You can also replace your username with a neat symbol like  to save some space
+#[username]
+#show_always = true
+#style_user = "bg:#9A348E"
+#style_root = "bg:#9A348E"
+#format = '[$user ]($style)'
+[character]
+success_symbol = "[❯](bold purple)"
+vicmd_symbol = "[❮](bold purple)"
+
+[directory]
+style = "bg:#DA627D"
+format = "[ $path ]($style)"
+truncation_length = 3
+truncation_symbol = "…/"
+
+# Here is how you can shorten some long paths by text replacement
+# similar to mapped_locations in Oh My Posh:
+[directory.substitutions]
+"Documents" = " "
+"Downloads" = " "
+"Music" = " "
+"Pictures" = " "
+# Keep in mind that the order matters. For example:
+# "Important Documents" = "  "
+# will not be replaced, because "Documents" was already substituted before.
+# So either put "Important Documents" before "Documents" or use the substituted version:
+# "Important  " = "  "
+
+[c]
+symbol = " "
+style = "bg:#86BBD8"
+format = '[ $symbol ($version) ]($style)'
+
+[container]
+
+[custom]
+
+[docker_context]
+symbol = " "
+style = "bg:#06969A"
+format = '[ $symbol $context ]($style) $path'
+
+[deno]
+
+[git_branch]
+symbol = ""
+style = "bg:#FCA17D"
+format = '[ $symbol $branch ]($style)'
+
+[git_status]
+style = "bg:#FCA17D"
+format = '[$all_status$ahead_behind ]($style)'
+
+[golang]
+symbol = " "
+style = "bg:#86BBD8"
+format = '[ $symbol ($version) ]($style)'
+
+[haskell]
+symbol = " "
+style = "bg:#86BBD8"
+format = '[ $symbol ($version) ]($style)'
+
+[nix_shell]
+format = '[$symbol$state]($style) '
+symbol = " "
+pure_msg = "λ"
+impure_msg = "⎔"
+
+[nodejs]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol ($version) ]($style)'
+
+[php]
+symbol = " "
+
+[python]
+symbol = " "
+
+[ruby]
+symbol = " "
+
+[rust]
+symbol = ""
+style = "bg:#86BBD8"
+format = '[ $symbol ($version) ]($style)'
+
+[terraform]
+
+[time]
+disabled = false
+time_format = "%R" # Hour:Minute Format
+style = "bg:#33658A"
+format = '[ ♥ $time ]($style)'
diff --git a/modules/terminal-life/starship.toml.nix b/modules/terminal-life/starship.toml.nix
new file mode 100644
index 00000000..ab6dfa7f
--- /dev/null
+++ b/modules/terminal-life/starship.toml.nix
@@ -0,0 +1,159 @@
+{
+  format = "$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nix_shell$nodejs$php$python$ruby$rust$terraform[](fg:#86BBD8 bg:#06969A))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})[ ](fg:#F85E84)$line_break$character";
+
+  # Disable the blank line at the start of the prompt
+  add_newline = false;
+
+  # You can also replace your username with a neat symbol like  to save some space
+  #username = {
+  #  show_always = true;
+  #  style_user = "bg:#9A348E";
+  #  style_root = "bg:#9A348E";
+  #  format = ''[$user ]($style)'';
+  #};
+  character = {
+    success_symbol = "[❯](bold purple)";
+    error_symbol = "[✗](#ff4b00)";
+    vicmd_symbol = "[❮](bold purple)";
+  };
+
+  fill = {
+    symbol = "-";
+    style = "bold green";
+  };
+
+  directory = {
+    style = "#F85E84";
+    truncate_to_repo = false;
+    fish_style_pwd_dir_length = 1;
+    truncation_symbol = "…/";
+    format = "[](fg:black bg:#F85E84)[$path[$read_only](bg:$style fg:black)](bg:$style fg:black)[](fg:$style)";
+    read_only = " ";
+  };
+
+  # Here is how you can shorten some long paths by text replacement
+  # similar to mapped_locations in Oh My Posh:
+  directory.substitutions = {
+    "Documents" = " ";
+    "Downloads" = " ";
+    "Music" = " ";
+    "Pictures" = " ";
+  };
+  # Keep in mind that the order matters. For example:
+  # "Important Documents" = "  "
+  # will not be replaced, because "Documents" was already substituted before.
+  # So either put "Important Documents" before "Documents" or use the substituted version:
+  # "Important  " = "  "
+
+  c = {
+    symbol = " ";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  #container = {};
+
+  custom = {
+    triton = {
+      command = "echo $TRITON_PROFILE";
+      when = "test $TRITON_PROFILE";
+      format = "[✚ ](fg:#F85E84 bg:#1A181A)[$output](fg:#F85E84 bg:#1A181A)";
+      description = "The current triton profile";
+    };
+  };
+
+  docker_context = {
+    symbol = " ";
+    style = "bg:#06969A";
+    format = ''[ $symbol $context ]($style) $path'';
+  };
+
+  #deno = {};
+
+  git_branch = {
+    style = "#E5C463";
+    format = "[](fg:black bg:$style)[ $symbol$branch](fg:black bg:$style)[](fg:$style)";
+  };
+
+  git_commit = {
+    style = "#E5C463";
+    # ^H is the literal backspace character which renders to \b in the final
+    # starship config TOML, produced in insert mode via ctrl+v then ctrl+h.
+    # We use the literal character, because escaping a single \ doesn't work
+    # with pkgs.formats.toml, see: https://github.com/NixOS/nixpkgs/issues/97310 and
+    # https://jdhao.github.io/2020/10/07/nvim_insert_unicode_char/
+    format = "[ ](bg:$style)[\\($hash$tag\\)](fg:black bg:$style)[](fg:$style)";
+  };
+
+  git_state = {
+    style = "#E5C463";
+    format = "[ ](bg:$style)[ \\($state( $progress_current/$progress_total)\\)](fg:black bg:$style)[](fg:$style)";
+  };
+
+  git_status = {
+    style = "#E5C463";
+    format = "([ ](bg:$style fg:black)$conflicted$staged$modified$renamed$deleted$untracked$stashed$ahead_behind[](fg:$style))";
+    conflicted = "[ ](bold fg:88 bg:#E5C463)[  \${count} ](fg:black bg:#E5C463)";
+    staged = "[ $count ](fg:black bg:#E5C463)";
+    modified = "[ \${count} ](fg:black bg:#E5C463)";
+    renamed = "[ \${count} ](fg:black bg:#E5C463)";
+    deleted = "[ \${count} ](fg:black bg:#E5C463)";
+    untracked = "[?\${count} ](fg:black bg:#E5C463)";
+    stashed = "[ \${count} ](fg:black bg:#E5C463)";
+    ahead = "[ \${count} ](fg:#523333 bg:#E5C463)";
+    behind = "[ \${count} ](fg:black bg:#E5C463)";
+    diverged = "[ ](fg:88 bg:#E5C463)[ נּ ](fg:black bg:#E5C463)[ \${ahead_count} ](fg:black bg:#E5C463)[ \${behind_count} ](fg:black bg:#E5C463)";
+  };
+
+  golang = {
+    symbol = " ";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  haskell = {
+    symbol = " ";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  nix_shell = {
+    format = ''[$symbol$state]($style) '';
+    symbol = " ";
+    pure_msg = "λ";
+    impure_msg = "⎔";
+  };
+
+  nodejs = {
+    symbol = "";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  php = {
+    symbol = " ";
+  };
+
+  python = {
+    symbol = " ";
+  };
+
+  ruby = {
+    symbol = " ";
+  };
+
+  rust = {
+    symbol = "";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  #terraform = {};
+
+  time = {
+    disabled = false;
+    time_format = "%R"; # Hour:Minute Format
+    style = "bg:#33658A";
+    format = ''[ ♥ $time ]($style)'';
+  };
+}
diff --git a/overlays/blesh.nix b/overlays/blesh.nix
new file mode 100644
index 00000000..01874da8
--- /dev/null
+++ b/overlays/blesh.nix
@@ -0,0 +1,13 @@
+final: prev: {
+  blesh = prev.blesh.overrideAttrs (oldAttrs: rec {
+    version = "unstable-2022-12-15";
+    src = prev.fetchFromGitHub {
+      owner = "akinomyoga";
+      repo = "ble.sh";
+      rev = "32277dae20f004c3a65aeb3adae881b8b8e0318f";
+      hash = "sha256-qh5z0rkDOKhgi4/LQX2WHShzqwlOUpe+CuJArEmuKMo=";
+      fetchSubmodules = true;
+      leaveDotGit = true;
+    };
+  });
+}
diff --git a/pkgs/sway-launcher.nix b/pkgs/sway-launcher.nix
index aed2cd1e..1ace27b5 100644
--- a/pkgs/sway-launcher.nix
+++ b/pkgs/sway-launcher.nix
@@ -1,7 +1,6 @@
 self:
 with self; ''
-  #!/usr/bin/env zsh
-  # terminal application launcher for sway, using fzf
+  #!/usr/bin/env bash
   # original command:
   # Based on: https://github.com/swaywm/sway/issues/1367
   # bindsym $altkey+space exec termite --name=launcher -e \
diff --git a/profiles/base-user/default.nix b/profiles/base-user/default.nix
index 92e297d0..a2c82d97 100644
--- a/profiles/base-user/default.nix
+++ b/profiles/base-user/default.nix
@@ -31,7 +31,6 @@ in {
           if psCfg.user.password != null
           then psCfg.user.password
           else "";
-        shell = pkgs.zsh;
         openssh.authorizedKeys.keys =
           if psCfg.user.publicKeys != null
           then psCfg.user.publicKeys
diff --git a/profiles/base-user/home.nix b/profiles/base-user/home.nix
index 9c964515..3d801baa 100644
--- a/profiles/base-user/home.nix
+++ b/profiles/base-user/home.nix
@@ -26,7 +26,6 @@ in {
     fonts.fontconfig.enable = mkForce true;
 
     programs.dircolors.enable = true;
-    programs.dircolors.enableZshIntegration = true;
 
     home.file."xinitrc".source = ./.xinitrc;
 

From a50ae3df100f2707bd4ea794a3451ff9407a7542 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 2 Feb 2023 17:28:43 +0100
Subject: [PATCH 02/46] bash: ble.sh tweaks and starship ricing

---
 modules/terminal-life/bash/default.nix  | 11 ++++++++++-
 modules/terminal-life/starship.toml.nix | 19 +++++++++++--------
 overlays/blesh.nix                      |  6 +++---
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index 05ea4ecc..3be672a5 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -30,7 +30,6 @@ in {
     # Syntax highlighting, auto suggestions, vim modes, etc.
     # https://github.com/akinomyoga/ble.sh/wiki/Manual-A1-Installation#user-content-nixpkgs
     source "$(blesh-share)" --attach=none
-    [[ ''${BLE_VERSION-} ]] && ble-attach
     # ctrl + space to accept autocomplete suggestion
     ble-bind -m 'auto_complete' -f 'C-@' 'auto_complete/insert-on-end'
     # Meta (Alt) + Backspace to delete a word
@@ -46,9 +45,19 @@ in {
     ble-bind -f down 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
     ble-bind -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
 
+    function my/complete-load-hook {
+      bleopt complete_auto_delay=300
+    }
+    blehook/eval-after-load complete my/complete-load-hook
+
+    bleopt exec_errexit_mark=
+    bleopt history_share=1
     bleopt filename_ls_colors="$LS_COLORS"
 
     source ${config.age.secrets.environment-secrets.path}
+
+    # end of .bashrc
+    [[ ''${BLE_VERSION-} ]] && ble-attach
   '';
 
   shellAliases = {
diff --git a/modules/terminal-life/starship.toml.nix b/modules/terminal-life/starship.toml.nix
index ab6dfa7f..0fd21ad0 100644
--- a/modules/terminal-life/starship.toml.nix
+++ b/modules/terminal-life/starship.toml.nix
@@ -1,5 +1,5 @@
 {
-  format = "$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nix_shell$nodejs$php$python$ruby$rust$terraform[](fg:#86BBD8 bg:#06969A))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})[ ](fg:#F85E84)$line_break$character";
+  format = "$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#86BBD8 bg:#06969A))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
 
   # Disable the blank line at the start of the prompt
   add_newline = false;
@@ -13,13 +13,18 @@
   #};
   character = {
     success_symbol = "[❯](bold purple)";
-    error_symbol = "[✗](#ff4b00)";
-    vicmd_symbol = "[❮](bold purple)";
+    error_symbol = "[✗](#FF4B00)";
+  };
+
+  status = {
+    disabled = false;
+    style = "#FF4B00";
   };
 
   fill = {
     symbol = "-";
-    style = "bold green";
+    #style = "bold green";
+    style = "black";
   };
 
   directory = {
@@ -118,10 +123,8 @@
   };
 
   nix_shell = {
-    format = ''[$symbol$state]($style) '';
-    symbol = " ";
-    pure_msg = "λ";
-    impure_msg = "⎔";
+    format = ''[$symbol]($style) '';
+    symbol = " ";
   };
 
   nodejs = {
diff --git a/overlays/blesh.nix b/overlays/blesh.nix
index 01874da8..72fd6bcc 100644
--- a/overlays/blesh.nix
+++ b/overlays/blesh.nix
@@ -1,11 +1,11 @@
 final: prev: {
   blesh = prev.blesh.overrideAttrs (oldAttrs: rec {
-    version = "unstable-2022-12-15";
+    version = "unstable-2023-02-01";
     src = prev.fetchFromGitHub {
       owner = "akinomyoga";
       repo = "ble.sh";
-      rev = "32277dae20f004c3a65aeb3adae881b8b8e0318f";
-      hash = "sha256-qh5z0rkDOKhgi4/LQX2WHShzqwlOUpe+CuJArEmuKMo=";
+      rev = "0ceb0cb38157c2c37650ffb069098783338eb02c";
+      hash = "sha256-f3w3gHKysRafBGcZbCPUvy9e/fOrQc9TBZAjb0ioxpo=";
       fetchSubmodules = true;
       leaveDotGit = true;
     };

From 35c276bb495e7d7c996a0fea34d5ced3bb1b768d Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 2 Feb 2023 17:46:00 +0100
Subject: [PATCH 03/46] bash: clean up unneeded starship.toml

---
 modules/terminal-life/starship.toml | 128 ----------------------------
 1 file changed, 128 deletions(-)
 delete mode 100644 modules/terminal-life/starship.toml

diff --git a/modules/terminal-life/starship.toml b/modules/terminal-life/starship.toml
deleted file mode 100644
index 1ef9ab70..00000000
--- a/modules/terminal-life/starship.toml
+++ /dev/null
@@ -1,128 +0,0 @@
-format = """
-[](#9A348E)\
-$character \
-[](bg:#DA627D fg:#9A348E)\
-$directory\
-[](fg:#DA627D bg:#FCA17D)\
-$git_branch\
-$git_status\
-[](fg:#FCA17D bg:#86BBD8)\
-$c\
-$deno\
-$golang\
-$haskell\
-$nix_shell\
-$nodejs\
-$php\
-$python\
-$ruby\
-$rust\
-$terraform\
-[](fg:#86BBD8 bg:#06969A)\
-$docker_context\
-[](fg:#06969A bg:#33658A)\
-$container \
-[](fg:#06969A bg:#33658A)\
-$time\
-[ ](fg:#33658A)\
-"""
-
-# Disable the blank line at the start of the prompt
-# add_newline = false
-
-# You can also replace your username with a neat symbol like  to save some space
-#[username]
-#show_always = true
-#style_user = "bg:#9A348E"
-#style_root = "bg:#9A348E"
-#format = '[$user ]($style)'
-[character]
-success_symbol = "[❯](bold purple)"
-vicmd_symbol = "[❮](bold purple)"
-
-[directory]
-style = "bg:#DA627D"
-format = "[ $path ]($style)"
-truncation_length = 3
-truncation_symbol = "…/"
-
-# Here is how you can shorten some long paths by text replacement
-# similar to mapped_locations in Oh My Posh:
-[directory.substitutions]
-"Documents" = " "
-"Downloads" = " "
-"Music" = " "
-"Pictures" = " "
-# Keep in mind that the order matters. For example:
-# "Important Documents" = "  "
-# will not be replaced, because "Documents" was already substituted before.
-# So either put "Important Documents" before "Documents" or use the substituted version:
-# "Important  " = "  "
-
-[c]
-symbol = " "
-style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
-
-[container]
-
-[custom]
-
-[docker_context]
-symbol = " "
-style = "bg:#06969A"
-format = '[ $symbol $context ]($style) $path'
-
-[deno]
-
-[git_branch]
-symbol = ""
-style = "bg:#FCA17D"
-format = '[ $symbol $branch ]($style)'
-
-[git_status]
-style = "bg:#FCA17D"
-format = '[$all_status$ahead_behind ]($style)'
-
-[golang]
-symbol = " "
-style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
-
-[haskell]
-symbol = " "
-style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
-
-[nix_shell]
-format = '[$symbol$state]($style) '
-symbol = " "
-pure_msg = "λ"
-impure_msg = "⎔"
-
-[nodejs]
-symbol = ""
-style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
-
-[php]
-symbol = " "
-
-[python]
-symbol = " "
-
-[ruby]
-symbol = " "
-
-[rust]
-symbol = ""
-style = "bg:#86BBD8"
-format = '[ $symbol ($version) ]($style)'
-
-[terraform]
-
-[time]
-disabled = false
-time_format = "%R" # Hour:Minute Format
-style = "bg:#33658A"
-format = '[ ♥ $time ]($style)'

From c5c6f1b098649cd157a4ceba4efabfaef48dbc9d Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 2 Feb 2023 17:50:23 +0100
Subject: [PATCH 04/46] bash: agenix secret only exists in teutat3s branch

---
 modules/terminal-life/bash/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index 3be672a5..c35763cc 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -54,8 +54,6 @@ in {
     bleopt history_share=1
     bleopt filename_ls_colors="$LS_COLORS"
 
-    source ${config.age.secrets.environment-secrets.path}
-
     # end of .bashrc
     [[ ''${BLE_VERSION-} ]] && ble-attach
   '';

From db3af3c76afaecc821b1c8d0f42cc2c5292c4ac0 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 24 Feb 2023 17:56:17 +0100
Subject: [PATCH 05/46] bash: disable ble.sh history share

complete on first TAB if there's a single matching filename
with show-all-if-ambiguous on

enable history search with arrow up after starting to type a command
---
 modules/terminal-life/bash/default.nix | 38 ++++++++++++++++++++------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index c35763cc..b66cce35 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -27,33 +27,53 @@ in {
 
     eval "$(${pkgs.direnv}/bin/direnv hook bash)"
 
+    bind 'set show-all-if-ambiguous on'
+
     # Syntax highlighting, auto suggestions, vim modes, etc.
     # https://github.com/akinomyoga/ble.sh/wiki/Manual-A1-Installation#user-content-nixpkgs
     source "$(blesh-share)" --attach=none
     # ctrl + space to accept autocomplete suggestion
     ble-bind -m 'auto_complete' -f 'C-@' 'auto_complete/insert-on-end'
     # Meta (Alt) + Backspace to delete a word
-    ble-bind -m 'emacs' -f 'M-C-?' 'kill-backward-cword'
+    ble-bind -m 'vi_imap' -f 'M-C-?' 'kill-backward-cword'
     # Meta (Alt) + p to jump one word backwards
-    ble-bind -m 'emacs' -f M-p '@nomarked backward-cword'
+    ble-bind -m 'vi_imap' -f M-p '@nomarked backward-cword'
     # Meta (Alt) + n to jump one word forwards
-    ble-bind -m 'emacs' -f M-n '@nomarked forward-cword'
+    ble-bind -m 'vi_imap' -f M-n '@nomarked forward-cword'
     # Arrow up and Ctrl + p searches history for entered input
-    ble-bind -f up 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
-    ble-bind -f C-p 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f up 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f C-p 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
     # Arrow down and Ctrl + n searches history for entered input
-    ble-bind -f down 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
-    ble-bind -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f down 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
 
     function my/complete-load-hook {
-      bleopt complete_auto_delay=300
+      bleopt complete_auto_delay=500
     }
     blehook/eval-after-load complete my/complete-load-hook
 
     bleopt exec_errexit_mark=
-    bleopt history_share=1
     bleopt filename_ls_colors="$LS_COLORS"
 
+    bleopt complete_menu_style=desc-raw
+
+    # Bash vim mode keybindings
+    if [[ $- == *i* ]]; then # in interactive session
+      set -o vi
+
+      ble-bind -m vi_imap -f 'ENTER' 'vi_imap/complete'
+      ble-bind -m vi_imap -f 'TAB' 'vi_imap/complete'
+
+      ble-bind -m vi_imap -f 'j j' 'vi_imap/normal-mode'
+      ble-bind -m vi_imap -f 'ESC' 'vi_imap/normal-mode'
+
+      ble-bind -m vi_nmap -f 'h' 'vi_nmap/insert-mode'
+      ble-bind -m vi_nmap -f 'i' 'vi-command/backward-line'
+      ble-bind -m vi_nmap -f 'j' 'vi-command/backward-char'
+      ble-bind -m vi_nmap -f 'k' 'vi-command/forward-line'
+      ble-bind -m vi_nmap -f 'l' 'vi-command/forward-char'
+    fi
+
     # end of .bashrc
     [[ ''${BLE_VERSION-} ]] && ble-attach
   '';

From 3f7f1f00384824bcf49f965f791c0df6cb7c61c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Fri, 24 Feb 2023 18:33:13 +0100
Subject: [PATCH 06/46] Fix blesh hash

---
 overlays/blesh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlays/blesh.nix b/overlays/blesh.nix
index 72fd6bcc..d31cbb3e 100644
--- a/overlays/blesh.nix
+++ b/overlays/blesh.nix
@@ -5,7 +5,7 @@ final: prev: {
       owner = "akinomyoga";
       repo = "ble.sh";
       rev = "0ceb0cb38157c2c37650ffb069098783338eb02c";
-      hash = "sha256-f3w3gHKysRafBGcZbCPUvy9e/fOrQc9TBZAjb0ioxpo=";
+      hash = "sha256-e/CetIdKuc8fhZp1v+SzOBwkZn8o1g5SjaF74Ir1daI=";
       fetchSubmodules = true;
       leaveDotGit = true;
     };

From 9a3a7c7d008901797ab743d2e952a2d49998002e Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 24 Feb 2023 18:23:36 +0100
Subject: [PATCH 07/46] bash: ble.sh use desc menu style for completion

---
 modules/terminal-life/bash/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index b66cce35..a9b9d0da 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -55,7 +55,7 @@ in {
     bleopt exec_errexit_mark=
     bleopt filename_ls_colors="$LS_COLORS"
 
-    bleopt complete_menu_style=desc-raw
+    bleopt complete_menu_style=desc
 
     # Bash vim mode keybindings
     if [[ $- == *i* ]]; then # in interactive session

From 5fd4ffeb5df38f65c74d165ecfd09b244fa87ad5 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 24 Feb 2023 18:35:06 +0100
Subject: [PATCH 08/46] bash: fix starship color in prompt

---
 modules/terminal-life/starship.toml.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/terminal-life/starship.toml.nix b/modules/terminal-life/starship.toml.nix
index 0fd21ad0..da8b2b7c 100644
--- a/modules/terminal-life/starship.toml.nix
+++ b/modules/terminal-life/starship.toml.nix
@@ -1,5 +1,5 @@
 {
-  format = "$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#86BBD8 bg:#06969A))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
+  format = "$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#F85E84 bg:black))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
 
   # Disable the blank line at the start of the prompt
   add_newline = false;

From 9e6c7c140b8933c62c2093c46121749d1a5cbe71 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 24 Feb 2023 20:15:45 +0100
Subject: [PATCH 09/46] bash: use nvfetcher for ble.sh sources

---
 overlays/blesh.nix          | 10 +---------
 pkgs/_sources/generated.nix | 25 +++++++++++++++++++------
 pkgs/sources.toml           |  6 ++++++
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/overlays/blesh.nix b/overlays/blesh.nix
index d31cbb3e..f3c93d73 100644
--- a/overlays/blesh.nix
+++ b/overlays/blesh.nix
@@ -1,13 +1,5 @@
 final: prev: {
   blesh = prev.blesh.overrideAttrs (oldAttrs: rec {
-    version = "unstable-2023-02-01";
-    src = prev.fetchFromGitHub {
-      owner = "akinomyoga";
-      repo = "ble.sh";
-      rev = "0ceb0cb38157c2c37650ffb069098783338eb02c";
-      hash = "sha256-e/CetIdKuc8fhZp1v+SzOBwkZn8o1g5SjaF74Ir1daI=";
-      fetchSubmodules = true;
-      leaveDotGit = true;
-    };
+    inherit (prev.sources.blesh-nvfetcher) version src;
   });
 }
diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index fb4a336e..b28f7715 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -15,6 +15,19 @@
       sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM=";
     };
   };
+  blesh-nvfetcher = {
+    pname = "blesh-nvfetcher";
+    version = "10aa9b4fe47fc07ccdc9d5ba35f1417fdb614d41";
+    src = fetchFromGitHub {
+      owner = "akinomyoga";
+      repo = "ble.sh";
+      rev = "10aa9b4fe47fc07ccdc9d5ba35f1417fdb614d41";
+      fetchSubmodules = true;
+      deepClone = false;
+      leaveDotGit = true;
+      sha256 = "sha256-5H6kBwHOOF5p+4htTEhTDVoseynTXcFBFfH6d3dYvks=";
+    };
+  };
   instant-nvim-nvfetcher = {
     pname = "instant-nvim-nvfetcher";
     version = "294b6d08143b3db8f9db7f606829270149e1a786";
@@ -39,13 +52,13 @@
   };
   ohmyzsh = {
     pname = "ohmyzsh";
-    version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
+    version = "5cb943eea46d322542c5c2a9f54b201eddc2aa67";
     src = fetchFromGitHub {
       owner = "ohmyzsh";
       repo = "ohmyzsh";
-      rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
+      rev = "5cb943eea46d322542c5c2a9f54b201eddc2aa67";
       fetchSubmodules = false;
-      sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw=";
+      sha256 = "sha256-Edxhyogl5evjmzyWvImnIpNo91ksvUgQtcuuY50L6c8=";
     };
   };
   powerlevel10k = {
@@ -72,13 +85,13 @@
   };
   vim-apprentice-nvfetcher = {
     pname = "vim-apprentice-nvfetcher";
-    version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
+    version = "59ad13661fa15edaf72c62218903c7817b5a3691";
     src = fetchFromGitHub {
       owner = "romainl";
       repo = "Apprentice";
-      rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
+      rev = "59ad13661fa15edaf72c62218903c7817b5a3691";
       fetchSubmodules = false;
-      sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo=";
+      sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=";
     };
   };
   vim-beautify-nvfetcher = {
diff --git a/pkgs/sources.toml b/pkgs/sources.toml
index 5ec5e936..da43c60a 100644
--- a/pkgs/sources.toml
+++ b/pkgs/sources.toml
@@ -46,3 +46,9 @@ fetch.github = "zeekay/vim-beautify"
 [vim-apprentice-nvfetcher]
 src.git = "https://github.com/romainl/Apprentice"
 fetch.github = "romainl/Apprentice"
+
+[blesh-nvfetcher]
+src.git = "https://github.com/akinomyoga/ble.sh"
+fetch.github = "akinomyoga/ble.sh"
+git.fetchSubmodules = true
+git.leaveDotGit = true

From d0470d5aafa7a5778b629bcd1deb51b4be136ea7 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 27 Mar 2023 13:35:59 +0200
Subject: [PATCH 10/46] flake: pull in changes from digga upstream

See:
https://github.com/divnix/digga/compare/54ede8e591d288c176a09d6fcf4b123896c0bf0f...0595ae70cdb5ccf1ab031199fe98551c4b378bd9?diff=unified
---
 default.nix             |  1 -
 doc/api-reference.md    |  2 +-
 doc/book.toml           |  6 +++++-
 doc/concepts/users.md   | 17 ++---------------
 doc/start/index.md      | 32 +++++++++++---------------------
 doc/tests.md            | 15 ++++++++++++---
 lib/default.nix         | 10 +++++++++-
 modules/core/nix.nix    |  6 +++---
 shell/devos.nix         | 31 +++++++++++++------------------
 shell/hooks/default.nix |  6 ++++--
 10 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/default.nix b/default.nix
index 0468b228..3d5b5f96 100644
--- a/default.nix
+++ b/default.nix
@@ -5,7 +5,6 @@ let
 
   ciSystems = [
     "aarch64-linux"
-    "i686-linux"
     "x86_64-linux"
   ];
 
diff --git a/doc/api-reference.md b/doc/api-reference.md
index ee2cb9e7..41fa2f78 100755
--- a/doc/api-reference.md
+++ b/doc/api-reference.md
@@ -59,5 +59,5 @@ list of strings
 _*Default*_
 
 ```
-["aarch64-linux","aarch64-darwin","i686-linux","x86_64-darwin","x86_64-linux"]
+["aarch64-linux","aarch64-darwin","x86_64-darwin","x86_64-linux"]
 ```
diff --git a/doc/book.toml b/doc/book.toml
index f9dca6a3..beb67004 100644
--- a/doc/book.toml
+++ b/doc/book.toml
@@ -1,5 +1,9 @@
 [book]
-authors = ["Timothy DeHerrera"]
+authors = [
+  "Timothy DeHerrera",
+  "Parthiv Seetharaman",
+  "David Arnold",
+]
 language = "en"
 multilingual = false
 src = "."
diff --git a/doc/concepts/users.md b/doc/concepts/users.md
index 3cb4480e..85e2f070 100644
--- a/doc/concepts/users.md
+++ b/doc/concepts/users.md
@@ -9,8 +9,7 @@
 Users are a special case of [profiles](profiles.md) that define system
 users and [home-manager][home-manager] configurations. For your convenience,
 home manager is wired in by default so all you have to worry about is declaring
-your users. For a fully fleshed out example, check out the developers personal
-[branch](https://github.com/divnix/devos/tree/nrd/users/nrd/default.nix).
+your users.
 
 ## Basic Usage
 
@@ -60,18 +59,6 @@ using the `homeConfigurations` flake output.
 This is great for keeping your environment consistent across Unix-like systems,
 including macOS.
 
-### From within the projects devshell:
-
-```sh
-# builds the pub-solar user defined in the PubSolarOS host
-nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage'
-
-# build and activate
-nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage' && ./result/activate && unlink result
-```
-
-### Manually from outside the project:
-
 ```sh
 # build
 nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPackage"
@@ -81,5 +68,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
 ```
 
 [home-manager]: https://nix-community.github.io/home-manager
-[modules-list]: https://github.com/divnix/devos/tree/main/users/modules/module-list.nix
+[modules-list]: https://github.com/divnix/digga/tree/main/users/modules/module-list.nix
 [portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers
diff --git a/doc/start/index.md b/doc/start/index.md
index 06e41292..c160df9f 100644
--- a/doc/start/index.md
+++ b/doc/start/index.md
@@ -4,7 +4,8 @@ The only dependency is nix, so make sure you have it [installed][install-nix].
 
 ## Get the Template
 
-If you currently don't have flakes setup, you can utilize the digga shell to pull the template:
+If you currently don't have flakes setup, you can utilize the digga shell to
+pull the template:
 
 ```sh
 nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
@@ -22,37 +23,26 @@ Then make sure to create the git repository:
 ```sh
 git init
 git add .
-git commit -m init
+git commit
 ```
 
-To drop into a nix-shell, if you don't have flakes setup, use the digga shell to create a `flake.lock`:
-
-```sh
-nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
-  --run "nix flake lock"
-```
-
-Or if you do have flakes support, just run:
-
-```sh
-nix flake lock
-```
-
-Finally, run `nix-shell` to get to an interactive shell with all the dependencies, including the unstable nix
-version required. You can run `menu` to confirm that you are using digga (expected output includes [docs], [general commands], [linter], etc.).
+Finally, run `nix-shell` to get to an interactive shell with all the
+dependencies, including the unstable nix version required. You can run `menu` to
+confirm that you are using digga (expected output includes [docs], [general
+commands], [linter], etc.).
 
 In addition, the [binary cache](../integrations/cachix.md) is added for faster deployment.
 
-> ##### _Notes:_
+> # _Notes:_
 >
 > - Flakes ignore files that have not been added to git, so be sure to stage new
 >   files before building the system.
 > - You can choose to simply clone the repo with git if you want to follow
 >   upstream changes.
-> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work
->   you can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
+> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work you
+>   can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
 
-## Next Steps:
+## Next Steps
 
 - [Make installable ISO](./iso.md)
 
diff --git a/doc/tests.md b/doc/tests.md
index aa2bda14..24dead09 100644
--- a/doc/tests.md
+++ b/doc/tests.md
@@ -14,12 +14,21 @@ be built during CI.
 
 ## Integration Tests
 
-All your profiles defined in suites will be tested in a NixOS VM.
+All your profiles defined in suites can be tested against an individual host.
+Simply use digga's pre-baked `digga.lib.allProfilesTest` like so:
+
+```nix
+{
+  hosts = {
+    Morty.tests = [ allProfilesTest ];
+  };
+}
+```
 
 You can write integration tests for one or more NixOS VMs that can,
 optionally, be networked together, and yes, it's as awesome as it sounds!
 
-Be sure to use the `mkTest` function from digga, `digga.lib.pkgs-lib.mkTest`
+Be sure to use the `mkTest` function from Digga, `digga.lib.mkTest`
 which wraps the official [testing-python][testing-python] function to ensure
 that the system is setup exactly as it is for a bare DevOS system. There are
 already great resources for learning how to use these tests effectively,
@@ -28,7 +37,7 @@ and the examples in [nixpkgs][nixos-tests].
 
 [test-doc]: https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
 [test-blog]: https://www.haskellforall.com/2020/11/how-to-use-nixos-for-lightweight.html
-[default]: https://github.com/divnix/devos/tree/main/tests/default.nix
+[default]: https://github.com/divnix/devos/tree/core/tests/default.nix
 [run-test]: https://github.com/NixOS/nixpkgs/blob/6571462647d7316aff8b8597ecdf5922547bf365/lib/debug.nix#L154-L166
 [nixos-tests]: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests
 [testing-python]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib/testing-python.nix
diff --git a/lib/default.nix b/lib/default.nix
index 9bc86f1a..ac167511 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,2 +1,10 @@
 {lib}:
-lib.makeExtensible (self: {})
+lib.makeExtensible (self: let
+  callLibs = file: import file {lib = self;};
+in rec {
+  ## Define your own library functions here!
+  #id = x: x;
+  ## Or in files, containing functions that take {lib}
+  #foo = callLibs ./foo.nix;
+  ## In configs, they can be used under "lib.our"
+})
diff --git a/modules/core/nix.nix b/modules/core/nix.nix
index 711304ba..6df8803a 100644
--- a/modules/core/nix.nix
+++ b/modules/core/nix.nix
@@ -15,10 +15,10 @@
       auto-optimise-store = true;
       # Prevents impurities in builds
       sandbox = true;
-      # give root and @wheel special privileges with nix
+      # Give root and @wheel special privileges with nix
       trusted-users = ["root" "@wheel"];
-      # This is just a representation of the nix default
-      system-features = ["nixos-test" "benchmark" "big-parallel" "kvm"];
+      # Allow only group wheel to connect to the nix daemon
+      allowed-users = ["@wheel"];
     };
     # Generally useful nix option defaults
     extraOptions = ''
diff --git a/shell/devos.nix b/shell/devos.nix
index c216f3b9..fdbcee2e 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -8,11 +8,11 @@
   inherit
     (pkgs)
     agenix
+    alejandra
     cachix
     editorconfig-checker
-    mdbook
     nix
-    alejandra
+    nodePackages
     nvfetcher
     shellcheck
     shfmt
@@ -25,21 +25,23 @@
     prettier
     ;
 
-  hooks = import ./hooks;
-
   pkgWithCategory = category: package: {inherit package category;};
   devos = pkgWithCategory "devos";
-  linter = pkgWithCategory "linter";
-  docs = pkgWithCategory "docs";
+  formatter = pkgWithCategory "linter";
 in {
-  _file = toString ./.;
-
-  imports = ["${extraModulesPath}/git/hooks.nix"];
-  git = {inherit hooks;};
+  imports = ["${extraModulesPath}/git/hooks.nix" ./hooks];
 
   # override for our own welcome
   devshell.name = pkgs.lib.mkForce "PubSolarOS";
 
+  packages = [
+    alejandra
+    editorconfig-checker
+    nodePackages.prettier
+    shellcheck
+    shfmt
+  ];
+
   commands = with pkgs;
     [
       (devos nix)
@@ -50,14 +52,7 @@ in {
         help = pkgs.nvfetcher.meta.description;
         command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher}/bin/nvfetcher -c ./sources.toml $@";
       }
-      (linter alejandra)
-      (linter editorconfig-checker)
-      (linter nodePackages.prettier)
-      (linter shfmt)
-      (linter shellcheck)
-      (linter treefmt)
-
-      (docs mdbook)
+      (formatter treefmt)
     ]
     ++ lib.optionals (!pkgs.stdenv.buildPlatform.isi686) [
       (devos cachix)
diff --git a/shell/hooks/default.nix b/shell/hooks/default.nix
index 10f2c9d2..1d60d49c 100644
--- a/shell/hooks/default.nix
+++ b/shell/hooks/default.nix
@@ -1,4 +1,6 @@
 {
-  enable = true;
-  pre-commit.text = builtins.readFile ./pre-commit.sh;
+  git.hooks = {
+    enable = true;
+    pre-commit.text = builtins.readFile ./pre-commit.sh;
+  };
 }

From b01c5f9fced9f154c621853bb98b04b011ec59d8 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 27 Mar 2023 10:38:24 +0200
Subject: [PATCH 11/46] audio: disable useless bluetooth sap plugin

---
 modules/audio/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/audio/default.nix b/modules/audio/default.nix
index f6d52e71..9a69301b 100644
--- a/modules/audio/default.nix
+++ b/modules/audio/default.nix
@@ -96,7 +96,13 @@ in {
     };
 
     # Enable bluetooth
-    hardware.bluetooth.enable = mkIf cfg.bluetooth.enable true;
+    hardware.bluetooth = mkIf cfg.bluetooth.enable {
+      enable = true;
+      # disable useless SIM Access Profile plugin
+      disabledPlugins = [
+        "sap"
+      ];
+    };
     services.blueman.enable = mkIf cfg.bluetooth.enable true;
 
     # Enable audio server & client

From b1ad71cd35a7c55f7e61fd5981dbdcbfd49f1805 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 27 Mar 2023 13:36:56 +0200
Subject: [PATCH 12/46] cachix: remove unused binary caches

---
 flake.nix                         |  6 +-----
 profiles/cachix/nix-community.nix | 10 ----------
 profiles/cachix/nrdxp.nix         | 10 ----------
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 profiles/cachix/nix-community.nix
 delete mode 100644 profiles/cachix/nrdxp.nix

diff --git a/flake.nix b/flake.nix
index bd494148..a9a49f7d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,6 @@
   description = "A highly structured configuration database.";
 
   nixConfig.extra-experimental-features = "nix-command flakes";
-  nixConfig.extra-substituters = "https://nix-dram.cachix.org https://dram.cachix.org  https://nrdxp.cachix.org https://nix-community.cachix.org";
-  nixConfig.extra-trusted-public-keys = "nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
 
   inputs = {
     # Track channels with commits tested and built by hydra
@@ -99,9 +97,7 @@
 
         imports = [(digga.lib.importHosts ./hosts)];
         hosts = {
-          /*
-          set host specific properties here
-          */
+          # Set host-specific properties here
           bootstrap = {
             modules = [
               digga.nixosModules.bootstrapIso
diff --git a/profiles/cachix/nix-community.nix b/profiles/cachix/nix-community.nix
deleted file mode 100644
index 3c957fcd..00000000
--- a/profiles/cachix/nix-community.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://nix-community.cachix.org"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}
diff --git a/profiles/cachix/nrdxp.nix b/profiles/cachix/nrdxp.nix
deleted file mode 100644
index ddced9c3..00000000
--- a/profiles/cachix/nrdxp.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://nrdxp.cachix.org"
-    ];
-    trusted-public-keys = [
-      "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="
-    ];
-  };
-}

From 972e3f1569c6c84c7445c997e189ebe127141649 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 27 Mar 2023 18:03:28 +0200
Subject: [PATCH 13/46] cachix: default binary cache is nixos.org, no need

to specify it explicitly (results in double entry in nix.conf)

Also force our nix.extraOptions because digga tries real hard to put
their binary caches there:
https://github.com/divnix/digga/blob/0595ae70cdb5ccf1ab031199fe98551c4b378bd9/modules/nix-config.nix#L19-L23
---
 modules/core/nix.nix               |  2 +-
 profiles/cachix/default.nix        | 13 -------------
 profiles/full-install/default.nix  |  2 --
 profiles/pub-solar-iso/default.nix |  1 -
 4 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 profiles/cachix/default.nix

diff --git a/modules/core/nix.nix b/modules/core/nix.nix
index 711304ba..325e20c3 100644
--- a/modules/core/nix.nix
+++ b/modules/core/nix.nix
@@ -21,7 +21,7 @@
       system-features = ["nixos-test" "benchmark" "big-parallel" "kvm"];
     };
     # Generally useful nix option defaults
-    extraOptions = ''
+    extraOptions = lib.mkForce ''
       min-free = 536870912
       keep-outputs = true
       keep-derivations = true
diff --git a/profiles/cachix/default.nix b/profiles/cachix/default.nix
deleted file mode 100644
index 9b810da7..00000000
--- a/profiles/cachix/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  folder = ./.;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.settings.substituters = ["https://cache.nixos.org/"];
-}
diff --git a/profiles/full-install/default.nix b/profiles/full-install/default.nix
index d3c03da7..d9b07733 100644
--- a/profiles/full-install/default.nix
+++ b/profiles/full-install/default.nix
@@ -7,8 +7,6 @@
 }: let
   inherit (lib) fileContents;
 in {
-  imports = [../cachix];
-
   config = {
     pub-solar.audio.mopidy.enable = true;
     pub-solar.audio.bluetooth.enable = true;
diff --git a/profiles/pub-solar-iso/default.nix b/profiles/pub-solar-iso/default.nix
index 2b3669c5..fa973283 100644
--- a/profiles/pub-solar-iso/default.nix
+++ b/profiles/pub-solar-iso/default.nix
@@ -7,7 +7,6 @@
 }: let
   inherit (lib) fileContents;
 in {
-  imports = [../cachix];
   config = {
     pub-solar.graphical.wayland.software-renderer.enable = true;
     pub-solar.sway.terminal = "foot";

From 52c2ca9f13b93d7e71925bdf229b80cd8f9fc474 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 27 Mar 2023 18:53:54 +0200
Subject: [PATCH 14/46] nix.conf: add back required experimental features

---
 modules/core/nix.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/core/nix.nix b/modules/core/nix.nix
index 325e20c3..87182a6e 100644
--- a/modules/core/nix.nix
+++ b/modules/core/nix.nix
@@ -22,6 +22,7 @@
     };
     # Generally useful nix option defaults
     extraOptions = lib.mkForce ''
+      experimental-features = flakes nix-command
       min-free = 536870912
       keep-outputs = true
       keep-derivations = true

From 3bdc4b1f3989711267e5c6346ad6c0e5dbc02314 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 28 Mar 2023 14:00:07 +0200
Subject: [PATCH 15/46] ci: cleanup unused directories

---
 .drone/setup_ssh.sh                         | 11 ----
 .drone/upstream-branch.sh                   | 12 ----
 .github/ISSUE_TEMPLATE/bug_report.md        | 38 -----------
 .github/ISSUE_TEMPLATE/community_request.md | 22 -------
 .github/ISSUE_TEMPLATE/feature_request.md   | 24 -------
 .github/ISSUE_TEMPLATE/upstream_notice.md   | 16 -----
 .github/workflows/check.yml                 | 29 ---------
 .github/workflows/mdbook_docs.yml           | 27 --------
 .github/workflows/release.yml               | 71 ---------------------
 9 files changed, 250 deletions(-)
 delete mode 100755 .drone/setup_ssh.sh
 delete mode 100755 .drone/upstream-branch.sh
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 delete mode 100644 .github/ISSUE_TEMPLATE/community_request.md
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 delete mode 100644 .github/ISSUE_TEMPLATE/upstream_notice.md
 delete mode 100644 .github/workflows/check.yml
 delete mode 100644 .github/workflows/mdbook_docs.yml
 delete mode 100644 .github/workflows/release.yml

diff --git a/.drone/setup_ssh.sh b/.drone/setup_ssh.sh
deleted file mode 100755
index f4a1bbd4..00000000
--- a/.drone/setup_ssh.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-# Setup ssh inside container
-mkdir -p ~/.ssh
-echo "$GITEA_SSH_KEY" > ~/.ssh/id_rsa
-echo "[git.b12f.io]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4uaREL7acSSCNAX+voDYl1Kj7JipP62fR5x1UyGP9u" >> ~/.ssh/known_hosts
-echo "Host git.b12f.io" >> ~/.ssh/config
-echo "  Port 2222" >> ~/.ssh/config
-chmod -R 600 ~/.ssh
diff --git a/.drone/upstream-branch.sh b/.drone/upstream-branch.sh
deleted file mode 100755
index a53ad4bb..00000000
--- a/.drone/upstream-branch.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-set -u
-
-LOCAL="$DRONE_BRANCH"
-[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos || UPSTREAM=origin/main
-
-git fetch --all
-git checkout "$LOCAL"
-git merge "$UPSTREAM"
-git push origin "$LOCAL"
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 1040ee63..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help improve
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Expected Behavior
-<!--- What should happen? -->
-<!--- How it should work? -->
-
-## Current Behavior
-<!--- What happens instead of the expected behavior? -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce
-<!--- An unambiguous set of steps to reproduce this bug. -->
-<!--- Linked fork or gist if needed. -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world. -->
-
-## Your Environment
-<!--- Include relevant details about the environment you experienced the bug in. -->
-<!--- If you have run `bud update`, for example, post the flake.lock file. -->
diff --git a/.github/ISSUE_TEMPLATE/community_request.md b/.github/ISSUE_TEMPLATE/community_request.md
deleted file mode 100644
index c55a3faf..00000000
--- a/.github/ISSUE_TEMPLATE/community_request.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Commuity Request
-about: inspire contribution to the `community` branch
-title: ''
-labels: 'community'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Ideas
-<!--- The `community` branch is meant to provide various preconfigured system options, -->
-<!--- useful to all kinds of users. -->
-
-<!--- The point is to engage the community for what it thinks are -->
-<!--- sane defaults for various tools. -->
-
-## Requests
-<!--- Have a tool that you'd like to see a system profile for? -->
-<!--- Feel free to request it here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 327943c0..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Would your feature fix an existing issue?
-<!--- If your idea is related to, or resolves other issues, please mention. -->
-
-## Describe the solution you'd like
-<!--- What you want to happen. -->
-
-## Describe alternatives you've considered
-<!--- Any alternative solutions or features you've considered? -->
-
-## Additional context
-<!--- Is this feature only useful for a particular usecase? -->
-<!--- Please elaborate. -->
diff --git a/.github/ISSUE_TEMPLATE/upstream_notice.md b/.github/ISSUE_TEMPLATE/upstream_notice.md
deleted file mode 100644
index 4ada54e3..00000000
--- a/.github/ISSUE_TEMPLATE/upstream_notice.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Upstream notice (Issues or Changes)
-about: Create an upstream notice to help our research
-title: '[ <put the upstream project> ]: <topic>'
-labels: 'upstream'
-assignees: ''
-
----
-
-## Link
-<!-- just place a link to the upstream issue, or PR -->
-
-
-## Context
-<!-- We want to make this as cheap for you as possible.
-Context is not required but helpful -->
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
deleted file mode 100644
index 756aa2bf..00000000
--- a/.github/workflows/check.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: "Check & Cachix"
-on:
-  push:
-    branches:
-      - main
-      - trying
-      - staging
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v13
-      with:
-        install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210415_76980a1/install
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          system-features = nixos-test benchmark big-parallel kvm recursive-nix
-          substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org
-          trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-    - uses: cachix/cachix-action@v10
-      with:
-        name: nrdxp
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix -Lv flake check
-    - run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel"
-    - run: nix -Lv develop -c echo OK
-    - run: nix -Lv develop --command bud --help
diff --git a/.github/workflows/mdbook_docs.yml b/.github/workflows/mdbook_docs.yml
deleted file mode 100644
index 5faf9c28..00000000
--- a/.github/workflows/mdbook_docs.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Deploy Docs to GitHub Pages
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  deploy:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup mdBook
-        uses: peaceiris/actions-mdbook@v1
-        with:
-          mdbook-version: 'latest'
-
-      - run: mdbook build doc
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: ./doc/book
-          cname: devos.divnix.com
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 8cabd128..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  changelog:
-    name: Update Changelog
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get version from tag
-        env:
-          GITHUB_REF: ${{ github.ref }}
-        run: |
-          export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
-          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: main
-      - name: Update Changelog
-        uses: heinrichreimer/github-changelog-generator-action@v2.1.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issues: false
-          issuesWoLabels: false
-          pullRequests: true
-          prWoLabels: true
-          addSections: '{"documentation":{"prefix":"**Documentation:**","labels":["documentation"]}}'
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Update Changelog for tag ${{ env.CURRENT_VERSION }}
-          file_pattern: CHANGELOG.md
-
-  release_notes:
-    name: Create Release Notes
-    runs-on: ubuntu-latest
-    needs: changelog
-    steps:
-      - name: Get version from tag
-        env:
-          GITHUB_REF: ${{ github.ref }}
-        run: |
-          export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
-          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: main
-
-      - name: Get Changelog Entry
-        id: changelog_reader
-        uses: mindsers/changelog-reader-action@v1
-        with:
-          version: ${{ env.CURRENT_VERSION }}
-          path: ./CHANGELOG.md
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{ steps.changelog_reader.outputs.log_entry }}
-          draft: false
-          prerelease: false

From 3ea141d445f5b3cf0acc7beff6623737d62eb1d6 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 28 Mar 2023 14:03:41 +0200
Subject: [PATCH 16/46] cachix: remove unused binary caches from drone

runner
---
 modules/docker-ci-runner/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/docker-ci-runner/default.nix b/modules/docker-ci-runner/default.nix
index 11998fd9..4863d970 100644
--- a/modules/docker-ci-runner/default.nix
+++ b/modules/docker-ci-runner/default.nix
@@ -23,7 +23,7 @@ let
 
     export nix_user_config_file="/home/build/.local/share/nix/trusted-settings.json"
     mkdir -p $(dirname \\$nix_user_config_file)
-    echo '{"extra-experimental-features":{"nix-command flakes":true},"extra-substituters":{"https://nix-dram.cachix.org https://dram.cachix.org  https://nrdxp.cachix.org https://nix-community.cachix.org":true},"extra-trusted-public-keys":{"nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=":true}}' > \\$nix_user_config_file
+    echo '{"extra-experimental-features":{"nix-command flakes":true}}' > \\$nix_user_config_file
     chown -R build /home/build/
 
     curl -L https://github.com/drone-runners/drone-runner-exec/releases/latest/download/drone_runner_exec_linux_amd64.tar.gz | tar xz

From fcd65dc34a68d27bd3b31c3175a2e8c0b37a6b23 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 15 Apr 2023 12:44:45 +0200
Subject: [PATCH 17/46] bash: want CTRL+c to cancel and discard current

line when in ble.sh vim insert mode
---
 modules/terminal-life/bash/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index a9b9d0da..ad4247f1 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -72,6 +72,8 @@ in {
       ble-bind -m vi_nmap -f 'j' 'vi-command/backward-char'
       ble-bind -m vi_nmap -f 'k' 'vi-command/forward-line'
       ble-bind -m vi_nmap -f 'l' 'vi-command/forward-char'
+
+      ble-bind -m vi_imap -f 'C-c' discard-line
     fi
 
     # end of .bashrc

From 24587194e9a10a7a56bb063aa0152537be6dc3b2 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 15 Apr 2023 21:13:45 +0200
Subject: [PATCH 18/46] docker-ci-runner: fix stop hanging for 120s

---
 modules/docker-ci-runner/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/docker-ci-runner/default.nix b/modules/docker-ci-runner/default.nix
index 4863d970..69decb0b 100644
--- a/modules/docker-ci-runner/default.nix
+++ b/modules/docker-ci-runner/default.nix
@@ -102,5 +102,10 @@ in
         };
       };
     };
+    # Fix container not stopping correctly and holding the system 120s upon
+    # shutdown / reboot
+    systemd.services.docker-drone-exec-runner.preStop = ''
+      docker stop drone-exec-runner
+    '';
   };
 }

From 91353938af657ad6079820945632be5bd478d4c0 Mon Sep 17 00:00:00 2001
From: Akshay Mankar <itsakshaymankar@gmail.com>
Date: Mon, 17 Apr 2023 20:05:42 +0200
Subject: [PATCH 19/46] modules/networking: Use mkDefault for caddy config

---
 modules/core/networking.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/core/networking.nix b/modules/core/networking.nix
index f5bd201d..fa91046e 100644
--- a/modules/core/networking.nix
+++ b/modules/core/networking.nix
@@ -56,12 +56,12 @@ in {
 
     # Caddy reverse proxy for local services like cups
     services.caddy = {
-      enable = cfg.enableCaddy;
-      globalConfig = ''
+      enable = lib.mkDefault cfg.enableCaddy;
+      globalConfig = lib.mkDefault ''
         default_bind 127.0.0.1
         auto_https off
       '';
-      extraConfig = concatStringsSep "\n" [
+      extraConfig = lib.mkDefault (concatStringsSep "\n" [
         (lib.optionalString
           config.pub-solar.printing.enable
           ''
@@ -79,7 +79,7 @@ in {
               file_server
             }
           '')
-      ];
+      ]);
     };
   };
 }

From 9930808f7739beb7e9b2493049fd164dd64439c3 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 5 May 2023 18:11:04 +0200
Subject: [PATCH 20/46] starship: prepare username@hostname prompt

Remove old toml file
---
 modules/terminal-life/starship.toml.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/terminal-life/starship.toml.nix b/modules/terminal-life/starship.toml.nix
index da8b2b7c..ed10ae61 100644
--- a/modules/terminal-life/starship.toml.nix
+++ b/modules/terminal-life/starship.toml.nix
@@ -5,12 +5,18 @@
   add_newline = false;
 
   # You can also replace your username with a neat symbol like  to save some space
-  #username = {
-  #  show_always = true;
-  #  style_user = "bg:#9A348E";
-  #  style_root = "bg:#9A348E";
-  #  format = ''[$user ]($style)'';
-  #};
+  username = {
+    show_always = true;
+    style_user = "bg:#9A348E";
+    style_root = "bg:#9A348E";
+    format = ''[$user]($style)'';
+  };
+  hostname = {
+    ssh_only = false;
+    format = "@[$ssh_symbol$hostname]($style)";
+    disabled = false;
+  };
+
   character = {
     success_symbol = "[❯](bold purple)";
     error_symbol = "[✗](#FF4B00)";

From 438be193e8a3d3a325a1f0988f13151d10cbd77a Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 5 May 2023 18:37:18 +0200
Subject: [PATCH 21/46] ble.sh decrease completion timeout a bit more

---
 modules/terminal-life/bash/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index ad4247f1..1370f04a 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -48,7 +48,7 @@ in {
     ble-bind -m 'vi_imap' -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
 
     function my/complete-load-hook {
-      bleopt complete_auto_delay=500
+      bleopt complete_auto_delay=250
     }
     blehook/eval-after-load complete my/complete-load-hook
 

From 70045c28eab502859c34f07162d6945471af6a1f Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 6 May 2023 15:19:08 +0200
Subject: [PATCH 22/46] zsh: remove leftover files and traces of zsh usage

Move base16.zsh into XDG_DATA_HOME, rename to base16.sh
---
 modules/terminal-life/nvim/ui.vim             |   2 +-
 modules/terminal-life/zsh/default.nix         | 123 ---
 modules/terminal-life/zsh/fzf.zsh             |  58 --
 modules/terminal-life/zsh/p10k.zsh            | 943 ------------------
 pkgs/_sources/generated.nix                   |  44 -
 pkgs/sources.toml                             |  16 -
 .../base-user/.local/share/scripts/base16.sh  |  64 +-
 profiles/base-user/home.nix                   |   2 +
 tests/first-test.nix                          |   2 +-
 9 files changed, 36 insertions(+), 1218 deletions(-)
 delete mode 100644 modules/terminal-life/zsh/default.nix
 delete mode 100644 modules/terminal-life/zsh/fzf.zsh
 delete mode 100644 modules/terminal-life/zsh/p10k.zsh
 rename modules/terminal-life/zsh/base16.zsh => profiles/base-user/.local/share/scripts/base16.sh (69%)

diff --git a/modules/terminal-life/nvim/ui.vim b/modules/terminal-life/nvim/ui.vim
index 3131188f..017b413e 100644
--- a/modules/terminal-life/nvim/ui.vim
+++ b/modules/terminal-life/nvim/ui.vim
@@ -1,4 +1,4 @@
-let g:base16_shell_path = $XDG_CONFIG_HOME . "/zsh/base16.sh"
+let g:base16_shell_path = $XDG_DATA_HOME . "/scripts/base16.sh"
 let base16colorspace = 256
 set termguicolors
 let g:sonokai_style = 'shusia'
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
deleted file mode 100644
index a9f0b97c..00000000
--- a/modules/terminal-life/zsh/default.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  config,
-  pkgs,
-  self,
-  ...
-}: let
-  psCfg = config.pub-solar;
-  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
-  enable = true;
-  enableAutosuggestions = true;
-  enableCompletion = true;
-  dotDir = ".config/zsh";
-
-  history = {
-    ignoreDups = true;
-    expireDuplicatesFirst = true;
-    ignoreSpace = true;
-    path = "$HOME/.local/share/zsh/zsh_history";
-    save = 10000;
-    size = 10000;
-  };
-
-  loginExtra = ''
-    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
-  '';
-
-  shellAliases = {
-    nano = "nvim";
-    vi = "nvim";
-    vim = "nvim";
-    mutt = "neomutt";
-    ls = "exa";
-    la = "exa --group-directories-first -lag";
-    fm = "vifm .";
-    vifm = "vifm .";
-    wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
-    irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
-    drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
-    no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
-    # fix nixos-option
-    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
-    myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
-  };
-  plugins = [
-    # src gets fetched by nvfetcher, see: ./pkgs/sources.toml
-    {
-      # will source ohmyzsh/plugins/z/
-      name = "zsh-plugins-z";
-      file = "plugins/z/z.plugin.zsh";
-      src = pkgs.sources.ohmyzsh.src;
-    }
-    {
-      name = "zsh-powerlevel10k";
-      file = "powerlevel10k.zsh-theme";
-      src = pkgs.sources.powerlevel10k.src;
-    }
-    {
-      name = "zsh-fast-syntax-highlighting";
-      file = "F-Sy-H.plugin.zsh";
-      src = pkgs.sources.F-Sy-H.src;
-    }
-    {
-      name = "zsh-nix-shell";
-      file = "nix-shell.plugin.zsh";
-      src = pkgs.sources.zsh-nix-shell.src;
-    }
-  ];
-
-  initExtra =
-    ''
-      bindkey -v
-      bindkey -v 'jj' vi-cmd-mode
-      bindkey -a 'i' up-line
-      bindkey -a 'k' down-line
-      bindkey -a 'j' backward-char
-      bindkey -a 'h' vi-insert
-      bindkey '^[[H' beginning-of-line
-      bindkey '^[[F' end-of-line
-      bindkey '^R' history-incremental-pattern-search-backward
-      bindkey '^ ' autosuggest-accept
-      bindkey '^q' push-line-or-edit
-
-      bindkey '^R' fzf-history-widget
-
-      # ArrowUp/Down start searching history with current input
-      autoload -U up-line-or-beginning-search
-      autoload -U down-line-or-beginning-search
-      zle -N up-line-or-beginning-search
-      zle -N down-line-or-beginning-search
-      bindkey "^[[A" up-line-or-beginning-search
-      bindkey "^[[B" down-line-or-beginning-search
-      bindkey "^P" up-line-or-beginning-search
-      bindkey "^N" down-line-or-beginning-search
-
-      # MAKE CTRL+S WORK IN VIM
-      stty -ixon
-      stty erase '^?'
-
-      precmd () {
-        DIR_NAME=$(pwd | sed "s|^$HOME|~|g")
-        echo -e -n "\e]2;$DIR_NAME\e\\"
-
-        if [ $(date +%d%m) = '0104' ]; then
-          if [ $? -eq 0 ]; then
-            echo "Success! That was a great command! I can't wait to see what amazing stuff you'll be up to next."
-          fi
-        fi
-      }
-
-      # If a command is not found, show me where it is
-      source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
-    ''
-    + builtins.readFile ./base16.zsh
-    + builtins.readFile ./p10k.zsh
-    + ''
-      source ${pkgs.fzf}/share/fzf/key-bindings.zsh
-      source ${pkgs.fzf}/share/fzf/completion.zsh
-      source ${pkgs.git-bug}/share/zsh/site-functions/git-bug
-      eval "$(direnv hook zsh)"
-    ''
-    + builtins.readFile ./fzf.zsh;
-}
diff --git a/modules/terminal-life/zsh/fzf.zsh b/modules/terminal-life/zsh/fzf.zsh
deleted file mode 100644
index 78b0fb86..00000000
--- a/modules/terminal-life/zsh/fzf.zsh
+++ /dev/null
@@ -1,58 +0,0 @@
-# Use ~~ as the trigger sequence instead of the default **
-export FZF_COMPLETION_TRIGGER='~~'
-
-# Options to fzf command
-export FZF_COMPLETION_OPTS='--border --info=inline'
-
-__fzfcmd() {
-  echo "fzf"
-}
-
-# ctrl+r - Paste the selected command from history into the command line
-fzf-history-widget() {
-  local selected num
-  setopt localoptions noglobsubst noposixbuiltins pipefail HIST_FIND_NO_DUPS 2> /dev/null
-
-  selected=( $(fc -rl 1 |
-    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
-  local ret=$?
-  if [ -n "$selected" ]; then
-    num=$selected[1]
-    if [ -n "$num" ]; then
-      zle vi-fetch-history -n $num
-    fi
-  fi
-  zle redisplay
-  typeset -f zle-line-init >/dev/null && zle zle-line-init
-  return $ret
-}
-zle     -N   fzf-history-widget
-bindkey '^R' fzf-history-widget
-
-# Use fd (https://github.com/sharkdp/fd) instead of the default find
-# command for listing path candidates.
-# - The first argument to the function ($1) is the base path to start traversal
-# - See the source code (completion.{bash,zsh}) for the details.
-_fzf_compgen_path() {
-  fd --hidden --follow --exclude ".git" . "$1"
-}
-
-# Use fd to generate the list for directory completion
-_fzf_compgen_dir() {
-  fd --type d --hidden --follow --exclude ".git" . "$1"
-}
-
-# (EXPERIMENTAL) Advanced customization of fzf options via _fzf_comprun function
-# - The first argument to the function is the name of the command.
-# - You should make sure to pass the rest of the arguments to fzf.
-_fzf_comprun() {
-  local command=$1
-  shift
-
-  case "$command" in
-    cd)           fzf "$@" --preview 'tree -C {} | head -200' ;;
-    export|unset) fzf "$@" --preview "eval 'echo \$'{}" ;;
-    ssh)          fzf "$@" --preview 'dig {}' ;;
-    *)            fzf "$@" ;;
-  esac
-}
diff --git a/modules/terminal-life/zsh/p10k.zsh b/modules/terminal-life/zsh/p10k.zsh
deleted file mode 100644
index 90734313..00000000
--- a/modules/terminal-life/zsh/p10k.zsh
+++ /dev/null
@@ -1,943 +0,0 @@
-# Generated by Powerlevel10k configuration wizard on 2020-04-18 at 01:15 CEST.
-# Based on romkatv/powerlevel10k/config/p10k-classic.zsh, checksum 30399.
-# Wizard options: powerline, classic, unicode, darkest, 24h time, angled separators,
-# sharp heads, sharp tails, 1 line, compact, concise, transient_prompt,
-# instant_prompt=verbose.
-# Type `p10k configure` to generate another config.
-#
-# Config for Powerlevel10k with classic powerline 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_*'
-
-  # Zsh >= 5.1 is required.
-  autoload -Uz is-at-least && is-at-least 5.1 || return
-
-  # The list of segments shown on the left. Fill it with the most important segments.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
-    ssh
-    context
-    dir                     # current directory
-    vcs                     # git status
-    # 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=(
-    vi_mode                 # vi mode (you don't need this if you've enabled prompt_char)
-    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/)
-    vim_shell               # vim shell indicator (:sh)
-    triton                  # show the current triton profile
-    nix_shell               # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
-    watson
-    # kubecontext             # current kubernetes context (https://kubernetes.io/)
-    # terraform               # terraform workspace (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)
-    # context                 # user@hostname
-    # ranger                  # ranger shell (https://github.com/ranger/ranger)
-    # nnn                     # nnn shell (https://github.com/jarun/nnn)
-    # midnight_commander      # midnight commander shell (https://midnight-commander.org/)
-    # 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/)
-    # time                    # current time
-    # 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)
-  )
-
-  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND="black"
-  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_BACKGROUND="yellow"
-  typeset -g POWERLEVEL9K_VI_INSERT_MODE_STRING=""
-  typeset -g POWERLEVEL9K_VI_COMMAND_MODE_STRING="CMD"
-
-  # Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you.
-  typeset -g POWERLEVEL9K_MODE=powerline
-  # 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=none
-
-  # 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=
-
-  # Add an empty line before each prompt.
-  typeset -g POWERLEVEL9K_PROMPT_ON_NEWLINE=true
-  typeset -g POWERLEVEL9K_RPROMPT_ON_NEWLINE=false
-
-  # Connect left prompt lines with these symbols. You'll probably want to use the same color
-  # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX=''
-  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%238F'
-  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%238F❯ '
-  # 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'
-
-  # Filler between left and right prompt on the first prompt line. You can set it to ' ', '·' or
-  # '─'. The last two make it easier to see the alignment between left and right prompt and to
-  # separate prompt from command output. You might want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false
-  # for more compact prompt if using using this option.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' '
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND=
-  if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then
-    # The color of the filler. You'll probably want to match the color of POWERLEVEL9K_MULTILINE
-    # ornaments defined above.
-    typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238
-    # 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
-
-  # Default background color.
-  typeset -g POWERLEVEL9K_BACKGROUND=none
-
-  # Separator between same-color segments on the left.
-  typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='%242F\uE0B1'
-  # Separator between same-color segments on the right.
-  typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='%242F\uE0B3'
-  # Separator between different-color segments on the left.
-  typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\uE0B0'
-  # Separator between different-color segments on the right.
-  typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\uE0B2'
-  # The right end of left prompt.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
-  # The left end of right prompt.
-  typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
-  # The left end of left prompt.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
-  # The right end of right prompt.
-  typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
-  # Left prompt terminator for lines without any segments.
-  typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=
-
-  #################################[ os_icon: os identifier ]##################################
-  # OS identifier color.
-  typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=255
-  # Custom icon.
-  # typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='⭐'
-
-  ################################[ prompt_char: prompt symbol ]################################
-  # Transparent background.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_BACKGROUND=
-  # Green prompt symbol if the last command succeeded.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=1
-  # Red prompt symbol if the last command failed.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=17
-  # 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='Ⅴ'
-  # 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=
-  # No surrounding whitespace.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_{LEFT,RIGHT}_WHITESPACE=
-
-  ##################################[ dir: current directory ]##################################
-  typeset -g POWERLEVEL9K_{ETC,FOLDER,HOME,HOME_SUB}_ICON=
-  typeset -g POWERLEVEL9K_DIR_{ETC,HOME,HOME_SUBFOLDER,DEFAULT,NOT_WRITABLE}_BACKGROUND=1
-  typeset -g POWERLEVEL9K_DIR_{ETC,HOME,HOME_SUBFOLDER,DEFAULT,NOT_WRITABLE}_FOREGROUND=0
-  typeset -g POWERLEVEL9K_DIR_WRITABLE_FORBIDDEN_VISUAL_IDENTIFIER_COLOR=17
-
-  typeset -g POWERLEVEL9K_DIR_{ETC,DEFAULT}_BACKGROUND=15
-  typeset -g POWERLEVEL9K_DIR_{HOME,HOME_SUBFOLDER}_BACKGROUND=1
-  typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_BACKGROUND=1
-
-  # 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
-  # Color of the shortened directory segments.
-  typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=0
-  # Color of the anchor directory segments. Anchor segments are never shortened. The first
-  # segment is always an anchor.
-  typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=0
-  # Display anchor directory segments in bold.
-  typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=false
-  # 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 true, remove everything before the last (deepest) subdirectory that contains files
-  # matching $POWERLEVEL9K_SHORTEN_FOLDER_MARKER. For example, when the current directory is
-  # /foo/bar/git_repo/baz, prompt will display git_repo/baz. This assumes that /foo/bar/git_repo
-  # contains a marker (.git) and other directories don't.
-  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 directories.
-  typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=true
-  # Show this icon when the current directory is not writable. POWERLEVEL9K_DIR_SHOW_WRITABLE
-  # above must be set to true for this parameter to have effect.
-  typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='∅'
-
-  #####################################[ vcs: git status ]######################################
-  # Branch icon. Set this parameter to '\uF126 ' 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 ⇣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='%0F'  # grey foreground
-      local      clean='%0F'   # green foreground
-      local   modified='%0F'  # yellow foreground
-      local  untracked='%0F'   # blue foreground
-      local conflicted='%0F'  # red foreground
-    else
-      # Styling for incomplete and stale Git status.
-      local       meta='%0F'  # grey foreground
-      local      clean='%0F'  # grey foreground
-      local   modified='%0F'  # grey foreground
-      local  untracked='%0F'  # grey foreground
-      local conflicted='%0F'  # grey foreground
-    fi
-
-    local res
-    local where  # branch or tag
-    if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then
-      res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}"
-      where=${(V)VCS_STATUS_LOCAL_BRANCH}
-    elif [[ -n $VCS_STATUS_TAG ]]; then
-      res+="${meta}#"
-      where=${(V)VCS_STATUS_TAG}
-    fi
-
-    # If local branch name or tag 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.
-    (( $#where > 32 )) && where[13,-13]="…"
-    res+="${clean}${where//\%/%%}"  # escape %
-
-    # Display the current Git commit if there is no branch or tag.
-    # Tip: To always display the current Git commit, remove `[[ -z $where ]] &&` from the next line.
-    [[ -z $where ]] && 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//\%/%%}"  # escape %
-    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 '|': '~|~/some/dir'.
-  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=4
-  typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=4
-  # Custom icon.
-  typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION=
-  # Custom prefix.
-  # typeset -g POWERLEVEL9K_VCS_PREFIX='%244Fon '
-
-  # 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 reposotiry.
-  typeset -g POWERLEVEL9K_VCS_BACKENDS=(git)
-
-  # These settings are used for respositories other than Git or when gitstatusd fails and
-  # Powerlevel10k has to fall back to using vcs_info.
-  typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=0
-  typeset -g POWERLEVEL9K_VCS_CLEAN_BACKGROUND=2
-  typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=0
-  typeset -g POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND=3
-  typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=0
-  typeset -g POWERLEVEL9K_VCS_MODIFIED_BACKGROUND=3
-
-  ##########################[ 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=true
-  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=true
-  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 longer than 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=0
-  # 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='%244Ftook '
-
-  #######################[ 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=37
-  # 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).
-  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 diretory, 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_CORE_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'
-
-  ###########[ nix_shell ]###########
-  #  # Nix shell color.
-  typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74
-
-  # 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='nix'
-
-  ###########[ vi_mode: vi mode (you don't need this if you've enabled prompt_char) ]###########
-  # Text and color for normal (a.k.a. command) vi mode.
-  typeset -g POWERLEVEL9K_VI_COMMAND_MODE_STRING=CMD
-  typeset -g POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND=4
-  # Text and color for visual vi mode.
-  typeset -g POWERLEVEL9K_VI_VISUAL_MODE_STRING=VIS
-  typeset -g POWERLEVEL9K_VI_MODE_VISUAL_FOREGROUND=3
-  # Text and color for overtype (a.k.a. overwrite and replace) vi mode.
-  typeset -g POWERLEVEL9K_VI_OVERWRITE_MODE_STRING=OVR
-  typeset -g POWERLEVEL9K_VI_MODE_OVERWRITE_FOREGROUND=2
-  # Text and color for insert vi mode.
-  typeset -g POWERLEVEL9K_VI_INSERT_MODE_STRING=
-  typeset -g POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND=7
-
-  ##################################[ context: user@hostname ]##################################
-  typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=17
-  # Context color in SSH without privileges.
-  typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=7
-  # Default context color (no privileges, no SSH).
-  typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=7
-
-  # 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'
-
-  ###[ 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
-  # 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
-  # Don't show Python version next to the anaconda environment name.
-  typeset -g POWERLEVEL9K_ANACONDA_SHOW_PYTHON_VERSION=false
-  # Separate environment name from Python version only with a space.
-  typeset -g POWERLEVEL9K_ANACONDA_{LEFT,RIGHT}_DELIMITER=
-  # 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
-  # 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='⭐'
-
-  ############[ 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='⭐'
-
-  ##########[ 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='⭐'
-
-  # 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_watson() {
-    local watson_status=$(watson status)
-    local noproject="No project started."
-    if [ "$watson_status" != "$noproject" ]; then
-      p10k segment -i "祥" -f yellow -t "$(echo $watson_status | awk '{print $2,$3}')"
-    else
-      p10k segment -i "⏾" -f red -t ""
-    fi
-  }
-
-  function prompt_triton() {
-    local triton_profile=$(echo $TRITON_PROFILE)
-    if [ "$triton_profile" != "" ]; then
-      p10k segment -f yellow -t "$(echo "✚" "$triton_profile")"
-    fi
-  }
-
-  # 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=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=false
-
-  # 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/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index d923f214..d11baea1 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -4,17 +4,6 @@
   fetchurl,
   fetchFromGitHub,
 }: {
-  F-Sy-H = {
-    pname = "F-Sy-H";
-    version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
-    src = fetchFromGitHub {
-      owner = "z-shell";
-      repo = "F-Sy-H";
-      rev = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
-      fetchSubmodules = false;
-      sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
-    };
-  };
   blesh-nvfetcher = {
     pname = "blesh-nvfetcher";
     version = "10aa9b4fe47fc07ccdc9d5ba35f1417fdb614d41";
@@ -50,28 +39,6 @@
       sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
     };
   };
-  ohmyzsh = {
-    pname = "ohmyzsh";
-    version = "b602e0a066d8c98e8c02201ad16c764447fd8531";
-    src = fetchFromGitHub {
-      owner = "ohmyzsh";
-      repo = "ohmyzsh";
-      rev = "b602e0a066d8c98e8c02201ad16c764447fd8531";
-      fetchSubmodules = false;
-      sha256 = "sha256-O4thanOQpX/DHPdfW2p/RUXzIPj6GUp9EnKJfkh7yQM=";
-    };
-  };
-  powerlevel10k = {
-    pname = "powerlevel10k";
-    version = "a30145b0f82d06770e924e9eac064ed223a94e6b";
-    src = fetchFromGitHub {
-      owner = "romkatv";
-      repo = "powerlevel10k";
-      rev = "a30145b0f82d06770e924e9eac064ed223a94e6b";
-      fetchSubmodules = false;
-      sha256 = "sha256-jnZXLrywUrJgTX1tFpoNH94r/jcGl2P6R7DoedluHxQ=";
-    };
-  };
   rnix-lsp-nvfetcher = {
     pname = "rnix-lsp-nvfetcher";
     version = "95d40673fe43642e2e1144341e86d0036abd95d9";
@@ -149,15 +116,4 @@
       sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U=";
     };
   };
-  zsh-nix-shell = {
-    pname = "zsh-nix-shell";
-    version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
-    src = fetchFromGitHub {
-      owner = "chisui";
-      repo = "zsh-nix-shell";
-      rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
-      fetchSubmodules = false;
-      sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=";
-    };
-  };
 }
diff --git a/pkgs/sources.toml b/pkgs/sources.toml
index cfb07131..ac9d5e1a 100644
--- a/pkgs/sources.toml
+++ b/pkgs/sources.toml
@@ -3,22 +3,6 @@
 src.git = "https://github.com/mlvzk/manix"
 fetch.github = "mlvzk/manix"
 
-[ohmyzsh]
-src.git = "https://github.com/ohmyzsh/ohmyzsh"
-fetch.github = "ohmyzsh/ohmyzsh"
-
-[powerlevel10k]
-src.git = "https://github.com/romkatv/powerlevel10k"
-fetch.github = "romkatv/powerlevel10k"
-
-[F-Sy-H]
-src.git = "https://github.com/z-shell/F-Sy-H"
-fetch.github = "z-shell/F-Sy-H"
-
-[zsh-nix-shell]
-src.git = "https://github.com/chisui/zsh-nix-shell"
-fetch.github = "chisui/zsh-nix-shell"
-
 [rnix-lsp-nvfetcher]
 src.git = "https://github.com/nix-community/rnix-lsp"
 fetch.github = "nix-community/rnix-lsp"
diff --git a/modules/terminal-life/zsh/base16.zsh b/profiles/base-user/.local/share/scripts/base16.sh
similarity index 69%
rename from modules/terminal-life/zsh/base16.zsh
rename to profiles/base-user/.local/share/scripts/base16.sh
index 3686b98d..ee33516b 100644
--- a/modules/terminal-life/zsh/base16.zsh
+++ b/profiles/base-user/.local/share/scripts/base16.sh
@@ -3,28 +3,28 @@
 # Base16 Shell template by Chris Kempson (http://chriskempson.com)
 # Burn scheme by Benjamin Bädorf
 
-color00="1a/18/1a" # Base 00 - Black
-color01="f8/5e/84" # Base 08 - Red
-color02="9e/cd/6f" # Base 0B - Green
-color03="e5/c4/63" # Base 0A - Yellow
-color04="7a/cc/d7" # Base 0D - Blue
-color05="ab/9d/f2" # Base 0E - Magenta
-color06="ef/90/62" # Base 0C - Cyan
-color07="e3/e1/e4" # Base 05 - White
-color08="94/94/94" # Base 03 - Bright Black
-color09=$color01 # Base 08 - Bright Red
-color10=$color02 # Base 0B - Bright Green
-color11=$color03 # Base 0A - Bright Yellow
-color12=$color04 # Base 0D - Bright Blue
-color13=$color05 # Base 0E - Bright Magenta
-color14=$color06 # Base 0C - Bright Cyan
-color15="ff/5f/5f" # Base 07 - Bright White
-color16="df/59/23" # Base 09
-color17="d7/00/00" # Base 0F
-color18="2d/2a/2e" # Base 01
-color19="30/30/30" # Base 02
-color20="d3/d1/d4" # Base 04
-color21="30/30/30" # Base 06
+color00="1a/18/1a"          # Base 00 - Black
+color01="f8/5e/84"          # Base 08 - Red
+color02="9e/cd/6f"          # Base 0B - Green
+color03="e5/c4/63"          # Base 0A - Yellow
+color04="7a/cc/d7"          # Base 0D - Blue
+color05="ab/9d/f2"          # Base 0E - Magenta
+color06="ef/90/62"          # Base 0C - Cyan
+color07="e3/e1/e4"          # Base 05 - White
+color08="94/94/94"          # Base 03 - Bright Black
+color09=$color01            # Base 08 - Bright Red
+color10=$color02            # Base 0B - Bright Green
+color11=$color03            # Base 0A - Bright Yellow
+color12=$color04            # Base 0D - Bright Blue
+color13=$color05            # Base 0E - Bright Magenta
+color14=$color06            # Base 0C - Bright Cyan
+color15="ff/5f/5f"          # Base 07 - Bright White
+color16="df/59/23"          # Base 09
+color17="d7/00/00"          # Base 0F
+color18="2d/2a/2e"          # Base 01
+color19="30/30/30"          # Base 02
+color20="d3/d1/d4"          # Base 04
+color21="30/30/30"          # Base 06
 color_foreground="e3/e1/e4" # Base 05
 color_background="1a/18/1a" # Base 00
 
@@ -50,16 +50,16 @@ else
 fi
 
 # 16 color space
-put_template 0  $color00
-put_template 1  $color01
-put_template 2  $color02
-put_template 3  $color03
-put_template 4  $color04
-put_template 5  $color05
-put_template 6  $color06
-put_template 7  $color07
-put_template 8  $color08
-put_template 9  $color09
+put_template 0 $color00
+put_template 1 $color01
+put_template 2 $color02
+put_template 3 $color03
+put_template 4 $color04
+put_template 5 $color05
+put_template 6 $color06
+put_template 7 $color07
+put_template 8 $color08
+put_template 9 $color09
 put_template 10 $color10
 put_template 11 $color11
 put_template 12 $color12
diff --git a/profiles/base-user/home.nix b/profiles/base-user/home.nix
index 3d801baa..1da6ace5 100644
--- a/profiles/base-user/home.nix
+++ b/profiles/base-user/home.nix
@@ -71,6 +71,8 @@ in {
     # docker run -it --name caddy-json-schema registry.greenbaum.cloud/gc/caddy-l4:2.5.2 caddy json-schema -output /srv/caddy_schema.json
     xdg.dataFile."nvim/json-schemas/caddy_schema.json".source = .local/share/nvim/json-schemas/caddy_schema.json;
     xdg.dataFile."nvim/templates/.keep".text = "";
+    xdg.dataFile."scripts/.keep".text = "";
+    xdg.dataFile."scripts/base16.sh".source = .local/share/scripts/base16.sh;
     xdg.dataFile."shell.nix.tmpl" = {
       text = ''
         let
diff --git a/tests/first-test.nix b/tests/first-test.nix
index a1da457d..248dd638 100644
--- a/tests/first-test.nix
+++ b/tests/first-test.nix
@@ -8,7 +8,7 @@
   nodes.test-machine = {suites ? null, ...}: {
     imports = suites.iso;
 
-    home-manager.users.pub-solar.programs.zsh.shellAliases = {
+    home-manager.users.pub-solar.programs.bash.shellAliases = {
       test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
       test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
     };

From 0c8763808a1bc8c836d9952c571d575a532f1d1c Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 13 May 2023 18:09:10 +0200
Subject: [PATCH 23/46] flake: update inputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated input 'agenix':
    'github:ryantm/agenix/b7ffcfe77f817d9ee992640ba1f270718d197f28' (2023-01-31)
  → 'github:ryantm/agenix/2994d002dcff5353ca1ac48ec584c7f6589fe447' (2023-04-21)
• Updated input 'darwin':
    'github:LnL7/nix-darwin/87b9d090ad39b25b2400029c64825fc2a8868943' (2023-01-09)
  → 'github:LnL7/nix-darwin/252541bd05a7f55f3704a3d014ad1badc1e3360d' (2023-05-10)
• Updated input 'deploy':
    'github:serokell/deploy-rs/8c9ea9605eed20528bf60fae35a2b613b901fd77' (2023-01-19)
  → 'github:serokell/deploy-rs/c80189917086e43d49eece2bd86f56813500a0eb' (2023-05-11)
• Updated input 'home':
    'github:nix-community/home-manager/65c47ced082e3353113614f77b1bc18822dc731f' (2023-01-23)
  → 'github:nix-community/home-manager/f9edbedaf015013eb35f8caacbe0c9666bbc16af' (2023-04-10)
• Updated input 'latest':
    'github:nixos/nixpkgs/2caf4ef5005ecc68141ecb4aac271079f7371c44' (2023-01-30)
  → 'github:nixos/nixpkgs/897876e4c484f1e8f92009fd11b7d988a121a4e7' (2023-05-06)
• Updated input 'nixos':
    'github:nixos/nixpkgs/0218941ea68b4c625533bead7bbb94ccce52dceb' (2023-01-31)
  → 'github:nixos/nixpkgs/9656e85a15a0fe67847ee8cdb99a20d8df499962' (2023-05-12)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/b7ac0a56029e4f9e6743b9993037a5aaafd57103' (2023-01-24)
  → 'github:nixos/nixos-hardware/81cd886719e10d4822b2a6caa96e95d56cc915ef' (2023-05-13)
---
 flake.lock | 63 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index dc21773b..afdf30c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1675176355,
-        "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=",
+        "lastModified": 1680281360,
+        "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28",
+        "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673295039,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "lastModified": 1683754942,
+        "narHash": "sha256-L+Bj8EL4XLmODRIuOkk9sI6FDECVzK+C8jeZFv7q6eY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "rev": "252541bd05a7f55f3704a3d014ad1badc1e3360d",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1674127017,
-        "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
+        "lastModified": 1683779844,
+        "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
+        "rev": "c80189917086e43d49eece2bd86f56813500a0eb",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1674440933,
-        "narHash": "sha256-CASRcD/rK3fn5vUCti3jzry7zi0GsqRsBohNq9wPgLs=",
+        "lastModified": 1681092193,
+        "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "65c47ced082e3353113614f77b1bc18822dc731f",
+        "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
         "type": "github"
       },
       "original": {
@@ -219,13 +219,34 @@
         "type": "github"
       }
     },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1682203081,
+        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "latest": {
       "locked": {
-        "lastModified": 1675115703,
-        "narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=",
+        "lastModified": 1683408522,
+        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44",
+        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
         "type": "github"
       },
       "original": {
@@ -237,11 +258,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1675154384,
-        "narHash": "sha256-gUXzyTS3WsO3g2Rz0qOYR2a26whkyL2UfTr1oPH9mm8=",
+        "lastModified": 1683928319,
+        "narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0218941ea68b4c625533bead7bbb94ccce52dceb",
+        "rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962",
         "type": "github"
       },
       "original": {
@@ -253,11 +274,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1674550793,
-        "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
+        "lastModified": 1683965003,
+        "narHash": "sha256-DrzSdOnLv/yFBvS2FqmwBA2xIbN/Lny/WlxHyoLR9zE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
+        "rev": "81cd886719e10d4822b2a6caa96e95d56cc915ef",
         "type": "github"
       },
       "original": {

From 647c80ae4bbd3cb1242cd3e0a7a3cf068a88a2a7 Mon Sep 17 00:00:00 2001
From: Hendrik Sokolowski <hensoko@gssws.de>
Date: Sun, 14 May 2023 15:49:43 +0200
Subject: [PATCH 24/46] disable test because of outdated test framework in
 digga

---
 flake.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index a9a49f7d..dd7ed53b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -105,10 +105,10 @@
           };
           PubSolarOS = {
             tests = [
-              (import ./tests/first-test.nix {
-                pkgs = nixos.legacyPackages.x86_64-linux;
-                lib = nixos.lib;
-              })
+              #(import ./tests/first-test.nix {
+              #  pkgs = nixos.legacyPackages.x86_64-linux;
+              #  lib = nixos.lib;
+              #})
             ];
           };
         };

From b5ff01f703cc620d9c5734270e1337969d55ece0 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 16 May 2023 15:04:29 +0200
Subject: [PATCH 25/46] sway: fix sway-launcher

whence is a zsh builtin, use bash's compgen function to get a list
of available commands
---
 pkgs/sway-launcher.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/sway-launcher.nix b/pkgs/sway-launcher.nix
index 1ace27b5..abc7f443 100644
--- a/pkgs/sway-launcher.nix
+++ b/pkgs/sway-launcher.nix
@@ -11,7 +11,7 @@ with self; ''
 
   # Get shell command list
   # This may include the occasional non-executable file
-  command_list=$({ whence -wm '*' | sed 's/:[^:]*$//' })
+  command_list=$({ compgen -c | sed 's/:[^:]*$//'; })
 
   # read existing command history
   if [ -f "$HIST_FILE" ]; then

From 6cb3ab687fe3ad91713adc60ce7a3a5fd1767efe Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 18 May 2023 04:14:01 +0200
Subject: [PATCH 26/46] flake: fix lastModified for input flake agenix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Retrieved using:
❯ nix flake metadata --json github:ryantm/agenix/2994d002dcff5353ca1ac48ec584c7f6589fe447
---
 flake.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index afdf30c2..43e6b1d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,7 +10,7 @@
         ]
       },
       "locked": {
-        "lastModified": 1680281360,
+        "lastModified": 1682101079,
         "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
         "owner": "ryantm",
         "repo": "agenix",

From 97cc2f3fa84ce384f8d79fa2320443d03f8f6c17 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 18 May 2023 00:00:56 +0200
Subject: [PATCH 27/46] starship: more icons for git status

---
 modules/terminal-life/starship.toml.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/terminal-life/starship.toml.nix b/modules/terminal-life/starship.toml.nix
index ed10ae61..09c845ab 100644
--- a/modules/terminal-life/starship.toml.nix
+++ b/modules/terminal-life/starship.toml.nix
@@ -84,6 +84,7 @@
   git_branch = {
     style = "#E5C463";
     format = "[](fg:black bg:$style)[ $symbol$branch](fg:black bg:$style)[](fg:$style)";
+    symbol = " ";
   };
 
   git_commit = {
@@ -104,16 +105,16 @@
   git_status = {
     style = "#E5C463";
     format = "([ ](bg:$style fg:black)$conflicted$staged$modified$renamed$deleted$untracked$stashed$ahead_behind[](fg:$style))";
-    conflicted = "[ ](bold fg:88 bg:#E5C463)[  \${count} ](fg:black bg:#E5C463)";
+    conflicted = "[ ](bold fg:88 bg:#E5C463)[  \${count} ](fg:black bg:#E5C463)";
     staged = "[ $count ](fg:black bg:#E5C463)";
-    modified = "[ \${count} ](fg:black bg:#E5C463)";
+    modified = "[ \${count} ](fg:black bg:#E5C463)";
     renamed = "[ \${count} ](fg:black bg:#E5C463)";
     deleted = "[ \${count} ](fg:black bg:#E5C463)";
     untracked = "[?\${count} ](fg:black bg:#E5C463)";
     stashed = "[ \${count} ](fg:black bg:#E5C463)";
     ahead = "[ \${count} ](fg:#523333 bg:#E5C463)";
     behind = "[ \${count} ](fg:black bg:#E5C463)";
-    diverged = "[ ](fg:88 bg:#E5C463)[ נּ ](fg:black bg:#E5C463)[ \${ahead_count} ](fg:black bg:#E5C463)[ \${behind_count} ](fg:black bg:#E5C463)";
+    diverged = "[ ](fg:88 bg:#E5C463)[  ](fg:black bg:#E5C463)[ \${ahead_count} ](fg:black bg:#E5C463)[ \${behind_count} ](fg:black bg:#E5C463)";
   };
 
   golang = {

From 7dbe853f3a1090b590a479bf96922e93ed474679 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 31 May 2023 20:54:31 +0200
Subject: [PATCH 28/46] ble.sh: use fzf ctrl-r history, ble.sh built-in
 completion

Fix selected ble-face region_input

Fix jump words limited by space (uword)
---
 modules/terminal-life/bash/default.nix | 11 +++++++++--
 modules/terminal-life/fzf/default.nix  |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index 1370f04a..fa535348 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -18,6 +18,9 @@ in {
 
   # Run when initializing an interactive shell
   initExtra = ''
+    # Use fzf's CTRL-R history widget
+    source ${pkgs.fzf}/share/fzf/key-bindings.bash
+
     # If a command is not found, show me where it is
     source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
 
@@ -37,9 +40,11 @@ in {
     # Meta (Alt) + Backspace to delete a word
     ble-bind -m 'vi_imap' -f 'M-C-?' 'kill-backward-cword'
     # Meta (Alt) + p to jump one word backwards
-    ble-bind -m 'vi_imap' -f M-p '@nomarked backward-cword'
+    ble-bind -m 'vi_imap' -f M-p '@nomarked backward-uword'
+    ble-bind -m 'vi_imap' -f M-left '@nomarked backward-uword'
     # Meta (Alt) + n to jump one word forwards
-    ble-bind -m 'vi_imap' -f M-n '@nomarked forward-cword'
+    ble-bind -m 'vi_imap' -f M-n '@nomarked forward-uword'
+    ble-bind -m 'vi_imap' -f M-right '@nomarked forward-uword'
     # Arrow up and Ctrl + p searches history for entered input
     ble-bind -m 'vi_imap' -f up 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
     ble-bind -m 'vi_imap' -f C-p 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
@@ -47,6 +52,8 @@ in {
     ble-bind -m 'vi_imap' -f down 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
     ble-bind -m 'vi_imap' -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
 
+    ble-face region_insert='fg=black,bg=navy'
+
     function my/complete-load-hook {
       bleopt complete_auto_delay=250
     }
diff --git a/modules/terminal-life/fzf/default.nix b/modules/terminal-life/fzf/default.nix
index 372e768d..88e60592 100644
--- a/modules/terminal-life/fzf/default.nix
+++ b/modules/terminal-life/fzf/default.nix
@@ -10,5 +10,8 @@
     "--color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062"
     "--color=marker:#ef9062,fg+:#303030,prompt:#e5c463,hl+:#7accd7"
   ];
-  enableBashIntegration = true;
+  # Use ble.sh for completions, see
+  # modules/terminal-life/bash/default.nix -> bleopt complete_menu_style=desc
+  # and https://github.com/akinomyoga/ble.sh/wiki/Manual-%C2%A77-Completion
+  enableBashIntegration = false;
 }

From 97239d1fbb62fb312440b5c9d7d5f087601da328 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 18 May 2023 00:04:39 +0200
Subject: [PATCH 29/46] inputs: switch to nixos-23.05

---
 flake.lock                               | 77 ++++++------------------
 flake.nix                                |  4 +-
 modules/audio/default.nix                | 47 +++++++++------
 modules/audio/pipewire-pulse.conf.json   | 36 -----------
 modules/core/packages.nix                |  1 +
 modules/core/services.nix                |  2 +-
 modules/graphical/default.nix            |  2 +-
 profiles/base-user/session-variables.nix |  2 +-
 8 files changed, 54 insertions(+), 117 deletions(-)
 delete mode 100644 modules/audio/pipewire-pulse.conf.json

diff --git a/flake.lock b/flake.lock
index 43e6b1d0..dfb93ccb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683754942,
-        "narHash": "sha256-L+Bj8EL4XLmODRIuOkk9sI6FDECVzK+C8jeZFv7q6eY=",
+        "lastModified": 1686307493,
+        "narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "252541bd05a7f55f3704a3d014ad1badc1e3360d",
+        "rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1683779844,
-        "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
+        "lastModified": 1685948350,
+        "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "c80189917086e43d49eece2bd86f56813500a0eb",
+        "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac",
         "type": "github"
       },
       "original": {
@@ -201,52 +201,30 @@
       "inputs": {
         "nixpkgs": [
           "nixos"
-        ],
-        "utils": "utils_2"
-      },
-      "locked": {
-        "lastModified": 1681092193,
-        "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-22.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "lastModified": 1686582345,
+        "narHash": "sha256-z4wLfa++k1d7Y/tQpQYub1D0K0OO9Wju0FZ8U53KUE0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "rev": "e753d659c64c7d158433d87ef7d6151ca1d1817a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "latest": {
       "locked": {
-        "lastModified": 1683408522,
-        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
+        "lastModified": 1686501370,
+        "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
+        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
         "type": "github"
       },
       "original": {
@@ -258,27 +236,27 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1683928319,
-        "narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=",
+        "lastModified": 1686431482,
+        "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962",
+        "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1683965003,
-        "narHash": "sha256-DrzSdOnLv/yFBvS2FqmwBA2xIbN/Lny/WlxHyoLR9zE=",
+        "lastModified": 1686452266,
+        "narHash": "sha256-zLKiX0iu6jZFeZDpR1gE6fNyMr8eiM8GLnj9SoUCjFs=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "81cd886719e10d4822b2a6caa96e95d56cc915ef",
+        "rev": "2a807ad6e8dc458db08588b78cc3c0f0ec4ff321",
         "type": "github"
       },
       "original": {
@@ -330,21 +308,6 @@
         "repo": "flake-utils",
         "type": "github"
       }
-    },
-    "utils_2": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index dd7ed53b..7d92a327 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
 
   inputs = {
     # Track channels with commits tested and built by hydra
-    nixos.url = "github:nixos/nixpkgs/nixos-22.11";
+    nixos.url = "github:nixos/nixpkgs/nixos-23.05";
     latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
     flake-compat.url = "github:edolstra/flake-compat";
@@ -19,7 +19,7 @@
     digga.inputs.darwin.follows = "darwin";
     digga.inputs.flake-compat.follows = "flake-compat";
 
-    home.url = "github:nix-community/home-manager/release-22.11";
+    home.url = "github:nix-community/home-manager/release-23.05";
     home.inputs.nixpkgs.follows = "nixos";
 
     darwin.url = "github:LnL7/nix-darwin";
diff --git a/modules/audio/default.nix b/modules/audio/default.nix
index 9a69301b..8ff6f2e6 100644
--- a/modules/audio/default.nix
+++ b/modules/audio/default.nix
@@ -66,31 +66,31 @@ in {
 
     # rtkit is optional but recommended
     security.rtkit.enable = true;
-    # Enable sound using pipewire-pulse
+    # Enable sound using pipewire-pulse, default config:
+    # https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/daemon/pipewire.conf.in
     services.pipewire = {
       enable = true;
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
-
-      config.pipewire = {
-        context.default.clock = {
-          allowed-rates = [44100 48000 88200 96000];
-          rate = 44100;
-        };
-      };
-      config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
     };
 
-    # Bluetooth configuration using wireplumber
-    # https://nixos.wiki/wiki/PipeWire#Bluetooth_Configuration
-    environment.etc = mkIf cfg.bluetooth.enable {
-      "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
-        bluez_monitor.properties = {
-          ["bluez5.enable-sbc-xq"] = true,
-          ["bluez5.enable-msbc"] = true,
-          ["bluez5.enable-hw-volume"] = true,
-          ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+    # Make pulseaudio listen on port 4713 for mopidy, extending the default
+    # config: https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/daemon/pipewire-pulse.conf.in
+    environment.etc = mkIf cfg.mopidy.enable {
+      "pipewire/pipewire-pulse.conf.d/99-custom.conf".text = ''
+        {
+          "context.modules": [
+            {
+              "name": "libpipewire-module-protocol-pulse",
+              "args": {
+                "server.address": ["unix:native", "tcp:4713"],
+                "vm.overrides": {
+                  "pulse.min.quantum": "1024/48000"
+                }
+              }
+            }
+          ]
         }
       '';
     };
@@ -98,10 +98,19 @@ in {
     # Enable bluetooth
     hardware.bluetooth = mkIf cfg.bluetooth.enable {
       enable = true;
-      # disable useless SIM Access Profile plugin
+      # Disable bluetooth on startup to save battery
+      powerOnBoot = false;
+      # Disable useless SIM Access Profile plugin
       disabledPlugins = [
         "sap"
       ];
+      settings = {
+        General = {
+          # Enables experimental features and interfaces.
+          # Makes BlueZ Battery Provider available
+          Experimental = true;
+        };
+      };
     };
     services.blueman.enable = mkIf cfg.bluetooth.enable true;
 
diff --git a/modules/audio/pipewire-pulse.conf.json b/modules/audio/pipewire-pulse.conf.json
deleted file mode 100644
index 97bedaaa..00000000
--- a/modules/audio/pipewire-pulse.conf.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "context.properties": {},
-  "context.spa-libs": {
-    "audio.convert.*": "audioconvert/libspa-audioconvert",
-    "support.*": "support/libspa-support"
-  },
-  "context.modules": [
-    {
-      "name": "libpipewire-module-rtkit",
-      "args": {},
-      "flags": ["ifexists", "nofail"]
-    },
-    {
-      "name": "libpipewire-module-protocol-native"
-    },
-    {
-      "name": "libpipewire-module-client-node"
-    },
-    {
-      "name": "libpipewire-module-adapter"
-    },
-    {
-      "name": "libpipewire-module-metadata"
-    },
-    {
-      "name": "libpipewire-module-protocol-pulse",
-      "args": {
-        "server.address": ["unix:native", "tcp:4713"],
-        "vm.overrides": {
-          "pulse.min.quantum": "1024/48000"
-        }
-      }
-    }
-  ],
-  "stream.properties": {}
-}
diff --git a/modules/core/packages.nix b/modules/core/packages.nix
index f0a35d17..807b282c 100644
--- a/modules/core/packages.nix
+++ b/modules/core/packages.nix
@@ -24,6 +24,7 @@ in {
         openssh
         curl
         htop
+        btop
         lsof
         psmisc
         file
diff --git a/modules/core/services.nix b/modules/core/services.nix
index 2d53dd74..475945e6 100644
--- a/modules/core/services.nix
+++ b/modules/core/services.nix
@@ -10,7 +10,7 @@
     # If you don't want the host to have SSH actually opened up to the net,
     # set `services.openssh.openFirewall` to false in your config.
     openFirewall = lib.mkDefault true;
-    passwordAuthentication = lib.mkDefault false;
+    settings.PasswordAuthentication = lib.mkDefault false;
   };
 
   # Service that makes Out of Memory Killer more effective
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 39f6be5d..46812e92 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -66,7 +66,7 @@ in {
 
     services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}");
 
-    qt5 = {
+    qt = {
       enable = true;
       platformTheme = "gtk2";
       style = "gtk2";
diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix
index fb816046..d21a9f80 100644
--- a/profiles/base-user/session-variables.nix
+++ b/profiles/base-user/session-variables.nix
@@ -85,7 +85,7 @@
     VUEDX_TELEMETRY = "off";
 
     # FZF shell history widget default colors
-    FZF_DEFAULT_OPTS = "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
+    FZF_DEFAULT_OPTS = lib.mkForce "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
   };
 
   envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;

From f4f67b3197a28a2c5dc6092fcbbec8bb5a83a29d Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 17 May 2023 23:56:46 +0200
Subject: [PATCH 30/46] chore: python3{9,10}Packages -> python3Packages

- Apply treefmt
---
 modules/docker-ci-runner/default.nix   |  19 +++--
 modules/terminal-life/nvim/default.nix | 103 +++++++++++++------------
 modules/virtualisation/default.nix     |   2 +-
 pkgs/lgcl.nix                          |   3 +-
 pkgs/mopidy-jellyfin.nix               |  13 ++--
 pkgs/uhk-agent.nix                     |   3 +-
 6 files changed, 75 insertions(+), 68 deletions(-)

diff --git a/modules/docker-ci-runner/default.nix b/modules/docker-ci-runner/default.nix
index 69decb0b..6a15f928 100644
--- a/modules/docker-ci-runner/default.nix
+++ b/modules/docker-ci-runner/default.nix
@@ -1,7 +1,11 @@
-{ lib, config, pkgs, self, ... }:
-
-with lib;
-let
+{
+  lib,
+  config,
+  pkgs,
+  self,
+  ...
+}:
+with lib; let
   bootstrap = pkgs.writeScript "bootstrap.sh" ''
     #!/usr/bin/env bash
 
@@ -40,8 +44,7 @@ let
   '';
   psCfg = config.pub-solar;
   cfg = config.pub-solar.docker-ci-runner;
-in
-{
+in {
   options.pub-solar.docker-ci-runner = {
     enable = lib.mkEnableOption "Enables a docker container running a drone exec runner as unprivileged user.";
 
@@ -88,7 +91,7 @@ in
           image = "debian";
           autoStart = true;
           entrypoint = "bash";
-          cmd = [ "/bootstrap.sh" ];
+          cmd = ["/bootstrap.sh"];
 
           volumes = [
             "${cfg.runnerVarsFile}:/run/vars"
@@ -98,7 +101,7 @@ in
 
           environment = cfg.runnerEnvironment;
 
-          extraOptions = lib.mkIf cfg.enableKvm [ "--device=/dev/kvm" ];
+          extraOptions = lib.mkIf cfg.enableKvm ["--device=/dev/kvm"];
         };
       };
     };
diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index e1bfd4e6..ba53ef49 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -34,7 +34,7 @@ in {
       nodePackages.vue-language-server
       nodePackages.vscode-langservers-extracted
       nodePackages.yaml-language-server
-      python39Packages.python-lsp-server
+      python3Packages.python-lsp-server
       python3Full
       solargraph
       rnix-lsp
@@ -43,65 +43,66 @@ in {
       universal-ctags
     ];
 
-  plugins = with pkgs.vimPlugins; [ ]
-  ++ lib.optionals (!cfg.lite) [
-    nvim-cmp
-    cmp-nvim-lsp
-    cmp_luasnip
-    luasnip
+  plugins = with pkgs.vimPlugins;
+    []
+    ++ lib.optionals (!cfg.lite) [
+      nvim-cmp
+      cmp-nvim-lsp
+      cmp_luasnip
+      luasnip
 
-    lsp_extensions-nvim
-    nvim-lspconfig
+      lsp_extensions-nvim
+      nvim-lspconfig
 
-    instant-nvim-nvfetcher
+      instant-nvim-nvfetcher
 
-    ack-vim
-    vim-airline
-    editorconfig-vim
-    nnn-vim
-    quick-scope
-    suda-vim
-    syntastic
-    vim-gutentags
-    vim-vinegar
-    vim-workspace-nvfetcher
+      ack-vim
+      vim-airline
+      editorconfig-vim
+      nnn-vim
+      quick-scope
+      suda-vim
+      syntastic
+      vim-gutentags
+      vim-vinegar
+      vim-workspace-nvfetcher
 
-    sonokai
-    vim-hybrid-material
-    vim-airline-themes
-    vim-apprentice-nvfetcher
+      sonokai
+      vim-hybrid-material
+      vim-airline-themes
+      vim-apprentice-nvfetcher
 
-    fugitive
-    vim-gitgutter
-    vim-rhubarb
-    vimagit-nvfetcher
+      fugitive
+      vim-gitgutter
+      vim-rhubarb
+      vimagit-nvfetcher
 
-    fzf-vim
-    fzfWrapper
-    vim-highlightedyank
+      fzf-vim
+      fzfWrapper
+      vim-highlightedyank
 
-    vim-beautify-nvfetcher
-    vim-surround
+      vim-beautify-nvfetcher
+      vim-surround
 
-    vim-bufkill
-    vim-sensible
+      vim-bufkill
+      vim-sensible
 
-    ansible-vim
-    emmet-vim
-    rust-vim
-    vim-caddyfile-nvfetcher
-    vim-go
-    vim-javascript
-    vim-json
-    SchemaStore-nvim
-    vim-markdown
-    vim-nix
-    vim-nixhash
-    vim-ruby
-    vim-toml
-    vim-vue
-    yats-vim
-  ];
+      ansible-vim
+      emmet-vim
+      rust-vim
+      vim-caddyfile-nvfetcher
+      vim-go
+      vim-javascript
+      vim-json
+      SchemaStore-nvim
+      vim-markdown
+      vim-nix
+      vim-nixhash
+      vim-ruby
+      vim-toml
+      vim-vue
+      yats-vim
+    ];
 
   extraConfig = builtins.concatStringsSep "\n" [
     ''
diff --git a/modules/virtualisation/default.nix b/modules/virtualisation/default.nix
index b4ce6a0c..3376014a 100644
--- a/modules/virtualisation/default.nix
+++ b/modules/virtualisation/default.nix
@@ -39,7 +39,7 @@ in {
       libvirt-glib
       qemu
       virt-manager
-      python38Packages.libvirt
+      python3Packages.libvirt
       gvfs
       edk2
       OVMF
diff --git a/pkgs/lgcl.nix b/pkgs/lgcl.nix
index 235fbe5e..73f91124 100644
--- a/pkgs/lgcl.nix
+++ b/pkgs/lgcl.nix
@@ -1,4 +1,5 @@
-self: with self; let
+self:
+with self; let
   looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
     meta.platforms = ["x86_64-linux" "aarch64-linux"];
   });
diff --git a/pkgs/mopidy-jellyfin.nix b/pkgs/mopidy-jellyfin.nix
index ec0d64a5..b507ba17 100644
--- a/pkgs/mopidy-jellyfin.nix
+++ b/pkgs/mopidy-jellyfin.nix
@@ -1,19 +1,20 @@
-self: with self; let
-  websocket-client = python39.pkgs.buildPythonPackage rec {
+self:
+with self; let
+  websocket-client = python3.pkgs.buildPythonPackage rec {
     pname = "websocket-client";
     version = "1.2.1";
     doCheck = false;
-    src = python39.pkgs.fetchPypi {
+    src = python3.pkgs.fetchPypi {
       inherit pname version;
       sha256 = "sha256-jftxXYqZL1cS//jIQ62ulOIrIqmbLF5rDsShqYHMTg0=";
     };
   };
 in
-  python39.pkgs.buildPythonPackage rec {
+  python3.pkgs.buildPythonPackage rec {
     pname = "Mopidy-Jellyfin";
     version = "1.0.2";
     doCheck = false;
-    propagatedBuildInputs = with python39.pkgs; [
+    propagatedBuildInputs = with python3.pkgs; [
       unidecode
       websocket-client
       requests
@@ -21,7 +22,7 @@ in
       pykka
       mopidy
     ];
-    src = python39.pkgs.fetchPypi {
+    src = python3.pkgs.fetchPypi {
       inherit pname version;
       sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g=";
     };
diff --git a/pkgs/uhk-agent.nix b/pkgs/uhk-agent.nix
index bccf06db..1293fc4b 100644
--- a/pkgs/uhk-agent.nix
+++ b/pkgs/uhk-agent.nix
@@ -1,4 +1,5 @@
-self: with self; let
+self:
+with self; let
   uhk-agent-bin = stdenv.mkDerivation rec {
     pname = "uhk-agent-bin";
     version = "1.5.14";

From a3ad8e57f81d37aef00b5673d278266917591474 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 13 May 2023 18:43:12 +0200
Subject: [PATCH 31/46] deploy-rs: use nixpkgs version, avoid rebuilding

https://github.com/serokell/deploy-rs/pull/207
https://github.com/serokell/deploy-rs/issues/163
---
 flake.nix       | 25 +++++++++++++++++++++++--
 shell/devos.nix |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7d92a327..d7f45cbe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,17 @@
           imports = [(digga.lib.importOverlays ./overlays)];
           overlays = [];
         };
-        latest = {};
+        latest = {
+          overlays = [
+            deploy.overlay
+            (self: super: {
+              deploy-rs = {
+                inherit (inputs.latest.legacyPackages.x86_64-linux) deploy-rs;
+                lib = super.deploy-rs.lib;
+              };
+            })
+          ];
+        };
       };
 
       lib = import ./lib {lib = digga.lib // nixos.lib;};
@@ -149,6 +159,17 @@
 
       homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
-      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {};
+      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {
+        #example = {
+        #  hostname = "example.com:22";
+        #  sshUser = "bartender";
+        #  fastConnect = true;
+        #  profilesOrder = ["system" "direnv"];
+        #  profiles.direnv = {
+        #    user = "bartender";
+        #    path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
+        #  };
+        #};
+      };
     };
 }
diff --git a/shell/devos.nix b/shell/devos.nix
index fdbcee2e..3a61ec3c 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -59,6 +59,6 @@ in {
     ]
     ++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [
       (devos nixos-generators)
-      (devos deploy-rs)
+      (devos deploy-rs.deploy-rs)
     ];
 }

From 5131912195d51431e1d3d7e99bab04db7b6a25cc Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 31 May 2023 20:46:44 +0200
Subject: [PATCH 32/46] overrides: use version from nixos-23.05

---
 overlays/overrides.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 839426d0..7bea8fc0 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -3,20 +3,6 @@ channels: final: prev: {
 
   inherit
     (channels.latest)
-    cachix
-    dhall
-    discord
-    element-desktop
-    rage
-    nix-index
-    qutebrowser
-    alejandra
-    signal-desktop
-    starship
-    deploy-rs
-    tdesktop
-    arduino
-    arduino-cli
     ;
 
   haskellPackages =

From f964dd38033ba7e0c92b206f854d1d18bb778681 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 31 May 2023 20:59:02 +0200
Subject: [PATCH 33/46] flake: use nixos-23.05

Use overlay for nvfetcher for recent fixes from master branch
---
 flake.lock | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 flake.nix  | 14 ++++++++-----
 2 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index dfb93ccb..f1d08d5c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -197,6 +197,24 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -281,6 +299,30 @@
         "type": "github"
       }
     },
+    "nvfetcher": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixos"
+        ]
+      },
+      "locked": {
+        "lastModified": 1685158767,
+        "narHash": "sha256-vgyu3jsnGDDAEYg4y/oFk2IaTCXUlce0ZaLtQprhmFk=",
+        "owner": "berberman",
+        "repo": "nvfetcher",
+        "rev": "c5ae2cb436a04f4590306589e71638d023a33bd4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "berberman",
+        "repo": "nvfetcher",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -291,7 +333,23 @@
         "home": "home",
         "latest": "latest",
         "nixos": "nixos",
-        "nixos-hardware": "nixos-hardware"
+        "nixos-hardware": "nixos-hardware",
+        "nvfetcher": "nvfetcher"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index d7f45cbe..868ee558 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,10 @@
     agenix.inputs.darwin.follows = "darwin";
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
+
+    nvfetcher.url = "github:berberman/nvfetcher";
+    nvfetcher.inputs.nixpkgs.follows = "nixos";
+    nvfetcher.inputs.flake-compat.follows = "flake-compat";
   };
 
   outputs = {
@@ -44,6 +48,7 @@
     nixos-hardware,
     agenix,
     deploy,
+    nvfetcher,
     ...
   } @ inputs:
     digga.lib.mkFlake
@@ -59,19 +64,17 @@
       channels = {
         nixos = {
           imports = [(digga.lib.importOverlays ./overlays)];
-          overlays = [];
-        };
-        latest = {
           overlays = [
             deploy.overlay
             (self: super: {
               deploy-rs = {
-                inherit (inputs.latest.legacyPackages.x86_64-linux) deploy-rs;
+                inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
                 lib = super.deploy-rs.lib;
               };
             })
           ];
         };
+        latest = {};
       };
 
       lib = import ./lib {lib = digga.lib // nixos.lib;};
@@ -84,6 +87,7 @@
           });
         })
         agenix.overlays.default
+        nvfetcher.overlays.default
 
         (import ./pkgs)
       ];
@@ -167,7 +171,7 @@
         #  profilesOrder = ["system" "direnv"];
         #  profiles.direnv = {
         #    user = "bartender";
-        #    path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
+        #    path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
         #  };
         #};
       };

From 4a8c97ff74bf9cc2cecc51a8da5c799c00c186ed Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 9 Jun 2023 17:05:39 +0200
Subject: [PATCH 34/46] waybar: use version from nixos-23.05

---
 overlays/waybar.nix | 5 -----
 pkgs/sources.toml   | 4 ----
 2 files changed, 9 deletions(-)
 delete mode 100644 overlays/waybar.nix

diff --git a/overlays/waybar.nix b/overlays/waybar.nix
deleted file mode 100644
index 075f5d3e..00000000
--- a/overlays/waybar.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-channels: final: prev: {
-  waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
-    inherit (prev.sources.waybar-nvfetcher) version src;
-  });
-}
diff --git a/pkgs/sources.toml b/pkgs/sources.toml
index 183c914b..5ec5e936 100644
--- a/pkgs/sources.toml
+++ b/pkgs/sources.toml
@@ -46,7 +46,3 @@ fetch.github = "zeekay/vim-beautify"
 [vim-apprentice-nvfetcher]
 src.git = "https://github.com/romainl/Apprentice"
 fetch.github = "romainl/Apprentice"
-
-[waybar-nvfetcher]
-src.git = "https://github.com/Alexays/Waybar"
-fetch.github = "Alexays/Waybar"

From a7d4be4af59ac4da6098265343f442bc2aadcb16 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 9 Jun 2023 17:06:11 +0200
Subject: [PATCH 35/46] neovim: add ansible-language-server

---
 modules/terminal-life/nvim/default.nix | 1 +
 modules/terminal-life/nvim/lsp.vim     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index ba53ef49..1afb5088 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -22,6 +22,7 @@ in {
 
   extraPackages = with pkgs;
     lib.mkIf (!cfg.lite) [
+      ansible-language-server
       ccls
       gopls
       nodejs
diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim
index ef238fe6..399e52e4 100644
--- a/modules/terminal-life/nvim/lsp.vim
+++ b/modules/terminal-life/nvim/lsp.vim
@@ -81,6 +81,7 @@ lua <<EOF
   local use_denols_for_typescript = not(os.getenv('NVIM_USE_DENOLS') == nil)
 
   for lsp_key, lsp_settings in pairs({
+        'ansiblels', ---------------------------- Ansible
         'bashls', ------------------------------- Bash
         'ccls', --------------------------------- C / C++ / Objective-C
         'cssls', -------------------------------- CSS / SCSS / LESS
@@ -147,7 +148,6 @@ lua <<EOF
                     ['schemas'] = {
                         ['https://json.schemastore.org/github-workflow'] = '.github/workflows/*.{yml,yaml}',
                         ['https://json.schemastore.org/github-action'] = '.github/action.{yml,yaml}',
-                        ['https://json.schemastore.org/ansible-stable-2.9'] = 'roles/tasks/*.{yml,yaml}',
                         ['https://json.schemastore.org/drone'] = '*.drone.{yml,yaml}',
                         ['https://json.schemastore.org/swagger-2.0'] = 'swagger.{yml,yaml}',
                     }

From c65f1857735905cc52c3d3e2da2c7e63da97021c Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 26 Apr 2023 12:49:44 +0200
Subject: [PATCH 36/46] pre-commit hook: only format modified lines

instead of entire files
---
 shell/hooks/pre-commit.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/shell/hooks/pre-commit.sh b/shell/hooks/pre-commit.sh
index 4ce4fa13..23776793 100755
--- a/shell/hooks/pre-commit.sh
+++ b/shell/hooks/pre-commit.sh
@@ -9,15 +9,25 @@ fi
 
 diff="git diff-index --name-only --cached $against --diff-filter d"
 
-all_files=($($diff))
+mapfile -t all_files < <($diff)
 
-# Format staged files.
+# Stash only unstaged changes, keeping staged changes
+old_stash=$(git rev-parse --quiet --verify refs/stash)
+git stash push --quiet --keep-index -m 'Unstaged changes before pre-commit hook'
+new_stash=$(git rev-parse --quiet --verify refs/stash)
+
+# Format staged files
 if ((${#all_files[@]} != 0)); then
   treefmt "${all_files[@]}" &&
     git add "${all_files[@]}"
 fi
 
-# check editorconfig
+# If unstaged changes were stashed re-apply to working tree
+if [ "$old_stash" != "$new_stash" ]; then
+  git stash pop --quiet
+fi
+
+# Check editorconfig
 if ((${#all_files[@]} != 0)); then
   if ! editorconfig-checker -- "${all_files[@]}"; then
     printf "%b\n" \

From d28da2e1e68b44bcc46459466bd178ccbe011e15 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Fri, 5 May 2023 18:32:40 +0200
Subject: [PATCH 37/46] lint: exclude file generated by nvfetcher

Fix pre-commit hook to only format staged files
---
 shell/hooks/pre-commit.sh | 8 ++++----
 treefmt.toml              | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/shell/hooks/pre-commit.sh b/shell/hooks/pre-commit.sh
index 23776793..45efec25 100755
--- a/shell/hooks/pre-commit.sh
+++ b/shell/hooks/pre-commit.sh
@@ -7,15 +7,15 @@ else
   against=$(${git}/bin/git hash-object -t tree /dev/null)
 fi
 
-diff="git diff-index --name-only --cached $against --diff-filter d"
-
-mapfile -t all_files < <($diff)
-
 # Stash only unstaged changes, keeping staged changes
 old_stash=$(git rev-parse --quiet --verify refs/stash)
 git stash push --quiet --keep-index -m 'Unstaged changes before pre-commit hook'
 new_stash=$(git rev-parse --quiet --verify refs/stash)
 
+diff="git diff-index --name-only --cached $against --diff-filter d"
+
+mapfile -t all_files < <($diff)
+
 # Format staged files
 if ((${#all_files[@]} != 0)); then
   treefmt "${all_files[@]}" &&
diff --git a/treefmt.toml b/treefmt.toml
index c7c1710d..41ee3051 100644
--- a/treefmt.toml
+++ b/treefmt.toml
@@ -1,6 +1,7 @@
 [formatter.nix]
 command = "alejandra"
 includes = ["*.nix"]
+excludes = ["pkgs/_sources/generated.nix"]
 
 [formatter.prettier]
 command = "prettier"

From d664702dc8d44d9f3ab3499a540a65e4f6c3ae9a Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 13 Jun 2023 14:58:03 +0200
Subject: [PATCH 38/46] ci.b12f.io -> ci.pub.solar

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f27fd0b..4efeef2c 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ _PubSolarOS_:
   as much non-free software as you like.
 - Automation is better. The reproducibility of nix feels so much more
   powerful once you're deploying your new configuration from your laptop
-  to all your other devices with one command. [We have an automated CI using drone](https://ci.b12f.io/pub-solar/os).
+  to all your other devices with one command. [We have an automated CI using drone](https://ci.pub.solar/pub-solar/os).
 - Community is important. We just like working on this together, and it
   feels really good to see our progress at the end of a
   [hakken.irl](https://pub.solar/hakken) session.

From 972e0af361b51e2bb6067ee0d37a31bcefacc056 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 13 Jun 2023 14:58:31 +0200
Subject: [PATCH 39/46] nvfetcher: bump versions

---
 pkgs/_sources/generated.nix | 52 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index addb0e89..2d455cc8 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -1,9 +1,6 @@
 # This file was generated by nvfetcher, please do not modify it manually.
+{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
 {
-  fetchgit,
-  fetchurl,
-  fetchFromGitHub,
-}: {
   F-Sy-H = {
     pname = "F-Sy-H";
     version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
@@ -14,6 +11,7 @@
       fetchSubmodules = false;
       sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
     };
+    date = "2023-01-25";
   };
   instant-nvim-nvfetcher = {
     pname = "instant-nvim-nvfetcher";
@@ -25,6 +23,7 @@
       fetchSubmodules = false;
       sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=";
     };
+    date = "2022-06-25";
   };
   manix = {
     pname = "manix";
@@ -36,28 +35,31 @@
       fetchSubmodules = false;
       sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
     };
+    date = "2021-04-20";
   };
   ohmyzsh = {
     pname = "ohmyzsh";
-    version = "b602e0a066d8c98e8c02201ad16c764447fd8531";
+    version = "cb8b677488c7a20278917af58dfccd72cd40e1b1";
     src = fetchFromGitHub {
       owner = "ohmyzsh";
       repo = "ohmyzsh";
-      rev = "b602e0a066d8c98e8c02201ad16c764447fd8531";
+      rev = "cb8b677488c7a20278917af58dfccd72cd40e1b1";
       fetchSubmodules = false;
-      sha256 = "sha256-O4thanOQpX/DHPdfW2p/RUXzIPj6GUp9EnKJfkh7yQM=";
+      sha256 = "sha256-c7tGTEdE8e1qD83Nxzno1VLAFV5gKoB4TJes4aVa2mY=";
     };
+    date = "2023-06-11";
   };
   powerlevel10k = {
     pname = "powerlevel10k";
-    version = "a30145b0f82d06770e924e9eac064ed223a94e6b";
+    version = "944f52fc430259ff49f497f3516a3ddfb45a0a6b";
     src = fetchFromGitHub {
       owner = "romkatv";
       repo = "powerlevel10k";
-      rev = "a30145b0f82d06770e924e9eac064ed223a94e6b";
+      rev = "944f52fc430259ff49f497f3516a3ddfb45a0a6b";
       fetchSubmodules = false;
-      sha256 = "sha256-jnZXLrywUrJgTX1tFpoNH94r/jcGl2P6R7DoedluHxQ=";
+      sha256 = "sha256-a2HTHvvI6aQXe/tzvd0P1IGWFFo64fMeKNX3TxMvCcc=";
     };
+    date = "2023-06-11";
   };
   rnix-lsp-nvfetcher = {
     pname = "rnix-lsp-nvfetcher";
@@ -69,6 +71,7 @@
       fetchSubmodules = false;
       sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
     };
+    date = "2022-11-27";
   };
   vim-apprentice-nvfetcher = {
     pname = "vim-apprentice-nvfetcher";
@@ -80,6 +83,7 @@
       fetchSubmodules = false;
       sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=";
     };
+    date = "2023-02-15";
   };
   vim-beautify-nvfetcher = {
     pname = "vim-beautify-nvfetcher";
@@ -91,6 +95,7 @@
       fetchSubmodules = false;
       sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
     };
+    date = "2018-12-27";
   };
   vim-caddyfile-nvfetcher = {
     pname = "vim-caddyfile-nvfetcher";
@@ -102,17 +107,19 @@
       fetchSubmodules = false;
       sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
     };
+    date = "2022-05-09";
   };
   vim-workspace-nvfetcher = {
     pname = "vim-workspace-nvfetcher";
-    version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
+    version = "c0d1e4332a378f58bfdf363b4957168fa78e79b4";
     src = fetchFromGitHub {
       owner = "thaerkh";
       repo = "vim-workspace";
-      rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
+      rev = "c0d1e4332a378f58bfdf363b4957168fa78e79b4";
       fetchSubmodules = false;
-      sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI=";
+      sha256 = "sha256-2Brx098dk5THiieBiW71FG9mUUwS1CSY9mpOPWA/Tq4=";
     };
+    date = "2023-05-28";
   };
   vimagit-nvfetcher = {
     pname = "vimagit-nvfetcher";
@@ -124,27 +131,18 @@
       fetchSubmodules = false;
       sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
     };
-  };
-  waybar-nvfetcher = {
-    pname = "waybar-nvfetcher";
-    version = "09142fa322e080474de0f2dc3ea98036846550df";
-    src = fetchFromGitHub {
-      owner = "Alexays";
-      repo = "Waybar";
-      rev = "09142fa322e080474de0f2dc3ea98036846550df";
-      fetchSubmodules = false;
-      sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U=";
-    };
+    date = "2022-07-03";
   };
   zsh-nix-shell = {
     pname = "zsh-nix-shell";
-    version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
+    version = "227d284ab2dc2f5153826974e0094a1990b1b5b9";
     src = fetchFromGitHub {
       owner = "chisui";
       repo = "zsh-nix-shell";
-      rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
+      rev = "227d284ab2dc2f5153826974e0094a1990b1b5b9";
       fetchSubmodules = false;
-      sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=";
+      sha256 = "sha256-SrGvHsAJCxzi69CKNKKvItYUaAP7CKwRntsprVHBs4Y=";
     };
+    date = "2023-05-29";
   };
 }

From 323a3bd189d3e3a86c03ef863430750647440529 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 2 Jun 2022 10:45:03 +0200
Subject: [PATCH 40/46] sway: use ExecStartPre in systemd service, like
 upstream wiki

---
 modules/sway/sway.service.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/sway/sway.service.nix b/modules/sway/sway.service.nix
index fbca3acd..253df4ac 100644
--- a/modules/sway/sway.service.nix
+++ b/modules/sway/sway.service.nix
@@ -8,10 +8,10 @@
   };
   Service = {
     Type = "simple";
+    ExecStartPre = "${pkgs.systemd}/bin/systemctl --user unset-environment WAYLAND_DISPLAY DISPLAY";
     ExecStart = "${pkgs.sway}/bin/sway";
     Restart = "on-failure";
     RestartSec = "1";
     TimeoutStopSec = "10";
-    ExecStopPost = "${pkgs.systemd}/bin/systemctl --user unset-environment SWAYSOCK DISPLAY I3SOCK WAYLAND_DISPLAY";
   };
 }

From a6bec82fb78de30f1611253e2137d2d831927807 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 13 Jun 2023 15:05:53 +0200
Subject: [PATCH 41/46] core: use linux 6.1

---
 modules/core/boot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/boot.nix b/modules/core/boot.nix
index 4f82a4b0..711569ef 100644
--- a/modules/core/boot.nix
+++ b/modules/core/boot.nix
@@ -36,7 +36,7 @@ in {
       loader.systemd-boot.enable = lib.mkDefault true;
 
       # Use latest LTS linux kernel by default
-      kernelPackages = lib.mkDefault pkgs.linuxPackages_5_15;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages_6_1;
 
       # Support ntfs drives
       supportedFilesystems = ["ntfs"];

From 3569216294736bcca970a5bca23f6b6b33fe0e43 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 13 Jun 2023 15:06:07 +0200
Subject: [PATCH 42/46] graphical: switch to ungoogled-chromium

---
 modules/graphical/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 46812e92..5966e73e 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -100,7 +100,7 @@ in {
         home.packages = [
           alacritty
           foot
-          chromium
+          ungoogled-chromium
           firefox-wayland
 
           flameshot

From a2733eee73c7add246cebec035a6ecd8fcb70905 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 13 Jun 2023 16:22:52 +0200
Subject: [PATCH 43/46] zsh: enable until we switch to bash to fix assertion

https://github.com/NixOS/nixpkgs/commit/631b7f6f882b05c2a5c35f088bfdd99ebbcbf1f3
---
 modules/terminal-life/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 083f05e9..2e9436bd 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -30,6 +30,7 @@ in {
     environment.shells = with pkgs; [
       zsh
     ];
+    programs.zsh.enable = true;
 
     environment.systemPackages = with pkgs; [
       screen

From c9c874ab00d7a85b078ff8c97c3842ce9725f2f8 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 20 Jun 2023 23:35:15 +0200
Subject: [PATCH 44/46] bash: show current directory on top in alacritty

---
 modules/terminal-life/bash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
index fa535348..9528aee9 100644
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@@ -18,8 +18,8 @@ in {
 
   # Run when initializing an interactive shell
   initExtra = ''
-    # Use fzf's CTRL-R history widget
-    source ${pkgs.fzf}/share/fzf/key-bindings.bash
+    # Show current directory at the top in Alacritty
+    PROMPT_COMMAND='echo -e -n "\e]2;$(basename "$PWD")\e\\"'
 
     # If a command is not found, show me where it is
     source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh

From 4c37713f2da6522f7cc242fcad76ccdbfebbc985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Wed, 28 Jun 2023 19:03:12 +0200
Subject: [PATCH 45/46] Update user & hostname display in starship

---
 modules/terminal-life/starship.toml.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/terminal-life/starship.toml.nix b/modules/terminal-life/starship.toml.nix
index 09c845ab..e05a1f46 100644
--- a/modules/terminal-life/starship.toml.nix
+++ b/modules/terminal-life/starship.toml.nix
@@ -1,20 +1,20 @@
 {
-  format = "$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#F85E84 bg:black))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
+  format = "$username$hostname$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#F85E84 bg:#000000))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
 
   # Disable the blank line at the start of the prompt
   add_newline = false;
 
   # You can also replace your username with a neat symbol like  to save some space
   username = {
-    show_always = true;
-    style_user = "bg:#9A348E";
-    style_root = "bg:#9A348E";
-    format = ''[$user]($style)'';
+    style_user = "bg:#000000 fg:#F85E84";
+    style_root = "bg:#F85E84 fg:#000000";
+    format = ''[$user ]($style)'';
   };
+
   hostname = {
-    ssh_only = false;
-    format = "@[$ssh_symbol$hostname]($style)";
-    disabled = false;
+    ssh_symbol = "";
+    trim_at = "";
+    style = "bg:#000000 fg:#F85E84";
   };
 
   character = {

From 2b9def0a764030c30ddb95a07c103389e1fca39a Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 28 Jun 2023 19:20:11 +0200
Subject: [PATCH 46/46] Merge branch main into origin/nixos-23.05

---
 flake.nix                                     |   2 +-
 modules/terminal-life/bash/default.nix        | 107 ++
 modules/terminal-life/default.nix             |  25 +-
 modules/terminal-life/fzf/default.nix         |   5 +-
 modules/terminal-life/nvim/ui.vim             |   2 +-
 modules/terminal-life/starship.toml.nix       | 169 ++++
 modules/terminal-life/zsh/default.nix         | 123 ---
 modules/terminal-life/zsh/fzf.zsh             |  58 --
 modules/terminal-life/zsh/p10k.zsh            | 943 ------------------
 overlays/blesh.nix                            |   5 +
 pkgs/_sources/generated.nix                   |  60 +-
 pkgs/sources.toml                             |  26 +-
 pkgs/sway-launcher.nix                        |   5 +-
 .../base-user/.local/share/scripts/base16.sh  |  64 +-
 profiles/base-user/default.nix                |   1 -
 profiles/base-user/home.nix                   |   3 +-
 tests/first-test.nix                          |   2 +-
 17 files changed, 366 insertions(+), 1234 deletions(-)
 create mode 100644 modules/terminal-life/bash/default.nix
 create mode 100644 modules/terminal-life/starship.toml.nix
 delete mode 100644 modules/terminal-life/zsh/default.nix
 delete mode 100644 modules/terminal-life/zsh/fzf.zsh
 delete mode 100644 modules/terminal-life/zsh/p10k.zsh
 create mode 100644 overlays/blesh.nix
 rename modules/terminal-life/zsh/base16.zsh => profiles/base-user/.local/share/scripts/base16.sh (69%)

diff --git a/flake.nix b/flake.nix
index 868ee558..5394598d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,7 @@
         # allowUnfree = true;
       };
 
-      supportedSystems = ["x86_64-linux" "aarch64-linux"];
+      supportedSystems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
 
       channels = {
         nixos = {
diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix
new file mode 100644
index 00000000..9528aee9
--- /dev/null
+++ b/modules/terminal-life/bash/default.nix
@@ -0,0 +1,107 @@
+{
+  config,
+  pkgs,
+  self,
+  ...
+}: let
+  psCfg = config.pub-solar;
+  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
+in {
+  enable = true;
+
+  historyControl = ["ignorespace"];
+
+  # Run when initializing a login shell
+  profileExtra = ''
+    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
+  '';
+
+  # Run when initializing an interactive shell
+  initExtra = ''
+    # Show current directory at the top in Alacritty
+    PROMPT_COMMAND='echo -e -n "\e]2;$(basename "$PWD")\e\\"'
+
+    # If a command is not found, show me where it is
+    source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
+
+    # Helps you navigate directories faster
+    # https://github.com/gsamokovarov/jump
+    eval "$(${pkgs.jump}/bin/jump shell --bind=z)"
+
+    eval "$(${pkgs.direnv}/bin/direnv hook bash)"
+
+    bind 'set show-all-if-ambiguous on'
+
+    # Syntax highlighting, auto suggestions, vim modes, etc.
+    # https://github.com/akinomyoga/ble.sh/wiki/Manual-A1-Installation#user-content-nixpkgs
+    source "$(blesh-share)" --attach=none
+    # ctrl + space to accept autocomplete suggestion
+    ble-bind -m 'auto_complete' -f 'C-@' 'auto_complete/insert-on-end'
+    # Meta (Alt) + Backspace to delete a word
+    ble-bind -m 'vi_imap' -f 'M-C-?' 'kill-backward-cword'
+    # Meta (Alt) + p to jump one word backwards
+    ble-bind -m 'vi_imap' -f M-p '@nomarked backward-uword'
+    ble-bind -m 'vi_imap' -f M-left '@nomarked backward-uword'
+    # Meta (Alt) + n to jump one word forwards
+    ble-bind -m 'vi_imap' -f M-n '@nomarked forward-uword'
+    ble-bind -m 'vi_imap' -f M-right '@nomarked forward-uword'
+    # Arrow up and Ctrl + p searches history for entered input
+    ble-bind -m 'vi_imap' -f up 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f C-p 'history-search-backward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    # Arrow down and Ctrl + n searches history for entered input
+    ble-bind -m 'vi_imap' -f down 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+    ble-bind -m 'vi_imap' -f C-n 'history-search-forward hide-status:immediate-accept:empty=emulate-readline:point=end'
+
+    ble-face region_insert='fg=black,bg=navy'
+
+    function my/complete-load-hook {
+      bleopt complete_auto_delay=250
+    }
+    blehook/eval-after-load complete my/complete-load-hook
+
+    bleopt exec_errexit_mark=
+    bleopt filename_ls_colors="$LS_COLORS"
+
+    bleopt complete_menu_style=desc
+
+    # Bash vim mode keybindings
+    if [[ $- == *i* ]]; then # in interactive session
+      set -o vi
+
+      ble-bind -m vi_imap -f 'ENTER' 'vi_imap/complete'
+      ble-bind -m vi_imap -f 'TAB' 'vi_imap/complete'
+
+      ble-bind -m vi_imap -f 'j j' 'vi_imap/normal-mode'
+      ble-bind -m vi_imap -f 'ESC' 'vi_imap/normal-mode'
+
+      ble-bind -m vi_nmap -f 'h' 'vi_nmap/insert-mode'
+      ble-bind -m vi_nmap -f 'i' 'vi-command/backward-line'
+      ble-bind -m vi_nmap -f 'j' 'vi-command/backward-char'
+      ble-bind -m vi_nmap -f 'k' 'vi-command/forward-line'
+      ble-bind -m vi_nmap -f 'l' 'vi-command/forward-char'
+
+      ble-bind -m vi_imap -f 'C-c' discard-line
+    fi
+
+    # end of .bashrc
+    [[ ''${BLE_VERSION-} ]] && ble-attach
+  '';
+
+  shellAliases = {
+    nano = "nvim";
+    vi = "nvim";
+    vim = "nvim";
+    mutt = "neomutt";
+    ls = "exa";
+    la = "exa --group-directories-first -lag";
+    fm = "vifm .";
+    vifm = "vifm .";
+    wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
+    irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
+    drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
+    no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
+    # fix nixos-option
+    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
+    myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
+  };
+}
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 2e9436bd..047eb3bd 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -24,28 +24,29 @@ in {
   config = mkIf cfg.enable {
     programs.command-not-found.enable = false;
 
-    # Needed to get zsh completion for system packages (e.g. systemd).
-    environment.pathsToLink = ["/share/zsh"];
-
-    environment.shells = with pkgs; [
-      zsh
-    ];
-    programs.zsh.enable = true;
-
     environment.systemPackages = with pkgs; [
       screen
     ];
 
+    # Starship is a fast and featureful shell prompt
+    # starship.toml has sane defaults that can be changed there
+    programs.starship = {
+      enable = true;
+      settings = import ./starship.toml.nix;
+    };
+
     home-manager = with pkgs;
       pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
         home.packages = [
           ack
           asciinema
           bat
+          blesh
           exa
           fd
           gh
           glow
+          jump
           nnn
           powerline
           silver-searcher
@@ -53,19 +54,19 @@ in {
           watson
         ];
 
-        programs.neovim = import ./nvim {
+        programs.bash = import ./bash {
           inherit config;
           inherit pkgs;
-          inherit lib;
+          inherit self;
         };
         programs.fzf = import ./fzf {
           inherit config;
           inherit pkgs;
         };
-        programs.zsh = import ./zsh {
+        programs.neovim = import ./nvim {
           inherit config;
           inherit pkgs;
-          inherit self;
+          inherit lib;
         };
       };
   };
diff --git a/modules/terminal-life/fzf/default.nix b/modules/terminal-life/fzf/default.nix
index 0cc6fd94..88e60592 100644
--- a/modules/terminal-life/fzf/default.nix
+++ b/modules/terminal-life/fzf/default.nix
@@ -10,5 +10,8 @@
     "--color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062"
     "--color=marker:#ef9062,fg+:#303030,prompt:#e5c463,hl+:#7accd7"
   ];
-  enableZshIntegration = true;
+  # Use ble.sh for completions, see
+  # modules/terminal-life/bash/default.nix -> bleopt complete_menu_style=desc
+  # and https://github.com/akinomyoga/ble.sh/wiki/Manual-%C2%A77-Completion
+  enableBashIntegration = false;
 }
diff --git a/modules/terminal-life/nvim/ui.vim b/modules/terminal-life/nvim/ui.vim
index 3131188f..017b413e 100644
--- a/modules/terminal-life/nvim/ui.vim
+++ b/modules/terminal-life/nvim/ui.vim
@@ -1,4 +1,4 @@
-let g:base16_shell_path = $XDG_CONFIG_HOME . "/zsh/base16.sh"
+let g:base16_shell_path = $XDG_DATA_HOME . "/scripts/base16.sh"
 let base16colorspace = 256
 set termguicolors
 let g:sonokai_style = 'shusia'
diff --git a/modules/terminal-life/starship.toml.nix b/modules/terminal-life/starship.toml.nix
new file mode 100644
index 00000000..e05a1f46
--- /dev/null
+++ b/modules/terminal-life/starship.toml.nix
@@ -0,0 +1,169 @@
+{
+  format = "$username$hostname$directory($git_branch$git_commit$git_state$git_status)($c$deno$golang$haskell$nodejs$php$python$ruby$rust$terraform[](fg:#F85E84 bg:#000000))($docker_context[](fg:#06969A))($container)$fill(\${custom.triton})$nix_shell$status[ |](fg:#F85E84)$line_break$character";
+
+  # Disable the blank line at the start of the prompt
+  add_newline = false;
+
+  # You can also replace your username with a neat symbol like  to save some space
+  username = {
+    style_user = "bg:#000000 fg:#F85E84";
+    style_root = "bg:#F85E84 fg:#000000";
+    format = ''[$user ]($style)'';
+  };
+
+  hostname = {
+    ssh_symbol = "";
+    trim_at = "";
+    style = "bg:#000000 fg:#F85E84";
+  };
+
+  character = {
+    success_symbol = "[❯](bold purple)";
+    error_symbol = "[✗](#FF4B00)";
+  };
+
+  status = {
+    disabled = false;
+    style = "#FF4B00";
+  };
+
+  fill = {
+    symbol = "-";
+    #style = "bold green";
+    style = "black";
+  };
+
+  directory = {
+    style = "#F85E84";
+    truncate_to_repo = false;
+    fish_style_pwd_dir_length = 1;
+    truncation_symbol = "…/";
+    format = "[](fg:black bg:#F85E84)[$path[$read_only](bg:$style fg:black)](bg:$style fg:black)[](fg:$style)";
+    read_only = " ";
+  };
+
+  # Here is how you can shorten some long paths by text replacement
+  # similar to mapped_locations in Oh My Posh:
+  directory.substitutions = {
+    "Documents" = " ";
+    "Downloads" = " ";
+    "Music" = " ";
+    "Pictures" = " ";
+  };
+  # Keep in mind that the order matters. For example:
+  # "Important Documents" = "  "
+  # will not be replaced, because "Documents" was already substituted before.
+  # So either put "Important Documents" before "Documents" or use the substituted version:
+  # "Important  " = "  "
+
+  c = {
+    symbol = " ";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  #container = {};
+
+  custom = {
+    triton = {
+      command = "echo $TRITON_PROFILE";
+      when = "test $TRITON_PROFILE";
+      format = "[✚ ](fg:#F85E84 bg:#1A181A)[$output](fg:#F85E84 bg:#1A181A)";
+      description = "The current triton profile";
+    };
+  };
+
+  docker_context = {
+    symbol = " ";
+    style = "bg:#06969A";
+    format = ''[ $symbol $context ]($style) $path'';
+  };
+
+  #deno = {};
+
+  git_branch = {
+    style = "#E5C463";
+    format = "[](fg:black bg:$style)[ $symbol$branch](fg:black bg:$style)[](fg:$style)";
+    symbol = " ";
+  };
+
+  git_commit = {
+    style = "#E5C463";
+    # ^H is the literal backspace character which renders to \b in the final
+    # starship config TOML, produced in insert mode via ctrl+v then ctrl+h.
+    # We use the literal character, because escaping a single \ doesn't work
+    # with pkgs.formats.toml, see: https://github.com/NixOS/nixpkgs/issues/97310 and
+    # https://jdhao.github.io/2020/10/07/nvim_insert_unicode_char/
+    format = "[ ](bg:$style)[\\($hash$tag\\)](fg:black bg:$style)[](fg:$style)";
+  };
+
+  git_state = {
+    style = "#E5C463";
+    format = "[ ](bg:$style)[ \\($state( $progress_current/$progress_total)\\)](fg:black bg:$style)[](fg:$style)";
+  };
+
+  git_status = {
+    style = "#E5C463";
+    format = "([ ](bg:$style fg:black)$conflicted$staged$modified$renamed$deleted$untracked$stashed$ahead_behind[](fg:$style))";
+    conflicted = "[ ](bold fg:88 bg:#E5C463)[  \${count} ](fg:black bg:#E5C463)";
+    staged = "[ $count ](fg:black bg:#E5C463)";
+    modified = "[ \${count} ](fg:black bg:#E5C463)";
+    renamed = "[ \${count} ](fg:black bg:#E5C463)";
+    deleted = "[ \${count} ](fg:black bg:#E5C463)";
+    untracked = "[?\${count} ](fg:black bg:#E5C463)";
+    stashed = "[ \${count} ](fg:black bg:#E5C463)";
+    ahead = "[ \${count} ](fg:#523333 bg:#E5C463)";
+    behind = "[ \${count} ](fg:black bg:#E5C463)";
+    diverged = "[ ](fg:88 bg:#E5C463)[  ](fg:black bg:#E5C463)[ \${ahead_count} ](fg:black bg:#E5C463)[ \${behind_count} ](fg:black bg:#E5C463)";
+  };
+
+  golang = {
+    symbol = " ";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  haskell = {
+    symbol = " ";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  nix_shell = {
+    format = ''[$symbol]($style) '';
+    symbol = " ";
+  };
+
+  nodejs = {
+    symbol = "";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  php = {
+    symbol = " ";
+  };
+
+  python = {
+    symbol = " ";
+  };
+
+  ruby = {
+    symbol = " ";
+  };
+
+  rust = {
+    symbol = "";
+    style = "bg:#86BBD8";
+    format = ''[ $symbol ($version) ]($style)'';
+  };
+
+  #terraform = {};
+
+  time = {
+    disabled = false;
+    time_format = "%R"; # Hour:Minute Format
+    style = "bg:#33658A";
+    format = ''[ ♥ $time ]($style)'';
+  };
+}
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
deleted file mode 100644
index a9f0b97c..00000000
--- a/modules/terminal-life/zsh/default.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  config,
-  pkgs,
-  self,
-  ...
-}: let
-  psCfg = config.pub-solar;
-  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in {
-  enable = true;
-  enableAutosuggestions = true;
-  enableCompletion = true;
-  dotDir = ".config/zsh";
-
-  history = {
-    ignoreDups = true;
-    expireDuplicatesFirst = true;
-    ignoreSpace = true;
-    path = "$HOME/.local/share/zsh/zsh_history";
-    save = 10000;
-    size = 10000;
-  };
-
-  loginExtra = ''
-    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
-  '';
-
-  shellAliases = {
-    nano = "nvim";
-    vi = "nvim";
-    vim = "nvim";
-    mutt = "neomutt";
-    ls = "exa";
-    la = "exa --group-directories-first -lag";
-    fm = "vifm .";
-    vifm = "vifm .";
-    wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
-    irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
-    drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
-    no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
-    # fix nixos-option
-    nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
-    myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
-  };
-  plugins = [
-    # src gets fetched by nvfetcher, see: ./pkgs/sources.toml
-    {
-      # will source ohmyzsh/plugins/z/
-      name = "zsh-plugins-z";
-      file = "plugins/z/z.plugin.zsh";
-      src = pkgs.sources.ohmyzsh.src;
-    }
-    {
-      name = "zsh-powerlevel10k";
-      file = "powerlevel10k.zsh-theme";
-      src = pkgs.sources.powerlevel10k.src;
-    }
-    {
-      name = "zsh-fast-syntax-highlighting";
-      file = "F-Sy-H.plugin.zsh";
-      src = pkgs.sources.F-Sy-H.src;
-    }
-    {
-      name = "zsh-nix-shell";
-      file = "nix-shell.plugin.zsh";
-      src = pkgs.sources.zsh-nix-shell.src;
-    }
-  ];
-
-  initExtra =
-    ''
-      bindkey -v
-      bindkey -v 'jj' vi-cmd-mode
-      bindkey -a 'i' up-line
-      bindkey -a 'k' down-line
-      bindkey -a 'j' backward-char
-      bindkey -a 'h' vi-insert
-      bindkey '^[[H' beginning-of-line
-      bindkey '^[[F' end-of-line
-      bindkey '^R' history-incremental-pattern-search-backward
-      bindkey '^ ' autosuggest-accept
-      bindkey '^q' push-line-or-edit
-
-      bindkey '^R' fzf-history-widget
-
-      # ArrowUp/Down start searching history with current input
-      autoload -U up-line-or-beginning-search
-      autoload -U down-line-or-beginning-search
-      zle -N up-line-or-beginning-search
-      zle -N down-line-or-beginning-search
-      bindkey "^[[A" up-line-or-beginning-search
-      bindkey "^[[B" down-line-or-beginning-search
-      bindkey "^P" up-line-or-beginning-search
-      bindkey "^N" down-line-or-beginning-search
-
-      # MAKE CTRL+S WORK IN VIM
-      stty -ixon
-      stty erase '^?'
-
-      precmd () {
-        DIR_NAME=$(pwd | sed "s|^$HOME|~|g")
-        echo -e -n "\e]2;$DIR_NAME\e\\"
-
-        if [ $(date +%d%m) = '0104' ]; then
-          if [ $? -eq 0 ]; then
-            echo "Success! That was a great command! I can't wait to see what amazing stuff you'll be up to next."
-          fi
-        fi
-      }
-
-      # If a command is not found, show me where it is
-      source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
-    ''
-    + builtins.readFile ./base16.zsh
-    + builtins.readFile ./p10k.zsh
-    + ''
-      source ${pkgs.fzf}/share/fzf/key-bindings.zsh
-      source ${pkgs.fzf}/share/fzf/completion.zsh
-      source ${pkgs.git-bug}/share/zsh/site-functions/git-bug
-      eval "$(direnv hook zsh)"
-    ''
-    + builtins.readFile ./fzf.zsh;
-}
diff --git a/modules/terminal-life/zsh/fzf.zsh b/modules/terminal-life/zsh/fzf.zsh
deleted file mode 100644
index 78b0fb86..00000000
--- a/modules/terminal-life/zsh/fzf.zsh
+++ /dev/null
@@ -1,58 +0,0 @@
-# Use ~~ as the trigger sequence instead of the default **
-export FZF_COMPLETION_TRIGGER='~~'
-
-# Options to fzf command
-export FZF_COMPLETION_OPTS='--border --info=inline'
-
-__fzfcmd() {
-  echo "fzf"
-}
-
-# ctrl+r - Paste the selected command from history into the command line
-fzf-history-widget() {
-  local selected num
-  setopt localoptions noglobsubst noposixbuiltins pipefail HIST_FIND_NO_DUPS 2> /dev/null
-
-  selected=( $(fc -rl 1 |
-    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
-  local ret=$?
-  if [ -n "$selected" ]; then
-    num=$selected[1]
-    if [ -n "$num" ]; then
-      zle vi-fetch-history -n $num
-    fi
-  fi
-  zle redisplay
-  typeset -f zle-line-init >/dev/null && zle zle-line-init
-  return $ret
-}
-zle     -N   fzf-history-widget
-bindkey '^R' fzf-history-widget
-
-# Use fd (https://github.com/sharkdp/fd) instead of the default find
-# command for listing path candidates.
-# - The first argument to the function ($1) is the base path to start traversal
-# - See the source code (completion.{bash,zsh}) for the details.
-_fzf_compgen_path() {
-  fd --hidden --follow --exclude ".git" . "$1"
-}
-
-# Use fd to generate the list for directory completion
-_fzf_compgen_dir() {
-  fd --type d --hidden --follow --exclude ".git" . "$1"
-}
-
-# (EXPERIMENTAL) Advanced customization of fzf options via _fzf_comprun function
-# - The first argument to the function is the name of the command.
-# - You should make sure to pass the rest of the arguments to fzf.
-_fzf_comprun() {
-  local command=$1
-  shift
-
-  case "$command" in
-    cd)           fzf "$@" --preview 'tree -C {} | head -200' ;;
-    export|unset) fzf "$@" --preview "eval 'echo \$'{}" ;;
-    ssh)          fzf "$@" --preview 'dig {}' ;;
-    *)            fzf "$@" ;;
-  esac
-}
diff --git a/modules/terminal-life/zsh/p10k.zsh b/modules/terminal-life/zsh/p10k.zsh
deleted file mode 100644
index 90734313..00000000
--- a/modules/terminal-life/zsh/p10k.zsh
+++ /dev/null
@@ -1,943 +0,0 @@
-# Generated by Powerlevel10k configuration wizard on 2020-04-18 at 01:15 CEST.
-# Based on romkatv/powerlevel10k/config/p10k-classic.zsh, checksum 30399.
-# Wizard options: powerline, classic, unicode, darkest, 24h time, angled separators,
-# sharp heads, sharp tails, 1 line, compact, concise, transient_prompt,
-# instant_prompt=verbose.
-# Type `p10k configure` to generate another config.
-#
-# Config for Powerlevel10k with classic powerline 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_*'
-
-  # Zsh >= 5.1 is required.
-  autoload -Uz is-at-least && is-at-least 5.1 || return
-
-  # The list of segments shown on the left. Fill it with the most important segments.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
-    ssh
-    context
-    dir                     # current directory
-    vcs                     # git status
-    # 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=(
-    vi_mode                 # vi mode (you don't need this if you've enabled prompt_char)
-    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/)
-    vim_shell               # vim shell indicator (:sh)
-    triton                  # show the current triton profile
-    nix_shell               # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
-    watson
-    # kubecontext             # current kubernetes context (https://kubernetes.io/)
-    # terraform               # terraform workspace (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)
-    # context                 # user@hostname
-    # ranger                  # ranger shell (https://github.com/ranger/ranger)
-    # nnn                     # nnn shell (https://github.com/jarun/nnn)
-    # midnight_commander      # midnight commander shell (https://midnight-commander.org/)
-    # 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/)
-    # time                    # current time
-    # 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)
-  )
-
-  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND="black"
-  typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_BACKGROUND="yellow"
-  typeset -g POWERLEVEL9K_VI_INSERT_MODE_STRING=""
-  typeset -g POWERLEVEL9K_VI_COMMAND_MODE_STRING="CMD"
-
-  # Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you.
-  typeset -g POWERLEVEL9K_MODE=powerline
-  # 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=none
-
-  # 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=
-
-  # Add an empty line before each prompt.
-  typeset -g POWERLEVEL9K_PROMPT_ON_NEWLINE=true
-  typeset -g POWERLEVEL9K_RPROMPT_ON_NEWLINE=false
-
-  # Connect left prompt lines with these symbols. You'll probably want to use the same color
-  # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX=''
-  typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%238F'
-  typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%238F❯ '
-  # 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'
-
-  # Filler between left and right prompt on the first prompt line. You can set it to ' ', '·' or
-  # '─'. The last two make it easier to see the alignment between left and right prompt and to
-  # separate prompt from command output. You might want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false
-  # for more compact prompt if using using this option.
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' '
-  typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND=
-  if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then
-    # The color of the filler. You'll probably want to match the color of POWERLEVEL9K_MULTILINE
-    # ornaments defined above.
-    typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238
-    # 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
-
-  # Default background color.
-  typeset -g POWERLEVEL9K_BACKGROUND=none
-
-  # Separator between same-color segments on the left.
-  typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='%242F\uE0B1'
-  # Separator between same-color segments on the right.
-  typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='%242F\uE0B3'
-  # Separator between different-color segments on the left.
-  typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\uE0B0'
-  # Separator between different-color segments on the right.
-  typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\uE0B2'
-  # The right end of left prompt.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
-  # The left end of right prompt.
-  typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
-  # The left end of left prompt.
-  typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2'
-  # The right end of right prompt.
-  typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0'
-  # Left prompt terminator for lines without any segments.
-  typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=
-
-  #################################[ os_icon: os identifier ]##################################
-  # OS identifier color.
-  typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=255
-  # Custom icon.
-  # typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='⭐'
-
-  ################################[ prompt_char: prompt symbol ]################################
-  # Transparent background.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_BACKGROUND=
-  # Green prompt symbol if the last command succeeded.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=1
-  # Red prompt symbol if the last command failed.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=17
-  # 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='Ⅴ'
-  # 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=
-  # No surrounding whitespace.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_{LEFT,RIGHT}_WHITESPACE=
-
-  ##################################[ dir: current directory ]##################################
-  typeset -g POWERLEVEL9K_{ETC,FOLDER,HOME,HOME_SUB}_ICON=
-  typeset -g POWERLEVEL9K_DIR_{ETC,HOME,HOME_SUBFOLDER,DEFAULT,NOT_WRITABLE}_BACKGROUND=1
-  typeset -g POWERLEVEL9K_DIR_{ETC,HOME,HOME_SUBFOLDER,DEFAULT,NOT_WRITABLE}_FOREGROUND=0
-  typeset -g POWERLEVEL9K_DIR_WRITABLE_FORBIDDEN_VISUAL_IDENTIFIER_COLOR=17
-
-  typeset -g POWERLEVEL9K_DIR_{ETC,DEFAULT}_BACKGROUND=15
-  typeset -g POWERLEVEL9K_DIR_{HOME,HOME_SUBFOLDER}_BACKGROUND=1
-  typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_BACKGROUND=1
-
-  # 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
-  # Color of the shortened directory segments.
-  typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=0
-  # Color of the anchor directory segments. Anchor segments are never shortened. The first
-  # segment is always an anchor.
-  typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=0
-  # Display anchor directory segments in bold.
-  typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=false
-  # 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 true, remove everything before the last (deepest) subdirectory that contains files
-  # matching $POWERLEVEL9K_SHORTEN_FOLDER_MARKER. For example, when the current directory is
-  # /foo/bar/git_repo/baz, prompt will display git_repo/baz. This assumes that /foo/bar/git_repo
-  # contains a marker (.git) and other directories don't.
-  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 directories.
-  typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=true
-  # Show this icon when the current directory is not writable. POWERLEVEL9K_DIR_SHOW_WRITABLE
-  # above must be set to true for this parameter to have effect.
-  typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='∅'
-
-  #####################################[ vcs: git status ]######################################
-  # Branch icon. Set this parameter to '\uF126 ' 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 ⇣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='%0F'  # grey foreground
-      local      clean='%0F'   # green foreground
-      local   modified='%0F'  # yellow foreground
-      local  untracked='%0F'   # blue foreground
-      local conflicted='%0F'  # red foreground
-    else
-      # Styling for incomplete and stale Git status.
-      local       meta='%0F'  # grey foreground
-      local      clean='%0F'  # grey foreground
-      local   modified='%0F'  # grey foreground
-      local  untracked='%0F'  # grey foreground
-      local conflicted='%0F'  # grey foreground
-    fi
-
-    local res
-    local where  # branch or tag
-    if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then
-      res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}"
-      where=${(V)VCS_STATUS_LOCAL_BRANCH}
-    elif [[ -n $VCS_STATUS_TAG ]]; then
-      res+="${meta}#"
-      where=${(V)VCS_STATUS_TAG}
-    fi
-
-    # If local branch name or tag 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.
-    (( $#where > 32 )) && where[13,-13]="…"
-    res+="${clean}${where//\%/%%}"  # escape %
-
-    # Display the current Git commit if there is no branch or tag.
-    # Tip: To always display the current Git commit, remove `[[ -z $where ]] &&` from the next line.
-    [[ -z $where ]] && 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//\%/%%}"  # escape %
-    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 '|': '~|~/some/dir'.
-  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=4
-  typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=4
-  # Custom icon.
-  typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION=
-  # Custom prefix.
-  # typeset -g POWERLEVEL9K_VCS_PREFIX='%244Fon '
-
-  # 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 reposotiry.
-  typeset -g POWERLEVEL9K_VCS_BACKENDS=(git)
-
-  # These settings are used for respositories other than Git or when gitstatusd fails and
-  # Powerlevel10k has to fall back to using vcs_info.
-  typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=0
-  typeset -g POWERLEVEL9K_VCS_CLEAN_BACKGROUND=2
-  typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=0
-  typeset -g POWERLEVEL9K_VCS_UNTRACKED_BACKGROUND=3
-  typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=0
-  typeset -g POWERLEVEL9K_VCS_MODIFIED_BACKGROUND=3
-
-  ##########################[ 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=true
-  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=true
-  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 longer than 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=0
-  # 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='%244Ftook '
-
-  #######################[ 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=37
-  # 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).
-  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 diretory, 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_CORE_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'
-
-  ###########[ nix_shell ]###########
-  #  # Nix shell color.
-  typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74
-
-  # 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='nix'
-
-  ###########[ vi_mode: vi mode (you don't need this if you've enabled prompt_char) ]###########
-  # Text and color for normal (a.k.a. command) vi mode.
-  typeset -g POWERLEVEL9K_VI_COMMAND_MODE_STRING=CMD
-  typeset -g POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND=4
-  # Text and color for visual vi mode.
-  typeset -g POWERLEVEL9K_VI_VISUAL_MODE_STRING=VIS
-  typeset -g POWERLEVEL9K_VI_MODE_VISUAL_FOREGROUND=3
-  # Text and color for overtype (a.k.a. overwrite and replace) vi mode.
-  typeset -g POWERLEVEL9K_VI_OVERWRITE_MODE_STRING=OVR
-  typeset -g POWERLEVEL9K_VI_MODE_OVERWRITE_FOREGROUND=2
-  # Text and color for insert vi mode.
-  typeset -g POWERLEVEL9K_VI_INSERT_MODE_STRING=
-  typeset -g POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND=7
-
-  ##################################[ context: user@hostname ]##################################
-  typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=17
-  # Context color in SSH without privileges.
-  typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=7
-  # Default context color (no privileges, no SSH).
-  typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=7
-
-  # 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'
-
-  ###[ 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
-  # 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
-  # Don't show Python version next to the anaconda environment name.
-  typeset -g POWERLEVEL9K_ANACONDA_SHOW_PYTHON_VERSION=false
-  # Separate environment name from Python version only with a space.
-  typeset -g POWERLEVEL9K_ANACONDA_{LEFT,RIGHT}_DELIMITER=
-  # 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
-  # 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='⭐'
-
-  ############[ 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='⭐'
-
-  ##########[ 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='⭐'
-
-  # 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_watson() {
-    local watson_status=$(watson status)
-    local noproject="No project started."
-    if [ "$watson_status" != "$noproject" ]; then
-      p10k segment -i "祥" -f yellow -t "$(echo $watson_status | awk '{print $2,$3}')"
-    else
-      p10k segment -i "⏾" -f red -t ""
-    fi
-  }
-
-  function prompt_triton() {
-    local triton_profile=$(echo $TRITON_PROFILE)
-    if [ "$triton_profile" != "" ]; then
-      p10k segment -f yellow -t "$(echo "✚" "$triton_profile")"
-    fi
-  }
-
-  # 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=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=false
-
-  # 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/overlays/blesh.nix b/overlays/blesh.nix
new file mode 100644
index 00000000..f3c93d73
--- /dev/null
+++ b/overlays/blesh.nix
@@ -0,0 +1,5 @@
+final: prev: {
+  blesh = prev.blesh.overrideAttrs (oldAttrs: rec {
+    inherit (prev.sources.blesh-nvfetcher) version src;
+  });
+}
diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix
index 2d455cc8..dfe616d8 100644
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -1,17 +1,19 @@
 # This file was generated by nvfetcher, please do not modify it manually.
 { fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
 {
-  F-Sy-H = {
-    pname = "F-Sy-H";
-    version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
+  blesh-nvfetcher = {
+    pname = "blesh-nvfetcher";
+    version = "f16c0d807c8e1fe26fa5d990b561829382cbdc72";
     src = fetchFromGitHub {
-      owner = "z-shell";
-      repo = "F-Sy-H";
-      rev = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
-      fetchSubmodules = false;
-      sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
+      owner = "akinomyoga";
+      repo = "ble.sh";
+      rev = "f16c0d807c8e1fe26fa5d990b561829382cbdc72";
+      fetchSubmodules = true;
+      deepClone = false;
+      leaveDotGit = true;
+      sha256 = "sha256-+tcM1z9uD7WXA7CfHmTbcPRcZfmXZ+Y7y6Bj4QA3f+4=";
     };
-    date = "2023-01-25";
+    date = "2023-06-12";
   };
   instant-nvim-nvfetcher = {
     pname = "instant-nvim-nvfetcher";
@@ -37,30 +39,6 @@
     };
     date = "2021-04-20";
   };
-  ohmyzsh = {
-    pname = "ohmyzsh";
-    version = "cb8b677488c7a20278917af58dfccd72cd40e1b1";
-    src = fetchFromGitHub {
-      owner = "ohmyzsh";
-      repo = "ohmyzsh";
-      rev = "cb8b677488c7a20278917af58dfccd72cd40e1b1";
-      fetchSubmodules = false;
-      sha256 = "sha256-c7tGTEdE8e1qD83Nxzno1VLAFV5gKoB4TJes4aVa2mY=";
-    };
-    date = "2023-06-11";
-  };
-  powerlevel10k = {
-    pname = "powerlevel10k";
-    version = "944f52fc430259ff49f497f3516a3ddfb45a0a6b";
-    src = fetchFromGitHub {
-      owner = "romkatv";
-      repo = "powerlevel10k";
-      rev = "944f52fc430259ff49f497f3516a3ddfb45a0a6b";
-      fetchSubmodules = false;
-      sha256 = "sha256-a2HTHvvI6aQXe/tzvd0P1IGWFFo64fMeKNX3TxMvCcc=";
-    };
-    date = "2023-06-11";
-  };
   rnix-lsp-nvfetcher = {
     pname = "rnix-lsp-nvfetcher";
     version = "95d40673fe43642e2e1144341e86d0036abd95d9";
@@ -133,16 +111,16 @@
     };
     date = "2022-07-03";
   };
-  zsh-nix-shell = {
-    pname = "zsh-nix-shell";
-    version = "227d284ab2dc2f5153826974e0094a1990b1b5b9";
+  waybar-nvfetcher = {
+    pname = "waybar-nvfetcher";
+    version = "41164905351436db3a124207261f9dd759c6fa1b";
     src = fetchFromGitHub {
-      owner = "chisui";
-      repo = "zsh-nix-shell";
-      rev = "227d284ab2dc2f5153826974e0094a1990b1b5b9";
+      owner = "Alexays";
+      repo = "Waybar";
+      rev = "41164905351436db3a124207261f9dd759c6fa1b";
       fetchSubmodules = false;
-      sha256 = "sha256-SrGvHsAJCxzi69CKNKKvItYUaAP7CKwRntsprVHBs4Y=";
+      sha256 = "sha256-aogiOj4pe2AJYxQFh8Dw6xQ2Tb6v4W9zwbGX4t2mStI=";
     };
-    date = "2023-05-29";
+    date = "2023-06-27";
   };
 }
diff --git a/pkgs/sources.toml b/pkgs/sources.toml
index 5ec5e936..ac9d5e1a 100644
--- a/pkgs/sources.toml
+++ b/pkgs/sources.toml
@@ -3,22 +3,6 @@
 src.git = "https://github.com/mlvzk/manix"
 fetch.github = "mlvzk/manix"
 
-[ohmyzsh]
-src.git = "https://github.com/ohmyzsh/ohmyzsh"
-fetch.github = "ohmyzsh/ohmyzsh"
-
-[powerlevel10k]
-src.git = "https://github.com/romkatv/powerlevel10k"
-fetch.github = "romkatv/powerlevel10k"
-
-[F-Sy-H]
-src.git = "https://github.com/z-shell/F-Sy-H"
-fetch.github = "z-shell/F-Sy-H"
-
-[zsh-nix-shell]
-src.git = "https://github.com/chisui/zsh-nix-shell"
-fetch.github = "chisui/zsh-nix-shell"
-
 [rnix-lsp-nvfetcher]
 src.git = "https://github.com/nix-community/rnix-lsp"
 fetch.github = "nix-community/rnix-lsp"
@@ -46,3 +30,13 @@ fetch.github = "zeekay/vim-beautify"
 [vim-apprentice-nvfetcher]
 src.git = "https://github.com/romainl/Apprentice"
 fetch.github = "romainl/Apprentice"
+
+[waybar-nvfetcher]
+src.git = "https://github.com/Alexays/Waybar"
+fetch.github = "Alexays/Waybar"
+
+[blesh-nvfetcher]
+src.git = "https://github.com/akinomyoga/ble.sh"
+fetch.github = "akinomyoga/ble.sh"
+git.fetchSubmodules = true
+git.leaveDotGit = true
diff --git a/pkgs/sway-launcher.nix b/pkgs/sway-launcher.nix
index aed2cd1e..abc7f443 100644
--- a/pkgs/sway-launcher.nix
+++ b/pkgs/sway-launcher.nix
@@ -1,7 +1,6 @@
 self:
 with self; ''
-  #!/usr/bin/env zsh
-  # terminal application launcher for sway, using fzf
+  #!/usr/bin/env bash
   # original command:
   # Based on: https://github.com/swaywm/sway/issues/1367
   # bindsym $altkey+space exec termite --name=launcher -e \
@@ -12,7 +11,7 @@ with self; ''
 
   # Get shell command list
   # This may include the occasional non-executable file
-  command_list=$({ whence -wm '*' | sed 's/:[^:]*$//' })
+  command_list=$({ compgen -c | sed 's/:[^:]*$//'; })
 
   # read existing command history
   if [ -f "$HIST_FILE" ]; then
diff --git a/modules/terminal-life/zsh/base16.zsh b/profiles/base-user/.local/share/scripts/base16.sh
similarity index 69%
rename from modules/terminal-life/zsh/base16.zsh
rename to profiles/base-user/.local/share/scripts/base16.sh
index 3686b98d..ee33516b 100644
--- a/modules/terminal-life/zsh/base16.zsh
+++ b/profiles/base-user/.local/share/scripts/base16.sh
@@ -3,28 +3,28 @@
 # Base16 Shell template by Chris Kempson (http://chriskempson.com)
 # Burn scheme by Benjamin Bädorf
 
-color00="1a/18/1a" # Base 00 - Black
-color01="f8/5e/84" # Base 08 - Red
-color02="9e/cd/6f" # Base 0B - Green
-color03="e5/c4/63" # Base 0A - Yellow
-color04="7a/cc/d7" # Base 0D - Blue
-color05="ab/9d/f2" # Base 0E - Magenta
-color06="ef/90/62" # Base 0C - Cyan
-color07="e3/e1/e4" # Base 05 - White
-color08="94/94/94" # Base 03 - Bright Black
-color09=$color01 # Base 08 - Bright Red
-color10=$color02 # Base 0B - Bright Green
-color11=$color03 # Base 0A - Bright Yellow
-color12=$color04 # Base 0D - Bright Blue
-color13=$color05 # Base 0E - Bright Magenta
-color14=$color06 # Base 0C - Bright Cyan
-color15="ff/5f/5f" # Base 07 - Bright White
-color16="df/59/23" # Base 09
-color17="d7/00/00" # Base 0F
-color18="2d/2a/2e" # Base 01
-color19="30/30/30" # Base 02
-color20="d3/d1/d4" # Base 04
-color21="30/30/30" # Base 06
+color00="1a/18/1a"          # Base 00 - Black
+color01="f8/5e/84"          # Base 08 - Red
+color02="9e/cd/6f"          # Base 0B - Green
+color03="e5/c4/63"          # Base 0A - Yellow
+color04="7a/cc/d7"          # Base 0D - Blue
+color05="ab/9d/f2"          # Base 0E - Magenta
+color06="ef/90/62"          # Base 0C - Cyan
+color07="e3/e1/e4"          # Base 05 - White
+color08="94/94/94"          # Base 03 - Bright Black
+color09=$color01            # Base 08 - Bright Red
+color10=$color02            # Base 0B - Bright Green
+color11=$color03            # Base 0A - Bright Yellow
+color12=$color04            # Base 0D - Bright Blue
+color13=$color05            # Base 0E - Bright Magenta
+color14=$color06            # Base 0C - Bright Cyan
+color15="ff/5f/5f"          # Base 07 - Bright White
+color16="df/59/23"          # Base 09
+color17="d7/00/00"          # Base 0F
+color18="2d/2a/2e"          # Base 01
+color19="30/30/30"          # Base 02
+color20="d3/d1/d4"          # Base 04
+color21="30/30/30"          # Base 06
 color_foreground="e3/e1/e4" # Base 05
 color_background="1a/18/1a" # Base 00
 
@@ -50,16 +50,16 @@ else
 fi
 
 # 16 color space
-put_template 0  $color00
-put_template 1  $color01
-put_template 2  $color02
-put_template 3  $color03
-put_template 4  $color04
-put_template 5  $color05
-put_template 6  $color06
-put_template 7  $color07
-put_template 8  $color08
-put_template 9  $color09
+put_template 0 $color00
+put_template 1 $color01
+put_template 2 $color02
+put_template 3 $color03
+put_template 4 $color04
+put_template 5 $color05
+put_template 6 $color06
+put_template 7 $color07
+put_template 8 $color08
+put_template 9 $color09
 put_template 10 $color10
 put_template 11 $color11
 put_template 12 $color12
diff --git a/profiles/base-user/default.nix b/profiles/base-user/default.nix
index 92e297d0..a2c82d97 100644
--- a/profiles/base-user/default.nix
+++ b/profiles/base-user/default.nix
@@ -31,7 +31,6 @@ in {
           if psCfg.user.password != null
           then psCfg.user.password
           else "";
-        shell = pkgs.zsh;
         openssh.authorizedKeys.keys =
           if psCfg.user.publicKeys != null
           then psCfg.user.publicKeys
diff --git a/profiles/base-user/home.nix b/profiles/base-user/home.nix
index 9c964515..1da6ace5 100644
--- a/profiles/base-user/home.nix
+++ b/profiles/base-user/home.nix
@@ -26,7 +26,6 @@ in {
     fonts.fontconfig.enable = mkForce true;
 
     programs.dircolors.enable = true;
-    programs.dircolors.enableZshIntegration = true;
 
     home.file."xinitrc".source = ./.xinitrc;
 
@@ -72,6 +71,8 @@ in {
     # docker run -it --name caddy-json-schema registry.greenbaum.cloud/gc/caddy-l4:2.5.2 caddy json-schema -output /srv/caddy_schema.json
     xdg.dataFile."nvim/json-schemas/caddy_schema.json".source = .local/share/nvim/json-schemas/caddy_schema.json;
     xdg.dataFile."nvim/templates/.keep".text = "";
+    xdg.dataFile."scripts/.keep".text = "";
+    xdg.dataFile."scripts/base16.sh".source = .local/share/scripts/base16.sh;
     xdg.dataFile."shell.nix.tmpl" = {
       text = ''
         let
diff --git a/tests/first-test.nix b/tests/first-test.nix
index a1da457d..248dd638 100644
--- a/tests/first-test.nix
+++ b/tests/first-test.nix
@@ -8,7 +8,7 @@
   nodes.test-machine = {suites ? null, ...}: {
     imports = suites.iso;
 
-    home-manager.users.pub-solar.programs.zsh.shellAliases = {
+    home-manager.users.pub-solar.programs.bash.shellAliases = {
       test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
       test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
     };