Merge remote-tracking branch 'origin/nixos' into nixos

modules/profiles/base.nix

@@ -100,7 +100,6 @@ in
     statix
     manix
     nix-output-monitor
-    attic
 
     # other
     bat

modules/programs/hyprland/_config.nix

@@ -25,7 +25,7 @@ in
 
   # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
   input {
-      kb_layout = de,us
+      kb_layout = ${concatStringsSep "," cfg.keyboardLayouts}
       kb_variant =
       kb_model =
       kb_options = grp:win_space_toggle,caps:escape

modules/programs/hyprland/default.nix

@@ -25,6 +25,11 @@ in
       description = "enable window shadows";
       default = true;
     };
+    keyboardLayouts = mkOption {
+      type = types.listOf types.str;
+      description = "list of keyboard layouts";
+      default = [ "de" "us" ];
+    };
   };
 
   config = mkIf cfg.enable {

modules/programs/nvim/default.nix

@@ -239,11 +239,12 @@ in
           stylua
           sumneko-lua-language-server
           taplo
+          typst
+          typst-lsp
           yamlfmt
         ];
-        plugins = with pkgs.vimPlugins; [
-          lazy-nvim
-          nvim-treesitter.withAllGrammars
+        plugins = [
+          pkgs.vimPlugins.lazy-nvim
         ];
       };
     };

modules/programs/nvim/plugins/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with builtins;
 {
@@ -115,9 +115,22 @@ with builtins;
       lazy = false;
     }
     {
-      plugin = nvim-treesitter.withAllGrammars;
+      plugin = nvim-treesitter;
       event = [ "BufReadPost" "BufNewFile" ];
-      conf = readFile ./nvim-treesitter.lua;
+      conf =
+        let
+          parserDir = pkgs.symlinkJoin {
+            name = "tresitter-grammars-all";
+            paths = lib.attrValues (lib.filterAttrs (_: builtins.isAttrs) nvim-treesitter-parsers);
+          };
+        in
+        readFile ./nvim-treesitter.lua + ''
+          vim.opt.runtimepath:append("${parserDir}")
+
+          require'nvim-treesitter.configs'.setup {
+            parser_install_dir = "${parserDir}",
+          }
+        '';
       dependencies = [
         { plugin = nvim-ts-context-commentstring; }
         {
@@ -189,6 +202,7 @@ with builtins;
     {
       plugin = telescope-fzf-native-nvim;
       conf = readFile ./telescope-fzf-native-nvim.lua;
+      cmd = [ "Telescope" ];
       keys = [
         { key = "<leader>ff"; cmd = "<cmd>Telescope find_files<cr>"; desc = "Find files"; }
         { key = "<leader>fb"; cmd = "<cmd>Telescope buffers<cr>"; desc = "Find buffers"; }
@@ -220,5 +234,14 @@ with builtins;
       cmd = [ "StartupTime" ];
       conf = readFile ./vim-startuptime.lua;
     }
+    {
+      plugin = typst-vim;
+      ft = [ "typst" "typ" ];
+    }
+    {
+      plugin = comment-nvim;
+      event = [ "BufReadPost" "BufNewFile" ];
+      conf = "require('Comment').setup()";
+    }
   ];
 }

modules/programs/nvim/plugins/mini-nvim.lua

@@ -1,11 +1,4 @@
 require("mini.align").setup()
-require("mini.comment").setup({
-  options = {
-    custom_commentstring = function()
-      return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
-    end,
-  },
-})
 require("mini.surround").setup()
 require("mini.move").setup()
 require("mini.pairs").setup()

modules/programs/nvim/plugins/nvim-lspconfig.lua

@@ -127,6 +127,7 @@ local servers = {
   "pylsp",
   "ruff_lsp",
   "rust_analyzer",
+  "typst_lsp",
 }
 for _, lsp in ipairs(servers) do
   lspconfig_setup(lsp, {})