Merge branch 'main' of orion:kiri/nixos-config

modules/home-manager/gpg.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   programs.gpg = {
     enable = true;
     homedir = "${config.xdg.dataHome}/gnupg";
@@ -15,6 +16,9 @@
     pinentry = {
       package = pkgs.pinentry-gnome3;
     };
-    sshKeys = ["CD848796822630B280FC6DFA55F24A20040F22B5"];
+    sshKeys = [
+      "CD848796822630B280FC6DFA55F24A20040F22B5"
+      "B8FBDFBD7F42C444C17E086E0EE2E34FB43A7187"
+    ];
   };
 }

modules/home-manager/nixCats/default.nix

@@ -45,6 +45,7 @@ let
           typescript
           typescript-language-server
 
+          rustc
           rust-analyzer
           rustfmt
 

modules/home-manager/nixCats/lua/plugins/coding.lua

@@ -171,13 +171,25 @@ require("lz.n").load({
       require("luasnip.loaders.from_vscode").lazy_load()
     end,
   },
+  {
+    -- lazydev makes your lsp way better in your config without needing extra lsp configuration.
+    "lazydev.nvim",
+    cmd = "LazyDev",
+    ft = "lua",
+    after = function()
+      require("lazydev").setup({
+        library = {
+          { words = { "nixCats" }, path = (nixCats.nixCatsPath or "") .. "/lua" },
+        },
+      })
+    end,
+  },
   {
     "blink.cmp",
     before = function()
       -- Trigger lazydev so it's ready for blink source
       require("lz.n").trigger_load({ "lazydev.nvim", "luasnip" })
     end,
-    event = "VimEnter",
     after = function()
       require("blink.cmp").setup({
         keymap = {

modules/home-manager/nixCats/lua/plugins/lsp.lua

@@ -1,18 +1,4 @@
 require("lz.n").load({
-  {
-    {
-      -- lazydev makes your lsp way better in your config without needing extra lsp configuration.
-      "lazydev.nvim",
-      cmd = "LazyDev",
-      ft = "lua",
-      after = function()
-        require("lazydev").setup({
-          library = {
-            { words = { "nixCats" }, path = (nixCats.nixCatsPath or "") .. "/lua" },
-          },
-        })
-      end,
-    },
   {
     "nvim-lspconfig",
     event = { "BufReadPre", "BufNewFile" },
@@ -171,17 +157,16 @@ require("lz.n").load({
       })
       vim.lsp.enable("tinymist")
 
-        -- vim.lsp.config("ltex_plus", {
+      vim.lsp.config("ltex_plus", {
-        --   settings = {
+        settings = {
-        --     ltex = {
+          ltex = {
-        --       language = "nl",
+            language = "nl",
-        --     },
+          },
-        --   },
+        },
-        -- })
+      })
-        -- vim.lsp.enable("ltex_plus")
+      vim.lsp.enable("ltex_plus")
 
       vim.lsp.enable("harper_ls")
     end,
   },
-  },
 })

modules/home-manager/ssh.nix

@@ -4,6 +4,15 @@
     enable = true;
     enableDefaultConfig = false;
 
+    matchBlocks = {
+      "github-work" = {
+        hostname = "github.com";
+        user = "git";
+        identityFile = "/home/kiri/.ssh/github-work.pub";
+        identitiesOnly = true;
+      };
+    };
+
     includes = [
       config.sops.secrets.ssh_config_orion.path
     ];

modules/home-manager/todoman.nix

@@ -7,7 +7,7 @@
       time_format = "%H:%M"
       default_list = "personal"
       default_due = 0
-      default_command = "list --sort due"
+      default_command = "list --sort priority,due"
       humanize = True
     '';
   };