fixup! chore: remove deprecated static host config

Swarsel · Dec 10, 2024 · 928366e · 928366e
1 parent c1517c1
commit 928366e
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 66 deletions.
diff --git a/SwarselSystems.org b/SwarselSystems.org
@@ -333,54 +333,56 @@ This sections puts together the =flake.nix= file from the [[#h:d39b8dfb-536d-414
 
 #+begin_src nix :noweb yes :tangle flake.nix
 
-  {
-    description = "SwarseFlake - Nix Flake for all SwarselSystems";
+      {
+        description = "SwarseFlake - Nix Flake for all SwarselSystems";
 
-    nixConfig = {
-      extra-substituters = [
-        "https://nix-community.cachix.org"
-        "https://cache.ngi0.nixos.org/"
-      ];
+        nixConfig = {
+          extra-substituters = [
+            "https://nix-community.cachix.org"
+            "https://cache.ngi0.nixos.org/"
+          ];
 
-      extra-trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
-      ];
-    };
+          extra-trusted-public-keys = [
+            "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+            "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
+          ];
+        };
 
-    inputs = {
-      <<flakeinputs>>
-    };
+        inputs = {
+          <<flakeinputs>>
+        };
 
-    outputs =
-      inputs@{ self
-      , nixpkgs
-      , nixpkgs-stable
-      , home-manager
-      , nix-darwin
-      , systems
-      , ...
-      }:
-      let
-        <<flakelet>>
-      in
-      {
-        <<flakeoutputgeneral>>
+        outputs =
+          inputs@{ self
+          , nixpkgs
+          , nixpkgs-stable
+          , home-manager
+          , nix-darwin
+          , systems
+          , ...
+          }:
+          let
+            <<flakelet>>
+          in
+          {
+            <<flakeoutputgeneral>>
 
-        nixosConfigurations = <<flakenixosconf>>
+            nixosConfigurations =
+              <<flakenixosconf>>
 
-        homeConfigurations = {
-           <<flakehomeconf>>
-        };
+            homeConfigurations = {
+               <<flakehomeconf>>
+            };
 
-        darwinConfigurations = <<flakedarwinconf>>
+            darwinConfigurations =
+              <<flakedarwinconf>>
 
-        nixOnDroidConfigurations = {
-          <<flakedroidconf>>
-        };
+            nixOnDroidConfigurations = {
+              <<flakedroidconf>>
+            };
 
-      };
-  }
+          };
+      }
 
 
 
@@ -725,9 +727,7 @@ Note: The preceding =nixosConfigurations= is found in [[#h:aee5ec75-7ca6-40d8-b6
 
 
 #+begin_src nix :tangle no :noweb-ref flakenixosconf
-
   mkFullHostConfigs (readHosts "nixos") true;
-
 #+end_src
 ** darwinConfigurations
 :PROPERTIES:
@@ -740,9 +740,7 @@ Note: The preceding =darwinConfigurations= is found in [[#h:aee5ec75-7ca6-40d8-b
 =3a272b1 feat!: dynamically create hosts=, and the deprecated system definitions removed in =7457109 main chore: remove deprecated static host config=. See those commits for a state with a simpler config.
 
 #+begin_src nix :tangle no :noweb-ref flakedarwinconf
-
   mkFullHostConfigs (readHosts "darwin") false;
-
 #+end_src
 
 ** homeConfigurations

diff --git a/flake.nix b/flake.nix
@@ -230,35 +230,33 @@
 
 
       nixosConfigurations =
-        nixosConfigurations = mkFullHostConfigs (readHosts "nixos") true;
-      nixosConfigurations =
+        mkFullHostConfigs (readHosts "nixos") true;
 
-        homeConfigurations = {
+      homeConfigurations = {
 
-      "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration {
-      pkgs = pkgsFor.x86_64-linux;
-      extraSpecialArgs = { inherit inputs outputs; };
-      modules = homeModules ++ mixedModules ++ [
-        ./hosts/home-manager
-      ];
-    };
+        "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration {
+          pkgs = pkgsFor.x86_64-linux;
+          extraSpecialArgs = { inherit inputs outputs; };
+          modules = homeModules ++ mixedModules ++ [
+            ./hosts/home-manager
+          ];
+        };
 
-};
+      };
 
-darwinConfigurations =
-darwinConfigurations = mkFullHostConfigs (readHosts "darwin") false;
-darwinConfigurations =
+      darwinConfigurations =
+        mkFullHostConfigs (readHosts "darwin") false;
 
-nixOnDroidConfigurations = {
+      nixOnDroidConfigurations = {
 
-magicant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-pkgs = pkgsFor.aarch64-linux;
-modules = [
-./hosts/magicant
-];
-};
+        magicant = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
+          pkgs = pkgsFor.aarch64-linux;
+          modules = [
+            ./hosts/magicant
+          ];
+        };
 
-};
+      };
 
-};
+    };
 }