Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion dotfiles/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@
followTags = true

[url "git@github.com:"]
insteadOf = "https://github.com/"
insteadOf = "https://github.com/"

[url "git@ssh.dev.azure.com:v3/"]
insteadOf = "https://dev.azure.com/"

[user]
email = adam.green@adgefficiency.com
Expand Down
2 changes: 1 addition & 1 deletion dotfiles/common/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pretzo_init() {
export STARSHIP_CONFIG=~/dotfiles/starship/starship.toml
source $HOME/dotfiles/zsh/.zprezto
source $HOME/dotfiles/dotfiles/common/.zpreztorc
source ~/.zprezto/init.zsh
source $HOME/dotfiles/zsh/.zprezto/init.zsh
}

starship_init() {
Expand Down
4 changes: 2 additions & 2 deletions dotfiles/wsl/.zshrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "$HOME/dotfiles/dotfiles/common/.zshrc"
source "$HOME/dotfiles/dotfiles/wsl/common.sh"

eval $(keychain --eval --agents ssh -Q --quiet $HOME/.ssh/azure-devops_id_rsa)
eval $(keychain --quiet --eval github ado)
# eval $(keychain --eval --agents ssh -Q --quiet $HOME/.ssh/azure-devops_id_rsa)

[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
8 changes: 4 additions & 4 deletions dotfiles/wsl/common.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
alias docs='cd ~/onedrive/docs'
alias docs='cd "/mnt/c/Users/ag43/OneDrive - Meridian Energy Limited/Documents/docs"'
alias od='cd ~/onedrive'
export TODO_DIR="/home/adam/onedrive/docs/project"
keychain --quiet ~/.ssh/github_ed25519
keychain --quiet ~/.ssh/azure-devops_id_rsa
export TODO_DIR="/mnt/c/Users/ag43/OneDrive - Meridian Energy Limited/Documents/docs/project"
keychain --quiet ~/.ssh/ado
keychain --quiet ~/.ssh/github
alias expl='explorer.exe .'
2 changes: 1 addition & 1 deletion fzf/setup.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
~/.fzf/install
~/.fzf/install --key-bindings --completion --no-update-rc
6 changes: 1 addition & 5 deletions macos/setup.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
#!/usr/bin/env bash

brew update && brew upgrade
brew install pyenv pyenv-virtualenv yabai
brew install yabai
brew install --cask amethyst
brew install --cask dockdoor
chmod +x ~/dotfiles/yabai/yabairc

brew install --HEAD koekeishiya/formulae/skhd
chmod +x ~/dotfiles/skhd/skhdrc

brew tap homebrew/cask-fonts
brew install --cask font-hack-nerd-font

mkdir -p ~/.config/kitty
ln -s ~/dotfiles/kitty/kitty.conf ~/.config/kitty/kitty.conf
62 changes: 31 additions & 31 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
{
"CopilotChat.nvim": { "branch": "main", "commit": "1d8aa27e2317950b0b7ddc023487c6f2b7b074ca" },
"LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
"CopilotChat.nvim": { "branch": "main", "commit": "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb" },
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
"Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
"barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" },
"barbar.nvim": { "branch": "master", "commit": "807bede7ef1d8e2ac5f108e9ac8123b1e2d321e3" },
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
"blink-cmp-dictionary": { "branch": "master", "commit": "43b701fe9728a704bc63e4667c5d8b398bf129b2" },
"blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" },
"blink-ripgrep.nvim": { "branch": "main", "commit": "b71592e916d748492c54b8bc9bc17dc2a0dcdfb5" },
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
"blink-cmp-dictionary": { "branch": "master", "commit": "5f1a703416e5090b9633c43873dba8ba03b0fb23" },
"blink-emoji.nvim": { "branch": "master", "commit": "a77aebc092ebece1eed108f301452ae774d6b67a" },
"blink-ripgrep.nvim": { "branch": "main", "commit": "56084d1f45c8621d23d4bac724c2dc50b1eb75db" },
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
"blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
"bullets.vim": { "branch": "master", "commit": "1c13e510e11d08b0259e8e627f128359c5521962" },
"conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
"bullets.vim": { "branch": "master", "commit": "8f3259e807c40b91d247f612823295ab99777a65" },
"conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
"copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
"copilot.lua": { "branch": "master", "commit": "407fbd5cd3397e1e46b7dedbd928eefcaf621e76" },
"dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" },
"copilot.lua": { "branch": "master", "commit": "0a7502946845fb14b860a6384c709a791bbab96a" },
"dbtpal": { "branch": "main", "commit": "706134b879eb2f48b2abf56f29e95a30a52cf398" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"emmet-vim": { "branch": "master", "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
"gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
"mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
"lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" },
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
"mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
"nvim-bqf": { "branch": "main", "commit": "17680cda3538913e88dd4c6456c837db9ace40ae" },
"nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" },
"nvim-bqf": { "branch": "main", "commit": "e20417d5e589e03eaaaadc4687904528500608be" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" },
"nvim-lspconfig": { "branch": "master", "commit": "c8b90ae5cbe21d547b342b05c9266dcb8ca0de8f" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
"nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
"nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" },
"nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
"nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" },
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
"nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
"obsidian.nvim": { "branch": "main", "commit": "705cc9b4f66eca1e54040ac819102e80a32896d3" },
"oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
"nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
"obsidian.nvim": { "branch": "main", "commit": "e0eb92c5afcacf5bf11e4735079a538fd1486ea9" },
"oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
"telescope-git-file-history.nvim": { "branch": "master", "commit": "c27d99ba88ec5f0b6d2b9f9bc67dd3d14c610b25" },
"telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
"undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
"vim": { "branch": "master", "commit": "d4b0823100c702af127cba8dd5595a8f599041ec" },
"vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
"vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
"vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
"vim-grepper": { "branch": "master", "commit": "acaaf32edaa11d82fb972d2af36b949ec3042928" },
"vim-markdown-toc": { "branch": "master", "commit": "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1" },
"vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
"vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
"vim-table-mode": { "branch": "master", "commit": "e156dbbedce0bbf61c0919db7678fa246fabd616" },
"vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
"winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
}
12 changes: 9 additions & 3 deletions nvim/lua/config/augroup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,15 @@ vim.api.nvim_create_autocmd("FileType", {
})

