Compare commits
16 Commits
main
...
4b2d24e1f4
| Author | SHA1 | Date | |
|---|---|---|---|
| 4b2d24e1f4 | |||
| f57d227203 | |||
| 82f904c9dc | |||
| 26b5f00643 | |||
| 31f604f8f6 | |||
| 8632e7a1bc | |||
| 0a9405ffd6 | |||
| eceaab3caf | |||
| 1dbb9c1e5d | |||
| b3e1e4e939 | |||
| 14e1f01784 | |||
| e1e300bee2 | |||
| 1418407e63 | |||
| 1e3a5d291f | |||
| a8100cf3e2 | |||
| 6c738b78e7 |
1
dots/.config/nvim/after/plugin/claude-code.nvim.lua
Normal file
1
dots/.config/nvim/after/plugin/claude-code.nvim.lua
Normal file
@@ -0,0 +1 @@
|
||||
require("claude-code").setup()
|
||||
@@ -1,17 +1,16 @@
|
||||
require("codecompanion").setup({
|
||||
ignore_warnings = true,
|
||||
extensions = {
|
||||
mcphub = {
|
||||
callback = "mcphub.extensions.codecompanion",
|
||||
opts = {
|
||||
make_vars = true,
|
||||
make_slash_commands = true,
|
||||
show_result_in_chat = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
strategies = {
|
||||
chat = { adapter = "openai" },
|
||||
inline = { adapter = "openai" },
|
||||
},
|
||||
})
|
||||
-- require("codecompanion").setup({
|
||||
-- extensions = {
|
||||
-- mcphub = {
|
||||
-- callback = "mcphub.extensions.codecompanion",
|
||||
-- opts = {
|
||||
-- make_vars = true,
|
||||
-- make_slash_commands = true,
|
||||
-- show_result_in_chat = true
|
||||
-- }
|
||||
-- }
|
||||
-- },
|
||||
-- strategies = {
|
||||
-- chat = { adapter = "openai" },
|
||||
-- inline = { adapter = "openai" },
|
||||
-- },
|
||||
-- })
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require("conform").setup({
|
||||
format_after_save = {
|
||||
lsp_fallback = false,
|
||||
lsp_fallback = true,
|
||||
async = false,
|
||||
timeout_ms = 500,
|
||||
},
|
||||
@@ -13,15 +13,14 @@ require("conform").setup({
|
||||
gdscript = { "gdformat" },
|
||||
haskell = { "ormolu" },
|
||||
html = { "prettierd", "prettier", stop_after_first = true },
|
||||
javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
||||
javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
||||
json = { "prettierd", "prettier", stop_after_first = true },
|
||||
jsonc = { "prettierd", "prettier", stop_after_first = true },
|
||||
lua = { "stylua" }, -- configured in stylua.toml
|
||||
markdown = { "prettierd", "prettier", stop_after_first = true },
|
||||
nix = { "nixfmt" },
|
||||
javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
||||
javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
||||
-- json = { "prettierd", "prettier", stop_after_first = true },
|
||||
-- jsonc = { "prettierd", "prettier", stop_after_first = true },
|
||||
python = { "isort", "black" },
|
||||
rust = { "rustfmt", lsp_fallback = "fallback" },
|
||||
svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
||||
typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
||||
typescriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
||||
|
||||
@@ -5,7 +5,9 @@ fzf.setup({ "max-perf" })
|
||||
vim.keymap.set("n", "<leader>f<leader>", fzf.builtin) -- Help
|
||||
vim.keymap.set("n", "<leader>fc", fzf.commands)
|
||||
vim.keymap.set("n", "<leader>ff", fzf.files)
|
||||
vim.keymap.set("n", "<leader>fg", fzf.live_grep_native)
|
||||
vim.keymap.set("n", "<leader>fg", function()
|
||||
fzf.live_grep_native({ resume = true })
|
||||
end)
|
||||
vim.keymap.set("n", "<leader>fb", fzf.buffers)
|
||||
vim.keymap.set("n", "<leader>fd", fzf.diagnostics_workspace)
|
||||
vim.keymap.set("n", "<leader>fhe", fzf.help_tags)
|
||||
@@ -13,4 +15,4 @@ vim.keymap.set("n", "<leader>fhi", fzf.search_history)
|
||||
vim.keymap.set("n", "<leader>fma", fzf.marks)
|
||||
vim.keymap.set("n", "<leader>fma", fzf.man_pages)
|
||||
|
||||
vim.keymap.set("i", "<c-f>", fzf.complete_path)
|
||||
vim.keymap.set("i", "<c-f>", fzf.complete_file)
|
||||
|
||||
1
dots/.config/nvim/after/plugin/kubectl.nvim.lua
Normal file
1
dots/.config/nvim/after/plugin/kubectl.nvim.lua
Normal file
@@ -0,0 +1 @@
|
||||
require("kubectl").setup()
|
||||
@@ -17,10 +17,9 @@ local servers = {
|
||||
format = false,
|
||||
},
|
||||
},
|
||||
emmet_language_server = {},
|
||||
-- emmet_language_server = {},
|
||||
gdscript = {},
|
||||
helm_ls = {
|
||||
filetypes = { "yaml", "helm", "yaml.helm-values" },
|
||||
helm_ls = { filetypes = { "helm", "yaml.helm-values" } },
|
||||
},
|
||||
hls = { filetypes = { "haskell", "lhaskell", "cabal" } },
|
||||
html = {},
|
||||
@@ -65,8 +64,26 @@ local servers = {
|
||||
},
|
||||
},
|
||||
-- marksman = {},
|
||||
nixd = {},
|
||||
-- TODO: This completion ain't working yet
|
||||
nixd = {
|
||||
nixpkgs = {
|
||||
expr = "import <nixpkgs> { }",
|
||||
},
|
||||
formatting = {
|
||||
command = { "nixfmt" },
|
||||
},
|
||||
options = {
|
||||
home_manager = {
|
||||
expr = '(builtins.getFlake "/home/hektor/.config/home-manager").homeConfigurations.work.options',
|
||||
},
|
||||
},
|
||||
},
|
||||
pyright = {},
|
||||
rust_analyzer = {
|
||||
settings = {
|
||||
["rust-analyzer"] = {},
|
||||
},
|
||||
},
|
||||
-- tsserver = {},
|
||||
svelte = {
|
||||
plugin = {
|
||||
@@ -76,48 +93,50 @@ local servers = {
|
||||
},
|
||||
},
|
||||
tailwindcss = {},
|
||||
-- vtsls = {},
|
||||
ts_ls = {},
|
||||
-- vtsls = {
|
||||
-- maxTsServerMemory = 16384,
|
||||
-- filetypes = {
|
||||
-- "javascript",
|
||||
-- "javascriptreact",
|
||||
-- "javascript.jsx",
|
||||
-- "typescript",
|
||||
-- "typescriptreact",
|
||||
-- "typescript.tsx",
|
||||
-- },
|
||||
-- settings = {
|
||||
-- complete_function_calls = true,
|
||||
-- vtsls = {
|
||||
-- enableMoveToFileCodeAction = true,
|
||||
-- autoUseWorkspaceTsdk = true,
|
||||
-- experimental = {
|
||||
-- completion = {
|
||||
-- enableServerSideFuzzyMatch = true,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- typescript = {
|
||||
-- updateImportsOnFileMove = { enabled = "always" },
|
||||
-- suggest = {
|
||||
-- completeFunctionCalls = true,
|
||||
-- },
|
||||
-- inlayHints = {
|
||||
-- enumMemberValues = { enabled = true },
|
||||
-- functionLikeReturnTypes = { enabled = true },
|
||||
-- parameterNames = { enabled = "literals" },
|
||||
-- parameterTypes = { enabled = true },
|
||||
-- propertyDeclarationTypes = { enabled = true },
|
||||
-- variableTypes = { enabled = false },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
terraformls = {},
|
||||
vtsls = {
|
||||
-- ts_ls = {},
|
||||
vtsls = {
|
||||
maxTsServerMemory = 16384,
|
||||
filetypes = {
|
||||
"javascript",
|
||||
"javascriptreact",
|
||||
"javascript.jsx",
|
||||
"typescript",
|
||||
"typescriptreact",
|
||||
"typescript.tsx",
|
||||
},
|
||||
settings = {
|
||||
complete_function_calls = true,
|
||||
vtsls = {
|
||||
enableMoveToFileCodeAction = true,
|
||||
autoUseWorkspaceTsdk = true,
|
||||
experimental = {
|
||||
completion = {
|
||||
enableServerSideFuzzyMatch = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
typescript = {
|
||||
updateImportsOnFileMove = { enabled = "always" },
|
||||
suggest = {
|
||||
completeFunctionCalls = true,
|
||||
},
|
||||
inlayHints = {
|
||||
enumMemberValues = { enabled = true },
|
||||
functionLikeReturnTypes = { enabled = true },
|
||||
parameterNames = { enabled = "literals" },
|
||||
parameterTypes = { enabled = true },
|
||||
propertyDeclarationTypes = { enabled = true },
|
||||
variableTypes = { enabled = false },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
yamlls = {
|
||||
settings = {
|
||||
yaml = {
|
||||
validate = true,
|
||||
schemaStore = {
|
||||
-- You must disable built-in schemaStore support if you want to use
|
||||
-- this plugin and its advanced options like `ignore`.
|
||||
|
||||
@@ -1 +1 @@
|
||||
require("mcphub").setup({})
|
||||
-- require("mcphub").setup({})
|
||||
|
||||
@@ -12,8 +12,8 @@ require("lint").linters_by_ft = {
|
||||
editorconfig = { "editorconfig-checker" },
|
||||
haskell = { "hlint" },
|
||||
-- html = { "htmlhint" },
|
||||
-- javascript = { eslint_linter },
|
||||
-- javascriptreact = { eslint_linter },
|
||||
javascript = { eslint_linter },
|
||||
javascriptreact = { eslint_linter },
|
||||
gdscript = { "gdlint" },
|
||||
latex = { "chktex" },
|
||||
-- lua = { "luacheck", "selene" },
|
||||
@@ -22,10 +22,9 @@ require("lint").linters_by_ft = {
|
||||
-- python = { "pylint" },
|
||||
sh = { "shellcheck" },
|
||||
svelte = { eslint_linter },
|
||||
systemd = { "systemdlint" },
|
||||
-- typescript = { eslint_linter },
|
||||
-- typescriptreact = { eslint_linter },
|
||||
yaml = { "yamllint" },
|
||||
typescript = { eslint_linter },
|
||||
typescriptreact = { eslint_linter },
|
||||
-- yaml = { "yamllint" },
|
||||
}
|
||||
|
||||
-- TODO: Wouldn't it be possible / nice to only try to load the linters when they are
|
||||
|
||||
9
dots/.config/nvim/after/plugin/obsidian-nvim.lua
Normal file
9
dots/.config/nvim/after/plugin/obsidian-nvim.lua
Normal file
@@ -0,0 +1,9 @@
|
||||
require("obsidian").setup({
|
||||
legacy_commands = false,
|
||||
workspaces = {
|
||||
{
|
||||
name = "test",
|
||||
path = "~/zk/work",
|
||||
},
|
||||
},
|
||||
})
|
||||
6
dots/.config/nvim/flake.lock
generated
6
dots/.config/nvim/flake.lock
generated
@@ -17,11 +17,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1765644376,
|
||||
"narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=",
|
||||
"lastModified": 1765934234,
|
||||
"narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe",
|
||||
"rev": "af84f9d270d404c17699522fab95bbf928a2d92f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -152,6 +152,7 @@
|
||||
fidget-nvim
|
||||
rustaceanvim
|
||||
pkgs.neovimPlugins.m-taskwarrior-d-nvim
|
||||
claude-code-nvim
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -34,13 +34,18 @@ require("nixCatsUtils.catPacker").setup({
|
||||
{ "razak17/tailwind-fold.nvim" },
|
||||
{ "rmagatti/auto-session" },
|
||||
{ "kndndrj/nvim-dbee" },
|
||||
{ "3rd/image.nvim", build = false },
|
||||
-- { "3rd/image.nvim", build = false },
|
||||
{ "polarmutex/beancount.nvim" },
|
||||
{ "jamesblckwell/nvimkit.nvim" },
|
||||
{ 'olimorris/codecompanion.nvim' },
|
||||
-- { "jamesblckwell/nvimkit.nvim" },
|
||||
{ "olimorris/codecompanion.nvim" },
|
||||
{ "ravitemer/mcphub.nvim", build = "pnpm install -g mcp-hub@latest" },
|
||||
{ "zbirenbaum/copilot.lua" },
|
||||
{ "zbirenbaum/copilot-cmp" },
|
||||
{ "saghen/blink.download" },
|
||||
{ "qvalentin/helm-ls.nvim", ft = "helm" },
|
||||
{ "ramilito/kubectl.nvim" },
|
||||
{ "mikesmithgh/kitty-scrollback.nvim" },
|
||||
{ "chrisgrieser/nvim-early-retirement" },
|
||||
{ "euclio/vim-markdown-composer" },
|
||||
{ "greggh/claude-code.nvim" },
|
||||
})
|
||||
|
||||
98
home/hosts/work/packages.local.nix
Normal file
98
home/hosts/work/packages.local.nix
Normal file
@@ -0,0 +1,98 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
[
|
||||
age
|
||||
aider-chat
|
||||
argocd
|
||||
azure-cli
|
||||
bat
|
||||
biome
|
||||
(config.lib.nixGL.wrap bruno)
|
||||
chromium
|
||||
clang
|
||||
claude-code
|
||||
(config.lib.nixGL.wrap code-cursor)
|
||||
curl
|
||||
dconf2nix
|
||||
dive
|
||||
emmet-language-server
|
||||
eslint_d
|
||||
flameshot
|
||||
fluxcd
|
||||
fzf
|
||||
fzf-git-sh
|
||||
git-machete
|
||||
github-copilot-cli
|
||||
glab
|
||||
go
|
||||
hadolint
|
||||
hello
|
||||
helm-ls
|
||||
htop
|
||||
input-leap
|
||||
jira-cli-go
|
||||
jq
|
||||
k3d
|
||||
(config.lib.nixGL.wrap kitty)
|
||||
kubectl
|
||||
kubernetes
|
||||
kubernetes-helm
|
||||
kustomize
|
||||
lua
|
||||
lua-language-server
|
||||
minikube
|
||||
ncspot
|
||||
nil
|
||||
nixd
|
||||
nixfmt-rfc-style
|
||||
# nodejs
|
||||
nodejs_24
|
||||
nvimpager
|
||||
(config.lib.nixGL.wrap obsidian)
|
||||
pavucontrol
|
||||
# pgadmin4
|
||||
prettierd
|
||||
responder
|
||||
ripgrep
|
||||
rust-analyzer
|
||||
rustlings
|
||||
shellcheck
|
||||
(config.lib.nixGL.wrap signal-desktop)
|
||||
silver-searcher
|
||||
sleuthkit
|
||||
spotify
|
||||
starship
|
||||
stylua
|
||||
taskopen
|
||||
taskwarrior3
|
||||
(config.lib.nixGL.wrap teams-for-linux)
|
||||
opentofu
|
||||
sops
|
||||
tldr
|
||||
tmux
|
||||
tree
|
||||
tree-sitter
|
||||
tsx
|
||||
upbound
|
||||
vault-bin
|
||||
(config.lib.nixGL.wrap vscode)
|
||||
vscode-langservers-extracted
|
||||
vtsls
|
||||
yaml-language-server
|
||||
xclip
|
||||
xmage
|
||||
yamllint
|
||||
yarn
|
||||
(python311.withPackages (ppkgs: [
|
||||
ppkgs.plyer
|
||||
ppkgs.dbus-python
|
||||
]))
|
||||
# flakes
|
||||
inputs.nvim.packages.x86_64-linux.nvim
|
||||
]
|
||||
Reference in New Issue
Block a user