feat(alias): tmux attach over new sessions

config/nvim v3.35.0

.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

base/zshenv

@@ -1 +0,0 @@
-ZDOTDIR=~/.config/zsh

base/zshrc

@@ -1,10 +1,60 @@
-# 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/"
+# Fig pre block. Keep at the top of this file.
-mkdir -p "$ZDOTDIR"
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
+
+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
 
 # 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"

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,29 @@ 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",
     })

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/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,6 +22,7 @@ return {
       mode = "cursor", -- cursor, or topline
     },
   },
+  { "kazhala/close-buffers.nvim" },
   {
     "folke/edgy.nvim",
     event = "VeryLazy",
@@ -48,12 +50,13 @@ return {
     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,
         },
@@ -96,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/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/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 \