feat(autoconfig)!: sysidentity is now just an attrset instead of having a property sysidentity

4 files changed, 14 insertions, 21 deletions

diff --git a/autoconfig.nix b/autoconfig.nix
index c39f974..cd40ee7 100644
--- a/autoconfig.nix
+++ b/autoconfig.nix
@@ -7,7 +7,7 @@ in {
     lib.mapAttrs
     (dir: _:
       let
-        inherit (import ./machines/${dir}/sysidentity.nix) sysidentity;
+        sysidentity = import ./machines/${dir}/sysidentity.nix;
 
         modules-dir = ./modules + ("/" + (if sysidentity ? "modules-subpath" then sysidentity.modules-subpath else "personal"));
 
diff --git a/machines/juno/sysidentity.nix b/machines/juno/sysidentity.nix
index 63abf37..5f90eaa 100644
--- a/machines/juno/sysidentity.nix
+++ b/machines/juno/sysidentity.nix
@@ -2,12 +2,10 @@ let
   groups = import ../../module-groups.nix;
 in
 {
-  sysidentity = {
-    name = "juno";
-    arch = "x86_64-linux";
+  name = "juno";
+  arch = "x86_64-linux";
 
-    drop = groups.non-laptop;
-    #defaultempty = true;
-    #have = groups.barebones;
-  };
+  drop = groups.non-laptop;
+  #defaultempty = true;
+  #have = groups.barebones;
 }
diff --git a/machines/minerva/sysidentity.nix b/machines/minerva/sysidentity.nix
index 06919b4..0afdb49 100644
--- a/machines/minerva/sysidentity.nix
+++ b/machines/minerva/sysidentity.nix
@@ -2,13 +2,10 @@ let
   groups = import ../../module-groups.nix;
 in
 {
-  sysidentity = {
-    name = "minerva";
-    type = "laptop";
-    arch = "x86_64-linux";
+  name = "minerva";
+  arch = "x86_64-linux";
 
-    defaultempty = false; # therefore drop will not remove from have
-    have = [ "gui-powerful" ];
-    drop = groups.non-laptop;
-  };
+  defaultempty = false; # therefore drop will not remove from have
+  have = [ "gui-powerful" ];
+  drop = groups.non-laptop;
 }
diff --git a/machines/vesta/sysidentity.nix b/machines/vesta/sysidentity.nix
index d5956de..a689f10 100644
--- a/machines/vesta/sysidentity.nix
+++ b/machines/vesta/sysidentity.nix
@@ -2,10 +2,8 @@ let
   groups = import ../../module-groups.nix;
 in
 {
-  sysidentity = {
-    name = "vesta";
-    arch = "x86_64-linux";
+  name = "vesta";
+  arch = "x86_64-linux";
 
-    drop = groups.non-desktop;
-  };
+  drop = groups.non-desktop;
 }