aboutsummaryrefslogtreecommitdiff
path: root/modules/programs
diff options
context:
space:
mode:
Diffstat (limited to 'modules/programs')
-rw-r--r--modules/programs/gemini.nix13
-rw-r--r--modules/programs/kitty.nix6
-rw-r--r--modules/programs/neovim/init.lua164
-rw-r--r--modules/programs/opencode.nix2
4 files changed, 87 insertions, 98 deletions
diff --git a/modules/programs/gemini.nix b/modules/programs/gemini.nix
index 8c0e38a..70c5260 100644
--- a/modules/programs/gemini.nix
+++ b/modules/programs/gemini.nix
@@ -10,12 +10,13 @@
config = lib.mkIf config.nx.programs.gemini-cli.enable {
home-manager.users."${username}".programs.gemini-cli = {
enable = true;
- settings = {
- "ui.theme" = "Default";
- "general.preferredEditor" = "nvim";
- "general.disableAutoUpdate" = true;
- "privacy.usageStatisticsEnabled" = false;
- };
+ # Cant store credentials due config read-only
+ #settings = {
+ # "ui.theme" = "Default";
+ # "general.preferredEditor" = "nvim";
+ # "general.disableAutoUpdate" = true;
+ # "privacy.usageStatisticsEnabled" = false;
+ #};
};
};
}
diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index f48985f..619d1db 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -12,9 +12,11 @@
programs.kitty = {
enable = true;
enableGitIntegration = true;
+ font = {
+ name = "monospace";
+ size = 11;
+ };
settings = {
- font_size = 11;
-
cursor_shape = "underline";
cursor_blink_interval = "-1";
cursor_stop_blinking_after = "15.0";
diff --git a/modules/programs/neovim/init.lua b/modules/programs/neovim/init.lua
index bd83eb9..79c49a5 100644
--- a/modules/programs/neovim/init.lua
+++ b/modules/programs/neovim/init.lua
@@ -20,38 +20,24 @@ map('n', '<leader>o', '<CMD>update<BAR>source %<CR>', { desc = 'Save & reload in
map('n', '<leader>w', '<CMD>write<CR>')
map('n', '<leader>q', '<CMD>quit<CR>')
--- Bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
- vim.fn.system({
- "git",
- "clone",
- "--filter=blob:none",
- "https://github.com/folke/lazy.nvim.git",
- "--branch=stable",
- lazypath,
- })
-end
-vim.opt.rtp:prepend(lazypath)
-
--- Plugin specifications
-require("lazy").setup({
- { "ellisonleao/gruvbox.nvim" },
- { "echasnovski/mini.starter" },
- { "lewis6991/gitsigns.nvim" },
- { "windwp/nvim-autopairs" },
- { "nvim-telescope/telescope.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
- { "j-hui/fidget.nvim" },
- { "nvim-treesitter/nvim-treesitter" },
- { "neovim/nvim-lspconfig" },
- { "hrsh7th/nvim-cmp" },
- { "hrsh7th/cmp-nvim-lsp" },
- { "hrsh7th/cmp-buffer" },
- { "hrsh7th/cmp-path" },
- { "hrsh7th/cmp-cmdline" },
- { "L3MON4D3/LuaSnip" },
- { "saadparwaiz1/cmp_luasnip" },
- { "onsails/lspkind-nvim" }
+vim.pack.add({
+ { src = "https://github.com/ellisonleao/gruvbox.nvim" },
+ { src = "https://github.com/echasnovski/mini.starter" },
+ { src = "https://github.com/lewis6991/gitsigns.nvim" },
+ { src = "https://github.com/windwp/nvim-autopairs" },
+ { src = "https://github.com/nvim-telescope/telescope.nvim" },
+ { src = "https://github.com/j-hui/fidget.nvim" },
+ { src = "https://github.com/nvim-lua/plenary.nvim" },
+ { src = "https://github.com/nvim-treesitter/nvim-treesitter" },
+ { src = "https://github.com/neovim/nvim-lspconfig" },
+ { src = "https://github.com/hrsh7th/nvim-cmp" },
+ { src = "https://github.com/hrsh7th/cmp-nvim-lsp" },
+ { src = "https://github.com/hrsh7th/cmp-buffer" },
+ { src = "https://github.com/hrsh7th/cmp-path" },
+ { src = "https://github.com/hrsh7th/cmp-cmdline" },
+ { src = "https://github.com/L3MON4D3/LuaSnip" },
+ { src = "https://github.com/saadparwaiz1/cmp_luasnip" },
+ { src = "https://github.com/onsails/lspkind-nvim" }
})
require("nvim-treesitter.configs").setup({
@@ -105,74 +91,75 @@ cmp.setup({
-- Add parentheses after selecting function or method
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
cmp.event:on(
- 'confirm_done',
- cmp_autopairs.on_confirm_done()
+ 'confirm_done',
+ cmp_autopairs.on_confirm_done()
)
local capabilities = require('cmp_nvim_lsp').default_capabilities()
vim.api.nvim_create_autocmd('LspAttach', {
- group = vim.api.nvim_create_augroup('UserLspConfig', {}),
- callback = function(ev)
- local opts = { buffer = ev.buf, noremap = true, silent = true }
- vim.keymap.set('n', '<leader>lf', function() vim.lsp.buf.format { async = true } end, opts)
- end,
+ group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+ callback = function(ev)
+ local opts = { buffer = ev.buf, noremap = true, silent = true }
+ vim.keymap.set('n', '<leader>lf', function() vim.lsp.buf.format { async = true } end, opts)
+ end,
})
local servers = {
- nixd = {
- settings = {
- nixd = {
- formatting = {
- command = { "nixfmt" },
- },
- },
- },
- },
- lua_ls = {
- settings = {
- lua_ls = {
- formatting = {
- command = { "luaformatter" },
- },
- },
- Lua = {
- runtime = {
- version = 'LuaJIT',
- },
- diagnostics = {
- globals = { 'vim', 'require' },
- },
- workspace = {
- library = vim.api.nvim_get_runtime_file("", true),
- },
- telemetry = {
- enable = false,
- },
- },
- },
- },
- pyright = {},
- tailwindcss = {},
- gopls = {
- settings = {
- gopls = {
- analyses = {
- unusedparams = true,
- unusedwrite = true,
- },
- staticcheck = true,
- },
- },
- },
- rust_analyzer = {},
+ nixd = {
+ settings = {
+ nixd = {
+ formatting = {
+ command = { "nixfmt" },
+ },
+ },
+ },
+ },
+ lua_ls = {
+ settings = {
+ lua_ls = {
+ formatting = {
+ command = { "luaformatter" },
+ },
+ },
+ Lua = {
+ runtime = {
+ version = 'LuaJIT',
+ },
+ diagnostics = {
+ globals = { 'vim', 'require' },
+ },
+ workspace = {
+ library = vim.api.nvim_get_runtime_file("", true),
+ },
+ telemetry = {
+ enable = false,
+ },
+ },
+ },
+ },
+ pyright = {},
+ tailwindcss = {},
+ gopls = {
+ settings = {
+ gopls = {
+ analyses = {
+ unusedparams = true,
+ unusedwrite = true,
+ },
+ staticcheck = true,
+ },
+ },
+ },
+ rust_analyzer = {},
+ ts_ls = {},
}
local server_names = {}
for server, config in pairs(servers) do
- config.capabilities = capabilities
- vim.lsp.config(server, config)
- table.insert(server_names, server)
+ config.capabilities = capabilities
+ vim.lsp.config(server, config)
+ table.insert(server_names, server)
end
vim.lsp.enable(server_names)
@@ -216,4 +203,3 @@ hl(0, "DiagnosticSignError", { bg = "none" })
hl(0, "DiagnosticSignHint", { bg = "none" })
hl(0, "DiagnosticSignInfo", { bg = "none" })
hl(0, "DiagnosticSignWarn", { bg = "none" })
-
diff --git a/modules/programs/opencode.nix b/modules/programs/opencode.nix
index 00c55e7..3ceb6fb 100644
--- a/modules/programs/opencode.nix
+++ b/modules/programs/opencode.nix
@@ -13,7 +13,7 @@
settings = {
theme = "system";
share = "disabled";
- autoUpdate = false;
+ autoupdate = false;
};
};
};
generated by cgit v1.3.1 (git 2.54.0) at 2026-05-30 17:42:49 +0000