Updates

.bash_aliases

@@ -12,4 +12,6 @@ alias tp="$HOME/bin/tmux_pair.bash"
 alias tpdf="termpdf.py"
 alias tn="tmux new-window -n"
 alias genpdf="pandoc -o migration.pdf -t ms"
-
+CFLAGS="-Wall -Werror -Wextra"
+alias cc="gcc ${CFLAGS}"
+alias update_ruby_build="git -C "$(rbenv root)"/plugins/ruby-build pull"

.config/git/config

@@ -12,28 +12,39 @@
         editor = nvim
 [alias]
         aa = add -A
+        # Selectively add files
         ap = add --patch
+        # Selectively add files—including new ones
         aap = !git add --intent-to-add . && git add --patch
         br = branch
         cb = clone --bare
         cp = cherry-pick
+        # Show all commits on the current branch but not develop
+        curr = "!git log --no-merges \"$(git rev-parse --abbrev-ref HEAD)\" ^develop"
         co = checkout
         cm = commit
         cma = commit --amend
-        cmf = commit --fixup
+        # Fixup commit with all staged changes
+        fu = "!sh -c '(git diff-files --quiet || (echo Unstaged changes, please commit or stash with --keep-index; exit 1)) && COMMIT=$(git rev-parse $1) && git commit --fixup=$COMMIT && git rebase -i --autosquash $COMMIT~1' -"
         g = log --all --grep # Search commit messages
         hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
         last = log -1 HEAD
+        maindiff = "!git log --no-merges develop ^main"
+        noci = -o ci.skip
         pf = push --force
-        pmr = push -o merge_request.create -o merge_request.assign="trevor" -o merge_request.remove_source_branch
+        # Create a merge request, assign it to me
         pmrup = !git push -u origin $(git symbolic-ref --short HEAD) -o merge_request.create -o merge_request.assign="trevor" -o merge_request.remove_source_branch
-        pmrd = pmr -o merge_request.draft
+        # Create a merge request, assign it to me, mark it as draft
         pmrdup = pmrup -o merge_request.draft
+        # Push against a new tracking branch with the same name
         pushup = !git push -u origin $(git symbolic-ref --short HEAD)
+        rb = rebase
         rbd = rebase develop
-        rbi = rebase -i # Useful for squashing commits
+        rbi = rebase -i
+        sq = "!f() { git reset --soft HEAD~$1 && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; }; f"
         st = status
         tree = log --oneline --graph --decorate --all
+        #  “Undo” the last commit, leaving its contents staged
         undo-commit = reset --soft HEAD~
         wa = worktree add
         wr = worktree remove

.config/nvim/lazy-lock.json

@@ -10,26 +10,28 @@
   "cmp-tmux": { "branch": "main", "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" },
   "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" },
   "cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" },
-  "codeium.vim": { "branch": "main", "commit": "a31ff444697497438cd2569200ddb4af846cae65" },
+  "codeium.vim": { "branch": "main", "commit": "fd440cd718742daab162241c5bd5857cd92f5f72" },
+  "feline.nvim": { "branch": "main", "commit": "6cfbe0608d2552a7d947c6f521670b10379fbe42" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
-  "gruvbox.nvim": { "branch": "main", "commit": "f0e029a3989691eb38cfa9272b75251c62a00821" },
-  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
-  "lspkind.nvim": { "branch": "master", "commit": "7f26cf5e27e2bd910ce0ea00c514da2bf97423b8" },
-  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
-  "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" },
-  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
+  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
+  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
+  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
+  "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" },
+  "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
   "nvim-html-css": { "branch": "main", "commit": "c072b05c56a40d3ec7874fa487723e6bef5d97f8" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0d9e870d01894c592d7ea93cfe0fa451916d9a7f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "50f30bcd8c62ac4a83d133d738f268279f2c2ce2" },
-  "nvim-treesitter": { "branch": "master", "commit": "362ebd3a210f20aab80be05557f216cbaf4531e6" },
+  "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" },
+  "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" },
+  "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" },
-  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
+  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
-  "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" },
+  "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" },
   "vim-rails": { "branch": "master", "commit": "1ad9663ce31e8c08134849d04184cda94bb42aba" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" },
-  "zen-mode.nvim": { "branch": "main", "commit": "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50" }
+  "vimwiki": { "branch": "dev", "commit": "fde35bb87e45abe930eebef5ab99a16289e53789" },
+  "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
 }

.config/nvim/lua/remap.lua

@@ -9,7 +9,7 @@ vim.keymap.set('n', '<leader>pD', ":pu!=strftime('%c')<CR>");
 -- Telescope
 local builtin = require('telescope.builtin')
 local telescope = require('telescope')
-vim.keymap.set('n', '<leader>tf', builtin.find_files, {}) -- Open files
+vim.keymap.set('n', '<leader>tf', "<cmd>Telescope find_files hidden=true<cr>", {}) -- Open files
 vim.keymap.set('n', '<leader>ts', builtin.live_grep, {})  -- Grep files
 vim.keymap.set('n', '<leader>tb', builtin.buffers, {})    -- Neovim buffers
 vim.keymap.set('n', '<leader>tm', builtin.man_pages, {}) -- man pages

.config/nvim/lua/tree.lua

@@ -1,7 +1,7 @@
 require("nvim-tree").setup({
   sort_by = "case_sensitive",
   filters = {
-    dotfiles = true,
+    dotfiles = false,
   },
 })
 

.config/nvim/lua/treesitter.lua

@@ -1,7 +1,7 @@
 -- Treesitter
-require'nvim-treesitter.configs'.setup {
+require'nvim-treesitter.configs'.setup({
   sync_install = false,
-  auto_install = false,
+  auto_install = true,
   highlight = {
     enable = true,
     additional_vim_regex_highlighting = false,
@@ -9,4 +9,4 @@ require'nvim-treesitter.configs'.setup {
   endwise = {
     enable = true,
   },
-}
+})