-- .py
vim.api.nvim_create_augroup("NoSpellForCode", { clear = true })

vim.api.nvim_create_autocmd("FileType", {
pattern = "python",
group = "NoSpellForCode",
pattern = { "python", "go" },
callback = function()
vim.cmd("highlight ColorColumn cterm=bold ctermbg=238 gui=bold guibg=#424450")
end,
vim.opt_local.spell = false
if vim.bo.filetype == "python" then
vim.opt_local.colorcolumn = "88"
end
end
})
1 change: 0 additions & 1 deletion nvim/lua/plugins/cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ return {
---@type blink.cmp.Config
opts = {
snippets = { preset = "luasnip" },

fuzzy = { implementation = "prefer_rust_with_warning" },

keymap = {
Expand Down
1 change: 1 addition & 0 deletions nvim/lua/plugins/copilot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ return {
context = "buffers",
history_path = vim.fn.stdpath("data") .. "/copilotchat_history",
auto_follow_cursor = false,
model = "gpt-4o",
},
},
}
5 changes: 4 additions & 1 deletion nvim/lua/plugins/linting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ return {
markdown = { "markdownlint", "codespell" },
python = { "ruff", "pydocstyle" },
sql = { "sqlfluff" },
yaml = { "actionlint", "yamllint" },
yaml = {
-- "actionlint",
"yamllint",
},
}

-- auto-run linting on buffer events
Expand Down
1 change: 1 addition & 0 deletions nvim/spell/en.utf-8.add
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ Backprop
backprop
designers
that/!
off
Binary file modified nvim/spell/en.utf-8.add.spl
Binary file not shown.
2 changes: 2 additions & 0 deletions python/setup-uv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ uv tool install mypy --python 3.11.9
uv tool install pytest --python 3.11.9
uv tool install ruff --python 3.11.9
uv tool install yamllint --python 3.11.9
uv tool install pydocstyle --python 3.11.9
uv tool install sqlfluff --python 3.11.9
Loading