artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nvim: deal with nixvim changes

Browse source
This commit is contained in:
Artemis Tosini 2024-03-07 23:35:31 +00:00
parent aa721b56b6
commit 9cabc65946
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
2 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
flake.lock
View file

@ -153,11 +153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706830856, "lastModified": 1709336216,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -279,11 +279,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709578243, "lastModified": 1709764752,
"narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=", "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3", "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709629079, "lastModified": 1709744297,
"narHash": "sha256-Q8R63JR7lv285MjWnHoNep1bLOG3fxScGAF4IZSVO+M=", "narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=",
"owner": "jovian-experiments", "owner": "jovian-experiments",
"repo": "jovian-nixos", "repo": "jovian-nixos",
"rev": "159d19febe910d27062ede99e748c31196b5c07c", "rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,11 +349,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709435391, "lastModified": 1709708644,
"narHash": "sha256-s4itTkIVxn5lYeTzwkbAgl99atnjdZv1idI1118vdzA=", "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "93554c04c2f1c02f4a383538e8848d511c3129e9", "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -379,11 +379,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709479366, "lastModified": 1709703039,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +424,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1709549216, "lastModified": 1709837370,
"narHash": "sha256-9KX2QB7qo9mISo936dDyiwDTES30y4OvDtM9zpAJLHI=", "narHash": "sha256-TlJ9iOw4HQmGIzycmwNT2OHOTUMkO5zHHKxnzMWa1tY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "680889ac01df8c2bfcb7a6ac7c850153d13d7b8f", "rev": "45dec97e806ecee29856cb714e5c4979b143ef94",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
sets/nvim.nix
View file

@ -134,9 +134,10 @@ lib.setAttrByPath setPath (
cmp-cmdline.enable = true; cmp-cmdline.enable = true;
cmp-git.enable = true; cmp-git.enable = true;
cmp-buffer.enable = true; cmp-buffer.enable = true;
nvim-cmp = { cmp = {
enable = true; enable = true;
snippet.expand = "luasnip"; settings = {
snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
sources = [ sources = [
{ name = "luasnip"; } { name = "luasnip"; }
{ name = "nvim_lsp"; } { name = "nvim_lsp"; }
@ -144,10 +145,6 @@ lib.setAttrByPath setPath (
{ name = "calc"; } { name = "calc"; }
{ name = "emoji"; } { name = "emoji"; }
]; ];
mappingPresets = [
"insert"
"cmdline"
];
mapping = { mapping = {
"<CR>" = "cmp.mapping.confirm({ select = true })"; "<CR>" = "cmp.mapping.confirm({ select = true })";
"<C-b>" = "cmp.mapping.scroll_docs(-4)"; "<C-b>" = "cmp.mapping.scroll_docs(-4)";
@ -157,6 +154,7 @@ lib.setAttrByPath setPath (
}; };
}; };
}; };
};
# For some reason you can't do this directly in nix? # For some reason you can't do this directly in nix?
extraConfigLuaPost = '' extraConfigLuaPost = ''