From 98d8ea35119321c9a36627b41857ee05d2f736a8 Mon Sep 17 00:00:00 2001
From: Michael Thomson <michael@michaelthomson.dev>
Date: Wed, 27 Aug 2025 15:08:09 +0000
Subject: [PATCH] update

---
 hosts/wsl/configuration.nix              | 14 ++++++++++++--
 hosts/wsl/home.nix                       |  6 ++++++
 modules/home-manager/emacs/default.nix   | 13 ++++++++-----
 modules/home-manager/emacs/emacs/init.el |  3 ++-
 modules/home-manager/nixcats/default.nix |  5 +++++
 modules/home-manager/nixcats/init.lua    | 10 ++++++++++
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/hosts/wsl/configuration.nix b/hosts/wsl/configuration.nix
index db1b0ad..97513bd 100644
--- a/hosts/wsl/configuration.nix
+++ b/hosts/wsl/configuration.nix
@@ -11,10 +11,19 @@
   imports = [
     inputs.home-manager.nixosModules.default
     ../../modules/nixos/user.nix
+    ../../modules/nixos/postgres.nix
   ];
 
-  wsl.enable = true;
-  wsl.defaultUser = "mthomson";
+  wsl = {
+    enable = true;
+    defaultUser = "mthomson";
+    startMenuLaunchers = true;
+    wslConf = {
+      network = {
+        generateResolvConf = true;
+      };
+    };
+  };
 
   networking.hostName = "wsl";
 
@@ -22,6 +31,7 @@
     git
     wget
     vim
+    dconf
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/wsl/home.nix b/hosts/wsl/home.nix
index 4a5f011..9a5217e 100644
--- a/hosts/wsl/home.nix
+++ b/hosts/wsl/home.nix
@@ -5,6 +5,7 @@
 }: {
   imports = [
     ../../modules/home-manager/git.nix
+    ../../modules/home-manager/stylix.nix
     ../../modules/home-manager/nixcats
     ../../modules/home-manager/zsh.nix
     ../../modules/home-manager/tmux.nix
@@ -12,6 +13,9 @@
     ../../modules/home-manager/jq.nix
     ../../modules/home-manager/lazygit.nix
     ../../modules/home-manager/man.nix
+    ../../modules/home-manager/emacs
+    ../../modules/home-manager/syncthing.nix
+    ../../modules/home-manager/bitwarden.nix
   ];
   home.username = "mthomson";
   home.homeDirectory = "/home/mthomson";
@@ -19,6 +23,8 @@
 
   home.packages = with pkgs; [
     gcc
+    openconnect
+    wsl-vpnkit
   ];
 
   programs.home-manager.enable = true;
diff --git a/modules/home-manager/emacs/default.nix b/modules/home-manager/emacs/default.nix
index 94e27b8..06a6f1e 100644
--- a/modules/home-manager/emacs/default.nix
+++ b/modules/home-manager/emacs/default.nix
@@ -11,12 +11,14 @@
     ripgrep
     typescript-language-server
     typescript
+    vscode-langservers-extracted
     nodejs
     # mathpix-snipping-tool
-	cmake
-	libtool
-	glibtool
-	graphviz
+    cmake
+    libtool
+    glibtool
+    graphviz
+    libvterm
   ];
 
   programs.emacs = {
@@ -24,9 +26,10 @@
     extraPackages = epkgs: [
       epkgs.mu4e
       epkgs.pdf-tools
+      epkgs.vterm
     ];
   };
-  services.emacs.enable = true;
+  #services.emacs.enable = true;
   home.file.".config/emacs" = {
     source = ./emacs;
     recursive = true;
diff --git a/modules/home-manager/emacs/emacs/init.el b/modules/home-manager/emacs/emacs/init.el
index 8bb7075..8f7810d 100644
--- a/modules/home-manager/emacs/emacs/init.el
+++ b/modules/home-manager/emacs/emacs/init.el
@@ -65,7 +65,7 @@
     (string-match "\\*[^*]+\\*" (buffer-name buffer)))
   (setq switch-to-prev-buffer-skip 'skip-these-buffers)
 
-  (set-face-attribute 'default nil :family "JetBrainsMono Nerd Font"  :height 120)
+  (set-face-attribute 'default nil :family "JetBrainsMono Nerd Font"  :height 100)
 
   (setq custom-file (locate-user-emacs-file "custom-vars.el"))
   (load custom-file 'noerror 'nomessage)
@@ -502,6 +502,7 @@
          (tsx-ts-mode . lsp)
          (js-mode . lsp)
          (js-ts-mode . lsp)
+         (css-ts-mode . lsp)
          (c-ts-mode . lsp)
 		 (c++-ts-mode . lsp)
          (lsp-mode . lsp-enable-which-key-integration)
diff --git a/modules/home-manager/nixcats/default.nix b/modules/home-manager/nixcats/default.nix
index e3f2dfa..35ff42c 100644
--- a/modules/home-manager/nixcats/default.nix
+++ b/modules/home-manager/nixcats/default.nix
@@ -49,6 +49,7 @@ in {
             vscode-langservers-extracted
             vue-language-server
             stylelint-lsp
+            tailwindcss-language-server
           ];
           c = with pkgs; [
             clang
@@ -56,6 +57,9 @@ in {
           csharp = with pkgs; [
             omnisharp-roslyn
           ];
+          gitlab = with pkgs; [
+            gitlab-ci-ls
+          ];
         };
 
         # This is for plugins that will load at startup without using packadd:
@@ -163,6 +167,7 @@ in {
             typescript = true;
             c = true;
             csharp = true;
+            gitlab = true;
           };
           # anything else to pass and grab in lua with `nixCats.extra`
           extra = {
diff --git a/modules/home-manager/nixcats/init.lua b/modules/home-manager/nixcats/init.lua
index 61e252d..6aa2fc4 100644
--- a/modules/home-manager/nixcats/init.lua
+++ b/modules/home-manager/nixcats/init.lua
@@ -711,6 +711,11 @@ require('lze').load {
     enabled = nixCats('typescript') or false,
     lsp = {},
   },
+  {
+    "tailwindcss",
+    enabled = nixCats('typescript') or false,
+    lsp = {},
+  },
   {
     "clangd",
     enabled = nixCats('c') or false,
@@ -723,6 +728,11 @@ require('lze').load {
       -- filetypes = { "go", "gomod", "gowork", "gotmpl" },
     },
   },
+  {
+    "gitlab_ci_ls",
+    enabled = nixCats("gitlab") or false,
+    lsp = {},
+  },
   {
     "omnisharp",
     enabled = nixCats("csharp") or false,