summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <mike1994vink@gmail.com>2023-01-02 10:20:27 +0000
committerMike Vink <mike1994vink@gmail.com>2023-01-02 10:20:27 +0000
commitd53cd97a278566a0ac2c81bb3d4381597709ef55 (patch)
tree960dd9dc12bb828eb8a9787a24ad1de18ede3b7d
parentdc480e6c9c3d164e4ddcfa0d46c8a90b96c7bbf0 (diff)
use main treesitter
-rw-r--r--flake.lock18
-rw-r--r--flake.nix1
-rw-r--r--home.nix3
3 files changed, 11 insertions, 11 deletions
diff --git a/flake.lock b/flake.lock
index f4628d3..410fe21 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1670280307,
- "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=",
+ "lastModified": 1671578428,
+ "narHash": "sha256-YmbpBcPaGz9KE2bC4xPvSdgCSMk0BmS/L3ePvy9TR/M=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2af0d07678fc15612345e0dd55337550dcf6465f",
+ "rev": "0f8bf4f92efa3c6168705b49a6788abb3612033a",
"type": "github"
},
"original": {
@@ -39,11 +39,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1670242877,
- "narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=",
+ "lastModified": 1671359686,
+ "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198",
+ "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
"type": "github"
},
"original": {
@@ -55,11 +55,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1670439346,
- "narHash": "sha256-forqFvUxaFZrgBc8fW6agn8ju4ULMJ6ubp0CWhhVA2Q=",
+ "lastModified": 1671447788,
+ "narHash": "sha256-Nitle27Q2gXkuk66VZUT+iyisT4pGQwQwU9eyExOVEk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "009093a2e1673a9d8d9e66c21f8de9a9ad064d85",
+ "rev": "bfb04388d42ff49e5e81da9f0bfcb48a6367273d",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 0e42c7d..47d9179 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,6 @@
mvinkioPkgs = mvinkio.legacyPackages.${system};
overlay = nixpkgs.lib.composeManyExtensions [
- (import ./overlays/treesitter.nix {inherit mvinkioPkgs;})
(import ./overlays/vimPlugins.nix {inherit pkgs;})
];
diff --git a/home.nix b/home.nix
index 6ab3af2..09114ab 100644
--- a/home.nix
+++ b/home.nix
@@ -93,8 +93,8 @@
};
};
- # fixes hotpot cannot be found error after updates
home.activation = {
+ # links neovim repo to xdg config home
neovim-symlink = home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
NEOVIM_CONFIG="${config.home.homeDirectory}/neovim"
XDG_CONFIG_HOME_NVIM="${config.xdg.configHome}/nvim"
@@ -104,6 +104,7 @@
$DRY_RUN_CMD ln -s $NEOVIM_CONFIG $XDG_CONFIG_HOME_NVIM
fi
'';
+ # fixes hotpot cannot be found error after updates
clearHotpotCache = home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
HOTPOT_CACHE="${config.xdg.cacheHome}/nvim/hotpot"
if [[ -d "$HOTPOT_CACHE" ]]; then