🤌

hosts/default.nix

@@ -168,17 +168,24 @@
       thinkpad = {
         extraModules = with inputs; [
           nixosHardware.nixosModules.lenovo-thinkpad-x1-7th-gen
-          hyprland.nixosModules.default
         ];
         extraHmModules = with inputs; [
           ccrEmacs.hmModules.default
-          hyprland.homeManagerModules.default
+          {
+            # TODO: remove after https://github.com/nix-community/home-manager/pull/3811
+            imports = let
+              hmModules = "${inputs.homeManagerGitWorkspace}/modules";
+            in [
+              "${hmModules}/services/git-workspace.nix"
+            ];
+          }
         ];
         overlays = [inputs.nil.overlays.default];
         secrets = {
           "thinkpad-wireguard-private-key" = {};
           "cachix-personal-token".owner = "ccr";
           "autistici-password".owner = "ccr";
+          "git-workspace-tokens".owner = "ccr";
         };
       };
       rock5b = {

hosts/mothership/default.nix

@@ -14,7 +14,7 @@
     "ccr"
     "nix"
     # "vm-sala"
-    "vm-mara"
+    # "vm-mara"
     # "vm-ubuntu"
     # "hydra"
     "hercules-ci"
@@ -23,8 +23,9 @@
     "docker"
     # "minio"
     "proxy"
-    # "binfmt"
+    "binfmt"
     "xdg"
+    # "remote-xfce"
   ];
 
   ccr = {

hosts/thinkpad/default.nix

@@ -40,13 +40,14 @@
     enable = true;
     autologin = true;
     modules = [
+      "git-workspace"
       "cura"
       "digikam"
       "discord"
       "element"
       # "nheko"
       # "thunderbird"
-      "aerc"
+      # "aerc"
       "emacs"
       "firefox"
       "git"
@@ -74,6 +75,7 @@
       "remmina"
       "whatsapp"
       # "pantalaimon"
+      # "moonlight"
     ];
     packages = with pkgs; [
       comma