feat(zsh): now using romkatv/powerlevel10k theme

config/nvim v3.35.0

.gitattributes

@@ -219,3 +219,9 @@ git/*              text
 **/git/*           text
 **/alias           text
 ssh/*              text
+
+# Git Crypt special files
+*-secret   filter=git-crypt diff=git-crypt
+*.key      filter=git-crypt diff=git-crypt
+secrets/** filter=git-crypt diff=git-crypt
+

.gitignore

@@ -8,6 +8,7 @@ config/fzf
 config/cheat/cheatsheets/pure-bash-bible/*
 config/cheat/cheatsheets/tldr/*
 config/git/credentials
+config/zsh/.zcompdump
 ssh/local.d/*
 !ssh/local.d/.gitkeep
 !.gitkeep

.ignore

@@ -0,0 +1,5 @@
+config/cheat/cheatsheets/community/**
+config/tmux/**
+config/nvim/**
+tools/**
+

.markdownlintignore

@@ -1,5 +0,0 @@
-config/cheat/cheatsheets/community/
-config/tmux/
-config/nvim/
-tools/
-

Brewfile

@@ -104,6 +104,8 @@ brew "editorconfig-checker"
 brew "eg-examples"
 # Run arbitrary commands when files change
 brew "entr"
+# Perl lib for reading and writing EXIF metadata
+brew "exiftool"
 # Simple, fast and user-friendly alternative to find
 brew "fd"
 # Banner-like program prints strings as ASCII art
@@ -122,6 +124,8 @@ brew "gdu"
 brew "gh"
 # Distributed revision control system
 brew "git"
+# Enable transparent encryption/decryption of files in a git repo
+brew "git-crypt"
 # Small git utilities
 brew "git-extras"
 # See your latest local git branches, formatted real fancy
@@ -142,6 +146,8 @@ brew "gnupg"
 brew "go"
 # Library access to GnuPG
 brew "gpgme"
+# Manage your GnuPG keys with ease!
+brew "gpg-tui"
 # Image manipulation
 brew "netpbm"
 # C/C++ and Java libraries for Unicode and globalization
@@ -234,8 +240,6 @@ brew "rust"
 brew "shellcheck"
 # Autoformat shell script source code
 brew "shfmt"
-# Cross-shell prompt for astronauts
-brew "starship"
 # Version control system designed to be a better CVS
 brew "subversion"
 # Feature-rich console based todo list manager
@@ -276,6 +280,8 @@ brew "wget"
 brew "wtfutil"
 # Check your $HOME for unwanted files and directories
 brew "xdg-ninja"
+# Hackable, minimal, fast TUI file explorer
+brew "xplr"
 # JavaScript package manager
 brew "yarn"
 # A vulnerability scanner for container images and filesystems

README.md

@@ -23,13 +23,13 @@ fork or download the repo as a zip and go from there with your own configs.
 
 ## The looks
 
-## tmux with starship, the default view
+## tmux with powerlevel10k, the default view
 
-![screenshot of tmux with starship](./.github/screenshots/tmux-starship.png)
+![screenshot of tmux with powerlevel10k](./.github/screenshots/tmux-powerlevel10k-130x20.png)
 
 ## tmux + nvim (astronvim) editing this repository
 
-![screenshot of tmux showing nvim](.github/screenshots/tmux-nvim-astronvim.png)
+![screenshot of tmux showing nvim](.github/screenshots/tmux-astronvim-130x40.png)
 
 ## Interesting files and locations
 
@@ -61,12 +61,12 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
 
 ### XDG Variables
 
-| Env                | Default              |
+| Env                | Default              | Short description                              |
-|--------------------|----------------------|
+|--------------------|----------------------|------------------------------------------------|
-| `$XDG_BIN_HOME`    | `$HOME/.local/bin`   |
+| `$XDG_BIN_HOME`    | `$HOME/.local/bin`   | Local binaries                                 |
-| `$XDG_CONFIG_HOME` | `$HOME/.config`      |
+| `$XDG_CONFIG_HOME` | `$HOME/.config`      | User-specific configs                          |
-| `$XDG_DATA_HOME`   | `$HOME/.local/share` |
+| `$XDG_DATA_HOME`   | `$HOME/.local/share` | User-specific data files                       |
-| `$XDG_STATE_HOME`  | `$HOME/.local/state` |
+| `$XDG_STATE_HOME`  | `$HOME/.local/state` | App state that should persist between restarts |
 
 - `$XDG_BIN_HOME` defines directory that contains local binaries.
 - `$XDG_DATA_HOME` defines the base directory relative to which user-specific data

base/bashrc

@@ -1,8 +1,10 @@
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
 # this is my bashrc config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] \
+  && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
+
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
 
@@ -11,10 +13,10 @@ function x-load-configs()
 {
     # Load the shell dotfiles, and then some:
     for file in $DOTFILES/config/{exports,alias,functions}; do
-        [ -r "$file" ] && [ -f "$file" ] && source "$file"
+        [ -r "$file" ] && source "$file"
-        [ -r "$file-secret" ] && [ -f "$file-secret" ] && source "$file-secret"
+        [ -r "$file-secret" ] && source "$file-secret"
-        [ -r "$file-$HOSTNAME" ] && [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
+        [ -r "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-        [ -r "$file-$HOSTNAME-secret" ] && [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+        [ -r "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
     done
 }
 x-load-configs
@@ -22,7 +24,9 @@ x-load-configs
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null;
 
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
+[ -f "${DOTFILES}/config/fzf/fzf.bash" ] \
+  && source "${DOTFILES}/config/fzf/fzf.bash"
 
 # Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"
+[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] \
+  && builtin source "$HOME/.fig/shell/bashrc.post.bash"

base/zshrc

@@ -1,10 +1,70 @@
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-export ZDOTDIR="$HOME/.config/zsh/"
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-mkdir -p "$ZDOTDIR"
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# Fig pre block. Keep at the top of this file.
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] \
+  && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
+
+# Defaults
+export DOTFILES="$HOME/.dotfiles"
+# shellcheck source=shared.sh
+source "$DOTFILES/scripts/shared.sh"
+
+autoload -U colors zsh/terminfo
+colors
+setopt correct
+
+# Add completion scripts to zsh path
+FPATH="~/.config/zsh/completion:$FPATH"
+autoload -Uz compinit && compinit -i
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
+# Run x-load-configs in your terminal to reload the files.
+function x-load-configs()
+{
+  # Load the shell dotfiles, and then some:
+  for file in $DOTFILES/config/{exports,alias,functions}; do
+    [ -r "$file" ] && source "$file"
+    [ -r "$file-secret" ] && source "$file-secret"
+    [ -r "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
+    [ -r "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
+  done
+}
+x-load-configs
+
+# Import ssh keys in keychain
+ssh-add -A 2>/dev/null;
+
+# Try to load antigen, if present
+ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
+[[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
+
+# antigen is present
+have antigen && {
+  antigen use oh-my-zsh
+
+  # config/functions
+  x-default-antigen-bundles
+
+  antigen apply
+}
+
+[ -f "${DOTFILES}/config/fzf/fzf.zsh" ] \
+  && source "${DOTFILES}/config/fzf/fzf.zsh"
+
+export LESSHISTFILE="$XDG_CACHE_HOME"/less_history
 
 # Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] \
+  && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+

config/alias

@@ -55,6 +55,11 @@ if [[ $(uname) == 'Darwin' ]]; then
   alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
 fi
 
+# tmux: automatically attach or create session with name 'main'
+alias tmux='tmux new-session -A -s main'
+# tmux: attach or create new session
+alias ta='tmux attach || tmux'
+
 # watch with: differences, precise, beep and color
 alias watchx='watch -dpbc'
 # delete .DS_Store files

config/astronvim/lua/user/init.lua

@@ -1,3 +1,4 @@
+-- luacheck: globals vim
 return {
   -- Configure AstroNvim updates
   updater = {
@@ -78,6 +79,32 @@ return {
   -- augroups/autocommands and custom filetypes also this just pure lua so
   -- anything that doesn't fit in the normal config locations above can go here
   polish = function()
+    local function yaml_ft(path, bufnr)
+      -- get content of buffer as string
+      local content = vim.filetype.getlines(bufnr)
+      if type(content) == "table" then content = table.concat(content, "\n") end
+
+      -- check if file is in roles, tasks, or handlers folder
+      local path_regex = vim.regex "(tasks\\|roles\\|handlers)/"
+      if path_regex and path_regex:match_str(path) then return "yaml.ansible" end
+      -- check for known ansible playbook text and if found, return yaml.ansible
+      local regex = vim.regex "hosts:\\|tasks:"
+      if regex and regex:match_str(content) then return "yaml.ansible" end
+
+      -- return yaml if nothing else
+      return "yaml"
+    end
+
+    vim.filetype.add {
+      extension = {
+        yml = yaml_ft,
+        yaml = yaml_ft,
+      },
+    }
+
+    require("notify").setup({
+      background_colour = "#000000",
+    })
     -- Set up custom filetypes
     -- vim.filetype.add {
     --   extension = {

config/astronvim/lua/user/mappings.lua

@@ -17,12 +17,33 @@ return {
       end,
       desc = "Pick to close",
     },
-    -- tables with the `name` key will be registered with which-key if it's installed
+    -- tables with the `name` key will be registered with which-key
-    -- this is useful for naming menus
+    -- if it's installed this is useful for naming menus
     ["<leader>b"] = { name = "Buffers" },
-    -- quick save
+    -- quick save (change description)
-    -- ["<C-s>"] = { ":w!<cr>", desc = "Save File" },  -- change description but the same command
+    ["<C-s>"] = { ":w!<cr>", desc = "Save File" },
-    ["<leader>P"] = { ":Telescope projects<cr>", desc = "Update Projects listing" },
+    ["<leader>P"] = {
+      ":Telescope projects<cr>",
+      desc = "Update Projects listing"
+    },
+    -- close_buffers
+    ['<leader>bch'] = {
+      "<CMD>lua require('close_buffers').delete({type = 'hidden'})<CR>",
+      desc = "Delete hidden buffers"
+    },
+    -- comment-box
+    ["<leader>bb"] = {
+      "<cmd>lua require('comment-box').lbox()<cr>",
+      desc = "Left aligned fixed size box with left aligned text"
+    },
+    ["<leader>bc"] = {
+      "<cmd>lua require('comment-box').ccbox()<cr>",
+      desc = "Centered adapted box with centered text"
+    },
+    ["<leader>bl"] = {
+      "<cmd>lua require('comment-box').cline()<cr>",
+      desc = "Centered line"
+    },
   },
   t = {
     -- setting a mapping to false will disable it

config/astronvim/lua/user/plugins/community.lua

@@ -34,13 +34,14 @@ return {
       position = "bottom"
     }
   },
+  { import = "astrocommunity.debugging.telescope-dap-nvim" },
   { import = "astrocommunity.editing-support.comment-box-nvim" },
   { import = "astrocommunity.editing-support.refactoring-nvim" },
   { import = "astrocommunity.editing-support.neogen" },
   { import = "astrocommunity.editing-support.nvim-regexplainer" },
   { import = "astrocommunity.editing-support.todo-comments-nvim" },
   { import = "astrocommunity.indent.mini-indentscope" },
-  { import = "astrocommunity.markdown-and-latex.glow-nvim" },
+  { import = "astrocommunity.lsp.lsp-signature-nvim" },
   { import = "astrocommunity.motion.harpoon" },
   { import = "astrocommunity.pack.ansible" },
   { import = "astrocommunity.pack.bash" },

config/astronvim/lua/user/plugins/user.lua

@@ -1,3 +1,4 @@
+-- luacheck: globals vim
 return {
   -- You can also add new plugins here as well:
   -- Add plugins, the lazy syntax
@@ -21,21 +22,41 @@ return {
       mode = "cursor", -- cursor, or topline
     },
   },
+  { "kazhala/close-buffers.nvim" },
   {
     "folke/edgy.nvim",
     event = "VeryLazy",
+    dependencies = {
+      {
+        'nvim-neo-tree/neo-tree.nvim',
+        config = function()
+          require('neo-tree').setup({
+            open_files_do_not_replace_types = {
+              'terminal', 'Trouble', 'qf', 'edgy'
+            },
+          })
+        end,
+      },
+      {
+        'simrat39/symbols-outline.nvim',
+        config = function()
+          require('symbols-outline').setup()
+        end,
+      },
+    },
     init = function()
       vim.opt.laststatus = 3
       vim.opt.splitkeep = "screen"
     end,
     opts = {
       bottom = {
-        -- toggleterm / lazyterm at the bottom with a height of 40% of the screen
+        -- toggleterm / lazyterm at the bottom with
+        -- a height of 40% of the screen
         {
           ft = "toggleterm",
           size = { height = 0.4 },
           -- exclude floating windows
-          filter = function(buf, win)
+          filter = function(_, win)
             return vim.api.nvim_win_get_config(win).relative == ""
           end,
         },
@@ -69,15 +90,6 @@ return {
           end,
           size = { height = 0.5 },
         },
-        {
-          title = "Neo-Tree Git",
-          ft = "neo-tree",
-          filter = function(buf)
-            return vim.b[buf].neo_tree_source == "git_status"
-          end,
-          pinned = true,
-          open = "Neotree position=right git_status",
-        },
         {
           title = "Neo-Tree Buffers",
           ft = "neo-tree",
@@ -87,11 +99,6 @@ return {
           pinned = true,
           open = "Neotree position=top buffers",
         },
-        -- {
-          -- ft = "Outline",
-          -- pinned = true,
-          -- open = "SymbolsOutlineOpen",
-        -- },
         -- any other neo-tree windows
         "neo-tree",
       },

config/functions

@@ -84,6 +84,9 @@ ask()
 # Defines default antigen bundles
 x-default-antigen-bundles()
 {
+  # the theme to use
+  antigen theme romkatv/powerlevel10k
+
   # these should be always available
   antigen bundle colored-man-pages
   antigen bundle command-not-found

config/gpg-tui/gpg-tui.toml

@@ -0,0 +1,32 @@
+[general]
+  splash = false
+  tick_rate = 250
+  color = "gray"
+  style = "plain"
+  file_explorer = "xplr"
+  detail_level = "minimum"
+  # key_bindings = [
+  #   { keys = [ "?" ], command = ":help" },
+  #   { keys = [ "o" ], command = ":options" },
+  #   { keys = [ "n" ], command = ":normal" },
+  #   { keys = [ "v" ], command = ":visual" },
+  #   { keys = [ "c" ], command = ":copy" },
+  #   { keys = [ "p", "C-v" ], command = ":paste" },
+  #   { keys = [ "x" ], command = ":export" },
+  #   { keys = [ "s" ], command = ":set prompt :sign" },
+  #   { keys = [ "e" ], command = ":set prompt :edit" },
+  #   { keys = [ "i" ], command = ":set prompt :import"},
+  #   { keys = [ "f" ], command = ":set prompt :receive" },
+  #   { keys = [ "u" ], command = ":set prompt :send" },
+  #   { keys = [ "g" ], command = ":generate" },
+  #   { keys = [ "d", "backspace" ], command = ":delete" },
+  #   { keys = [ "C-r" ], command = ":refresh" },
+  # ]
+
+[gpg]
+  armor = false
+  # homedir = "~/.gnupg"
+  # outdir = "~/.gnupg/out"
+  # outfile = "{type}_{query}.{ext}"
+  # default_key = "0xA1B2C3XY"
+

config/starship.toml

@@ -1,37 +0,0 @@
-# Get editor completions based on the config schema
-"$schema" = 'https://starship.rs/config-schema.json'
-
-# Inserts a blank line between shell prompts
-add_newline = true
-
-# Timeout for commands executed by starship (in milliseconds).
-command_timeout = 1000
-
-# Replace the '❯' symbol in the prompt with '➜'
-[character] # The name of the module we are configuring is 'character'
-success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'
-
-[cmd_duration]
-disabled = true
-
-[git_branch]
-symbol = '🌱 '
-truncation_length = 20
-truncation_symbol = '…'
-ignore_branches = ['master', 'main']
-
-[git_status]
-up_to_date = '✓'
-staged = '[++\($count\)](green)'
-
-[package]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
-
-[php]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'
-
-[nodejs]
-format = '[$symbol($version )]($style)'
-version_format = '${major}.${minor}'

config/zsh/.zshrc

@@ -1,52 +0,0 @@
-autoload -U colors zsh/terminfo
-colors
-setopt correct
-
-# Add completion scripts to zsh path
-FPATH="~/.config/zsh/completion:$FPATH"
-autoload -Uz compinit && compinit -i
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
-
-# Defaults
-export DOTFILES="$HOME/.dotfiles"
-# shellcheck source=shared.sh
-source "$DOTFILES/scripts/shared.sh"
-
-# Run x-load-configs in your terminal to reload the files.
-function x-load-configs()
-{
-  # Load the shell dotfiles, and then some:
-  for file in $DOTFILES/config/{exports,alias,functions}; do
-    [ -f "$file" ] && source "$file"
-    [ -f "$file-secret" ] && source "$file-secret"
-    [ -f "$file-$HOSTNAME" ] && source "$file-$HOSTNAME"
-    [ -f "$file-$HOSTNAME-secret" ] && source "$file-$HOSTNAME-secret"
-  done
-}
-x-load-configs
-
-# Import ssh keys in keychain
-ssh-add -A 2>/dev/null;
-
-# Try to load antigen, if present
-ANTIGEN_ZSH_PATH="$XDG_BIN_HOME/antigen.zsh"
-[[ -f "$ANTIGEN_ZSH_PATH" ]] && source "$ANTIGEN_ZSH_PATH"
-
-# antigen is present
-have antigen && {
-  antigen use oh-my-zsh
-
-  # config/functions
-  x-default-antigen-bundles
-
-  antigen apply
-}
-
-# starship is present
-have starship && eval "$(starship init zsh)"
-
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
-  && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
-
-export LESSHISTFILE="$XDG_CACHE_HOME"/less_history
-

local/bin/dfm

@@ -47,7 +47,6 @@ function section_install
     all)
       $0 install macos
       $0 install antigen
-      $0 install starship
       $0 brew install
       $0 install composer
       $0 install dotenv

local/bin/x-welcome-banner

@@ -18,7 +18,7 @@ RESET='\033[0m'
 # Print time-based personalized message, using figlet & lolcat if availible
 function welcome_greeting () {
   h=$(date +%H)
-  if [ "$h" -lt 04 ] || [[ $h -gt 22 ]];
+  if [ "$h" -lt 04 ] || [ "$h" -gt 22 ];
     then greeting="Good Night"
   elif [ "$h" -lt 12 ];
     then greeting="Good morning"
@@ -41,7 +41,7 @@ function welcome_greeting () {
 function welcome_sysinfo () {
   if hash neofetch 2>/dev/null; then
     neofetch --shell_version off \
-      --disable kernel distro shell resolution de wm wm_theme theme icons terminal \
+      --disable kernel distro shell resolution cpu gpu de wm wm_theme theme icons terminal \
       --backend off \
       --colors 4 8 4 4 8 6 \
       --color_blocks off \