From 08145342a08fb231a2b3587199e6021d1b15ea8f Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Wed, 13 Mar 2024 03:48:00 +0530
Subject: [PATCH] [feat] Update some stuff

---
 config/nix/common/nvim/default.nix |  6 ++---
 config/nix/justfile                | 12 +++++++++
 config/nix/overlays.nix            | 39 ++++++++++--------------------
 3 files changed, 28 insertions(+), 29 deletions(-)
 create mode 100644 config/nix/justfile

diff --git a/config/nix/common/nvim/default.nix b/config/nix/common/nvim/default.nix
index 548b5d1d..12d758aa 100644
--- a/config/nix/common/nvim/default.nix
+++ b/config/nix/common/nvim/default.nix
@@ -125,9 +125,6 @@
         "<leader>o" = "[[<cmd>TroubleToggle<cr>]]";
         "<leader>ee" = "require'rest-nvim'.run";
         "<leader>ec" = "function() require'rest-nvim'.run(true) end";
-        # "<leader>ee" = "[[<Plug>RestNvim]]";
-        # "<leader>ec" = "[[<Plug>RestNvimPreview]]";
-        # "<leader>el" = "require('telescope').extensions.rest.select_env";
         "<leader>\\\"" = ''[["+]]'';
         "vff" = "[[<cmd>vertical Gdiffsplit<cr>]]";
         "<C-k>" = "vim.lsp.buf.definition";
@@ -145,6 +142,9 @@
       terminal = {
         "<C-\\\\>" = "require('FTerm').toggle";
       };
+      insert = {
+        "<C-\\\\>" = "require('FTerm').toggle";
+      };
     };
 
     extraPlugins = with pkgs.vimPlugins; [
diff --git a/config/nix/justfile b/config/nix/justfile
new file mode 100644
index 00000000..894f6c8e
--- /dev/null
+++ b/config/nix/justfile
@@ -0,0 +1,12 @@
+set dotenv-load
+
+[macos]
+install:
+    nix run nix-darwin -- switch --flake .
+
+[linux]
+install:
+	sudo nixos-rebuild switch --flake .
+
+home:
+	nix --extra-experimental-features "nix-command flakes" run home-manager/master -- switch --flake .
diff --git a/config/nix/overlays.nix b/config/nix/overlays.nix
index d2634725..20501b57 100644
--- a/config/nix/overlays.nix
+++ b/config/nix/overlays.nix
@@ -9,21 +9,6 @@ let
   };
   vimPlugins = final: prev: {
     vimPlugins = prev.vimPlugins // {
-      # nvim-treesitter = prev.vimPlugins.nvim-treesitter.override(.allGrammars ++ [
-      # (prev.vimPlugins.nvim-treesitter.allGrammars ++ [
-      #   (prev.vimPluginspkgs.tree-sitter.buildGrammar {
-      #     language = "just";
-      #     version = "8af0aab";
-      #     src = final.pkgs.fetchFromGitHub {
-      #       owner = "IndianBoy42";
-      #       repo = "tree-sitter-just";
-      #       rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
-      #       sha256 = final.pkgs.lib.fakeSha256;
-      #       # sha256 = "sha256-hYKFidN3LHJg2NLM1EiJFki+0nqi1URnoLLPknUbFJY=";
-      #     };
-      #   })
-      # ]);
-
       comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
         name = "comfortable-motion";
         src = final.pkgs.fetchFromGitHub {
@@ -88,15 +73,18 @@ let
       ln -s ${inputs.nix-index-database.legacyPackages.${prev.system}.database} $out/files
     '';
   });
-  treesitterGrammars = (final: prev: {
-    treesitter-just = prev.pkgs.tree-sitter.buildGrammar {
-      language = "just";
-      version = "8af0aab";
-      src = final.pkgs.fetchFromGitHub {
-        owner = "IndianBoy42";
-        repo = "tree-sitter-just";
-        rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
-        sha256 = "sha256-OBlXwWriE6cdGn0dhpfSMnJ6Rx1Z7KcXehaamdi/TxQ";
+
+  tree-sitter-grammars = (final: prev: {
+    tree-sitter-grammars = prev.tree-sitter-grammars // {
+      tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
+        language = "just";
+        version = "1";
+        src = final.pkgs.fetchFromGitHub {
+          owner = "IndianBoy42";
+          repo = "tree-sitter-just";
+          rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
+          sha256 = "sha256-OBlXwWriE6cdGn0dhpfSMnJ6Rx1Z7KcXehaamdi/TxQ";
+        };
       };
     };
   });
@@ -104,12 +92,11 @@ in
 [
   catppuccinThemes
   vimPlugins
+  tree-sitter-grammars
   tmuxPlugins
   inputs.neovim-nightly-overlay.overlay
   anyrun-overlay
   inputs.nixneovim.overlays.default
-  # inputs.nixneovimplugins.overlays.default
   inputs.nur.overlay
   nix-index-db
-  treesitterGrammars
 ]