tor: more instances

hosts/mu/hardware.nix

@@ -9,7 +9,6 @@
     nixos-hardware.nixosModules.common-cpu-intel
     nixos-hardware.nixosModules.common-pc
     nixos-hardware.nixosModules.common-pc-laptop
-    nixos-hardware.nixosModules.common-pc-laptop-acpi_call
     nixos-hardware.nixosModules.common-pc-ssd
   ];
 

hosts/tor/tor.nix

@@ -55,6 +55,8 @@
             MyFamily = builtins.concatStringsSep "," [
               "1B9D2C9E0EFE2C6BD23D62B2FCD145886AD242D1" # /var/lib/tor-1/fingerprint
               "293CE00D11B1D8B99AE8811CBDFDA3F353353710" # /var/lib/tor-2/fingerprint
+              # "TODO" # /var/lib/tor-3/fingerprint
+              # "TODO" # /var/lib/tor-4/fingerprint
             ];
           };
         };
@@ -72,6 +74,16 @@
       orPort = 444;
       controlPort = 9052;
     };
+    tor-3 = mkTorContainer {
+      stateDir = "/var/lib/tor-3/";
+      orPort = 445;
+      controlPort = 9053;
+    };
+    tor-4 = mkTorContainer {
+      stateDir = "/var/lib/tor-4/";
+      orPort = 446;
+      controlPort = 9054;
+    };
   };
 
   environment.systemPackages = with pkgs; [
@@ -170,6 +182,18 @@
         group = builtins.toString config.ids.gids.tor;
         mode = "0700";
       }
+      {
+        directory = "/var/lib/tor-3";
+        user = builtins.toString config.ids.uids.tor;
+        group = builtins.toString config.ids.gids.tor;
+        mode = "0700";
+      }
+      {
+        directory = "/var/lib/tor-4";
+        user = builtins.toString config.ids.uids.tor;
+        group = builtins.toString config.ids.gids.tor;
+        mode = "0700";
+      }
     ];
   };
 }

hosts/zeta/hardware.nix

@@ -9,7 +9,6 @@
     nixos-hardware.nixosModules.common-cpu-intel
     nixos-hardware.nixosModules.common-pc
     nixos-hardware.nixosModules.common-pc-laptop
-    nixos-hardware.nixosModules.common-pc-laptop-acpi_call
     nixos-hardware.nixosModules.common-pc-ssd
   ];
 

modules/base/vim.nix

@@ -517,6 +517,11 @@
 
               local lspconfig = require("lspconfig")
 
+              -- https://github.com/golang/tools/tree/master/gopls
+              lspconfig.gopls.setup({
+                capabilities = capabilities,
+              })
+
               -- https://github.com/nix-community/nixd
               lspconfig.nixd.setup({
                 capabilities = capabilities,
@@ -908,6 +913,7 @@
         nixpkgs-unstable.legacyPackages.${pkgs.system}.basedpyright # lsp
         nixpkgs-unstable.legacyPackages.${pkgs.system}.ruff # lsp/conform
         pkgs.alejandra # conform
+        pkgs.gopls # lsp
         pkgs.nixd # lsp
         pkgs.nodePackages.prettier # conform
         pkgs.opentofu # conform