diff --git a/.condarc b/.condarc index c583f2b..5ef700e 100644 --- a/.condarc +++ b/.condarc @@ -9,3 +9,4 @@ create_default_packages: - ipython - ipykernel - pylatexenc + - ipywidgets diff --git a/.config/1Password/ssh/agent.toml b/.config/1Password/ssh/agent.toml new file mode 100644 index 0000000..ff6cc27 --- /dev/null +++ b/.config/1Password/ssh/agent.toml @@ -0,0 +1,11 @@ +# first for soft-Serve +[[ssh-keys]] +item = "Git" +vault = "Personal" + +[[ssh-keys]] +item = "Hetzner" +vault = "Personal" + +[[ssh-keys]] +vault = "Personal" diff --git a/.config/linearmouse/linearmouse.json b/.config/linearmouse/linearmouse.json index bcacf4f..f3d8675 100644 --- a/.config/linearmouse/linearmouse.json +++ b/.config/linearmouse/linearmouse.json @@ -1,44 +1,44 @@ { + "$schema" : "https:\/\/schema.linearmouse.app\/0.10.0", "schemes" : [ { + "scrolling" : { + "reverse" : { + "vertical" : true + }, + "acceleration" : 1, + "distance" : "auto", + "speed" : 0 + }, "pointer" : { "disableAcceleration" : true }, "if" : { "device" : { + "productName" : "USB Receiver", "productID" : "0xc547", "vendorID" : "0x46d", - "category" : "mouse", - "productName" : "USB Receiver" + "category" : "mouse" } - }, - "scrolling" : { - "reverse" : { - "vertical" : true - }, - "distance" : "auto", - "acceleration" : 1, - "speed" : 0 } }, { "if" : { "device" : { - "vendorID" : "0x5ac", "category" : "trackpad", - "productName" : "Apple Internal Keyboard \/ Trackpad", - "productID" : "0x343" + "productID" : "0x343", + "vendorID" : "0x5ac", + "productName" : "Apple Internal Keyboard \/ Trackpad" } }, "scrolling" : { - "acceleration" : { - "vertical" : 1 - }, "reverse" : { "vertical" : false + }, + "acceleration" : { + "vertical" : 1 } } } - ], - "$schema" : "https:\/\/schema.linearmouse.app\/0.10.0" + ] } \ No newline at end of file diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index df695d8..eb52699 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -7,63 +7,62 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "codecompanion.nvim": { "branch": "main", "commit": "dab51b5a195ad382f1e4b3a4968f836c4bb48623" }, + "codecompanion.nvim": { "branch": "main", "commit": "798de29f5d082cfe6e139efb81b768b470361d5a" }, "codewindow.nvim": { "branch": "master", "commit": "dd7017617962943eb1d152fc58940f11c6775a4a" }, - "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, - "csvview.nvim": { "branch": "main", "commit": "d9bd2efedb028bdb818fd18d1f3db9e0a1d01867" }, + "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, + "csvview.nvim": { "branch": "main", "commit": "b5e57ee599d91c7eb6915df6b515915501b0b7df" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "grug-far.nvim": { "branch": "main", "commit": "c88435b825a35bfa468b47159709b3221976ecd1" }, - "gruvbox-material": { "branch": "master", "commit": "3eb4a739a80f68b8386d13359a005ef45bf9a9eb" }, - "image.nvim": { "branch": "master", "commit": "b991fc7f845bc6ab40c6ec00b39750dcd5190010" }, + "gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" }, + "grug-far.nvim": { "branch": "main", "commit": "8e8f3429038d45a6d4144c0642d92f470e5480f3" }, + "gruvbox-material": { "branch": "master", "commit": "e41451337d33997aff4c078a83165a9f66e2d38d" }, + "image.nvim": { "branch": "master", "commit": "f1163cc2f6fff5b0de7c23c7502eee0df23a3e0e" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" }, - "kulala.nvim": { "branch": "main", "commit": "c7efcd01afafae0ab68c2a77cd050b9795edd8ad" }, + "kulala.nvim": { "branch": "main", "commit": "eb0804ef7c98680bfe1844c8e4bfd62c0ccd34c7" }, "lazy-lsp.nvim": { "branch": "master", "commit": "91146e303717f55561c281d541e32f75de931a0d" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "leetcode.nvim": { "branch": "master", "commit": "02fb2c855658ad6b60e43671f6b040c812181a1d" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "magick.nvim": { "branch": "master", "commit": "d7118ebf2d2d544a865058fc8bfd7c5bfea7db22" }, + "magick.nvim": { "branch": "master", "commit": "b5376d32422ed7eb52c718943516dc7057ae8712" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, "mini.diff": { "branch": "main", "commit": "00f072250061ef498f91ed226918c9ec31a416a4" }, - "mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" }, - "mini.sessions": { "branch": "main", "commit": "427c84e16c3d7363e2a4879c0efd2a3f6a62ff75" }, + "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, + "mini.sessions": { "branch": "main", "commit": "71c9ae596664ac110560d27eb928fc24e22bc53d" }, "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, "molten-nvim": { "branch": "push-otzqzrqwlkzu", "commit": "143272989e9c10401a70918207321be71db45d29" }, "nabla.nvim": { "branch": "master", "commit": "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "9ea60f79e370d8f4847efc145e53afe4b0613fc1" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" }, + "neogit": { "branch": "master", "commit": "a1fc4e50fa494e04097cf2d02e86bcd7ac5760d6" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-autopairs": { "branch": "master", "commit": "d2f791ceeb26d04d87aa54343bc94e8ad8d7be1c" }, + "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, "nvim-ghost.nvim": { "branch": "main", "commit": "bdba2a8ad0eec84379d65e7aa9b76a17b11b653a" }, - "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, - "nvim-notify": { "branch": "master", "commit": "1e99f4f9534ecf3b84eb7ef54a8d460230e78442" }, + "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" }, + "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" }, "nvim-python-repl": { "branch": "main", "commit": "ccc5f104f5e934d49b1571a748a09dc9d210221e" }, - "nvim-treesitter": { "branch": "master", "commit": "34d78baa86a37e86fe64b642860144c28ab9f0c8" }, + "nvim-treesitter": { "branch": "master", "commit": "29f96aafe1ec99f464732b4586af53d2953345bb" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, - "otter.nvim": { "branch": "main", "commit": "e8c662e1aefa8b483cfba6e00729a39a363dcecc" }, + "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "otter.nvim": { "branch": "main", "commit": "3ff6c154d55528fbde475b2a722f91389421e873" }, "pastify.nvim": { "branch": "main", "commit": "5e0e7e5e1b4880476a35a82d3dfe93764a9a37da" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "quarto-nvim": { "branch": "main", "commit": "1cb2d24d7793241bd43f38e3a6f99a6d11f84458" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "77e5bad54227dcfe3878ffbda88ab1efdaacb475" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5578ca6709e0e9a0c76fc7c484b9951b428cbb71" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, - "render-markdown.nvim": { "branch": "main", "commit": "6fbd1491abc104409f119685de5353c35c97c005" }, - "searchbox.nvim": { "branch": "main", "commit": "c255af511687ab830c8b9d3e7f19aa91bb2f2a1d" }, + "render-markdown.nvim": { "branch": "main", "commit": "d7b646f2e6136d963e1bd3abbb9e2ac3fa90837a" }, + "searchbox.nvim": { "branch": "main", "commit": "ed230583c78795526b3d4585ac1460c108e26213" }, "telescope-conda.nvim": { "branch": "main", "commit": "045e4f477ca98cdefde631397cb9a9a2e1c77e45" }, "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, "telescope-luasnip.nvim": { "branch": "master", "commit": "07a2a2936a7557404c782dba021ac0a03165b343" }, "telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" }, - "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, + "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vimtex": { "branch": "master", "commit": "b8bb79b5fb27e9030ade92e75cd9375416f2c666" }, - "wezterm.nvim": { "branch": "main", "commit": "032c33b621b96cc7228955b4352b48141c482098" }, - "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } + "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } } diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua index 857e225..a7f2f00 100644 --- a/.config/nvim/lua/keymaps.lua +++ b/.config/nvim/lua/keymaps.lua @@ -210,10 +210,13 @@ vim.api.nvim_create_autocmd('LspAttach', { }) vim.keymap.set('n', 'gF', 'ToggleFormat', { silent = true, desc = "Conform: Toggle Format-on-save" }) ----- Toggle diagnostics +---- LSP +-- Toggle diagnostics vim.keymap.set('n', 'dd', function() vim.diagnostic.enable(not vim.diagnostic.is_enabled()) end, { silent = true, desc = "LSP: Toggle Diagnostics" }) +-- Toggle autoformat/format-on-save +vim.keymap.set('n', 'df', 'ToggleFormat', { silent = true, desc = "LSP: Toggle Format-on-save" }) ---- floating keybinding help for lsp local show_lsp_zero_keybindings = function() diff --git a/.config/nvim/lua/plugins/editing/lsp.lua b/.config/nvim/lua/plugins/editing/lsp.lua index 64ec474..56a6fb7 100644 --- a/.config/nvim/lua/plugins/editing/lsp.lua +++ b/.config/nvim/lua/plugins/editing/lsp.lua @@ -20,6 +20,15 @@ return { cpp = { 'clangd' } }, configs = { + basedpyright = { + settings = { + basedpyright = { + analysis = { + typeCheckingMode = "standard" + } + } + } + }, lua_ls = { settings = { Lua = { diff --git a/.config/yadm/mac-install.yml b/.config/yadm/mac-install.yml index 46d6919..9ba45ea 100644 --- a/.config/yadm/mac-install.yml +++ b/.config/yadm/mac-install.yml @@ -73,6 +73,9 @@ - yazi - mosh - abduco + - xh + - bruno-cli + - charmbracelet/tap/mods state: latest update_homebrew: yes @@ -106,7 +109,6 @@ - microsoft-teams - anaconda - google-drive - - openinterminal - gpg-suite - iterm2 - iina @@ -140,6 +142,7 @@ - piphero - embyserver - balenaetcher + - bruno state: latest - name: "Homebrew: Start Services" diff --git a/.docker/config.json b/.docker/config.json index 7eb916d..ed19a6b 100644 --- a/.docker/config.json +++ b/.docker/config.json @@ -6,6 +6,9 @@ "$HOMEBREW_PREFIX/lib/docker/cli-plugins" ], "plugins": { + "-x-cli-hints": { + "enabled": "true" + }, "debug": { "hooks": "exec" }, diff --git a/.gitconfig b/.gitconfig index 6be7005..730b97f 100644 --- a/.gitconfig +++ b/.gitconfig @@ -11,6 +11,7 @@ required = true [core] autocrlf = input + editor = nvim [gpg] format = ssh [includeIf "gitdir:/Users/"] diff --git a/.oh-my-zsh b/.oh-my-zsh index f733dc3..028d653 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit f733dc340b2a1c5b2e61a4da7de790b2f557175f +Subproject commit 028d65363230b4aa54f3aaa14e03237243a2f1d8 diff --git a/.ssh/config b/.ssh/config index abf2b4d..9a80a1a 100644 --- a/.ssh/config +++ b/.ssh/config @@ -14,5 +14,14 @@ Host ssh.devinl.im User davay Port 2222 -Host * - IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" +Host git.devinl.im + HostName git.devinl.im + Port 23231 + +Match exec "uname | grep -q Darwin" + Host * + IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" + +Match exec "uname | grep -q Linux" + Host * + IdentityAgent "~/.1password/agent.sock" diff --git a/.zshrc_portable b/.zshrc_portable index 7dc1da8..d652e51 100644 --- a/.zshrc_portable +++ b/.zshrc_portable @@ -2,6 +2,21 @@ export PATH="$HOME/.local/bin:$PATH" # pip? export PATH="$HOME/.cargo/bin/:$PATH" # rust +# Tokens and API Keys +load_gemini_key() { + export GEMINI_API_KEY="$(op read "op://Personal/Gemini API Key/credential")" +} + +gemini() { + if [ -z "${GEMINI_API_KEY}" ]; then + echo "GEMINI_API_KEY not set. Run load_gemini_key first." + return 1 + fi + + xh POST "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent?key=${GEMINI_API_KEY}" \ + contents:="$1" +} + # powerlevel10k [[ ! -f ~/powerlevel10k/powerlevel10k.zsh-theme ]] || source ~/powerlevel10k/powerlevel10k.zsh-theme [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh @@ -88,12 +103,18 @@ alias status="git status" alias pull="git pull" alias push="git push" alias clean="git clean -dfx" -alias nuke="git clean -dfx && git reset --hard HEAD" alias stashlist="git stash list" alias stashshow="git stash show -p" alias stashpop="git stash pop" alias branches="git --no-pager branch --all" alias commits="git --no-pager log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" +alias lfsconfig='echo -e "[lfs]\nurl = git@git.devinl.im:$(basename $(git rev-parse --show-toplevel)).git\nlocksverify = true" > .lfsconfig' + +nuke() { + git fetch origin && \ + git clean -dfx && \ + git reset --hard origin $(git symbolic-ref --short HEAD) +} ## aliases requiring params backmerge() { @@ -119,13 +140,19 @@ checkout() { return $? fi - # 2: Check if it's a valid commit ID + # 2: Check if it's a remote branch + if git rev-parse --verify --quiet "origin/$1" >/dev/null 2>&1; then + git checkout -b "$1" "origin/$1" + return $? + fi + + # 3: Check if it's a valid commit ID if git rev-parse --verify --quiet "$1^{commit}" >/dev/null 2>&1; then git checkout "$1" return $? fi - # 3: Check if it's a number to go back in history + # 4: Check if it's a number to go back in history if [[ "$1" =~ ^[0-9]+$ ]]; then git checkout "HEAD~$1" return $? diff --git a/Library/Preferences/.GlobalPreferences.plist b/Library/Preferences/.GlobalPreferences.plist index c6948c2..205dd19 100644 Binary files a/Library/Preferences/.GlobalPreferences.plist and b/Library/Preferences/.GlobalPreferences.plist differ diff --git a/Library/Preferences/com.apple.symbolichotkeys.plist b/Library/Preferences/com.apple.symbolichotkeys.plist index dac8b40..eafb80c 100644 Binary files a/Library/Preferences/com.apple.symbolichotkeys.plist and b/Library/Preferences/com.apple.symbolichotkeys.plist differ diff --git a/Library/Preferences/com.hegenberg.BetterTouchTool.plist b/Library/Preferences/com.hegenberg.BetterTouchTool.plist index 1644410..b93e12a 100644 Binary files a/Library/Preferences/com.hegenberg.BetterTouchTool.plist and b/Library/Preferences/com.hegenberg.BetterTouchTool.plist differ diff --git a/Library/Preferences/com.lwouis.alt-tab-macos.plist b/Library/Preferences/com.lwouis.alt-tab-macos.plist index 47d696a..68742ee 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/mo.com.sleeplessmind.Wooshy.plist b/Library/Preferences/mo.com.sleeplessmind.Wooshy.plist index 4f60d3c..349411b 100644 Binary files a/Library/Preferences/mo.com.sleeplessmind.Wooshy.plist and b/Library/Preferences/mo.com.sleeplessmind.Wooshy.plist differ