update

hosts/wsl/home.nix

@@ -17,6 +17,7 @@
     ../../modules/home-manager/syncthing.nix
     ../../modules/home-manager/bitwarden.nix
     ../../modules/home-manager/kitty.nix
+    ../../modules/home-manager/kubernetes.nix
   ];
   home.username = "mthomson";
   home.homeDirectory = "/home/mthomson";

modules/home-manager/git.nix

@@ -64,7 +64,7 @@
       };
       includes = [
         {
-          condition = "gitdir:~/dev/work/";
+          condition = "gitdir:~/dev/work/konrad/";
           contents = {
             user = {
               email = "mthomson@konradgroup.com";
@@ -72,6 +72,18 @@
             };
           };
         }
+        {
+          condition = "gitdir:~/dev/work/symcor/";
+          contents = {
+            user = {
+              email = "mthomson@symcor.com";
+              name = "Michael Thomson";
+            };
+            http = {
+              sslVerify = false;
+            };
+          };
+        }
       ];
     };
   };

modules/home-manager/kubernetes.nix

@@ -9,6 +9,8 @@
     velero
     fluxcd
     kompose
+    kubernetes-helm
+    envsubst
   ];
 
   programs = {

modules/home-manager/nixcats/default.nix

@@ -2,9 +2,17 @@
   config,
   lib,
   inputs,
+  pkgs,
   ...
 }: let
   utils = inputs.nixCats.utils;
+
+  kulala-grammer = pkgs.tree-sitter.buildGrammar {
+    language = "kulala_http";
+    version = "${pkgs.vimPlugins.kulala-nvim.version}";
+    src = "${pkgs.vimPlugins.kulala-nvim}/lua/tree-sitter";
+    generate = true;
+  };
 in {
   imports = [
     inputs.nixCats.homeModule
@@ -79,6 +87,9 @@ in {
           gitlab = with pkgs; [
             gitlab-ci-ls
           ];
+          http = with pkgs; [
+            kulala-fmt
+          ];
         };
 
         # This is for plugins that will load at startup without using packadd:
@@ -88,6 +99,10 @@ in {
             # but as a demo, we do it anyway.
             lze
             lzextras
+            (nvim-treesitter.withPlugins (
+              plugins:
+                nvim-treesitter.allGrammars ++ [kulala-grammer]
+            ))
             snacks-nvim
             gruvbox-nvim
             gruber-darker-nvim
@@ -119,7 +134,6 @@ in {
             mini-nvim
             nvim-lspconfig
             blink-cmp
-            nvim-treesitter.withAllGrammars
             gitsigns-nvim
             harpoon2
             which-key-nvim
@@ -129,6 +143,9 @@ in {
             nvim-dap-ui
             nvim-dap-virtual-text
           ];
+          http = with pkgs.vimPlugins; [
+            kulala-nvim
+          ];
         };
 
         # shared libraries to be added to LD_LIBRARY_PATH
@@ -198,6 +215,7 @@ in {
             c = true;
             csharp = true;
             gitlab = true;
+            http = true;
           };
           # anything else to pass and grab in lua with `nixCats.extra`
           extra = {

modules/home-manager/nixcats/init.lua

@@ -583,6 +583,21 @@ require('lze').load {
       vim.keymap.set("n", "<leader>j", function() harpoon:list():next() end)
     end
   },
+  {
+    "kulala.nvim",
+    keys = {
+      { "<leader>Rs", desc = "Send request" },
+      { "<leader>Ra", desc = "Send all requests" },
+      { "<leader>Rb", desc = "Open scratchpad" },
+    },
+    ft = {"http", "rest"},
+    after = function ()
+      require('kulala').setup({
+        global_keymaps = true,
+        global_keymaps_prefix = "<leader>R",
+      })
+    end
+  },
   {
     "zk-nvim",
     enabled = nixCats('notes') or false,
@@ -645,7 +660,7 @@ local function lsp_on_attach(_, bufnr)
 
   -- See `:help K` for why this keymap
   nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+  -- nmap('<C-K>', vim.lsp.buf.signature_help, 'Signature Documentation')
 
   -- Lesser used LSP functionality
   nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')

modules/nixos/postgres.nix

@@ -1,16 +1,17 @@
 {pkgs, ...}: {
-  services.postgresql = {
+  services = {
-    enable = true;
+    postgresql = {
-    ensureDatabases = ["todo"];
+      enable = true;
-    ensureUsers = [
+      authentication = ''
-      {
+        #type database  DBuser  auth-method
-        name = "todo";
+        local all       all     trust
-        ensurePermissions = {
+      '';
-          "DATABASE todo" = "ALL PRIVILEGES";
+      enableTCPIP = true;
-        };
+      port = 5432;
-      }
+    };
-    ];
+    # pgadmin = {
-    enableTCPIP = true;
+    #   enable = true;
-    port = 5432;
+    #   initialEmail = "admin@admin.com";
+    # };
   };
 }