chore: flake maintenance

hosts/nixos/bakery/default.nix

@@ -1,7 +1,6 @@
 { self, config, inputs, lib, minimal, ... }:
 let
   primaryUser = config.swarselsystems.mainUser;
-  sharedOptions = { };
 in
 {
 
@@ -13,35 +12,28 @@ in
 
   ];
 
-  swarselprofiles = {
-    reduced = lib.mkIf (!minimal) true;
-    btrfs = true;
+  swarselsystems = {
+    isLaptop = true;
+    isNixos = true;
+    isBtrfs = true;
+    isLinux = true;
+    lowResolution = "1280x800";
+    highResolution = "1920x1080";
+    sharescreen = "eDP-1";
+    info = "Lenovo Ideapad 720S-13IKB";
+    firewall = lib.mkForce true;
+    wallpaper = self + /files/wallpaper/lenovowp.png;
+    hasBluetooth = true;
+    hasFingerprint = true;
+    isImpermanence = true;
+    isSecureBoot = false;
+    isCrypted = true;
+    isSwap = true;
+    rootDisk = "/dev/nvme0n1";
+    swapSize = "4G";
+    hostName = config.node.name;
   };
 
-  swarselsystems = lib.recursiveUpdate
-    {
-      isLaptop = true;
-      isNixos = true;
-      isBtrfs = true;
-      isLinux = true;
-      lowResolution = "1280x800";
-      highResolution = "1920x1080";
-      sharescreen = "eDP-1";
-      info = "Lenovo Ideapad 720S-13IKB";
-      firewall = lib.mkForce true;
-      wallpaper = self + /files/wallpaper/lenovowp.png;
-      hasBluetooth = true;
-      hasFingerprint = true;
-      isImpermanence = true;
-      isSecureBoot = false;
-      isCrypted = true;
-      isSwap = true;
-      rootDisk = "/dev/nvme0n1";
-      swapSize = "4G";
-      hostName = config.node.name;
-    }
-    sharedOptions;
-
   home-manager.users."${primaryUser}" = {
     # home.stateVersion = lib.mkForce "23.05";
     swarselsystems = {
@@ -57,4 +49,8 @@ in
       };
     };
   };
+} // lib.optionalAttrs (!minimal) {
+  swarselprofiles = {
+    personal = true;
+  };
 }

hosts/nixos/bakery/disk-config.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, config, rootDisk, ... }:
+{ lib, pkgs, config, ... }:
 let
   type = "btrfs";
   extraArgs = [ "-L" "nixos" "-f" ]; # force overwrite

hosts/nixos/chaostheatre/default.nix

@@ -29,11 +29,6 @@ in
     firewall.enable = true;
   };
 
-  swarselprofiles = {
-    chaostheatre = lib.mkIf (!minimal) true;
-    minimal = lib.mkIf minimal true;
-    btrfs = true;
-  };
   swarselsystems = {
     info = "~SwarselSystems~ demo host";
     wallpaper = self + /files/wallpaper/lenovowp.png;
@@ -50,4 +45,9 @@ in
     isNixos = true;
   };
 
+} // lib.optionalAttrs (!minimal) {
+  swarselprofiles = {
+    chaostheatre = true;
+    minimal = true;
+  };
 }

hosts/nixos/milkywell/default.nix

@@ -25,10 +25,6 @@
     enableAllFirmware = lib.mkForce false;
   };
 
-  swarselprofiles = {
-    minimal = lib.mkIf minimal true;
-    server.syncserver = true;
-  };
   swarselsystems = {
     info = "VM.Standard.E2.1.Micro";
     isImpermanence = true;
@@ -42,4 +38,13 @@
     isNixos = true;
   };
 
+} // lib.optionalAttrs (!minimal) {
+  swarselprofiles = {
+    server = true;
+  };
+
+  swarselmodules.server = {
+    forgejo = lib.mkDefault false;
+    ankisync = lib.mkDefault false;
+  };
 }

hosts/nixos/milkywell/disk-config.nix

@@ -1,7 +1,6 @@
 # NOTE: ... is needed because dikso passes diskoFile
 { lib
 , config
-, rootDisk
 , ...
 }:
 let

hosts/nixos/moonside/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ lib, config, minimal, ... }:
 let
   inherit (config.repo.secrets.local.syncthing) dev1 dev2 dev3 loc1;
   inherit (config.swarselsystems) sopsFile;
