☝️

nvim/ftplugin/slim.lua

@@ -0,0 +1 @@
+vim.opt_local.foldmethod = "indent"

nvim/init.lua

@@ -13,6 +13,8 @@ require("lazy").setup({
  import = "lazyvim.plugins",
  },
  { import = "lazyvim.plugins.extras.coding.copilot" },
+ { import = "lazyvim.plugins.extras.coding.copilot-chat" },
+ { import = "lazyvim.plugins.extras.coding.mini-surround" },
  { import = "lazyvim.plugins.extras.editor.mini-move" },
  { import = "lazyvim.plugins.extras.editor.dial" },
  { import = "lazyvim.plugins.extras.formatting.prettier" },

nvim/lazyvim.json

@@ -1,14 +1,9 @@
 {
  "extras": [
- "lazyvim.plugins.extras.coding.copilot",
- "lazyvim.plugins.extras.editor.mini-move",
- "lazyvim.plugins.extras.formatting.prettier",
- "lazyvim.plugins.extras.lang.tailwind",
- "lazyvim.plugins.extras.lang.typescript",
- "lazyvim.plugins.extras.util.mini-hipatterns"
+ "lazyvim.plugins.extras.editor.trouble-v3"
  ],
  "news": {
- "NEWS.md": "3314"
+ "NEWS.md": "4964"
  },
- "version": 3
+ "version": 5
 }

nvim/lua/plugins/coding.lua

@@ -1,11 +1,11 @@
 return {
- {
- "L3MON4D3/LuaSnip",
- config = function()
- require("luasnip.loaders.from_snipmate").lazy_load()
- end,
- dependencies = {},
- },
+ -- {
+ --  "L3MON4D3/LuaSnip",
+ --  config = function()
+ --  require("luasnip.loaders.from_snipmate").lazy_load()
+ --  end,
+ --  dependencies = {},
+ -- },
  { "rafamadriz/friendly-snippets", enabled = false },
  {
  "hrsh7th/nvim-cmp",

nvim/lua/plugins/formatting.lua

@@ -15,18 +15,11 @@ return {
  args = { "fmt", "-r", "-" },
  stdin = true,
  },
- -- erb_format = {
- -- command = "erb-format",
- -- args = { "--stdin" },
- -- stdin = true,
- -- condition = function(ctx)
- -- local basename = vim.fs.basename(ctx.filename)
- -- if basename and string.match(basename, ".yml$") then
- -- return false
- -- end
- -- return true
- -- end,
- -- },
+ erb_format = {
+ command = "erb-format",
+ args = { "--stdin" },
+ stdin = true,
+ },
  },
  },
  },

nvim/lua/plugins/obsidian.lua

@@ -1,26 +1,26 @@
 return {
- "epwalsh/obsidian.nvim",
- lazy = true,
- ft = "markdown",
- dependencies = { "nvim-lua/plenary.nvim" },
- keys = {
- { "<leader>oo", "<cmd>ObsidianOpen<cr>", desc = "Open Obisidian.app" },
- { "<leader>on", "<cmd>ObsidianNew<cr>", desc = "New note" },
- { "<leader>of", "<cmd>ObsidianQuickSwitch<cr>", desc = "Find note by name" },
- { "<leader>og", "<cmd>ObsidianSearch<cr>", desc = "Grep notes" },
- { "<leader>ot", "<cmd>ObsidianToday<cr>", desc = "Open today's daily note" },
- },
- opts = {
- workspaces = {
- {
- name = "Wiki",
- path = "/Users/mikker/Library/Mobile Documents/iCloud~md~obsidian/Wiki",
- overrides = {
- daily_notes = {
- folder = "02 Calendar/Journals/",
- },
- },
- },
- },
- },
+ -- "epwalsh/obsidian.nvim",
+ -- lazy = true,
+ -- ft = "markdown",
+ -- dependencies = { "nvim-lua/plenary.nvim" },
+ -- keys = {
+ --  { "<leader>oo", "<cmd>ObsidianOpen<cr>", desc = "Open Obisidian.app" },
+ --  { "<leader>on", "<cmd>ObsidianNew<cr>", desc = "New note" },
+ --  { "<leader>of", "<cmd>ObsidianQuickSwitch<cr>", desc = "Find note by name" },
+ --  { "<leader>og", "<cmd>ObsidianSearch<cr>", desc = "Grep notes" },
+ --  { "<leader>ot", "<cmd>ObsidianToday<cr>", desc = "Open today's daily note" },
+ -- },
+ -- opts = {
+ --  workspaces = {
+ --  {
+ --  name = "Wiki",
+ --  path = "/Users/mikker/Library/Mobile Documents/iCloud~md~obsidian/Wiki",
+ --  overrides = {
+ --  daily_notes = {
+ --  folder = "02 Calendar/Journals/",
+ --  },
+ --  },
+ --  },
+ --  },
+ -- },
 }

