odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: odie:b95645f726e2b89c80395bfd07839544ff082ebd
Branches Tags
odie:develop
odie:wsl
..
compare: odie:1d36dfeb863be1696b66983c7624a6bc12f58ef4
Branches Tags
odie:develop
odie:wsl

No commits in common. "b95645f726e2b89c80395bfd07839544ff082ebd" and "1d36dfeb863be1696b66983c7624a6bc12f58ef4" have entirely different histories.
b95645f726 ... 1d36dfeb86

4 changed files with 58 additions and 54 deletions
Show Stats Expand all files Collapse all files

102
flake.lock
View File

@ -226,11 +226,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719994518, "lastModified": 1719877454,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,11 +354,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721042469, "lastModified": 1720450253,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720524665, "lastModified": 1719259945,
"narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720734513, "lastModified": 1720470846,
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -491,11 +491,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720734513, "lastModified": 1719827439,
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -507,11 +507,11 @@
"neorg": { "neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1721116501, "lastModified": 1720531316,
"narHash": "sha256-T6U+FvM03wm6PJ6+kwCoWt/X4Ul4PuN+qroH+0PBVP0=", "narHash": "sha256-vtpra0ub46Y9nIvUQAWJ1sePfPyxBFcFBneAGHDYQok=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "b47fd8b0545ef74600bfa8be0af309e63590ffa8", "rev": "db75bb60ba5e565051cf7bb18c8b1a519ed58d3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +534,11 @@
"norg-meta": "norg-meta" "norg-meta": "norg-meta"
}, },
"locked": { "locked": {
"lastModified": 1721117920, "lastModified": 1720578710,
"narHash": "sha256-yg7tZiT/R9bxIozWhsCdFIIsJWTU/LQCXIb3HaYUNx4=", "narHash": "sha256-fWyaDs/FIQHFh4j2a9e7OODRa78ovAK7V0UnNWlA4kY=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay", "repo": "nixpkgs-neorg-overlay",
"rev": "fae702eca10242b63a8f02d43d8392971af27fc8", "rev": "8f13f649b9ce4f5bcdebd14f0a0248ac4e3dba2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,11 +550,11 @@
"neorg-telescope": { "neorg-telescope": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720944314, "lastModified": 1718775458,
"narHash": "sha256-/JHVFDzzJ2AeLMYjP8hoOrDgR7BUSALnNEiYv8nYXhQ=", "narHash": "sha256-VZbmetQyPHiduMlmHTaFQJZUt4bYPS5vxMc5dwHUBnE=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg-telescope", "repo": "neorg-telescope",
"rev": "b4ca2f231fdf7dd915848111e6a041fe4355009a", "rev": "fe255a3432ce639de7a374ccfb8602f517244dcd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,11 +575,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721108565, "lastModified": 1720483510,
"narHash": "sha256-/ZkI/yQtg3wg6GkLynAfsi6dy8cHzcOZWVBUl1muNbA=", "narHash": "sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "384c3d1c1e7ae21931b75c99a787d6af91cf7abb", "rev": "b6b51915180e6d2eac488d6f882e4ba36bad380d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,11 +591,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1721082242, "lastModified": 1720478486,
"narHash": "sha256-qSsIx/IhwCBLxWJbOaHdOguz3UX05hBZViPfNLc0cmQ=", "narHash": "sha256-66u+yzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "c2b51e6c41c5230af21dc4d978e896ef9e8b922a", "rev": "fb6c059dc55c8d594102937be4dd70f5ff51614a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,11 +631,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720845312, "lastModified": 1719845423,
"narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "rev": "ec12b88104d6c117871fad55e931addac4626756",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -668,11 +668,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1720737798, "lastModified": 1720515935,
"narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -690,11 +690,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721037029, "lastModified": 1720428387,
"narHash": "sha256-wuHiinPG5CzCUBr9I51g+IRhP/69Y9gRVh+QnEtFnyI=", "narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "f6db2d325bdf57d39a3ae43376bdf2a020a6aad2", "rev": "30ebd0beb2ed26e09bcd245d757504029f807cce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -764,11 +764,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1720957393, "lastModified": 1720418205,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "rev": "655a58a72a6601292512670343087c2d75d859c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -792,11 +792,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1721042250, "lastModified": 1720530938,
"narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=", "narHash": "sha256-kUmpiyPfVFKPPLKfq3p50ddi6MdwcW7g4IqM8b7bRxg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "b9ed90003273f0a75151b32948e16b44891f403c", "rev": "a5e9dbdef1530a76056db12387d489a68eea6f80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -848,11 +848,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1721116862, "lastModified": 1720585878,
"narHash": "sha256-4dZ2AM7eOKnzcZgCE+QUSZUgQGskYeNGbB7neDzo8d8=", "narHash": "sha256-Ioa3bxQY2Ll7CuT7u0xDNYiCYgJ1OQxsC9AzE2sJXZ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "64f752e6fbf6d89da13f417fa34225a8b081ce92", "rev": "ff62716f986058f217f411504e7a63bfb11f243b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -932,11 +932,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720818892, "lastModified": 1719887753,
"narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
modules/nixvim/options.nix
View File

@ -15,6 +15,7 @@ in {
globals = { globals = {
mapleader = " "; mapleader = " ";
maplocalleader = ","; maplocalleader = ",";
inlay_hints_visible = true;
}; };
opts = { opts = {
termguicolors = true; termguicolors = true;
@ -75,7 +76,6 @@ in {
xz xz
icu74 icu74
alejandra alejandra
nixpkgs-fmt
vscode-extensions.ms-vscode.cpptools vscode-extensions.ms-vscode.cpptools
]; ];
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [

2
modules/nixvim/plugins/lsp/languages/nix.nix
View File

@ -3,7 +3,7 @@
servers = { servers = {
nil-ls = { nil-ls = {
enable = true; enable = true;
settings.formatting.command = ["nixpkgs-fmt"]; settings.formatting.command = ["alejandra"];
}; };
}; };
}; };

6
modules/nixvim/plugins/lsp/lsp.nix
View File

@ -13,6 +13,10 @@
"<leader>ca" = "code_action"; "<leader>ca" = "code_action";
}; };
}; };
inlayHints = true; onAttach = ''
if client.server_capabilities.inlayHintProvider then
vim.lsp.inlay_hint.enable(bufnr, true)
end
'';
}; };
} }