From 02a7d9ee523d0411145d97dc45003f376ccce98c Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sat, 13 Jul 2024 15:16:11 +0200
Subject: fix(modules): Adopt to flake update

---
 modules/home/conf/nvim/files/default.nix           |  2 +-
 modules/home/conf/nvim/plgs/treesitter/default.nix | 54 ++++++++++++----------
 modules/home/conf/taskwarrior/hooks/default.nix    |  6 ++-
 3 files changed, 34 insertions(+), 28 deletions(-)

(limited to 'modules/home/conf')

diff --git a/modules/home/conf/nvim/files/default.nix b/modules/home/conf/nvim/files/default.nix
index 68c267b9..f935ac7b 100644
--- a/modules/home/conf/nvim/files/default.nix
+++ b/modules/home/conf/nvim/files/default.nix
@@ -1,7 +1,7 @@
 {lib, ...}: {
   programs.nixvim = {
     extraFiles = {
-      "ftplugin/tex.lua" = ''
+      "ftplugin/tex.lua".text = ''
         ${lib.strings.fileContents ./ftplugin/tex.lua}
       '';
     };
diff --git a/modules/home/conf/nvim/plgs/treesitter/default.nix b/modules/home/conf/nvim/plgs/treesitter/default.nix
index 13d27348..b4b20388 100644
--- a/modules/home/conf/nvim/plgs/treesitter/default.nix
+++ b/modules/home/conf/nvim/plgs/treesitter/default.nix
@@ -8,46 +8,50 @@
     plugins.treesitter = {
       enable = true;
 
-      ensureInstalled = "all";
-      indent = true;
+      # NOTE: These are required to build grammars, but I already use the nix grammars <2024-07-13>
+      gccPackage = null;
+      nodejsPackage = null;
+      treesitterPackage = null;
 
       # inject nixvim specific highlighting (eg in extraConfigLua).
       nixvimInjections = true;
 
+      nixGrammars = true;
       grammarPackages =
         config.programs.nixvim.plugins.treesitter.package.passthru.allGrammars
         ++ [pkgs.tree-sitter-yts];
 
-      disabledLanguages = [];
+      settings = {
+        auto_install = false;
+        ensureInstalled = "all";
+        indent.enable = true;
+        disabledLanguages = [];
 
-      /*
-      # TODO: this is not supported by the NixVim module, NixNeovim supports this though..
-      highlight = {
-        #  `false` will disable the whole extension
-        enable = true;
-        disable = ["latex"];
+        highlight = {
+          enable = true;
+          disable = [];
 
-        #  Setting this to true will run `:h syntax` and tree-sitter at the same time.
-        #  Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-        #  Using this option may slow down your editor; and you may see some duplicate highlights.
-        #  Instead of true it can also be a list of languages
-        additionalVimRegexHighlighting = [""];
-      };
-      */
+          #  Setting this to true will run `:h syntax` and tree-sitter at the same time.
+          #  Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+          #  Using this option may slow down your editor; and you may see some duplicate highlights.
+          #  Instead of true it can also be a list of languages
+          additionalVimRegexHighlighting = ["latex"];
+        };
 
-      incrementalSelection = {
-        enable = true;
-        keymaps = {
-          # TODO: include these in the which-key description
-          initSelection = "gnn"; #  set to `false` to disable one of the mappings
-          nodeIncremental = "grn";
-          scopeIncremental = "grc";
-          nodeDecremental = "grm";
+        incrementalSelection = {
+          enable = true;
+          keymaps = {
+            # TODO: include these in the which-key description
+            initSelection = "gnn"; #  set to `false` to disable one of the mappings
+            nodeIncremental = "grn";
+            scopeIncremental = "grc";
+            nodeDecremental = "grm";
+          };
         };
       };
     };
     extraFiles = {
-      "queries/yts/highlights.scm" = ''
+      "queries/yts/highlights.scm".text = ''
         ${lib.strings.fileContents "${pkgs.tree-sitter-yts}/queries/highlights.scm"}
       '';
     };
diff --git a/modules/home/conf/taskwarrior/hooks/default.nix b/modules/home/conf/taskwarrior/hooks/default.nix
index 4bac0ca7..ef97e1b5 100644
--- a/modules/home/conf/taskwarrior/hooks/default.nix
+++ b/modules/home/conf/taskwarrior/hooks/default.nix
@@ -48,7 +48,8 @@
     buildInputs = [
       pkgs.timewarrior
       pkgs.taskwarrior
-      (pkgs.python3.withPackages (pythonPackages:
+      # TODO: Use a `taskw` package, that actually supports newer python variants <2024-07-13>
+      (pkgs.python311.withPackages (pythonPackages:
         with pythonPackages; [
           taskw
         ]))
@@ -67,7 +68,8 @@
     ];
     buildInputs = [
       pkgs.taskwarrior
-      (pkgs.python3.withPackages (pythonPackages:
+      # TODO: Use a `taskw` package, that actually supports newer python variants <2024-07-13>
+      (pkgs.python311.withPackages (pythonPackages:
         with pythonPackages; [
           taskw
         ]))
-- 
cgit 1.4.1