summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ghostty/Library/Application Support/com.mitchellh.ghostty/config2
-rw-r--r--ncmpcpp/.config/ncmpcpp/config8
-rw-r--r--neovim/.config/nvim/ginit.vim2
-rw-r--r--neovim/.config/nvim/lua/config/colourscheme.lua2
-rw-r--r--neovim/.config/nvim/lua/config/lualine.lua5
-rw-r--r--neovim/.config/nvim/lua/plugins/codecompanion.lua33
-rw-r--r--neovim/.config/nvim/lua/plugins/gen.lua7
-rw-r--r--neovim/.config/nvim/lua/plugins/lspsaga.lua6
-rw-r--r--neovim/.config/nvim/lua/plugins/nvim_dap.lua14
-rw-r--r--neovim/.config/nvim/lua/plugins/nvim_lspconfig.lua21
-rw-r--r--neovim/.config/nvim/lua/plugins/pytest.lua29
-rw-r--r--neovim/.config/nvim/lua/plugins/telescope.lua9
-rw-r--r--neovim/.config/nvim/lua/plugins/venv_selector.lua1
-rw-r--r--zsh/.zshenv1
-rw-r--r--zsh/.zshrc7
15 files changed, 85 insertions, 62 deletions
diff --git a/ghostty/Library/Application Support/com.mitchellh.ghostty/config b/ghostty/Library/Application Support/com.mitchellh.ghostty/config
index 3a0a70b..39b4f83 100644
--- a/ghostty/Library/Application Support/com.mitchellh.ghostty/config
+++ b/ghostty/Library/Application Support/com.mitchellh.ghostty/config
@@ -42,7 +42,7 @@ font-size = 13
# # which is explained in the docs for that config option.
# # Just for example:
# resize-overlay-duration = 4s 200ms
-theme = light:nord-light,dark:nord
+theme = light:Builtin Light,dark:Builtin Dark
macos-titlebar-style = native
shell-integration-features = title,sudo,cursor
font-thicken = true
diff --git a/ncmpcpp/.config/ncmpcpp/config b/ncmpcpp/.config/ncmpcpp/config
index 3fd7ed2..ac5df5f 100644
--- a/ncmpcpp/.config/ncmpcpp/config
+++ b/ncmpcpp/.config/ncmpcpp/config
@@ -1 +1,7 @@
-song_columns_list_format = (20)[]{a} (11f)[blue]{y} (20)[blue]{b} (3f)[green]{d}|{} (3f)[green]{n} (45)[black]{t} (7f)[magenta]{l}
+song_columns_list_format = (20)[green]{a} (11f)[blue]{yr} (20)[blue]{b} (3f)[blue]{dE:D#}|{} (3f)[cyan]{n:#} (45)[cyan]{t} (7f)[magenta]{lr}
+
+autocenter_mode = "yes"
+centered_cursor = "yes"
+mouse_support = "no"
+empty_tag_marker = ""
+search_engine_default_search_mode = "2"
diff --git a/neovim/.config/nvim/ginit.vim b/neovim/.config/nvim/ginit.vim
index da8ff9a..127405e 100644
--- a/neovim/.config/nvim/ginit.vim
+++ b/neovim/.config/nvim/ginit.vim
@@ -7,7 +7,7 @@ elseif exists("g:neovide")
let g:neovide_position_animation_length = 0
let g:neovide_scroll_animation_length = 0
let g:neovide_theme = 'auto'
-else
+elseif !exists('g:gui_vimr')
GuiFont SarasaMonoCL Nerd Font Propo:h14
endif
diff --git a/neovim/.config/nvim/lua/config/colourscheme.lua b/neovim/.config/nvim/lua/config/colourscheme.lua
index 6450d46..edba16f 100644
--- a/neovim/.config/nvim/lua/config/colourscheme.lua
+++ b/neovim/.config/nvim/lua/config/colourscheme.lua
@@ -1,4 +1,4 @@
-local colorscheme = "nord"
+local colorscheme = "xcode"
vim.o.background = "light"
local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
if not ok then
diff --git a/neovim/.config/nvim/lua/config/lualine.lua b/neovim/.config/nvim/lua/config/lualine.lua
index 5155bda..2617a5a 100644
--- a/neovim/.config/nvim/lua/config/lualine.lua
+++ b/neovim/.config/nvim/lua/config/lualine.lua
@@ -39,7 +39,10 @@ local config = {
-- Disable sections and component separators
component_separators = '',
section_separators = '',
- theme = 'nord',
+ theme = {
+ normal = { c = { fg = colors.fg, bg = colors.bg } },
+ inactive = { c = { fg = colors.fg, bg = colors.bg } },
+ },
},
sections = {
-- these are to remove the defaults
diff --git a/neovim/.config/nvim/lua/plugins/codecompanion.lua b/neovim/.config/nvim/lua/plugins/codecompanion.lua
index b05497c..75da038 100644
--- a/neovim/.config/nvim/lua/plugins/codecompanion.lua
+++ b/neovim/.config/nvim/lua/plugins/codecompanion.lua
@@ -6,26 +6,33 @@ return {
"nvim-treesitter/nvim-treesitter",
},
opts = {
- adapters = {
- qwen = function()
- return require('codecompanion.adapters').extend('ollama', {
- name = 'qwen',
- schema = {
- model = {
- default = 'qwen2.5-coder:3b',
- },
- },
- })
- end,
- },
strategies = {
chat = {
- adapter = 'qwen',
+ adapter = 'ollama',
+ model = 'quen2.5-coder:1.5b',
},
inline = {
adapter = 'qwen',
+ adapter = 'ollama',
+ model = 'quen2.5-coder:1.5b',
+ },
+ actions = {
+ adapter = 'qwen',
+ adapter = 'ollama',
+ model = 'quen2.5-coder:1.5b',
},
},
+ adapters = {
+ acp = {
+ claude_code = function()
+ return require("codecompanion.adapters").extend("claude_code", {
+ env = {
+ CLAUDE_CODE_OAUTH_TOKEN = "CLAUDE_OAUTH_TOKEN"
+ },
+ })
+ end,
+ }
+ }
},
},
}
diff --git a/neovim/.config/nvim/lua/plugins/gen.lua b/neovim/.config/nvim/lua/plugins/gen.lua
deleted file mode 100644
index 55e85b6..0000000
--- a/neovim/.config/nvim/lua/plugins/gen.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
- 'David-Kunz/gen.nvim',
- opts = {
- model = 'qwen2.5-coder:3b',
- display_mode = 'split',
- }
-}
diff --git a/neovim/.config/nvim/lua/plugins/lspsaga.lua b/neovim/.config/nvim/lua/plugins/lspsaga.lua
index 27173ec..be1170b 100644
--- a/neovim/.config/nvim/lua/plugins/lspsaga.lua
+++ b/neovim/.config/nvim/lua/plugins/lspsaga.lua
@@ -19,10 +19,10 @@ return {
},
keys = {
{ "gh", "<cmd>Lspsaga finder<CR>", desc = "Lspsaga finder" },
- { "<leader>cx", "<cmd>Lspsaga code_action<CR>", desc = "Lspsaga codeaction" },
- { "<leader>cx", "<cmd><C-U>Lspsaga range_code_action<CR>", mode = "v", desc = "Lspsaga codeaction" },
+ { "g.", "<cmd>Lspsaga code_action<CR>", desc = "Lspsaga codeaction" },
+ { "g.", "<cmd><C-U>Lspsaga range_code_action<CR>", mode = "v", desc = "Lspsaga codeaction" },
{ "K", "<cmd>Lspsaga hover_doc<CR>", desc = "Lspsaga hover doc" },
- { "<leader>rn", "<cmd>Lspsaga rename<CR>", desc = "Lspsaga rename" },
+ { "grn", "<cmd>Lspsaga rename<CR>", desc = "Lspsaga rename" },
{ "[g", "<cmd>Lspsaga diagnostic_jump_next<CR>", desc = "Lspsaga jump to next diagnostic" },
{ "]g", "<cmd>Lspsaga diagnostic_jump_prev<CR>", desc = "Lspsaga jump to previous diagnostic" },
}
diff --git a/neovim/.config/nvim/lua/plugins/nvim_dap.lua b/neovim/.config/nvim/lua/plugins/nvim_dap.lua
index f94fd0f..e1daedb 100644
--- a/neovim/.config/nvim/lua/plugins/nvim_dap.lua
+++ b/neovim/.config/nvim/lua/plugins/nvim_dap.lua
@@ -5,12 +5,6 @@ return {
'mfussenegger/nvim-dap-python',
'rcarriga/nvim-dap-ui',
'nvim-neotest/nvim-nio',
- {
- 'nvim-neotest/neotest',
- dependencies = {
- 'nvim-neotest/neotest-python',
- }
- },
},
keys = {
{ "<leader>br", require('dap').toggle_breakpoint, "Toggle breakpoint" },
@@ -102,14 +96,6 @@ return {
})
require("dapui").setup()
-
- require("neotest").setup({
- adapters = {
- require("neotest-python")({
- dap = { django = true },
- }),
- }
- })
end,
},
}
diff --git a/neovim/.config/nvim/lua/plugins/nvim_lspconfig.lua b/neovim/.config/nvim/lua/plugins/nvim_lspconfig.lua
index ebea05a..bd3e911 100644
--- a/neovim/.config/nvim/lua/plugins/nvim_lspconfig.lua
+++ b/neovim/.config/nvim/lua/plugins/nvim_lspconfig.lua
@@ -25,21 +25,6 @@ return {
vim.lsp.enable(lsp)
end
- vim.lsp.config('basedpyright', {
- settings = {
- basedpyright = {
- disableOrganizeImports = true,
- },
- python = {
- analysis = {
- ignore = { '*' },
- },
- },
- }
- })
-
- vim.lsp.enable('basedpyright')
-
vim.lsp.config('lua_ls', {
on_init = function(client)
local path = client.workspace_folders[1].name
@@ -56,7 +41,7 @@ return {
-- Make the server aware of Neovim runtime files
workspace = {
checkThirdParty = false,
- library = {
+ library = {
vim.env.VIMRUNTIME
-- Depending on the usage, you might want to add additional paths here.
-- "${3rd}/luv/library"
@@ -116,7 +101,9 @@ return {
vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
local opts = { buffer = ev.buf }
- vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', { noremap = true })
+ vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true })
+ vim.keymap.set('n', 'gI', vim.lsp.buf.implementation, { noremap = true })
+ vim.keymap.set('n', 'gA', vim.lsp.buf.references, { noremap = true })
vim.keymap.set('v', '<leader>f', vim.lsp.buf.format, { noremap = true, silent = true })
vim.keymap.set('n', '<leader>f', function()
vim.lsp.buf.format { async = true }
diff --git a/neovim/.config/nvim/lua/plugins/pytest.lua b/neovim/.config/nvim/lua/plugins/pytest.lua
new file mode 100644
index 0000000..20e246e
--- /dev/null
+++ b/neovim/.config/nvim/lua/plugins/pytest.lua
@@ -0,0 +1,29 @@
+return {
+ {
+ "richardhapb/pytest.nvim",
+ dependencies = { "nvim-treesitter/nvim-treesitter" },
+ opts = {}, -- Define the options here
+ config = function(_, opts)
+ require('nvim-treesitter.configs').setup {
+ ensure_installed = { 'python', 'xml' },
+ docker = {
+ enabled = function()
+ return vim.fn.getcwd():match("docker-compose.dev.yml$")
+ end,
+ enable_docker_compose = function()
+ return vim.fn.getcwd():match("docker-compose.dev.yml$")
+ end,
+ docker_compose_file = "docker-compose.dev.yml",
+ },
+ django = {
+ enabled = function()
+ return vim.fn.getcwd():match("manage.py$")
+ end,
+ django_settings_module = "krotosstudio.settings",
+ },
+ }
+
+ require('pytest').setup(opts)
+ end
+ }
+}
diff --git a/neovim/.config/nvim/lua/plugins/telescope.lua b/neovim/.config/nvim/lua/plugins/telescope.lua
index 08729ca..0f81d89 100644
--- a/neovim/.config/nvim/lua/plugins/telescope.lua
+++ b/neovim/.config/nvim/lua/plugins/telescope.lua
@@ -7,11 +7,15 @@ return {
'nvim-lua/plenary.nvim',
},
{
- "nvim-telescope/telescope-live-grep-args.nvim",
+ 'nvim-telescope/telescope-live-grep-args.nvim',
-- This will not install any breaking changes.
-- For major updates, this must be adjusted manually.
version = "^1.0.0",
},
+ {
+ 'nvim-telescope/telescope-fzf-native.nvim',
+ build = 'make'
+ },
},
cmd = "Telescope",
keys = {
@@ -29,7 +33,7 @@ return {
live_grep_args = {
auto_quoting = true, -- enable/disable auto-quoting
-- define mappings, e.g.
- mappings = { -- extend mappings
+ mappings = { -- extend mappings
i = {
["<C-k>"] = lga_actions.quote_prompt(),
["<C-i>"] = lga_actions.quote_prompt({ postfix = " --iglob " }),
@@ -47,6 +51,7 @@ return {
-- then load the extension
telescope.load_extension("live_grep_args")
+ telescope.load_extension("fzf")
end
},
}
diff --git a/neovim/.config/nvim/lua/plugins/venv_selector.lua b/neovim/.config/nvim/lua/plugins/venv_selector.lua
index 0e4fb30..b3f03af 100644
--- a/neovim/.config/nvim/lua/plugins/venv_selector.lua
+++ b/neovim/.config/nvim/lua/plugins/venv_selector.lua
@@ -1,7 +1,6 @@
return {
{
'linux-cultist/venv-selector.nvim',
- branch = 'regexp',
opts = {},
keys = {
{ ',v', '<cmd>VenvSelect<CR>', desc = 'VenvSelect' },
diff --git a/zsh/.zshenv b/zsh/.zshenv
index bc88c29..b3e5c0c 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -20,5 +20,6 @@ export CMAKE_C_COMPILER=/usr/bin/clang
export CMAKE_CXX_COMPILER=/usr/bin/clang++
. "$HOME/.cargo/env"
+. "$HOME/.config/env/private"
export OLLAMA_API_BASE=http://127.0.0.1:11434
diff --git a/zsh/.zshrc b/zsh/.zshrc
index cae971a..4219f52 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -36,7 +36,14 @@ eval $(thefuck --alias)
eval "$(starship init zsh)"
+# Aliases
alias rm="rm -I"
+alias grep='ug -G'
+alias egrep='ug -E'
+alias fgrep='ug -F'
+alias zgrep='ug -zG'
+alias zegrep='ug -zE'
+alias zfgrep='ug -zF'
# bun completions
[ -s "/Users/michael/.bun/_bun" ] && source "/Users/michael/.bun/_bun"
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-13 00:49:13 +0000