Merge branch 'main' of github.com:ianhomer/dotfiles into feature/gigi

.github/workflows/test.yaml

@@ -23,6 +23,7 @@ jobs:
       - uses: actions/[email protected]
       - name:
         run: |
+          echo $SHELL
           sudo apt-get install stow
           rm ~/.bashrc
           rm ~/.bash_profile

bin/backup-me

@@ -49,11 +49,19 @@ args="$args --log-file=$LOG"
 # args="$args --dry-run"
 log:: "rsync args : $args"
 
-LOCATIONS=".dotfiles gdrive .local/share/buku"
+LOCATIONS=".dotfiles .local/share/buku"
 PROJECT_ROOTS="things dotmodules my try"
 for root in $PROJECT_ROOTS ; do
   LOCATIONS="$LOCATIONS projects/$root"
 done
+GDRIVE_LOCATIONS=$(
+  find $HOME -maxdepth 1 -type d \( -name 'gdrive' -o -name 'gdrive-*' \) \
+    -exec basename {} \;
+)
+for gdrive in $GDRIVE_LOCATIONS ; do
+  echo "Found gdrive : $gdrive"
+  LOCATIONS="$LOCATIONS $gdrive"
+done
 echo $DEFAULT_PROJECT_ROOTS
 for location in $LOCATIONS ; do
   LOCATION="$HOME/$location"

bin/dotme

