chore: flake cleanup

hosts/nixos/bakery/default.nix

@@ -1,13 +1,7 @@
 { self, config, inputs, lib, minimal, ... }:
 let
   primaryUser = config.swarselsystems.mainUser;
-  sharedOptions = {
-    isLaptop = true;
-    isNixos = true;
-    isBtrfs = true;
-    isLinux = true;
-    sharescreen = "eDP-1";
-  };
+  sharedOptions = { };
 in
 {
 
@@ -21,12 +15,18 @@ in
 
   swarselprofiles = {
     reduced = lib.mkIf (!minimal) true;
-    minimal = lib.mkIf minimal true;
     btrfs = true;
   };
 
   swarselsystems = lib.recursiveUpdate
     {
+      isLaptop = true;
+      isNixos = true;
+      isBtrfs = true;
+      isLinux = true;
+      lowResolution = "1280x800";
+      highResolution = "1920x1080";
+      sharescreen = "eDP-1";
       info = "Lenovo ThinkPad";
       firewall = lib.mkForce true;
       wallpaper = self + /files/wallpaper/lenovowp.png;
@@ -43,26 +43,18 @@ in
     sharedOptions;
 
   home-manager.users."${primaryUser}" = {
-    swarselprofiles = {
-      reduced = lib.mkIf (!minimal) true;
-      minimal = lib.mkIf minimal true;
-    };
     # home.stateVersion = lib.mkForce "23.05";
-    swarselsystems = lib.recursiveUpdate
-      {
-        lowResolution = "1280x800";
-        highResolution = "1920x1080";
-        monitors = {
-          main = {
-            name = "LG Display 0x04EF Unknown";
-            mode = "1920x1080"; # TEMPLATE
-            scale = "1";
-            position = "1920,0";
-            workspace = "15:L";
-            output = "eDP-1";
-          };
+    swarselsystems = {
+      monitors = {
+        main = {
+          name = "LG Display 0x04EF Unknown";
+          mode = "1920x1080"; # TEMPLATE
+          scale = "1";
+          position = "1920,0";
+          workspace = "15:L";
+          output = "eDP-1";
         };
-      }
-      sharedOptions;
+      };
+    };
   };
 }

hosts/nixos/chaostheatre/default.nix

@@ -1,12 +1,6 @@
 { self, config, pkgs, lib, minimal, ... }:
 let
   mainUser = "demo";
-  sharedOptions = {
-    inherit mainUser;
-    isBtrfs = false;
-    isLinux = true;
-    isPublic = true;
-  };
 in
 {
 
@@ -40,25 +34,20 @@ in
     minimal = lib.mkIf minimal true;
     btrfs = true;
   };
-  swarselsystems = lib.recursiveUpdate
-    {
-      info = "~SwarselSystems~ demo host";
-      wallpaper = self + /files/wallpaper/lenovowp.png;
-      isImpermanence = true;
-      isCrypted = true;
-      isSecureBoot = false;
-      isSwap = true;
-      swapSize = "4G";
-      rootDisk = "/dev/vda";
-    }
-    sharedOptions;
-
-  home-manager.users.${mainUser} = {
-    home.stateVersion = lib.mkForce "23.05";
-    swarselsystems = lib.recursiveUpdate
-      {
-        isNixos = true;
-      }
-      sharedOptions;
+  swarselsystems = {
+    info = "~SwarselSystems~ demo host";
+    wallpaper = self + /files/wallpaper/lenovowp.png;
+    isImpermanence = true;
+    isCrypted = true;
+    isSecureBoot = false;
+    isSwap = true;
+    swapSize = "4G";
+    rootDisk = "/dev/vda";
+    isBtrfs = false;
+    inherit mainUser;
+    isLinux = true;
+    isPublic = true;
+    isNixos = true;
   };
+
 }

hosts/nixos/milkywell/default.nix

@@ -1,12 +1,4 @@
-{ lib, config, minimal, ... }:
-let
-  primaryUser = config.swarselsystems.mainUser;
-  sharedOptions = {
-    isBtrfs = true;
-    isLinux = true;
-    isNixos = true;
-  };
-in
+{ lib, minimal, ... }:
 {
   imports = [
     ./hardware-configuration.nix
@@ -33,22 +25,17 @@ in
     minimal = lib.mkIf minimal true;
     server.syncserver = true;
   };
-  swarselsystems = lib.recursiveUpdate
-    {
-      info = "VM.Standard.E2.1.Micro";
-      isImpermanence = true;
-      isSecureBoot = false;
-      isCrypted = true;
-      isSwap = true;
-      rootDisk = "/dev/sda";
-      swapSize = "4G";
-    }
-    sharedOptions;
-
-  home-manager.users."${primaryUser}" = {
-    swarselsystems = lib.recursiveUpdate
-      { }
-      sharedOptions;
+  swarselsystems = {
+    info = "VM.Standard.E2.1.Micro";
+    isImpermanence = true;
+    isSecureBoot = false;
+    isCrypted = true;
+    isSwap = true;
+    rootDisk = "/dev/sda";
+    swapSize = "4G";
+    isBtrfs = true;
+    isLinux = true;
+    isNixos = true;
   };
 
 }

hosts/nixos/moonside/default.nix

@@ -1,16 +1,9 @@
 { lib, config, globals, ... }:
 let
-  primaryUser = config.swarselsystems.mainUser;
   inherit (config.repo.secrets.common) workHostName;
   inherit (config.repo.secrets.local.syncthing) dev1 dev2 dev3 loc1;
   inherit (config.swarselsystems) sopsFile;
   serviceDomain = config.repo.secrets.common.services.domains.syncthing3;
-
-  sharedOptions = {
-    isBtrfs = true;
-    isNixos = true;
-    isLinux = true;
-  };
 in
 {
   imports = [
@@ -212,22 +205,16 @@ in
   swarselprofiles = {
     server.moonside = true;
   };
-  swarselsystems = lib.recursiveUpdate
-    {
-      info = "VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM";
-      isImpermanence = true;
-      isSecureBoot = false;
-      isCrypted = false;
-      isSwap = false;
-      rootDisk = "/dev/sda";
-    }
-    sharedOptions;
 
-  home-manager.users."${primaryUser}" = {
-    home.stateVersion = lib.mkForce "23.11";
-    swarselsystems = lib.recursiveUpdate
-      { }
-      sharedOptions;
+  swarselsystems = {
+    info = "VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM";
+    isImpermanence = true;
+    isSecureBoot = false;
+    isCrypted = false;
+    isSwap = false;
+    rootDisk = "/dev/sda";
+    isBtrfs = true;
+    isNixos = true;
+    isLinux = true;
   };
-
 }

hosts/nixos/toto/default.nix

@@ -1,11 +1,4 @@
-{ self, config, lib, minimal, ... }:
-let
-  primaryUser = config.swarselsystems.mainUser;
-  sharedOptions = {
-    isBtrfs = true;
-    isLinux = true;
-  };
-in
+{ self, lib, minimal, ... }:
 {
 
   imports = [
@@ -13,8 +6,6 @@ in
     ./hardware-configuration.nix
   ];
 
-
-
   networking = {
     hostName = "toto";
     firewall.enable = false;
@@ -22,31 +13,24 @@ in
 
   swarselprofiles = {
     toto = lib.mkIf (!minimal) true;
-    minimal = lib.mkIf minimal true;
     btrfs = true;
   };
-  swarselsystems = lib.recursiveUpdate
-    {
-      info = "~SwarselSystems~ remote install helper";
-      wallpaper = self + /files/wallpaper/lenovowp.png;
-      isImpermanence = true;
-      isCrypted = true;
-      isSecureBoot = false;
-      isSwap = true;
-      swapSize = "2G";
-      # rootDisk = "/dev/nvme0n1";
-      rootDisk = "/dev/vda";
-      # rootDisk = "/dev/vda";
-    }
-    sharedOptions;
 
-  home-manager.users.${primaryUser} = {
-    home.stateVersion = lib.mkForce "23.05";
-    swarselsystems = lib.recursiveUpdate
-      {
-        isLaptop = false;
-        isNixos = true;
-      }
-      sharedOptions;
+  swarselsystems = {
+    info = "~SwarselSystems~ remote install helper";
+    wallpaper = self + /files/wallpaper/lenovowp.png;
+    isImpermanence = true;
+    isCrypted = true;
+    isSecureBoot = false;
+    isSwap = true;
+    swapSize = "2G";
+    # rootDisk = "/dev/nvme0n1";
+    rootDisk = "/dev/vda";
+    # rootDisk = "/dev/vda";
+    isBtrfs = true;
+    isLinux = true;
+    isLaptop = false;
+    isNixos = true;
   };
+
 }

hosts/nixos/winters/default.nix

@@ -1,12 +1,4 @@
-{ lib, config, ... }:
-let
-  primaryUser = config.swarselsystems.mainUser;
-  sharedOptions = {
-    isBtrfs = false;
-    isLinux = true;
-    isNixos = true;
-  };
-in
+{ config, ... }:
 {
 
   imports = [
@@ -30,19 +22,15 @@ in
   swarselprofiles = {
     server.local = true;
   };
-  swarselsystems = lib.recursiveUpdate
-    {
-      info = "ASRock J4105-ITX, 32GB RAM";
-      isImpermanence = false;
-      isSecureBoot = true;
-      isCrypted = true;
-    }
-    sharedOptions;
 
-  home-manager.users."${primaryUser}" = {
-    home.stateVersion = lib.mkForce "23.05";
-    swarselsystems = lib.recursiveUpdate
-      { }
-      sharedOptions;
+  swarselsystems = {
+    info = "ASRock J4105-ITX, 32GB RAM";
+    isImpermanence = false;
+    isSecureBoot = true;
+    isCrypted = true;
+    isBtrfs = false;
+    isLinux = true;
+    isNixos = true;
   };
+
 }