From c6a614fc1f1742a0db7cb79651d5d1dba45f5725 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@jellyfish.co>
Date: Mon, 5 Aug 2024 09:51:11 -0400
Subject: [PATCH] no more luasnip
---
.envrc | 4 +--
flake.lock | 32 ++++++-------------
flake.nix | 5 ++-
nix/home-manager/flake.lock | 30 ++++++++---------
nix/home-manager/modules/packages/neovim.nix | 10 +++---
.../modules/packages/neovim/core.lua | 9 ++++++
6 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/.envrc b/.envrc
index 44a156f..95f79be 100644
--- a/.envrc
+++ b/.envrc
@@ -1,5 +1,5 @@
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
- source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.5; then
+ source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
fi
watch_file flake.nix
diff --git a/flake.lock b/flake.lock
index cacc542..e0c9b1f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -35,7 +35,9 @@
"cachix": "cachix",
"flake-compat": "flake-compat_2",
"nix": "nix_2",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
@@ -316,28 +318,12 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1713361204,
- "narHash": "sha256-TA6EDunWTkc5FvDCqU3W2T3SFn0gRZqh6D/hJnM02MM=",
- "owner": "cachix",
- "repo": "devenv-nixpkgs",
- "rev": "285676e87ad9f0ca23d8714a6ab61e7e027020c6",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "rolling",
- "repo": "devenv-nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1722421184,
- "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
- "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
- "revCount": 660624,
+ "lastModified": 1722630782,
+ "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
+ "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
+ "revCount": 661606,
"type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.660624%2Brev-9f918d616c5321ad374ae6cb5ea89c9e04bf3e58/01910eb2-668d-7bd2-a368-717c54b0ccd9/source.tar.gz"
+ "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.661606%2Brev-d04953086551086b44b6f3c6b7eeb26294f207da/01911d30-fe87-7d66-95a4-290fef07e398/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -400,7 +386,7 @@
"root": {
"inputs": {
"devenv": "devenv",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"systems": "systems_3"
}
},
diff --git a/flake.nix b/flake.nix
index 1ce58d7..0ac7c2b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,10 @@
{
inputs = {
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz";
- devenv.url = "github:cachix/devenv";
+ devenv = {
+ url = "github:cachix/devenv";
+ inputs = {nixpkgs.follows = "nixpkgs";};
+ };
};
nixConfig = {
diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index 7dd2c0c..fc53d7b 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -29,11 +29,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1722666539,
- "narHash": "sha256-3v7m4hrV5kJjlV+0cCNnwOMDipnL5u9WDtDm38ySfl8=",
+ "lastModified": 1722839439,
+ "narHash": "sha256-AwQv9kstzEOYjzuC9uY8jECqFJPuV/UxPLa30L3DLqo=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "69c2c0c3c2f56314966dae21d79274515b228482",
+ "rev": "1388e72dd8562c8b2908fd655dee0c797df9e930",
"type": "github"
},
"original": {
@@ -143,11 +143,11 @@
]
},
"locked": {
- "lastModified": 1722136042,
- "narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=",
+ "lastModified": 1722740924,
+ "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
"owner": "Mic92",
"repo": "nix-index-database",
- "rev": "c0ca47e8523b578464014961059999d8eddd4aae",
+ "rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
"type": "github"
},
"original": {
@@ -201,11 +201,11 @@
"poetry2nix": "poetry2nix"
},
"locked": {
- "lastModified": 1722522305,
- "narHash": "sha256-CxBOZkCe24DgqnJGCa2hRanD4QXl0QqBPuItx9bcah0=",
+ "lastModified": 1722781338,
+ "narHash": "sha256-uVK3J4g1JfQvDG9O0p7hGmfBNLBlD1arrK0KLGHYZTg=",
"owner": "NixNeovim",
"repo": "NixNeovimPlugins",
- "rev": "8cb5a60ce3beca6a36812d5249424d928fef8a17",
+ "rev": "303f0ea30708f3bc647e1ebe7a398aceaf31c33d",
"type": "github"
},
"original": {
@@ -231,11 +231,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1722697094,
- "narHash": "sha256-cowZ0ncf5idDZLXX5c66bIDQ1/vPNT9hB5Pcn5HjfQ8=",
+ "lastModified": 1722862185,
+ "narHash": "sha256-bDt4jvQK9pgKzkL/EJ+fAb6dW+QM1O4RHgjgqZCeYx8=",
"owner": "nixOS",
"repo": "nixpkgs",
- "rev": "2731b928f5bae12b9ecc7929aaabad92c0f70de5",
+ "rev": "dd34fb5e692a611eee3f984da0d3271f261109b8",
"type": "github"
},
"original": {
@@ -318,11 +318,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1722589793,
- "narHash": "sha256-OYDIo1Iqb6ldcC6JdqzKAKSRiXjDOwOAJKKMH8OZutk=",
+ "lastModified": 1722798820,
+ "narHash": "sha256-/Bd0VzlutcxTwSNouS/iC6BDv395NoO4XmBJaS2vQLg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "aa00ddcf654a35ba0eafe17247cf189958d33182",
+ "rev": "c9109f23de57359df39db6fa36b5ca4c64b671e1",
"type": "github"
},
"original": {
diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix
index eb1547d..110a49f 100644
--- a/nix/home-manager/modules/packages/neovim.nix
+++ b/nix/home-manager/modules/packages/neovim.nix
@@ -37,9 +37,9 @@
lualine_z = ["location" {separator = {right = "";};} {left_padding = 2;}];
};
};
- luasnip = {
- enable = true;
- };
+ # luasnip = {
+ # enable = true;
+ # };
lsp-lines = {
enable = true;
};
@@ -141,7 +141,7 @@
};
snippet = {
- luasnip.enable = true;
+ luasnip.enable = false;
};
sources = {
cmdline = {
@@ -149,7 +149,7 @@
};
emoji.enable = true;
fuzzy_path.enable = true;
- luasnip.enable = true;
+ # luasnip.enable = true;
nvim_lsp.enable = true;
nvim_lsp_document_symbol.enable = true;
nvim_lsp_signature_help.enable = true;
diff --git a/nix/home-manager/modules/packages/neovim/core.lua b/nix/home-manager/modules/packages/neovim/core.lua
index 5520450..f544636 100644
--- a/nix/home-manager/modules/packages/neovim/core.lua
+++ b/nix/home-manager/modules/packages/neovim/core.lua
@@ -50,6 +50,15 @@ require("officer").setup({ create_mappings = true })
local cmp = require("cmp")
+cmp.setup({
+ snippet = {
+ expand = function(args)
+ vim.snippet.expand(args.body)
+ end,
+ },
+ cmdline,
+})
+
cmp.setup.cmdline(":", {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({