deepak/nixconf
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

lsp updates, nixpkgs updates, flirting with rmeoving omz
Some checks failed
Bump flake.lock / build (push) Failing after 10m33s
Details
Test templates, puts into cache / nix (nix-runner) (push) Failing after 8m13s
Details

Browse Source
This commit is contained in:
Deepak Mallubhotla
2025-09-19 13:35:51 -05:00
parent 975fc9f07f
commit ddf02dcc73
6 changed files with 144 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
flake.lock generated
View File

@@ -1,18 +1,18 @@
{ {
"nodes": { "nodes": {
"NixOS-WSL-2411": { "NixOS-WSL-stable": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-24-11" "nixpkgs-stable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1755261305, "lastModified": 1758123407,
"narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=", "narHash": "sha256-4qwMlR0Q4Zr2rjUFauYIldfjzffYt3G5tZ1uPFPPYGU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "203a7b463f307c60026136dd1191d9001c43457f", "rev": "ba2b3b6c0bc42442559a3b090f032bc8d501f5e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -78,23 +78,23 @@
"type": "github" "type": "github"
} }
}, },
"homeManager-24-11": { "homeManager-stable": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-24-11" "nixpkgs-stable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1747688870, "lastModified": 1757808926,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863", "rev": "f21d9167782c086a33ad53e2311854a8f13c281e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -132,29 +132,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24-11": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1751274312, "lastModified": 1758216857,
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1758198701,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -184,11 +184,11 @@
"nvim-web-devicons": { "nvim-web-devicons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1756088254, "lastModified": 1756936794,
"narHash": "sha256-wFysvIQO2fx+VTWAEe+lzccsk9kgeIWZ7azGaPfAUAw=", "narHash": "sha256-2Q6ZZQj5HFXTw1YwX3ibdGOTwfbfPUBbcPOsuBUpSjc=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-web-devicons", "repo": "nvim-web-devicons",
"rev": "81b37d7937953b50e5fd8d9d7dfe2c6d0088fde1", "rev": "6e51ca170563330e063720449c21f43e27ca0bc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -250,13 +250,13 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"NixOS-WSL-2411": "NixOS-WSL-2411", "NixOS-WSL-stable": "NixOS-WSL-stable",
"claude-mcp-bundle": "claude-mcp-bundle", "claude-mcp-bundle": "claude-mcp-bundle",
"cmp-vimtex": "cmp-vimtex", "cmp-vimtex": "cmp-vimtex",
"homeManager-24-11": "homeManager-24-11", "homeManager-stable": "homeManager-stable",
"mdt": "mdt", "mdt": "mdt",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-24-11": "nixpkgs-24-11", "nixpkgs-stable": "nixpkgs-stable",
"nomodoro": "nomodoro", "nomodoro": "nomodoro",
"nvim-web-devicons": "nvim-web-devicons", "nvim-web-devicons": "nvim-web-devicons",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@@ -269,15 +269,15 @@
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-24-11" "nixpkgs-stable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1758007585,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -338,15 +338,15 @@
"treefmt-nix_2": { "treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-24-11" "nixpkgs-stable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1755934250, "lastModified": 1758206697,
"narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -383,11 +383,11 @@
"zsh-completions": { "zsh-completions": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1756006663, "lastModified": 1757826833,
"narHash": "sha256-cYoawtN/U4F1yjesz8Yef8MFpT9uWtNDOt9peqXzU0I=", "narHash": "sha256-1ZlYYJrTrstdHWfM73ZpSnGaMwsFCbdRRkI4fMh0R8s=",
"owner": "zsh-users", "owner": "zsh-users",
"repo": "zsh-completions", "repo": "zsh-completions",
"rev": "8d5a945c93a6069f3f305219f373b61d2f05472c", "rev": "d08cee09cecdc2d95bf501183597411a7632be7c",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
flake.nix
View File

@@ -3,26 +3,26 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-24-11.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
treefmt-nix = { treefmt-nix = {
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs-24-11"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs-24-11"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
NixOS-WSL-2411 = { NixOS-WSL-stable = {
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs-24-11"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
homeManager-24-11 = { homeManager-stable = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs-24-11"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
# Custom Vim Plugins # Custom Vim Plugins

18
home/deepak/home.nix
View File

@@ -135,7 +135,7 @@ in
defaultEditor = true; defaultEditor = true;
vimAlias = true; vimAlias = true;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs-unstable.vimPlugins; [
{ {
plugin = vimtex; plugin = vimtex;
config = "let g:nix_recommended_style = 0"; config = "let g:nix_recommended_style = 0";
@@ -149,15 +149,18 @@ in
telescope-file-browser-nvim telescope-file-browser-nvim
telescope-media-files-nvim telescope-media-files-nvim
telescope-symbols-nvim telescope-symbols-nvim
# need fzf for parrot
fzf-lua fzf-lua
# ctrlp-vim # ctrlp-vim
# lsp stuff # lsp stuff
lsp-zero-nvim
nvim-cmp nvim-cmp
cmp-nvim-lsp cmp-nvim-lsp
cmp_luasnip cmp_luasnip
nvim-lspconfig nvim-lspconfig
friendly-snippets
luasnip
guess-indent-nvim guess-indent-nvim
@@ -174,8 +177,6 @@ in
vim-fugitive vim-fugitive
flash-nvim flash-nvim
gitsigns-nvim gitsigns-nvim
friendly-snippets
luasnip
which-key-nvim which-key-nvim
overseer-nvim overseer-nvim
@@ -208,6 +209,11 @@ in
programs.thefuck.enable = true; programs.thefuck.enable = true;
programs.fzf = {
enable = true;
enableZshIntegration = true;
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
shellAliases = { shellAliases = {
@@ -251,7 +257,7 @@ in
} }
pkgs.customZshPlugins.zsh-completions pkgs.customZshPlugins.zsh-completions
]; ];
initExtra = '' initContent = ''
eval "$(${pkgs.direnv}/bin/direnv hook zsh)" eval "$(${pkgs.direnv}/bin/direnv hook zsh)"
''; '';
}; };

122
home/deepak/neovim/lsp.lua
View File

@@ -1,50 +1,82 @@
local lsp_zero = require("lsp-zero") -- local lsp_zero = require("lsp-zero")
lsp_zero.on_attach(function(client, bufnr) -- lsp_zero.on_attach(function(client, bufnr)
lsp_zero.default_keymaps({ buffer = bufnr }) -- lsp_zero.default_keymaps({ buffer = bufnr })
end) -- end)
local cmp = require("cmp") local cmp = require("cmp")
local cmp_format = lsp_zero.cmp_format({ details = true }) local luasnip = require ("luasnip")
local cmp_action = lsp_zero.cmp_action() -- local cmp_format = lsp_zero.cmp_format({ details = true })
-- local cmp_action = lsp_zero.cmp_action()
require("luasnip.loaders.from_vscode").lazy_load() require("luasnip.loaders.from_vscode").lazy_load()
cmp.setup({ cmp.setup({
sources = { sources = {
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ {
name = "buffer", name = "buffer",
option = { option = {
get_bufnrs = function() get_bufnrs = function()
return vim.api.nvim_list_bufs() return vim.api.nvim_list_bufs()
end, end,
},
}, },
{ name = "luasnip", option = { show_autosnippets = true } },
-- { name = "luasnip" },
{ name = "vimtex" },
}, },
{ name = "luasnip", option = { show_autosnippets = true } }, formatting = cmp_format,
-- { name = "luasnip" }, mapping = cmp.mapping.preset.insert({
{ name = "vimtex" }, ['<CR>'] = cmp.mapping(function(fallback)
}, if cmp.visible() then
formatting = cmp_format, if luasnip.expandable() then
mapping = cmp.mapping.preset.insert({ luasnip.expand()
-- ['<Tab>'] = cmp_action.tab_complete(), else
-- ['<S-Tab>'] = cmp_action.select_prev_or_fallback(), cmp.confirm({
["<Tab>"] = cmp_action.luasnip_supertab(), select = true,
["<S-Tab>"] = cmp_action.luasnip_shift_supertab(), })
["<C-f>"] = cmp_action.luasnip_jump_forward(), end
["<C-b>"] = cmp_action.luasnip_jump_backward(), else
["<CR>"] = cmp.mapping.confirm({ select = false }), fallback()
}), end
window = { end),
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(), ["<Tab>"] = cmp.mapping(function(fallback)
}, if cmp.visible() then
snippet = { cmp.select_next_item()
expand = function(args) elseif luasnip.locally_jumpable(1) then
require("luasnip").lsp_expand(args.body) luasnip.jump(1)
end, else
}, fallback()
}) end
-- require("lspconfig").nil_ls.setup({}) end, { "i", "s" }),
require("lspconfig").pyright.setup({})
require("lspconfig").nixd.setup({}) ["<S-Tab>"] = cmp.mapping(function(fallback)
require("lspconfig").terraformls.setup({}) if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.locally_jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { "i", "s" }),
}),
window = {
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(),
},
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
},
})
-- require("lspconfig").nil_ls.setup({})
-- require("lspconfig").pyright.setup({})
-- require("lspconfig").nixd.setup({})
-- require("lspconfig").terraformls.setup({})
--
vim.lsp.enable("pyright")
vim.lsp.enable("nixd")
vim.lsp.enable("terraformls")

16
hosts/hosts.nix
View File

@@ -16,7 +16,7 @@ let
}; };
in in
{ {
"nixosWalrus" = inputs.nixpkgs-24-11.lib.nixosSystem { "nixosWalrus" = inputs.nixpkgs-stable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit customPackageOverlay; inherit customPackageOverlay;
@@ -29,12 +29,12 @@ in
( (
{ ... }: { ... }:
{ {
nix.registry.nixpkgs.flake = inputs.nixpkgs-24-11; nix.registry.nixpkgs.flake = inputs.nixpkgs-stable;
} }
) )
./commonWSL-configuration.nix ./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.homeManager-24-11.nixosModules.home-manager inputs.homeManager-stable.nixosModules.home-manager
{ {
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
withGUI = false; withGUI = false;
@@ -53,10 +53,10 @@ in
]; ];
} }
inputs.NixOS-WSL-2411.nixosModules.wsl inputs.NixOS-WSL-stable.nixosModules.wsl
]; ];
}; };
"nixosEggYoke" = inputs.nixpkgs-24-11.lib.nixosSystem { "nixosEggYoke" = inputs.nixpkgs-stable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit customPackageOverlay; inherit customPackageOverlay;
@@ -69,12 +69,12 @@ in
( (
{ ... }: { ... }:
{ {
nix.registry.nixpkgs.flake = inputs.nixpkgs-24-11; nix.registry.nixpkgs.flake = inputs.nixpkgs-stable;
} }
) )
./commonWSL-configuration.nix ./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.homeManager-24-11.nixosModules.home-manager inputs.homeManager-stable.nixosModules.home-manager
{ {
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
withGUI = false; withGUI = false;
@@ -89,7 +89,7 @@ in
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
]; ];
} }
inputs.NixOS-WSL-2411.nixosModules.wsl inputs.NixOS-WSL-stable.nixosModules.wsl
]; ];
}; };
} }

3
overlays/default.nix
View File

@@ -12,14 +12,17 @@ let
cmpVimtexPlugin = prev.vimUtils.buildVimPlugin { cmpVimtexPlugin = prev.vimUtils.buildVimPlugin {
src = cmp-vimtex; src = cmp-vimtex;
name = "cmp-vimtex"; name = "cmp-vimtex";
doCheck = false;
}; };
spaceportNvimPlugin = prev.vimUtils.buildVimPlugin { spaceportNvimPlugin = prev.vimUtils.buildVimPlugin {
src = spaceport-nvim; src = spaceport-nvim;
name = "spaceport-nvim"; name = "spaceport-nvim";
doCheck = false;
}; };
nomodoroNvimPlugin = prev.vimUtils.buildVimPlugin { nomodoroNvimPlugin = prev.vimUtils.buildVimPlugin {
src = nomodoro; src = nomodoro;
name = "nomodoro"; name = "nomodoro";
doCheck = false;
}; };
# parrotNvimPlugin = prev.vimUtils.buildVimPlugin { # parrotNvimPlugin = prev.vimUtils.buildVimPlugin {