Skip to content

Commit

Permalink
format and some improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@jan-xyz
jan-xyz committed Jan 11, 2025
1 parent 6672056 commit b10299d
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 28 deletions.
3 changes: 2 additions & 1 deletion fish/config.fish
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ set --export PATH /opt/homebrew/bin /opt/homebrew/sbin $PATH
set --export FZF_DEFAULT_OPTS "--color=fg:#e5e9f0,bg:#3b4252,hl:#81a1c1 --color=fg+:#e5e9f0,bg+:#3b4252,hl+:#81a1c1 --color=info:#eacb8a,prompt:#bf6069,pointer:#b48dac --color=marker:#a3be8b,spinner:#b48dac,header:#a3be8b"

#
# Pyenv
# Python
#
set --export PYENV_ROOT $HOME/.pyenv
set --export PATH $PYENV_ROOT/bin $PATH
set --export WORKON_HOME $HOME/Envs
pyenv init - | source
set --export PATH $PATH /Users/jan/.local/bin

#
# Go
Expand Down
4 changes: 3 additions & 1 deletion nvim/ftdetect/go.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
pattern = { "*" },
callback = function()
-- ignore lua files to not be self-detecting the pattern.
if vim.bo.filetype == "lua" then return end
if vim.bo.filetype == "lua" then
return
end

if vim.fn.search("{{ .\\+ }}", "nw") ~= 0 then
vim.bo.filetype = "gotmpl"
Expand Down
42 changes: 21 additions & 21 deletions nvim/lazy-lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,65 @@
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
"catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" },
"catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "6ef1ca479d37d4ff66f13eed44d08912caff483a" },
"everforest-nvim": { "branch": "main", "commit": "7c57941d5ef5a150f307b9295c00a59e95d78587" },
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"everforest-nvim": { "branch": "main", "commit": "4f41a53d69b679c9bf770da76129d78754d8d8c0" },
"fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
"formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" },
"fortune.nvim": { "branch": "master", "commit": "29a99fbf887a2d48693f1eaa1893f84cde60af54" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"fugit2.nvim": { "branch": "main", "commit": "e5011ee344962eb9c15a3cb42e289d8081e29ac9" },
"fugit2.nvim": { "branch": "main", "commit": "0807236b454c41e405ac87a69da34fcc40c91876" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"github-nvim-theme": { "branch": "main", "commit": "0e4636f556880d13c00d8a8f686fae8df7c9845f" },
"gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"incline.nvim": { "branch": "main", "commit": "16fc9c073e3ea4175b66ad94375df6d73fc114c0" },
"indent-blankline.nvim": { "branch": "master", "commit": "e51b651ca26cba250ef3a1150c8d35045eee2a84" },
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
"inlay-hints.nvim": { "branch": "master", "commit": "af84dee42cd118af6d592b06c1c0e45d6432a6c0" },
"lazy.nvim": { "branch": "main", "commit": "60cf258a9ae7fffe04bb31141141a91845158dcc" },
"lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
"lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
"lsp-preview.nvim": { "branch": "main", "commit": "51249aa09e4f2f0717de88e39b59ed27fc575680" },
"lsp_lines.nvim": { "branch": "main", "commit": "7d9e2748b61bff6ebba6e30adbc7173ccf21c055" },
"lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
"lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mini.diff": { "branch": "main", "commit": "65c59f9967fec965d8759a88c1baa43147699035" },
"neogit": { "branch": "master", "commit": "8e1e301c2e33c60375850bcf22ba1fb77b684b97" },
"neogit": { "branch": "master", "commit": "efd2a182024e422a4c4061683b9264c782eb684a" },
"neorg": { "branch": "main", "commit": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be" },
"neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
"neotest-go": { "branch": "main", "commit": "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6" },
"neotest-haskell": { "branch": "master", "commit": "329117bd9cf86a1c644ac12c8fa618c14a718b7e" },
"neotest-haskell": { "branch": "master", "commit": "e93f3fa0b9655c523cbbba99278e0ac41027686d" },
"neotest-plenary": { "branch": "master", "commit": "3523adcf9ffaad1911960c5813b0136c1b63a2ec" },
"neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
"neotest-rust": { "branch": "main", "commit": "f2e0b3713d3559ce33be9aa32ace3a6051ec5593" },
"neotest-rust": { "branch": "main", "commit": "eec7eaf8491e619fe99e620e2da3cd31b30e406b" },
"neotest-scala": { "branch": "main", "commit": "685f0fac6196862b47025c6b91513af6a406501a" },
"nord.nvim": { "branch": "main", "commit": "0881ddf9a3edeb616404335e6e225874f3fed8e7" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
"nvim-colorizer.lua": { "branch": "master", "commit": "f134063618a65cad4d7415fddbd96ff7e0c5b4ae" },
"nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" },
"nvim-colorizer.lua": { "branch": "master", "commit": "4acf88d31b3a7a1a7f31e9c30bf2b23c6313abdb" },
"nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" },
"nvim-dap": { "branch": "master", "commit": "8517126e9323e346f6a99b3b594c5a940b914dcd" },
"nvim-dap": { "branch": "master", "commit": "cc92b054720a96170eca6bd9bdedd43d2b0a7a8a" },
"nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
"nvim-dap-lldb": { "branch": "main", "commit": "81273514fdb5107b79090364b57a3ff5570bea21" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
"nvim-lightbulb": { "branch": "master", "commit": "33d4c95e0e853956bc9468b70b3064c87d5abaca" },
"nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" },
"nvim-lspconfig": { "branch": "master", "commit": "9a011595325d2c991e7e245ddbd519e617092a3b" },
"nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" },
"nvim-lspconfig": { "branch": "master", "commit": "ac936a66fba9a58613bed95d7615cff2c5bf0387" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-scrollview": { "branch": "main", "commit": "f7f611330a8f7cd00dc81538fec369611be678ed" },
"nvim-treesitter": { "branch": "master", "commit": "8e40904e49bbad5812798eb54be8c00d77cdd301" },
"nvim-treesitter-context": { "branch": "master", "commit": "158377d700596367a91ea41818f76abdbf75a232" },
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
"nvim-treesitter": { "branch": "master", "commit": "b3752a311a8e0978b8d6ce486e2d681aa66e460d" },
"nvim-treesitter-context": { "branch": "master", "commit": "8e412ebe97d84504b68a071ecf9bb68413b13632" },
"nvim-web-devicons": { "branch": "master", "commit": "f09be61d05bebcba85bb47be1931322d51b95644" },
"pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
Expand All @@ -73,7 +73,7 @@
"telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
"toggleterm.nvim": { "branch": "main", "commit": "87b2d6a3cab8e2bd9a0255427074285f0365398d" },
"tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" },
"tree-sitter-haskell": { "branch": "master", "commit": "70ea0757986ea58a0d39ddfcd9d791beadeb0f43" },
"tokyonight.nvim": { "branch": "main", "commit": "c2725eb6d086c8c9624456d734bd365194660017" },
"tree-sitter-haskell": { "branch": "master", "commit": "2c2fcb22e3b939ed59ae8d6f10500c3213c68670" },
"which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }
}
1 change: 1 addition & 0 deletions nvim/lua/languages/rust.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ function M.setup()

