Skip to content

Commit b73b25d

Browse files
ADGEfficiencyADGEfficiency
authored
WSL 2025-09-20 (#66)
1 parent 00ec937 commit b73b25d

File tree

10 files changed

+79
-56
lines changed

10 files changed

+79
-56
lines changed

‎Makefile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ dotfiles: setup-stow
3232
stow "$(STOW_ARGS)" yabai
3333
ln -sf ~/dotfiles/fish ~/.config/fish\
3434

35-
.PHONY: setup-uv python
3635

3736
setup-uv:
3837
bash ./python/setup-uv.sh
@@ -55,6 +54,17 @@ setup-vim:
5554
git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
5655
"vim" +PluginInstall +qall
5756

57+
.PHONY: setup-nix nix-pkgs
58+
59+
setup-nix:
60+
curl -L https://nixos.org/nix/install | sh
61+
. ./nix/load-"$(OS)".sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
62+
. ./nix/load-"$(OS)".sh && nix-channel --update
63+
64+
NIX_ARGS=--extra-experimental-features nix-command --extra-experimental-features flakes
65+
nix-pkgs: setup-nix
66+
. ./nix/load-"$(OS)".sh && cd nix && nix flake update "$(NIX_ARGS)" && (nix profile upgrade "$(NIX_ARGS)" nix || nix profile install "$(NIX_ARGS)" .)
67+
5868
.PHONY: setup-brew brew-pkgs
5969

6070
setup-brew:

‎dotfiles/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ pre
3737
temp
3838
temp.*
3939
temp
40+
.databricks
4041
**/.mypy_cache

‎nvim/lazy-lock.json‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,63 @@
11
{
2-
"CopilotChat.nvim": { "branch": "main", "commit": "07dcc188bc488b2dafa9324bd42088640bee3d19" },
3-
"LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
2+
"CopilotChat.nvim": { "branch": "main", "commit": "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb" },
3+
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
44
"Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
5-
"barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" },
5+
"barbar.nvim": { "branch": "master", "commit": "807bede7ef1d8e2ac5f108e9ac8123b1e2d321e3" },
66
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
7-
"blink-cmp-dictionary": { "branch": "master", "commit": "944b3b215b01303672d4213758db7c5c5a1e3c92" },
8-
"blink-emoji.nvim": { "branch": "master", "commit": "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06" },
9-
"blink-ripgrep.nvim": { "branch": "main", "commit": "274eb06080a786a1c8c3d35093be269310e9f49f" },
10-
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
7+
"blink-cmp-dictionary": { "branch": "master", "commit": "5f1a703416e5090b9633c43873dba8ba03b0fb23" },
8+
"blink-emoji.nvim": { "branch": "master", "commit": "a77aebc092ebece1eed108f301452ae774d6b67a" },
9+
"blink-ripgrep.nvim": { "branch": "main", "commit": "56084d1f45c8621d23d4bac724c2dc50b1eb75db" },
10+
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
1111
"blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
12-
"bullets.vim": { "branch": "master", "commit": "89294b8930e660936374fb763ac48a1ac51dd29c" },
13-
"conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
12+
"bullets.vim": { "branch": "master", "commit": "8f3259e807c40b91d247f612823295ab99777a65" },
13+
"conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
1414
"copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
15-
"copilot.lua": { "branch": "master", "commit": "2d7511494245129aa6c2176f9c71cc2bc1360ed9" },
16-
"dbtpal": { "branch": "main", "commit": "981eab51609362712c64e3cf3fb773fe11f859b9" },
15+
"copilot.lua": { "branch": "master", "commit": "0a7502946845fb14b860a6384c709a791bbab96a" },
16+
"dbtpal": { "branch": "main", "commit": "706134b879eb2f48b2abf56f29e95a30a52cf398" },
1717
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
18-
"emmet-vim": { "branch": "master", "commit": "e98397144982d1e75b20d94d55a82de3ec8f648d" },
19-
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
20-
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
21-
"gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
18+
"emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },
19+
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
20+
"gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" },
2221
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
23-
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
22+
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
2423
"leap.nvim": { "branch": "main", "commit": "f19d43590c4b6d31188ee1ea2954d2b7558a9e11" },
25-
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
24+
"lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" },
2625
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
27-
"mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
28-
"mini.nvim": { "branch": "main", "commit": "9b935c218ddba02e5dc75c94f90143bce1f7c646" },
29-
"nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
30-
"nvim-bqf": { "branch": "main", "commit": "daa1a130632dc2b05a9a73538bac058dfa4e0b86" },
26+
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
27+
"mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
28+
"nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" },
29+
"nvim-bqf": { "branch": "main", "commit": "e20417d5e589e03eaaaadc4687904528500608be" },
3130
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
32-
"nvim-lint": { "branch": "master", "commit": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" },
33-
"nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" },
34-
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
35-
"nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
31+
"nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
32+
"nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" },
33+
"nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
34+
"nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" },
3635
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
37-
"nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" },
38-
"nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
36+
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
37+
"nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
3938
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
40-
"oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" },
39+
"oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" },
4140
"peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
42-
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
41+
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
4342
"semshi": { "branch": "master", "commit": "7f18bedc70cbb7aa68dcc6df5e730d88e4527622" },
44-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
45-
"telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
46-
"telescope-makefile": { "branch": "master", "commit": "f35425d7d53d92a04215c3714a5819811d2842c3" },
43+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
44+
"telescope-git-file-history.nvim": { "branch": "master", "commit": "c27d99ba88ec5f0b6d2b9f9bc67dd3d14c610b25" },
45+
"telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
4746
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
48-
"telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" },
49-
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
50-
"undotree": { "branch": "master", "commit": "178d19e00a643f825ea11d581b1684745d0c4eda" },
47+
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
48+
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
49+
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
5150
"vim": { "branch": "master", "commit": "d4b0823100c702af127cba8dd5595a8f599041ec" },
52-
"vim-argwrap": { "branch": "master", "commit": "03615d1eed248408567bc8fa6a5a8c94ef3cd170" },
51+
"vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
5352
"vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
5453
"vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
55-
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
54+
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
5655
"vim-grepper": { "branch": "master", "commit": "acaaf32edaa11d82fb972d2af36b949ec3042928" },
57-
"vim-markdown-toc": { "branch": "master", "commit": "66026b323379c9a712c6169cd43153216acef090" },
56+
"vim-markdown-toc": { "branch": "master", "commit": "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1" },
5857
"vim-one": { "branch": "master", "commit": "187f5c85b682c1933f8780d4d419c55d26a82e24" },
5958
"vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
6059
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
61-
"vim-table-mode": { "branch": "master", "commit": "bb025308a45c67c7c8f0763ba37bc2ee3f534df0" },
60+
"vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
6261
"winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
63-
"zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }
62+
"zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
6463
}

