From 91ad5fdcde826a43c908bd0a980b44b6916ea4e6 Mon Sep 17 00:00:00 2001 From: jessebot Date: Wed, 28 Jun 2023 01:45:22 -0700 Subject: [PATCH 01/15] add nuclear to music section for macOS --- .config/onboardme/packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/onboardme/packages.yml b/.config/onboardme/packages.yml index d36b473..1846a9e 100644 --- a/.config/onboardme/packages.yml +++ b/.config/onboardme/packages.yml @@ -196,6 +196,7 @@ brew: - spotifyd # spotify TUI: written in rust, but no longer maintained # - spotify-tui + - nuclear Linux: # linuxbrew asks for this - gcc From 7329a15f88095df427c3c55b576aaff0762a75fa Mon Sep 17 00:00:00 2001 From: jessebot Date: Sat, 1 Jul 2023 14:54:48 +0200 Subject: [PATCH 02/15] adding bfg for removing passwords from git repos, installing via brew --- .config/onboardme/packages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/onboardme/packages.yml b/.config/onboardme/packages.yml index 1846a9e..bd6db78 100644 --- a/.config/onboardme/packages.yml +++ b/.config/onboardme/packages.yml @@ -128,6 +128,8 @@ brew: # colima is a docker desktop replacement - colima devops: + # for removing passwords or large files from git history + - bfg - pyenv - pyenv-virtualenv # docker cli From cbead5382bb2d6dc32a1e169d090bb9dd7f29b62 Mon Sep 17 00:00:00 2001 From: jessebot Date: Sun, 2 Jul 2023 08:28:27 +0200 Subject: [PATCH 03/15] adding back nextcloud finallygit add onboardme/packages.yml :D --- .config/onboardme/packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/onboardme/packages.yml b/.config/onboardme/packages.yml index bd6db78..8a49046 100644 --- a/.config/onboardme/packages.yml +++ b/.config/onboardme/packages.yml @@ -103,8 +103,8 @@ brew: - "--cask rectangle" # Default browser - "--cask firefox" - # File server cloud replacement, not ready yet - # - "--cask nextcloud" + # File server cloud replacement + - "--cask nextcloud" # wezterm: Rust based terminal the is cross-OS-compatible - "--cask wez/wezterm/wezterm" # gives us the default gnu/linux sed we all know and love From 8d51163e4622ac622cdbe8ddc558a7eea8395394 Mon Sep 17 00:00:00 2001 From: jessebot Date: Mon, 3 Jul 2023 09:51:05 +0200 Subject: [PATCH 04/15] add nextcloud back to Linux GUI offerings :) --- .config/onboardme/packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/onboardme/packages.yml b/.config/onboardme/packages.yml index 8a49046..bbc063d 100644 --- a/.config/onboardme/packages.yml +++ b/.config/onboardme/packages.yml @@ -265,8 +265,8 @@ apt: - gufw # pdf viewer with themeing - zathura - # commented out till nextcloud is working - # - nextcloud-desktop + # nextcloud is a self hosted file share app + - nextcloud-desktop # libreoffice is a FOSS office suite that replaces Google Docs/Office365 - libreoffice # GUI interface for pulseaudio, so you can disable audio devices From b61a9ee3634ea71181b3ba85ea597f60eb77831d Mon Sep 17 00:00:00 2001 From: jessebot Date: Tue, 4 Jul 2023 10:16:03 +0200 Subject: [PATCH 05/15] set filetype for tpl files in helm chart directories --- .config/nvim/init.lua | 8 ++++++++ .config/nvim/lua/user/lazy.lua | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 965f2af..ba3db3a 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -59,6 +59,14 @@ vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, { end, }) +-- autocommand to set the file type to helm based on files ending in tpl +vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, { + pattern = {"*/charts/*/templates/*.tpl"}, + callback = function() + vim.cmd("set filetype=helm") + end, +}) + require('user.tree-sitter') -- folding and indentation diff --git a/.config/nvim/lua/user/lazy.lua b/.config/nvim/lua/user/lazy.lua index affcaab..cb7a2ad 100644 --- a/.config/nvim/lua/user/lazy.lua +++ b/.config/nvim/lua/user/lazy.lua @@ -234,7 +234,8 @@ local plugins = { -- {'dhruvasagar/vim-table-mode'}, -- { - 'towolf/vim-helm' + 'towolf/vim-helm', + ft = {'helm'}, }, -- ---------------- Language Server Protocol Plugins --------------------- -- snippets From 4b5b8d5e6ecc049aee24da2235a97c1fdeeae497 Mon Sep 17 00:00:00 2001 From: jessebot Date: Tue, 4 Jul 2023 10:34:43 +0200 Subject: [PATCH 06/15] fix pip version alias; add wezterm tab renaming with tab command; remove old comments --- .config/bash/alias.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.config/bash/alias.sh b/.config/bash/alias.sh index f7cd82f..7d2c472 100644 --- a/.config/bash/alias.sh +++ b/.config/bash/alias.sh @@ -7,8 +7,6 @@ if [[ $(uname) == *"Darwin"* ]]; then # Always use GNU sed alias sed='gsed' else - # wezterm requires this if it's installed via flatpak - # alias wezterm='flatpak run org.wezfurlong.wezterm' # freetube only seems to work through flatpak on debian alias freetube="flatpak run io.freetubeapp.FreeTube" # lutris works better through flatpak @@ -32,8 +30,9 @@ alias tere='tree' # can't spell docker alias docekr='docker' +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Python 🐍 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # # can't spell python -alias pip="pip3.11" +alias pip="pip$PYTHON_VERSION" alias pthyon="python$PYTHON_VERSION" alias ptyhon="python$PYTHON_VERSION" alias pythong="python$PYTHON_VERSION" @@ -42,6 +41,9 @@ alias python="python$PYTHON_VERSION" # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ General ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +# allow setting wezterm tab title more easily +alias tab='wezterm cli set-tab-title' + # makes wget XDG compliant (this goes to ~/.local/share/wget/wget-hsts) mkdir -p $XDG_DATA_HOME/wget/wget-hsts alias wget='wget --hsts-file="$XDG_DATA_HOME/wget/wget-hsts"' From 9fb451768c53b81adacbfb1cd1d299a166b2b166 Mon Sep 17 00:00:00 2001 From: jessebot Date: Thu, 6 Jul 2023 15:38:58 +0200 Subject: [PATCH 07/15] adding neotree file browswer shortcut for +n to toggle showing --- .config/nvim/lua/user/keymap.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.config/nvim/lua/user/keymap.lua b/.config/nvim/lua/user/keymap.lua index 62085e4..d0f509a 100644 --- a/.config/nvim/lua/user/keymap.lua +++ b/.config/nvim/lua/user/keymap.lua @@ -9,13 +9,19 @@ vim.keymap.set('n', '', 'za') vim.keymap.set('n', '', 'ToggleTerm') vim.keymap.set('t', '', 'ToggleTerm') --- cmatrix +-- cmatrix - goofy "The Matrix" terminal wallpaper vim.keymap.set('n', 'M', 'Matrix', { desc = "󰘨 The Matrixℒ️" }) --- gitui + +-- neotree - this launches a file browser on the left hand side of the screen :tree: +vim.keymap.set('n', 'n', 'NeoTreeShowToggle', { desc = "🌳 Neotree - a file browser tree for neovim" }) + +-- gitui - a TUI for git vim.keymap.set('n', 'g', 'Gitui', { desc = "ξœ‚ gitui - terminal UI for git" }) --- k9s + +-- k9s - a TUI dashboard for k8s vim.keymap.set('n', 'K', 'K9s', { desc = "󱃾 k9s - kubernetes dashboard" }) --- bpython + +-- bpython - colorful and rich python interpretter vim.keymap.set('n', 'p', 'Bpython', { desc = "ξ˜† bpython - color + docs in interactive python" }) -- ---------------------- Telescope windows ---------------------------- From 6451bbb929c5c60fe1e206c0ab1fcf24525b2498 Mon Sep 17 00:00:00 2001 From: jessebot Date: Fri, 7 Jul 2023 10:25:51 +0200 Subject: [PATCH 08/15] updating keymap hints for neovim and cleaning up lua formatting --- .config/nvim/lua/user/keymap.lua | 118 +++++++++++++++++++++++++------ 1 file changed, 97 insertions(+), 21 deletions(-) diff --git a/.config/nvim/lua/user/keymap.lua b/.config/nvim/lua/user/keymap.lua index d0f509a..889ddcb 100644 --- a/.config/nvim/lua/user/keymap.lua +++ b/.config/nvim/lua/user/keymap.lua @@ -1,37 +1,113 @@ --- map leader to +-- ~~~~~~~~~~~~~~~~~~~~~~~ Key Mappings for Neovim ~~~~~~~~~~~~~~~~~~~~~~~~~~ + +-- leader key is the default modifier key for neovim. We map leader to vim.g.mapleader = " " --- enter to fold code (collapses code block) +-- Enter to fold code (collapses code block) vim.keymap.set('n', '', 'za') --- ---------------------- toggleterm windows ---------------------------- +-- neotree - launches a file browser on the left hand side of the screen +vim.keymap.set( + 'n', + 'n', + 'NeoTreeShowToggle', + { desc = "🌳 Neotree - a file browser tree for neovim" } +) + +-- ------------------------ terminal windows ---------------------------- + -- CTRL+t keybindings to toggle terminal -vim.keymap.set('n', '', 'ToggleTerm') -vim.keymap.set('t', '', 'ToggleTerm') +vim.keymap.set( + 'n', + '', + 'ToggleTerm', + { desc = "ο’‰ ToggleTerm - terminal for neovim" } +) +vim.keymap.set( + 't', + '', + 'ToggleTerm', + { desc = "ο’‰ ToggleTerm - terminal for neovim" } +) + +-- ------------------------ external app windows ----------------------------- -- cmatrix - goofy "The Matrix" terminal wallpaper -vim.keymap.set('n', 'M', 'Matrix', { desc = "󰘨 The Matrixℒ️" }) - --- neotree - this launches a file browser on the left hand side of the screen :tree: -vim.keymap.set('n', 'n', 'NeoTreeShowToggle', { desc = "🌳 Neotree - a file browser tree for neovim" }) +vim.keymap.set( + 'n', + 'M', + 'Matrix', + { desc = "󰘨 The Matrixℒ️" } +) -- gitui - a TUI for git -vim.keymap.set('n', 'g', 'Gitui', { desc = "ξœ‚ gitui - terminal UI for git" }) +vim.keymap.set( + 'n', + 'g', + 'Gitui', + { desc = "ξœ‚ gitui - terminal UI for git" } +) -- k9s - a TUI dashboard for k8s -vim.keymap.set('n', 'K', 'K9s', { desc = "󱃾 k9s - kubernetes dashboard" }) +vim.keymap.set( + 'n', + 'K', + 'K9s', + { desc = "󱃾 k9s - kubernetes dashboard" } +) -- bpython - colorful and rich python interpretter -vim.keymap.set('n', 'p', 'Bpython', { desc = "ξ˜† bpython - color + docs in interactive python" }) +vim.keymap.set( + 'n', + 'p', + 'Bpython', + { desc = "ξ˜† bpython - color + docs in interactive python" } +) -- ---------------------- Telescope windows ---------------------------- -vim.keymap.set('n', ":", "Telescope commands", { desc = "All Commands" }) -vim.keymap.set('n', 'H', 'Telescope highlights', { desc = "Telescope for highlight groups in current buffer" }) -vim.keymap.set('n', 'h', 'Telescope command_history', { desc = "Telescope for command history" }) -vim.keymap.set('n', "ff", "Telescope find_files", { desc = "Find Files (cwd)" }) -vim.keymap.set('n', "fr", "Telescope oldfiles", { desc = "Files Recently Opened in Neovim" }) - --- --------------------------- Diagnostics ------------------------------ -vim.keymap.set("n", "d", "TroubleToggle", - {silent = true, noremap = true} +vim.keymap.set( + 'n', + ":", + "Telescope commands", + { desc = "πŸ”­ All Commands" } +) + +vim.keymap.set( + 'n', + 'H', + 'Telescope highlights', + { desc = "πŸ”­ Telescope for highlight groups in current buffer" } +) + +vim.keymap.set( + 'n', + 'h', + 'Telescope command_history', + { desc = "πŸ”­ Telescope for command history" } +) + +vim.keymap.set( + 'n', + "ff", + "Telescope find_files", + { desc = "πŸ”­ Find Files (cwd)" } +) + +vim.keymap.set( + 'n', + "fr", + "Telescope oldfiles", + { desc = "πŸ”­ Files Recently Opened in Neovim" } +) + +-- --------------------------- Diagnostics ------------------------------ +vim.keymap.set( + "n", + "d", + "TroubleToggle", + { + silent = true, + noremap = true, + desc = "πŸ› Diagnostics for the active buffer" + } ) From 26a92312c069a9f70229d5e7de63ca2c11f2e132 Mon Sep 17 00:00:00 2001 From: jessebot Date: Sun, 9 Jul 2023 11:07:59 +0200 Subject: [PATCH 09/15] add cron section, fix comments, update wallpaper functionality going forward --- .config/onboardme/config.yml | 63 +++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/.config/onboardme/config.yml b/.config/onboardme/config.yml index db882ef..2849b07 100644 --- a/.config/onboardme/config.yml +++ b/.config/onboardme/config.yml @@ -1,28 +1,26 @@ ---- -# ______________________________________________________________ # # Config file for the onboardme cli command. # -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # -# - If this files exists as: ~/.config/onboardme/config.yaml # -# then its loaded instead of the default config # # -------------------------------------------------------------- # - +# This files should be in: ~/.config/onboardme/config.yaml # +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # +--- log: # Full path to a file you'd like to log to. Creates file if it doesn't exist + # if empty, onboardme does not log to a file file: "" # what level of logs to output (debug, info, warn, error) level: "warn" # steps refer to a specific function in the list of functions we run steps: - # these are mac specific steps + # mac specific steps Darwin: - dot_files - packages - font_setup - neovim_setup - sudo_setup - # these are linux specific steps + # linux specific steps Linux: - dot_files - packages @@ -62,6 +60,7 @@ package: - snap # list of extra existing packages groups to install groups: + # any package groups in this default section are always installed default: # basic tui stuff to have a nice time in the terminal :) - default @@ -82,13 +81,55 @@ package: # things like zoom and slack - work +# 🚧 this section is under construction +cron: + reminders: + lunch: + enabled: + Linux: true + Darwin: true + # daily at noon + schedule: "0 12 * * *" + # whether or not to use the macOS "say" program + # not sure equivilent on linux πŸ€” + text_to_speech: true + blurb: "It is snack time!" + + take_breaks: + enabled: + Linux: true + Darwin: true + # hourly by default + schedule: "0 * * * *" + text_to_speech: true + blurb: "Take a break from your screen! Consider a glass of water and a short walk to stretch your legs." + + backups: + freetube: + # defaults to daily at 6PM in your local timezone + # you can use this site for schedules: https://crontab-generator.org/ + schedule: "0 18 * * *" + files: + - history.db + - playlists.db + - profiles.db + - settings.db + from_dir: + Linux: "~/.config/FreeTube" + Darwin: "~/Library/Application\ Support/FreeTube" + to_dir: + Linux: "~/Nextcloud/freetube/linux" + Darwin: "~/Nextcloud/freetube/macos" + +# 🚧 this section is under construction # known safe remote hosts that you expect to be able to ping and SSH into remote_hosts: [] # - 192.168.42.42 +# 🚧 this section is under construction # setup iptable on Linux only firewall: false -### TODO: make this work, it's a nice dream though. -# any URL we can curl to download a folder from -# wallpapers_download_url: "" +# 🚧 this section is under construction +# set wallpapers dir. MacOS: https://apple.stackexchange.com/a/348454 +wallpapers_dir: "" From b7221ebcd5c29db4799aa238f4e15ba77c64f988 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Sun, 9 Jul 2023 12:23:43 +0200 Subject: [PATCH 10/15] Update README.md - add config file reference for others to use dot files with onboardme --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da5c315..5bc8187 100644 --- a/README.md +++ b/README.md @@ -692,7 +692,9 @@ These are the sensible defaults for [`onboardme`](https://github.com/jessebot/on Please feel free to fork this repo and make it your own. -You can still use `onboardme`, but you'll want to pass in _your_ git URL and branch. Example: +You can still use `onboardme`, but you'll want to pass in _your_ git URL and branch. + +Example via the CLI: ```bash # this uses your personal git URL and makes sure to always pull from main @@ -700,6 +702,25 @@ You can still use `onboardme`, but you'll want to pass in _your_ git URL and bra onboardme --git_url https://github.com/your_username/dot_files --git_branch main ``` +Example via the config file, `~/.config/onboardme/config.yaml`: + +```yaml +# this uses your personal git URL and makes sure to always pull from main +dot_files: + # your personal git repo URL for your dot files + # defaults to https://github.com/jessebot/dot_files.git if not set + git_url: "https://github.com/your_username/dot_files.git" + # the branch to use for the git repo above, defaults to main + git_branch: "main" + # !!CAREFUL: runs a `git reset --hard`, which will overwrite/delete dot files in + # $HOME that conflict with the above defined git repo url and branch. + # Unless you know for sure you want to overwrite everytime you run onboardme, you + # should run the following to get the files that would be overwritten before setting this: + # onboardme -s dot_files + # if set to true, then using onboardme -O will toggle it back to false + overwrite: false +``` + ### FAQ
From c812b7834ccd5c00675197fa423631e86ff6a5cf Mon Sep 17 00:00:00 2001 From: jessebot Date: Sun, 9 Jul 2023 13:02:41 +0200 Subject: [PATCH 11/15] add default wireguard syntax highlighting using cfg filetype --- .config/nvim/init.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index ba3db3a..5475763 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -67,6 +67,14 @@ vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, { end, }) +-- autocommand to set the file type to cfg for wireguard configs +vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, { + pattern = {"*/etc/wireguard/wg*.conf"}, + callback = function() + vim.cmd("set filetype=cfg") + end, +}) + require('user.tree-sitter') -- folding and indentation From a9e9fc27ceb2805809d9a006bcf791530bc7d32e Mon Sep 17 00:00:00 2001 From: jessebot Date: Mon, 10 Jul 2023 10:53:50 +0200 Subject: [PATCH 12/15] add back table mode :D --- .config/nvim/lua/user/keymap.lua | 8 ++++++++ .config/nvim/lua/user/lazy.lua | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.config/nvim/lua/user/keymap.lua b/.config/nvim/lua/user/keymap.lua index 889ddcb..0479da6 100644 --- a/.config/nvim/lua/user/keymap.lua +++ b/.config/nvim/lua/user/keymap.lua @@ -14,6 +14,14 @@ vim.keymap.set( { desc = "🌳 Neotree - a file browser tree for neovim" } ) +-- ---------------------- markdown table formatting ------------------------- +vim.keymap.set( + 'n', + 'tm', + 'TableModeToggle', + { desc = "σ°“± Table Mode - format your markdown tables as you go" } +) + -- ------------------------ terminal windows ---------------------------- -- CTRL+t keybindings to toggle terminal diff --git a/.config/nvim/lua/user/lazy.lua b/.config/nvim/lua/user/lazy.lua index cb7a2ad..593e355 100644 --- a/.config/nvim/lua/user/lazy.lua +++ b/.config/nvim/lua/user/lazy.lua @@ -231,8 +231,10 @@ local plugins = { 'folke/twilight.nvim' }, -- for markdown tables -- maybe not working? - -- {'dhruvasagar/vim-table-mode'}, - -- + { + 'dhruvasagar/vim-table-mode' + }, + { 'towolf/vim-helm', ft = {'helm'}, From 5b2a50ab6c2af9d6505e8406bcb929957bc636b8 Mon Sep 17 00:00:00 2001 From: jessebot Date: Mon, 10 Jul 2023 13:29:05 +0200 Subject: [PATCH 13/15] comment out experimental cron jobs --- .config/onboardme/config.yml | 80 ++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.config/onboardme/config.yml b/.config/onboardme/config.yml index 2849b07..67473c6 100644 --- a/.config/onboardme/config.yml +++ b/.config/onboardme/config.yml @@ -82,44 +82,44 @@ package: - work # 🚧 this section is under construction -cron: - reminders: - lunch: - enabled: - Linux: true - Darwin: true - # daily at noon - schedule: "0 12 * * *" - # whether or not to use the macOS "say" program - # not sure equivilent on linux πŸ€” - text_to_speech: true - blurb: "It is snack time!" - - take_breaks: - enabled: - Linux: true - Darwin: true - # hourly by default - schedule: "0 * * * *" - text_to_speech: true - blurb: "Take a break from your screen! Consider a glass of water and a short walk to stretch your legs." - - backups: - freetube: - # defaults to daily at 6PM in your local timezone - # you can use this site for schedules: https://crontab-generator.org/ - schedule: "0 18 * * *" - files: - - history.db - - playlists.db - - profiles.db - - settings.db - from_dir: - Linux: "~/.config/FreeTube" - Darwin: "~/Library/Application\ Support/FreeTube" - to_dir: - Linux: "~/Nextcloud/freetube/linux" - Darwin: "~/Nextcloud/freetube/macos" +# cron: +# reminders: +# lunch: +# enabled: +# Linux: true +# Darwin: true +# # daily at noon +# schedule: "0 12 * * *" +# # whether or not to use the macOS "say" program +# # not sure equivilent on linux πŸ€” +# text_to_speech: true +# blurb: "It is snack time!" +# +# take_breaks: +# enabled: +# Linux: true +# Darwin: true +# # hourly by default +# schedule: "0 * * * *" +# text_to_speech: true +# blurb: "Take a break from your screen! Consider a glass of water and a short walk to stretch your legs." +# +# backups: +# freetube: +# # defaults to daily at 6PM in your local timezone +# # you can use this site for schedules: https://crontab-generator.org/ +# schedule: "0 18 * * *" +# files: +# - history.db +# - playlists.db +# - profiles.db +# - settings.db +# from_dir: +# Linux: "~/.config/FreeTube" +# Darwin: "~/Library/Application\ Support/FreeTube" +# to_dir: +# Linux: "~/Nextcloud/freetube/linux" +# Darwin: "~/Nextcloud/freetube/macos" # 🚧 this section is under construction # known safe remote hosts that you expect to be able to ping and SSH into @@ -131,5 +131,5 @@ remote_hosts: [] firewall: false # 🚧 this section is under construction -# set wallpapers dir. MacOS: https://apple.stackexchange.com/a/348454 -wallpapers_dir: "" +# set wallpapers directory. MacOS: https://apple.stackexchange.com/a/348454 +# wallpapers_dir: "" From 0c16d55cae02a6511b492b84cda81c04703be345 Mon Sep 17 00:00:00 2001 From: jessebot Date: Mon, 10 Jul 2023 15:27:00 +0200 Subject: [PATCH 14/15] add table of contents generator --- .config/nvim/lua/user/lazy.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/nvim/lua/user/lazy.lua b/.config/nvim/lua/user/lazy.lua index 593e355..3e526d8 100644 --- a/.config/nvim/lua/user/lazy.lua +++ b/.config/nvim/lua/user/lazy.lua @@ -235,6 +235,12 @@ local plugins = { 'dhruvasagar/vim-table-mode' }, + -- markdown table of contents generator + { + 'mzlogin/vim-markdown-toc' + }, + + -- formatting helm charts properly { 'towolf/vim-helm', ft = {'helm'}, From bec9e316f2958d996805792e91c529b76c315cf7 Mon Sep 17 00:00:00 2001 From: jessebot Date: Mon, 10 Jul 2023 20:00:40 +0200 Subject: [PATCH 15/15] update completion for lima, add kubecolor to devops packages --- .config/bash/completion.sh | 338 +++++++++++++++++++++++++++++++++ .config/onboardme/packages.yml | 2 + 2 files changed, 340 insertions(+) diff --git a/.config/bash/completion.sh b/.config/bash/completion.sh index 460b2b5..73187d2 100644 --- a/.config/bash/completion.sh +++ b/.config/bash/completion.sh @@ -47,3 +47,341 @@ fi # remembers directories overtime and helps with auto-completion # I never use this though... # eval "$(jump shell bash)" +# bash completion V2 for limactl -*- shell-script -*- + +__limactl_debug() +{ + if [[ -n ${BASH_COMP_DEBUG_FILE-} ]]; then + echo "$*" >> "${BASH_COMP_DEBUG_FILE}" + fi +} + +# Macs have bash3 for which the bash-completion package doesn't include +# _init_completion. This is a minimal version of that function. +__limactl_init_completion() +{ + COMPREPLY=() + _get_comp_words_by_ref "$@" cur prev words cword +} + +# This function calls the limactl program to obtain the completion +# results and the directive. It fills the 'out' and 'directive' vars. +__limactl_get_completion_results() { + local requestComp lastParam lastChar args + + # Prepare the command to request completions for the program. + # Calling ${words[0]} instead of directly limactl allows to handle aliases + args=("${words[@]:1}") + requestComp="${words[0]} __complete ${args[*]}" + + lastParam=${words[$((${#words[@]}-1))]} + lastChar=${lastParam:$((${#lastParam}-1)):1} + __limactl_debug "lastParam ${lastParam}, lastChar ${lastChar}" + + if [[ -z ${cur} && ${lastChar} != = ]]; then + # If the last parameter is complete (there is a space following it) + # We add an extra empty parameter so we can indicate this to the go method. + __limactl_debug "Adding extra empty parameter" + requestComp="${requestComp} ''" + fi + + # When completing a flag with an = (e.g., limactl -n=) + # bash focuses on the part after the =, so we need to remove + # the flag part from $cur + if [[ ${cur} == -*=* ]]; then + cur="${cur#*=}" + fi + + __limactl_debug "Calling ${requestComp}" + # Use eval to handle any environment variables and such + out=$(eval "${requestComp}" 2>/dev/null) + + # Extract the directive integer at the very end of the output following a colon (:) + directive=${out##*:} + # Remove the directive + out=${out%:*} + if [[ ${directive} == "${out}" ]]; then + # There is not directive specified + directive=0 + fi + __limactl_debug "The completion directive is: ${directive}" + __limactl_debug "The completions are: ${out}" +} + +__limactl_process_completion_results() { + local shellCompDirectiveError=1 + local shellCompDirectiveNoSpace=2 + local shellCompDirectiveNoFileComp=4 + local shellCompDirectiveFilterFileExt=8 + local shellCompDirectiveFilterDirs=16 + local shellCompDirectiveKeepOrder=32 + + if (((directive & shellCompDirectiveError) != 0)); then + # Error code. No completion. + __limactl_debug "Received error from custom completion go code" + return + else + if (((directive & shellCompDirectiveNoSpace) != 0)); then + if [[ $(type -t compopt) == builtin ]]; then + __limactl_debug "Activating no space" + compopt -o nospace + else + __limactl_debug "No space directive not supported in this version of bash" + fi + fi + if (((directive & shellCompDirectiveKeepOrder) != 0)); then + if [[ $(type -t compopt) == builtin ]]; then + # no sort isn't supported for bash less than < 4.4 + if [[ ${BASH_VERSINFO[0]} -lt 4 || ( ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -lt 4 ) ]]; then + __limactl_debug "No sort directive not supported in this version of bash" + else + __limactl_debug "Activating keep order" + compopt -o nosort + fi + else + __limactl_debug "No sort directive not supported in this version of bash" + fi + fi + if (((directive & shellCompDirectiveNoFileComp) != 0)); then + if [[ $(type -t compopt) == builtin ]]; then + __limactl_debug "Activating no file completion" + compopt +o default + else + __limactl_debug "No file completion directive not supported in this version of bash" + fi + fi + fi + + # Separate activeHelp from normal completions + local completions=() + local activeHelp=() + __limactl_extract_activeHelp + + if (((directive & shellCompDirectiveFilterFileExt) != 0)); then + # File extension filtering + local fullFilter filter filteringCmd + + # Do not use quotes around the $completions variable or else newline + # characters will be kept. + for filter in ${completions[*]}; do + fullFilter+="$filter|" + done + + filteringCmd="_filedir $fullFilter" + __limactl_debug "File filtering command: $filteringCmd" + $filteringCmd + elif (((directive & shellCompDirectiveFilterDirs) != 0)); then + # File completion for directories only + + local subdir + subdir=${completions[0]} + if [[ -n $subdir ]]; then + __limactl_debug "Listing directories in $subdir" + pushd "$subdir" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1 || return + else + __limactl_debug "Listing directories in ." + _filedir -d + fi + else + __limactl_handle_completion_types + fi + + __limactl_handle_special_char "$cur" : + __limactl_handle_special_char "$cur" = + + # Print the activeHelp statements before we finish + if ((${#activeHelp[*]} != 0)); then + printf "\n"; + printf "%s\n" "${activeHelp[@]}" + printf "\n" + + # The prompt format is only available from bash 4.4. + # We test if it is available before using it. + if (x=${PS1@P}) 2> /dev/null; then + printf "%s" "${PS1@P}${COMP_LINE[@]}" + else + # Can't print the prompt. Just print the + # text the user had typed, it is workable enough. + printf "%s" "${COMP_LINE[@]}" + fi + fi +} + +# Separate activeHelp lines from real completions. +# Fills the $activeHelp and $completions arrays. +__limactl_extract_activeHelp() { + local activeHelpMarker="_activeHelp_ " + local endIndex=${#activeHelpMarker} + + while IFS='' read -r comp; do + if [[ ${comp:0:endIndex} == $activeHelpMarker ]]; then + comp=${comp:endIndex} + __limactl_debug "ActiveHelp found: $comp" + if [[ -n $comp ]]; then + activeHelp+=("$comp") + fi + else + # Not an activeHelp line but a normal completion + completions+=("$comp") + fi + done <<<"${out}" +} + +__limactl_handle_completion_types() { + __limactl_debug "__limactl_handle_completion_types: COMP_TYPE is $COMP_TYPE" + + case $COMP_TYPE in + 37|42) + # Type: menu-complete/menu-complete-backward and insert-completions + # If the user requested inserting one completion at a time, or all + # completions at once on the command-line we must remove the descriptions. + # https://github.com/spf13/cobra/issues/1508 + local tab=$'\t' comp + while IFS='' read -r comp; do + [[ -z $comp ]] && continue + # Strip any description + comp=${comp%%$tab*} + # Only consider the completions that match + if [[ $comp == "$cur"* ]]; then + COMPREPLY+=("$comp") + fi + done < <(printf "%s\n" "${completions[@]}") + ;; + + *) + # Type: complete (normal completion) + __limactl_handle_standard_completion_case + ;; + esac +} + +__limactl_handle_standard_completion_case() { + local tab=$'\t' comp + + # Short circuit to optimize if we don't have descriptions + if [[ "${completions[*]}" != *$tab* ]]; then + IFS=$'\n' read -ra COMPREPLY -d '' < <(compgen -W "${completions[*]}" -- "$cur") + return 0 + fi + + local longest=0 + local compline + # Look for the longest completion so that we can format things nicely + while IFS='' read -r compline; do + [[ -z $compline ]] && continue + # Strip any description before checking the length + comp=${compline%%$tab*} + # Only consider the completions that match + [[ $comp == "$cur"* ]] || continue + COMPREPLY+=("$compline") + if ((${#comp}>longest)); then + longest=${#comp} + fi + done < <(printf "%s\n" "${completions[@]}") + + # If there is a single completion left, remove the description text + if ((${#COMPREPLY[*]} == 1)); then + __limactl_debug "COMPREPLY[0]: ${COMPREPLY[0]}" + comp="${COMPREPLY[0]%%$tab*}" + __limactl_debug "Removed description from single completion, which is now: ${comp}" + COMPREPLY[0]=$comp + else # Format the descriptions + __limactl_format_comp_descriptions $longest + fi +} + +__limactl_handle_special_char() +{ + local comp="$1" + local char=$2 + if [[ "$comp" == *${char}* && "$COMP_WORDBREAKS" == *${char}* ]]; then + local word=${comp%"${comp##*${char}}"} + local idx=${#COMPREPLY[*]} + while ((--idx >= 0)); do + COMPREPLY[idx]=${COMPREPLY[idx]#"$word"} + done + fi +} + +__limactl_format_comp_descriptions() +{ + local tab=$'\t' + local comp desc maxdesclength + local longest=$1 + + local i ci + for ci in ${!COMPREPLY[*]}; do + comp=${COMPREPLY[ci]} + # Properly format the description string which follows a tab character if there is one + if [[ "$comp" == *$tab* ]]; then + __limactl_debug "Original comp: $comp" + desc=${comp#*$tab} + comp=${comp%%$tab*} + + # $COLUMNS stores the current shell width. + # Remove an extra 4 because we add 2 spaces and 2 parentheses. + maxdesclength=$(( COLUMNS - longest - 4 )) + + # Make sure we can fit a description of at least 8 characters + # if we are to align the descriptions. + if ((maxdesclength > 8)); then + # Add the proper number of spaces to align the descriptions + for ((i = ${#comp} ; i < longest ; i++)); do + comp+=" " + done + else + # Don't pad the descriptions so we can fit more text after the completion + maxdesclength=$(( COLUMNS - ${#comp} - 4 )) + fi + + # If there is enough space for any description text, + # truncate the descriptions that are too long for the shell width + if ((maxdesclength > 0)); then + if ((${#desc} > maxdesclength)); then + desc=${desc:0:$(( maxdesclength - 1 ))} + desc+="…" + fi + comp+=" ($desc)" + fi + COMPREPLY[ci]=$comp + __limactl_debug "Final comp: $comp" + fi + done +} + +__start_limactl() +{ + local cur prev words cword split + + COMPREPLY=() + + # Call _init_completion from the bash-completion package + # to prepare the arguments properly + if declare -F _init_completion >/dev/null 2>&1; then + _init_completion -n =: || return + else + __limactl_init_completion -n =: || return + fi + + __limactl_debug + __limactl_debug "========= starting completion logic ==========" + __limactl_debug "cur is ${cur}, words[*] is ${words[*]}, #words[@] is ${#words[@]}, cword is $cword" + + # The user could have moved the cursor backwards on the command-line. + # We need to trigger completion from the $cword location, so we need + # to truncate the command-line ($words) up to the $cword location. + words=("${words[@]:0:$cword+1}") + __limactl_debug "Truncated words[*]: ${words[*]}," + + local out directive + __limactl_get_completion_results + __limactl_process_completion_results +} + +if [[ $(type -t compopt) = "builtin" ]]; then + complete -o default -F __start_limactl limactl +else + complete -o default -o nospace -F __start_limactl limactl +fi + +# ex: ts=4 sw=4 et filetype=sh diff --git a/.config/onboardme/packages.yml b/.config/onboardme/packages.yml index bbc063d..49a814d 100644 --- a/.config/onboardme/packages.yml +++ b/.config/onboardme/packages.yml @@ -142,6 +142,8 @@ brew: - kubectl # kubectl plugin manager - krew + # kubecolor, a kubectl colorizer + - hidetatz/tap/kubecolor # terminal based dashbaord for k8s - k9s # package manager for k8s