-- LSP config
nvim_lsp.rust_analyzer.setup({
cmd = { "/opt/homebrew/bin/rust-analyzer" },
capabilities = completion.default_capabilities(),
settings = {
["rust-analyzer"] = {
Expand Down
35 changes: 30 additions & 5 deletions nvim/lua/plugins/test.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,37 @@ return {

vim.keymap.set("n", "<leader>tn", nt.run.run, { desc = "Run nearest test", noremap = true })
vim.keymap.set("n", "<leader>tl", nt.run.run_last, { desc = "Run last test", noremap = true })
vim.keymap.set("n", "<leader>to", nt.output.open, { desc = "Show output from closest test", noremap = true })
vim.keymap.set("n", "<leader>ts", nt.summary.toggle, { desc = "Toggle or focus the test summary", noremap = true })
vim.keymap.set(
"n",
"<leader>to",
nt.output.open,
{ desc = "Show output from closest test", noremap = true }
)
vim.keymap.set(
"n",
"<leader>ts",
nt.summary.toggle,
{ desc = "Toggle or focus the test summary", noremap = true }
)
vim.keymap.set("n", "<leader>ta", run_all, { desc = "Run all tests", noremap = true })
vim.keymap.set("n", "<leader>tf", run_all_in_file, { desc = "Run all tests in the current file", noremap = true })
vim.keymap.set("n", "<leader>td", debug_nearest_test, { desc = "Run nearest test with debugger", noremap = true })
vim.keymap.set("n", "<leader>tw", watch_current_file, { desc = "Toggle watching the current file", noremap = true })
vim.keymap.set(
"n",
"<leader>tf",
run_all_in_file,
{ desc = "Run all tests in the current file", noremap = true }
)
vim.keymap.set(
"n",
"<leader>td",
debug_nearest_test,
{ desc = "Run nearest test with debugger", noremap = true }
)
vim.keymap.set(
"n",
"<leader>tw",
watch_current_file,
{ desc = "Toggle watching the current file", noremap = true }
)
end,
},
}
1 change: 1 addition & 0 deletions nvim/lua/plugins/treesitter.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ return {
opts = {
enbaled = true,
mode = "topline",
max_lines = 3,
},
},
}

0 comments on commit b10299d

Please sign in to comment.