From 28115a7756ba1e7624a238254029cb7a41d14317 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Mon, 11 Mar 2024 16:02:46 -0400 Subject: [PATCH] updated flake, and fixed nixvim settings --- flake.lock | 48 ++++++++++++++-------------- users/tacocat/neovim/default.nix | 54 +++++++++++++------------------- 2 files changed, 46 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 6dc8590..09d21bc 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1708939976, - "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=", + "lastModified": 1710156081, + "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", "owner": "numtide", "repo": "devshell", - "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3", + "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1710062421, - "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", + "lastModified": 1710164657, + "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", + "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1709578243, - "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=", + "lastModified": 1710062421, + "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3", + "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1709554374, - "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=", + "lastModified": 1709771483, + "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7", + "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1709737311, - "narHash": "sha256-sBpgwrEg2svZD8LN+QeJgUAVf1+7MH4+JPgISN3Ihzk=", + "lastModified": 1710169318, + "narHash": "sha256-kg8LqNYguwBCdcqWRzbT0fTtVp8w+t0JqFwwB6j677w=", "owner": "doronbehar", "repo": "nix-matlab", - "rev": "9ff67d0f7a045b350178a9e04de9b6469dea5c82", + "rev": "99e48cba718b52ab07031c7db5327104aaea9cb3", "type": "gitlab" }, "original": { @@ -296,11 +296,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1709410583, - "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", + "lastModified": 1710123225, + "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "owner": "NixOs", "repo": "nixos-hardware", - "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", + "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709740068, - "narHash": "sha256-Oii3MYcyi2K2o6/4rA3hetOpxCZ+IrBYegLA951s29s=", + "lastModified": 1710181454, + "narHash": "sha256-VNHX2xdChvBvkrfriRDzgwdApOJDIxSTz8XoR6G1RHY=", "owner": "nix-community", "repo": "nixvim", - "rev": "ffe8978028e17fd861723bcbf99de8314e7bd88c", + "rev": "8b500ef1db8c65ebb94b31434146e00efe4e8b9f", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nur": { "locked": { - "lastModified": 1710080370, - "narHash": "sha256-pIbyQ0a/FUW1uRn2YyHnZm4Fi8tT3FmH9M0CjGMVUHM=", + "lastModified": 1710186250, + "narHash": "sha256-j3yNHXTcgCiTtPq/61nkqXIqggEx0Rr33BILCBOC7QQ=", "owner": "nix-community", "repo": "nur", - "rev": "691000ac2025ae3e089966e8191410f778f7fa23", + "rev": "e3a0f99335866b0020f6720e4f02b5b7a4da05f4", "type": "github" }, "original": { diff --git a/users/tacocat/neovim/default.nix b/users/tacocat/neovim/default.nix index abd81fd..ca9afe6 100644 --- a/users/tacocat/neovim/default.nix +++ b/users/tacocat/neovim/default.nix @@ -44,7 +44,7 @@ }; markdown-preview = { enable = true; - browser = "firefox"; + settings.browser = "firefox"; }; lualine = { enable = true; @@ -65,39 +65,29 @@ }; }; }; - nvim-cmp = { + cmp = { enable = true; - sources = [ - { name = "nvim_lsp"; } - { name = "treesitter"; } - { name = "luasnip"; } - { name = "latex_symbols"; } - { name = "path"; } - { name = "buffer"; } - ]; - snippet.expand = "luasnip"; - completion = { - autocomplete = false; - }; - mapping = { - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.close()"; - "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.scroll_docs(4)"; - "" = { - action = "cmp.mapping.select_prev_item()"; - modes = [ - "i" - "s" - ]; + settings = { + sources = [ + { name = "nvim_lsp"; } + { name = "treesitter"; } + { name = "luasnip"; } + { name = "latex_symbols"; } + { name = "path"; } + { name = "buffer"; } + ]; + snippet.expand = "luasnip"; + completion = { + autocomplete = false; }; - "" = { - action = "cmp.mapping.select_next_item()"; - modes = [ - "i" - "s" - ]; + mapping = { + "" = "cmp.mapping.complete()"; + "" = "cmp.mapping.close()"; + "" = "cmp.mapping.confirm({ select = true })"; + "" = "cmp.mapping.scroll_docs(-4)"; + "" = "cmp.mapping.scroll_docs(4)"; + "" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; + "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; }; }; };