nvim/lua/plugins/ui.lua

@@ -15,11 +15,6 @@ return {
 
  -- no indent guides
  { "lukas-reineke/indent-blankline.nvim", enabled = false },
- {
- "echasnovski/mini.indentscope",
- enabled = false,
- -- opts = { draw = { delay = 10, animation = require("mini.indentscope").gen_animation.none() } },
- },
 
  -- no fancy ui
  { "folke/noice.nvim", enabled = false },

sprinkles.symlink/github.com.js

@@ -8,18 +8,18 @@ document.addEventListener("keydown", (event) => {
 async function rebase() {
  const button = q('[data-details-container=".js-merge-pr"]');
 
- if (button.innerText !== "Rebase and merge") {
+ if (button.innerText !== "Squash and merge") {
  q('[aria-label="Select merge method"]').click();
  await sleep(250);
 
- q('.js-merge-method-menu button[value="rebase"]').click();
+ q('.js-merge-method-menu button[value="squash"]').click();
  await sleep(250);
  }
 
  button.click();
  await sleep(250);
 
- q(".btn-group-rebase .js-merge-commit-button").click();
+ q(".btn-group-squash .js-merge-commit-button").click();
 }
 
 function sleep(delay) {

wezterm/wezterm.lua.symlink

@@ -23,8 +23,8 @@ config.hide_tab_bar_if_only_one_tab = true
 config.scrollback_lines = 10000
 
 config.window_padding = {
- left = 4,
- right = 4,
+ left = 8,
+ right = 8,
  top = 8,
  bottom = 4,
 }

zsh/zshrc.symlink

@@ -11,20 +11,40 @@ source $ZSH_FILES/prompt.zsh
 source $ZSH_FILES/bindkeys.zsh
 source $ZSH_FILES/aliases.zsh
 
-if type brew &>/dev/null; then
- FPATH=$(brew --prefix)/share/zsh-completions:$FPATH
+export PATH="./bin:$PATH"
 
- autoload -Uz compinit
- compinit
+# bun completions
+[ -s "/Users/mikker/.bun/_bun" ] && source "/Users/mikker/.bun/_bun"
 
- source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
- source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+### Added by Zinit's installer
+if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
+ print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
+ command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
+ command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
+ print -P "%F{33} %F{34}Installation successful.%f%b" || \
+ print -P "%F{160} The clone has failed.%f%b"
 fi
 
+source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
+autoload -Uz _zinit
+(( ${+_comps} )) && _comps[zinit]=_zinit
+
+# Load a few important annexes, without Turbo
+# (this is currently required for annexes)
+zinit light-mode for \
+ zdharma-continuum/zinit-annex-as-monitor \
+ zdharma-continuum/zinit-annex-bin-gem-node \
+ zdharma-continuum/zinit-annex-patch-dl \
+ zdharma-continuum/zinit-annex-rust
+
+### End of Zinit's installer chunk
+
+zinit light zsh-users/zsh-autosuggestions
+zinit light zdharma-continuum/fast-syntax-highlighting
+
+zinit ice lucid wait'0' # what does this first line do?
+zinit light joshskidmore/zsh-fzf-history-search
+
 # Local modifications
 [[ -f ~/.lrc ]] && . ~/.lrc
 
-export PATH="./bin:$PATH"
-
-# bun completions
-[ -s "/Users/mikker/.bun/_bun" ] && source "/Users/mikker/.bun/_bun"