colmena: added host toscano

nixos/configurations.nix

@@ -25,6 +25,9 @@
     }
   ];
   defaultModules = baseModules ++ customModules;
+  deployment = {
+    allowLocalDeployment = true;
+  };
 in {
-  toscano = import ./hosts/toscano.nix;
+  #toscano = import ./hosts/toscano/configuration.nix;
 }

nixos/hosts/toscano/configuration.nix

@@ -8,14 +8,14 @@
   ...
 }: {
   imports = [
-    ../networks/linode.nix
+    ../../../networks/linode.nix
-    ../profiles/forgejo.nix
+    ../../../profiles/gitea.nix
-    ../profiles/hakyll-skeleton.nix
+    ../../../profiles/hakyll-skeleton.nix
-    ../profiles/jfdic-web.nix
+    ../../../profiles/jfdic-web.nix
-    ../profiles/resrok-web.nix
+    ../../../profiles/resrok-web.nix
-    ../profiles/tmateServer.nix
+    ../../../profiles/tmateServer.nix
-    ../profiles/voc-web.nix
+    ../../../profiles/voc-web.nix
-    ../secrets/forgejo.nix
+    ../../../secrets/gitea.nix
   ];
 
   deployment.targetHost = "45.79.236.198";

outputs.nix

@@ -23,34 +23,19 @@ in {
     };
 }))
 // {
-  nixopsConfigurations.default = {
+  colmena = {
-    inherit nixpkgs;
+    meta = {
-    network = {
+      description = "jfdi collective's NixOS deployment";
-      description = "jfdic-ops nodes";
+      name = "jfdic-ops";
-      enableRollback = true;
+      nixpkgs = import nixpkgs {
-      storage.legacy = {
+        system = "x86_64-linux";
-        databasefile = "~/.nixops/deployments.nixops";
+        overlays = [];
       };
     };
-    defaults = {
+    toscano = import ./nixos/hosts/toscano/configuration.nix;
-      system.autoUpgrade.enable = false; # Disabled as it conflicts with NixOps
+    nixosConfigurations = import ./nixos/configurations.nix (inputs
-      _module.args.inputs = inputs; # make flake inputs accessiable in NixOS
+      // {
-      imports = [./profiles/host_common.nix];
+        inherit inputs;
-    };
+      });
-    toscano = import ./hosts/toscano.nix;
-    colmena = {
-      meta = {
-        description = "jfdic-ops deployment";
-        name = "jfdic-ops";
-        nixpkgs = import nixpkgs {
-          system = "x86_64-linux";
-          overlays = [];
-        };
-      };
-      nixosConfigurations = import ./nixos/configurations.nix (inputs
-        // {
-          inherit inputs;
-        });
-    };
   };
 }

profiles/server_common.nix

@@ -7,8 +7,8 @@
 }: {
   imports = [
     ../profiles/openssh.nix
-    ../secrets/user-fiscalvelvetpoet.nix
+    ../nixos/secrets/user-fiscalvelvetpoet.nix
-    ../secrets/user-root.nix
+    ../nixos/secrets/user-root.nix
   ];
 
   programs.mosh = {