‎nvim/lua/config/keymap.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ vim.keymap.set("n", "<leader>o", "<CMD>split | Oil<CR>")
112112

113113
-- CopilotChat
114114
vim.keymap.set("n", "<leader>c", ":CopilotChat<CR>")
115+
vim.keymap.set("n", "<leader>sc", function()
116+
require("CopilotChat").toggle({ window = { layout = "horizontal" } })
117+
end, { desc = "Toggle Copilot Chat (horizontal)" })
115118

116119
-- ZenMode
117120
vim.keymap.set("n", "<leader>z", ":ZenMode<CR>")

‎nvim/lua/plugins/cmp.lua‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ return {
2323
opts = {
2424
snippets = { preset = "luasnip" },
2525
fuzzy = { implementation = "prefer_rust_with_warning" },
26-
2726
cmdline = {
2827
enabled = true,
2928
completion = {
@@ -35,11 +34,11 @@ return {
3534
"accept",
3635
},
3736
["<CR>"] = {
37+
"accept_and_enter",
3838
"fallback",
3939
},
4040
},
4141
},
42-
4342
completion = {
4443
documentation = {
4544
-- Controls whether the documentation window will automatically show when selecting a completion item
@@ -73,7 +72,6 @@ return {
7372
},
7473
},
7574
},
76-
7775
list = {
7876
selection = {
7977
auto_insert = true,
@@ -149,7 +147,6 @@ return {
149147
},
150148
},
151149
},
152-
153150
signature = {
154151
enabled = true,
155152
trigger = {

‎nvim/lua/plugins/copilot.lua‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,18 @@ return {
3838
{ "nvim-lua/plenary.nvim" },
3939
},
4040
opts = {
41+
system_prompt = [[You are an expert software engineer.
42+
- Provide clear, concise explanations
43+
- Include comments only if necessary
44+
- Include functions only if necessary
45+
- Include docstrings
46+
- All Python code should pass strict type checking]],
4147
debug = true,
4248
context = "buffers",
4349
history_path = vim.fn.stdpath("data") .. "/copilotchat_history",
4450
auto_follow_cursor = false,
45-
model = "gpt-4o",
51+
auto_insert_mode = true,
52+
model = "gpt-4",
4653
},
4754
},
4855
}

‎nvim/lua/plugins/formatting.lua‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,29 @@ return {
1111
},
1212

1313
formatters_by_ft = {
14-
bash = { "beautysh", "shellharden" },
14+
bash = {
15+
"beautysh",
16+
"shellharden",
17+
},
1518
sh = { "beautysh", "shellharden" },
1619
html = { "djlintJinja", "prettier" },
1720
jinja = { "djlintJinja" },
1821
json = { "jq" },
1922
lua = { "stylua" },
2023
go = { "gofmt" },
21-
python = { "isort", "ruff_format" },
22-
markdown = { "injected" },
24+
python = {
25+
"isort",
26+
"ruff_format",
27+
"trim_whitespace",
28+
},
29+
-- markdown = { "injected" },
2330
javascript = { "prettier" },
2431
css = { "stylelint" },
2532
yaml = { "yamlfix" },
2633
sql = { "sqlfluff" },
2734
["*"] = {
2835
"codespell",
2936
"trim_newlines",
30-
"injected",
31-
"trim_whitespace",
3237
},
3338
},
3439
})
@@ -113,7 +118,7 @@ return {
113118
javascript = "js",
114119
julia = "jl",
115120
latex = "tex",
116-
markdown = "md",
121+
-- markdown = "md",
117122
python = "py",
118123
ruby = "rb",
119124
rust = "rs",

‎nvim/lua/plugins/text-editing.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ return {
88
vim.keymap.set("n", "S", "<Plug>(leap-from-window)")
99
end,
1010
},
11-
{ "akinsho/git-conflict.nvim", version = "*", config = true },
11+
-- { "akinsho/git-conflict.nvim", version = "*", config = true },
1212
{
1313
"toppair/peek.nvim",
1414
event = { "VeryLazy" },

‎scripts/aliases.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,6 @@ alias macbook='ssh adam@macbook.local'
156156

157157
alias f='fish'
158158

159+
alias secret='nvim /home/adam/src/.env.secret'
159160
alias ai='claude'
160161
alias ai-talk='claude converse'

‎starship/starship.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ format = """$shell$hostname$directory$line_break$character"""
55
right_format = """$cmd_duration$git_branch$python$nix_shell"""
66

77
[shell]
8-
fish_indicator = "[  ](bold purple)"
9-
zsh_indicator = " 󰬇"
10-
bash_indicator = " $"
8+
fish_indicator = " fish"
9+
zsh_indicator = " zsh"
10+
bash_indicator = " bash"
1111
disabled = false
1212

1313
[localip]

0 commit comments

Comments
 (0)