Merge branch 'main' of srcpub:greg/nixos-config

modules/hm/development.nix

@@ -19,6 +19,7 @@ let
     nixpkgs-review
     nodejs
     process-compose
+    subversion
   ];
 in
 with lib;

modules/hm/vscodium.nix

@@ -34,10 +34,12 @@ in
             jnoortheen.nix-ide
             mkhl.direnv
             ms-python.python
+            ms-vscode.cpptools-extension-pack
             ms-vscode.makefile-tools
             ms-vscode-remote.remote-ssh
             njpwerner.autodocstring
             rust-lang.rust-analyzer
+            slint.slint
             tamasfe.even-better-toml
             vscjava.vscode-java-test
             vscjava.vscode-java-dependency

modules/hm/zed.nix

@@ -12,9 +12,60 @@ in
   options.greg.zed = lib.mkEnableOption "Whether to install the Zed editor";
 
   config = lib.mkIf cfg {
-    home.packages = with pkgs; [
-      nil
-      zed-editor
-    ];
+    programs.zed-editor = {
+      enable = true;
+      extensions = [
+        "ansible"
+        "cargo-tom"
+        "dockerfile"
+        "mcp-server-gitlab"
+        "helm"
+        "html"
+        "ini"
+        "jsonnet"
+        "latex"
+        "make"
+        "markdown-oxide"
+        "material-icon-theme"
+        "nix"
+        "nu"
+        "postgres-context-server"
+        "python-refactoring"
+        "slint"
+        "snippets"
+        "toml"
+      ];
+      extraPackages = with pkgs; [
+        cargo
+        direnv
+        nil
+        nix
+        python3
+        rustc
+      ];
+      installRemoteServer = true;
+      userKeymaps = [
+        {
+        }
+      ];
+      userSettings = {
+        baseKeymap = "VSCode";
+        buffer_font_size = 16;
+        features = {
+          copilot = true;
+        };
+        relative_line_numbers = true;
+        telemetry = {
+          metrics = true;
+        };
+        theme = {
+          mode = "system";
+          light = "Gruvbox Dark";
+          dark = "One Dark";
+        };
+        vim_mode = true;
+        ui_font_size = 20;
+      };
+    };
   };
 }