@@ -130,10 +130,6 @@ in
     };
   };
 
-  swarselprofiles = {
-    server.moonside = true;
-  };
-
   swarselsystems = {
     flakePath = "/root/.dotfiles";
     info = "VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM";
@@ -150,4 +146,17 @@ in
       serviceIP = "localhost";
     };
   };
+} // lib.optionalAttrs (!minimal) {
+  swarselprofiles = {
+    server = true;
+  };
+
+  swarselmodules.server = {
+    oauth2-proxy = lib.mkDefault true;
+    croc = lib.mkDefault true;
+    microbin = lib.mkDefault true;
+    shlink = lib.mkDefault true;
+    slink = lib.mkDefault true;
+    syncthing = lib.mkDefault true;
+  };
 }

hosts/nixos/moonside/disk-config.nix

@@ -1,7 +1,6 @@
 # NOTE: ... is needed because dikso passes diskoFile
 { lib
 , config
-, rootDisk
 , ...
 }:
 let

hosts/nixos/pyramid/default.nix

@@ -12,16 +12,14 @@ in
 
   ];
 
-  swarselprofiles = {
-    personal = lib.mkIf (!minimal) true;
-    work = lib.mkIf (!minimal) true;
-    uni = lib.mkIf (!minimal) true;
-    framework = lib.mkIf (!minimal) true;
-    amdcpu = true;
-    amdgpu = true;
-    hibernation = true;
-    btrfs = true;
+  swarselmodules = {
+    optional = {
+      amdcpu = true;
+      amdgpu = true;
+      hibernation = true;
+    };
   };
+
   swarselsystems = {
     lowResolution = "1280x800";
     highResolution = "2560x1600";
@@ -66,4 +64,12 @@ in
       };
     };
   };
+} // lib.optionalAttrs (!minimal) {
+  swarselprofiles = {
+    personal = true;
+    optionals = true;
+    work = true;
+    uni = true;
+    framework = true;
+  };
 }

hosts/nixos/toto/default.nix

@@ -1,4 +1,4 @@
-{ self, lib, minimal, ... }:
+{ self, lib, ... }:
 {
 
   imports = [
@@ -12,8 +12,7 @@
   };
 
   swarselprofiles = {
-    toto = lib.mkIf (!minimal) true;
-    btrfs = true;
+    minimal = lib.mkForce true;
   };
 
   swarselsystems = {

hosts/nixos/toto/disk-config.nix

@@ -2,7 +2,6 @@
 { lib
 , pkgs
 , config
-, rootDisk
 , ...
 }:
 let

hosts/nixos/winters/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ lib, config, minimal, ... }:
 {
 
   imports = [
@@ -20,11 +20,6 @@
     firewall.allowedTCPPorts = [ 80 443 ];
   };
 
-
-  swarselprofiles = {
-    server.local = true;
-  };
-
   swarselsystems = {
     info = "ASRock J4105-ITX, 32GB RAM";
     isImpermanence = false;
@@ -35,4 +30,41 @@
     isNixos = true;
   };
 
+} // lib.optionalAttrs (!minimal) {
+
+  swarselprofiles = {
+    server = true;
+  };
+
+  swarselmodules.server = {
+    nfs = lib.mkDefault true;
+    nginx = lib.mkDefault true;
+    kavita = lib.mkDefault true;
+    restic = lib.mkDefault true;
+    jellyfin = lib.mkDefault true;
+    navidrome = lib.mkDefault true;
+    spotifyd = lib.mkDefault true;
+    mpd = lib.mkDefault true;
+    postgresql = lib.mkDefault true;
+    matrix = lib.mkDefault true;
+    nextcloud = lib.mkDefault true;
+    immich = lib.mkDefault true;
+    paperless = lib.mkDefault true;
+    transmission = lib.mkDefault true;
+    syncthing = lib.mkDefault true;
+    grafana = lib.mkDefault true;
+    emacs = lib.mkDefault true;
+    freshrss = lib.mkDefault true;
+    jenkins = lib.mkDefault false;
+    kanidm = lib.mkDefault true;
+    firefly-iii = lib.mkDefault true;
+    koillection = lib.mkDefault true;
+    radicale = lib.mkDefault true;
+    atuin = lib.mkDefault true;
+    forgejo = lib.mkDefault true;
+    ankisync = lib.mkDefault true;
+    # snipeit = lib.mkDefault false;
+    homebox = lib.mkDefault true;
+  };
+
 }