@@ -152,6 +152,7 @@ command_inner() {
   if is-dotme-full ; then
     [ $DRY -eq 0 ] && is-pc && dotme-pip
     [ $DRY -eq 0 ] && is-pc && dotme-gem
+    [ $DRY -eq 0 ] && is-pc && dotme-lua
   fi
   [ $DRY -eq 0 ] && clean-vim
   [ $DRY -eq 0 ] && dotme-vim

bin/dotme-gem

@@ -8,7 +8,7 @@ should-run $0 || exit 0
 
 $(shim) && cd ${ME} && . bin/i.sh
 if ! command -v rbenv ; then
-  log::warn "rbenv not installed"
+  log::info "rbenv not installed"
   exit
 fi
 

bin/dotme-gitme

@@ -7,7 +7,7 @@ should-run -m 7 $@ $0 || exit 0
 
 $(shim) && cd ${ME} && . bin/i.sh
 if ! command -v fasd ; then
-  log::warn "fasd not installed"
+  log::info "fasd not installed"
   exit
 fi
 

bin/dotme-lua

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+#
+# Install lua packages
+#
+
+should-run $0 || exit 0
+
+if ! command -v luarocks ; then
+  log::info "luarocks not installed"
+  exit
+fi
+
+
+luarocks --lua-version 5.1 --local install magick
+
+should-run -fu $0
+
+

bin/dotme-node

@@ -20,7 +20,7 @@ $(shim) && cd ${ME} && . bin/i.sh
 [ ! -d ~/.nvm ] && mkdir ~/.nvm
 
 if ! command -v node ; then
-  log::warn "node not installed"
+  log::info "node not installed"
   exit
 fi
 

bin/dotme-pip

@@ -10,7 +10,7 @@ should-run -m 30 $0 $REQUIREMENTS || exit 0
 $(shim) && cd ${ME} && . bin/i.sh
 
 if ! command -v pip3 ; then
-  log::warn "pip3 not installed"
+  log::info "pip3 not installed"
   exit
 fi
 

bin/dotme-rust

@@ -6,7 +6,7 @@ $(shim) && cd ${ME} && . bin/i.sh
 log:: "configuring rust"
 
 if ! command -v rustup-init ; then
-  log::warn "rustup-init not installed"
+  log::info "rustup-init not installed"
   exit
 fi
 

bin/dotme-test

@@ -10,7 +10,7 @@ should-run -m 7 $@ $0 || exit 0
 $(shim) && cd ${ME} && . bin/i.sh
 
 if ! command -v node ; then
-  log::warn "pnpm not installed"
+  log::info "pnpm not installed"
   exit
 fi
 

bin/git-remote-to-ssh

@@ -4,8 +4,14 @@
 
 startingDirectory=($PWD)
 $(shim) && cd ${ME} && . bin/i.sh && cd $startingDirectory
+if [[ ! -d .git ]] ; then
+  log:: OK "Not a git directory, no remote URL to change"
+  exit 0
+fi
 remoteUrl=`git config --get remote.origin.url`
 
+
+
 if [[ "$remoteUrl" != *ianhomer/dotfiles* ]] ; then
   log:: NOK "${remoteUrl} not supported for conversion"
   exit 1

config/brew/Brewfile

@@ -138,6 +138,8 @@ brew "jq"
 brew "k9s"
 brew "libpq"
 brew "lua-language-server"
+brew "[email protected]"
+brew "luarocks"
 brew "maven"
 brew "neofetch"
 brew "node"
@@ -172,4 +174,4 @@ cask "visual-studio-code"
 brew "catimg"
 brew "eye-d3"
 # brew "ffmpeg", args: ["with-libvpx"]
-# brew "imagemagick", args: ["with-webp"]
+brew "imagemagick"

dotfiles/bash/.bashrc

@@ -56,4 +56,6 @@ fi
 . ~/.config/sh/aliases.sh
 . ~/.config/sh/aliases-non-fish.sh
 
-[[ -f ~/.cargo/env ]] && . ~/.cargo/env
+[[ -f ~/.carg/env ]] && . ~/.cargo/env
+
+echo "... ~/.bashrc complete"

dotfiles/nvim/.config/nvim/init.lua

@@ -56,6 +56,7 @@ nvim_set_var("knobs_levels", {
   indentline = 5,
   indentscope = 5,
   illuminate = 5,
+  image = 7,
   jester = 5,
   kanagawa = 3,
   lens = 8,
@@ -536,7 +537,14 @@ require("lazy").setup(
         require("config.ufo")
       end,
     },
-
+    {
+      "3rd/image.nvim",
+      event = "VeryLazy",
+      opts = {
+        backend = "kitty",
+        hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp" }
+      }
+    },
     -- -- Git
     {
       "tpope/vim-fugitive",
@@ -722,3 +730,6 @@ require("lazy").setup(
     },
   }
 )
+
+package.path = package.path .. ";" .. vim.fn.expand("$HOME") .. "/.luarocks/share/lua/5.1/?/init.lua;"
+package.path = package.path .. ";" .. vim.fn.expand("$HOME") .. "/.luarocks/share/lua/5.1/?.lua;"

dotfiles/nvim/.config/nvim/lazy-lock.json

@@ -16,6 +16,7 @@
   "gitsigns.nvim": { "branch": "main", "commit": "5fc573f2d2a49aec74dd6dc977e8b137429d1897" },
   "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" },
   "icon-picker.nvim": { "branch": "master", "commit": "8e89c06411584e02a928b3baaee056eab24466b3" },
+  "image.nvim": { "branch": "master", "commit": "41f0f2643a09631bc0d8e2837b514667d423e440" },
   "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
   "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },

dotfiles/nvim/.config/nvim/lua/config/core.lua

@@ -24,6 +24,8 @@ for _, plugin in pairs(disabled_built_ins) do
     vim.g["loaded_" .. plugin] = 1
 end
 
+
+
 vim.api.nvim_exec(
     [[
 command! -nargs=* Fuzzy execute "Telescope grep_string search=".escape(<q-args>, ' ')

dotfiles/nvim/.config/nvim/lua/config/treesitter.lua

@@ -13,6 +13,8 @@ treesitter.setup({
     "html",
     "lua",
     "make",
+    -- "markdown",
+    "markdown_inline",
     "markdown",
     "python",
     "query",

dotfiles/vim/.config/vim/spell/en.utf-8.add

@@ -312,3 +312,4 @@ YubiKey
 AirDrop
 powerpack
 os
+Exploratative

test/os/ubuntu/Dockerfile

@@ -0,0 +1,20 @@
+#
+# Slim image for dotfile validation
+#
+FROM ubuntu:latest
+RUN apt update
+RUN apt install -y stow git
+RUN groupadd us && \
+    useradd -m -g us me
+RUN mkdir /etc/sudoers.d
+RUN echo "me ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/me
+RUN mkdir /home/me/.dotfiles/
+COPY . /home/me/.dotfiles
+USER me
+RUN rm ~/.bashrc
+# Only include shim and stow dotfile modules when dotme runs
+RUN /home/me/.dotfiles/bin/dotme -i "shim|stow"
+RUN /home/me/.dotfiles/start
+
+WORKDIR /home/me
+