diff --git a/.config/linearmouse/linearmouse.json b/.config/linearmouse/linearmouse.json index b785a46..909bf8e 100644 --- a/.config/linearmouse/linearmouse.json +++ b/.config/linearmouse/linearmouse.json @@ -4,39 +4,39 @@ { "if" : { "device" : { + "productID" : "0xc547", "productName" : "USB Receiver", "vendorID" : "0x46d", - "productID" : "0xc547", "category" : "mouse" } }, "scrolling" : { + "distance" : "auto", "reverse" : { "vertical" : true }, - "acceleration" : 1, "speed" : 0, - "distance" : "auto" + "acceleration" : 1 }, "pointer" : { "disableAcceleration" : true } }, { - "scrolling" : { - "reverse" : { - "vertical" : false - }, - "acceleration" : { - "vertical" : 1 - } - }, "if" : { "device" : { "productName" : "Apple Internal Keyboard \/ Trackpad", + "category" : "trackpad", "vendorID" : "0x5ac", - "productID" : "0x343", - "category" : "trackpad" + "productID" : "0x343" + } + }, + "scrolling" : { + "acceleration" : { + "vertical" : 1 + }, + "reverse" : { + "vertical" : false } } } diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 48b5220..93fc3fc 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -7,48 +7,47 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codecompanion.nvim": { "branch": "main", "commit": "77e04c5e6c58dea6bd3bbdc4cc45dd099ba6a38a" }, + "codecompanion.nvim": { "branch": "main", "commit": "ade8d29c94f6ad3c5b4ccf38517cec13126a6f0d" }, "codewindow.nvim": { "branch": "master", "commit": "dd7017617962943eb1d152fc58940f11c6775a4a" }, - "conform.nvim": { "branch": "master", "commit": "6a28c90082a67f62a323ab90d988e000a718a8c7" }, - "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" }, + "conform.nvim": { "branch": "master", "commit": "d28ccf945374edd9f1c34a82f6c22261dbd8ab98" }, + "dressing.nvim": { "branch": "master", "commit": "c334ac73e031f0dc93d6d91f3658ee75b8be1d3b" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "grug-far.nvim": { "branch": "main", "commit": "190c03d54e8976491e6e49acb97087bf4182b079" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, - "image.nvim": { "branch": "master", "commit": "88e9693e188b8464b1c426aebb4389fd9db2fcbf" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, + "image.nvim": { "branch": "master", "commit": "3e0fb47c9ea92a0ba9468c2ae533f30539505a1a" }, + "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" }, "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" }, - "kulala.nvim": { "branch": "main", "commit": "9bfa4e9ac82ca3429bd2edcc70e15623545c8d3f" }, + "kulala.nvim": { "branch": "main", "commit": "3fc84b71f250408bfc4d863f663c5e273f42180a" }, "lazy-lsp.nvim": { "branch": "master", "commit": "8cfb2329a4cdc8e1eefe47dc18fb8e8c6dbdf183" }, "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, "leetcode.nvim": { "branch": "master", "commit": "02fb2c855658ad6b60e43671f6b040c812181a1d" }, "lsp-zero.nvim": { "branch": "v4.x", "commit": "19a8b90340c6c522219c84f7befe784d657ab28e" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "lualine.nvim": { "branch": "master", "commit": "640260d7c2d98779cab89b1e7088ab14ea354a02" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mini.diff": { "branch": "main", "commit": "24d46798be8a358d38d3adc92c7ebcbb2d6f67e0" }, + "mini.diff": { "branch": "main", "commit": "65c59f9967fec965d8759a88c1baa43147699035" }, "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, - "mini.nvim": { "branch": "main", "commit": "919b953f044d97a2243cc2d1f0b316a199434127" }, + "mini.nvim": { "branch": "main", "commit": "0a8a1072137d916406507c941698a4bfa9dbbe7a" }, "mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" }, "molten-nvim": { "branch": "main", "commit": "66ee5c0a0fbe3e014b867d04db44592f2d3eb30f" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, - "nvim-lspconfig": { "branch": "master", "commit": "28b205ebe73a18f401e040585106f9bafd8ff21f" }, + "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, + "nvim-lspconfig": { "branch": "master", "commit": "bc6ada4b0892b7f10852c0b8ca7209fd39a6d754" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-treesitter": { "branch": "master", "commit": "00d219068385a4aa80859d4606ad6e03af6faa83" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5bd21aa75aa9e24c0680b23fc88380cd80a53641" }, + "nvim-treesitter": { "branch": "master", "commit": "01a92da4389b5346b4049c5b42256c9d84526f04" }, + "nvim-treesitter-context": { "branch": "master", "commit": "a2a334900d3643de585ac5c6140b03403454124f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "otter.nvim": { "branch": "main", "commit": "ca9ce67d0399380b659923381b58d174344c9ee7" }, "outline.nvim": { "branch": "main", "commit": "6c44527837ff7ac1cd054dc365a721e881020a2e" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "quarto-nvim": { "branch": "main", "commit": "23083a0152799ca7263ac9ae53d768d4dd93d24e" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "e0f9b3efe150724af2d2ed59997d5ece373840e3" }, "render-markdown.nvim": { "branch": "main", "commit": "fc05fb7c56795f191b6800799a2ec6ea325ba715" }, - "scrollEOF.nvim": { "branch": "master", "commit": "38fd5880021e90c15dc61fa325f714bd8077f0a6" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, - "telescope.nvim": { "branch": "master", "commit": "37dc9233a473dd6c3f54456ef9994d8f77c80211" }, + "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "wezterm.nvim": { "branch": "main", "commit": "032c33b621b96cc7228955b4352b48141c482098" }, diff --git a/.config/nvim/lua/plugins/editing/lsp.lua b/.config/nvim/lua/plugins/editing/lsp.lua index 8462921..48fda67 100644 --- a/.config/nvim/lua/plugins/editing/lsp.lua +++ b/.config/nvim/lua/plugins/editing/lsp.lua @@ -13,7 +13,6 @@ return { formatters_by_ft = { markdown = { 'injected' }, python = { - 'ruff_fix', 'ruff_format', 'ruff_organize_imports', }, diff --git a/.config/nvim/lua/plugins/editing/treesitter.lua b/.config/nvim/lua/plugins/editing/treesitter.lua index 66f37cb..394721a 100644 --- a/.config/nvim/lua/plugins/editing/treesitter.lua +++ b/.config/nvim/lua/plugins/editing/treesitter.lua @@ -7,7 +7,7 @@ return { }, config = function() require('treesitter-context').setup({ - mode = 'cursor' -- cursor or topline + mode = 'topline' -- cursor or topline }) require 'nvim-treesitter.configs'.setup({ diff --git a/.config/nvim/lua/plugins/jupyter/molten.lua b/.config/nvim/lua/plugins/jupyter/molten.lua index 8483eed..fa976bb 100644 --- a/.config/nvim/lua/plugins/jupyter/molten.lua +++ b/.config/nvim/lua/plugins/jupyter/molten.lua @@ -10,7 +10,8 @@ return { vim.g.molten_auto_open_output = false -- image.nvim or wezterm (install wezterm.nvim) - vim.g.molten_image_provider = "none" + -- vim.g.molten_image_provider = "none" + vim.g.molten_image_provider = "wezterm" -- optional, I like wrapping. works for virt text and the output window vim.g.molten_wrap_output = true diff --git a/.config/yadm/mac-install.yml b/.config/yadm/mac-install.yml index 4da121b..ecec89a 100644 --- a/.config/yadm/mac-install.yml +++ b/.config/yadm/mac-install.yml @@ -57,6 +57,8 @@ - bat - oven-sh/bun/bun - jesseduffield/lazygit/lazygit + - saulpw/vd/visidata + - xsv state: latest update_homebrew: yes @@ -110,6 +112,8 @@ - craft - zoom - 1password-cli + - bettertouchtool + - bambu-studio state: latest - name: "Homebrew: Start Services" diff --git a/.config/yadm/scripts/sync_ssh.sh b/.config/yadm/scripts/sync_ssh.sh index cea0cf3..7abc4d8 100755 --- a/.config/yadm/scripts/sync_ssh.sh +++ b/.config/yadm/scripts/sync_ssh.sh @@ -62,28 +62,42 @@ install_zsh() { sync_zsh() { log "Syncing Zsh configuration..." - # Create backup of existing config - # ssh ${REMOTE_CONNECTION} 'cp ~/.zshrc ~/.zshrc.backup 2>/dev/null || true' - # Sync .zshrc rsync -av ~/.zshrc_portable "${REMOTE_CONNECTION}:~/.zshrc" - # Sync custom Oh My Zsh files if they exist - if [ -d ~/.oh-my-zsh/custom ]; then - rsync -av ~/.oh-my-zsh/custom/ "${REMOTE_CONNECTION}:~/.oh-my-zsh/custom/" - fi } -# Install Neovim on remote install_neovim() { - log "Installing Neovim..." + log "Installing Neovim AppImage..." ssh "${REMOTE_CONNECTION}" ' - if ! command -v nvim &> /dev/null; then - sudo dnf install -y neovim + # Handle dubious ownership error + git config --global --add safe.directory "*" + + # Create directory for app images if it doesnt exist + mkdir -p ~/.local/bin + + # Download latest stable Neovim AppImage + curl -L -o nvim.appimage $(curl -s https://api.github.com/repos/neovim/neovim/releases/latest | grep -o "https.*appimage\"" | tr -d "\"") + + # Make it executable + chmod u+x nvim.appimage + + # Move to final location + mv nvim.appimage ~/.local/bin/nvim + + # Clean up + rm -rf squashfs-root + + # Add to PATH if not already there + if ! grep -q "PATH=\"\$HOME/.local/bin:\$PATH\"" ~/.zshrc; then + echo "export PATH=\"\$HOME/.local/bin:\$PATH\"" >> ~/.zshrc fi + + # Create symbolic link for backward compatibility + sudo ln -sf ~/.local/bin/nvim /usr/local/bin/nvim 2>/dev/null || true ' -} + } # Sync Neovim configuration sync_neovim() { diff --git a/.visidatarc b/.visidatarc new file mode 100644 index 0000000..7694ca8 --- /dev/null +++ b/.visidatarc @@ -0,0 +1,27 @@ +# Use 'i' instead of 'e' to edit +TableSheet.unbindkey('i') +TableSheet.bindkey('i', 'edit-cell') + +# I already use alt + whatever everywhere, need to rebind + +# Menu bar items +TableSheet.unbindkey('Alt+f') # File Menu +TableSheet.unbindkey('Alt+e') # Edit Menu +TableSheet.unbindkey('Alt+v') # View Menu +TableSheet.unbindkey('Alt+c') # Column Menu +TableSheet.unbindkey('Alt+r') # Row Menu +TableSheet.unbindkey('Alt+d') # Data Menu +TableSheet.unbindkey('Alt+p') # Plot Menu +TableSheet.unbindkey('Alt+s') # System Menu +TableSheet.unbindkey('Alt+h') # Help Menu +TableSheet.unbindkey('F1') # Quick Reference +TableSheet.unbindkey('F2') # Hello World +TableSheet.bindkey('F1', 'menu-file') # File Menu +TableSheet.bindkey('F2', 'menu-edit') # Edit Menu +TableSheet.bindkey('F3', 'menu-view') # View Menu +TableSheet.bindkey('F4', 'menu-column') # Column Menu +TableSheet.bindkey('F5', 'menu-row') # Row Menu +TableSheet.bindkey('F6', 'menu-data') # Data Menu +TableSheet.bindkey('F7', 'menu-plot') # Plot Menu +TableSheet.bindkey('F8', 'menu-system') # System Menu +TableSheet.bindkey('F9', 'menu-help') # Help Menu diff --git a/Library/Preferences/.GlobalPreferences.plist b/Library/Preferences/.GlobalPreferences.plist index b322ef7..fff5002 100644 Binary files a/Library/Preferences/.GlobalPreferences.plist and b/Library/Preferences/.GlobalPreferences.plist differ diff --git a/Library/Preferences/com.lwouis.alt-tab-macos.plist b/Library/Preferences/com.lwouis.alt-tab-macos.plist index b672fc3..5df7cc0 100644 Binary files a/Library/Preferences/com.lwouis.alt-tab-macos.plist and b/Library/Preferences/com.lwouis.alt-tab-macos.plist differ diff --git a/Library/Preferences/dev.warp.Warp-Stable.plist b/Library/Preferences/dev.warp.Warp-Stable.plist index f0ff62d..eadbdd0 100644 Binary files a/Library/Preferences/dev.warp.Warp-Stable.plist and b/Library/Preferences/dev.warp.Warp-Stable.plist differ