Re-add variants and reorganize things

pindakaas/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    disk."${config.networking.hostName}".device = "/dev/disk/by-id/mmc-DA4064_0x931f080f";
+    networking.hostName = "pindakaas";
+  };
+  imports = [
+    ./hardware.nix
+    ./features.nix
+  ];
+}

pindakaas/dk.nix

@@ -1,2 +0,0 @@
-{ ... } @ args:
-import ../dk/single_uefi_btrfs.nix (args // { id = "mmc-DA4064_0x931f080f"; name = "pindakaas"; })

pindakaas/features.nix

@@ -0,0 +1,9 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    frogeye = {
+      desktop.xorg = true;
+      extra = true;
+    };
+  };
+}

pindakaas/hardware.nix

@@ -6,24 +6,29 @@
 
     # Otherwise it will not show stage1 echo and prompt
     # UPST
-    kernelParams = ["console=tty0"];
+    kernelParams = [ "console=tty0" ];
 
     # Pinebook supports UEFI, at least when tow-boot is installed on the SPI
     loader = {
       # EFI Variables don't work (no generation appears in systemd-boot)
       efi.canTouchEfiVariables = false;
-
-      # systemd-boot crashes after booting, so GRUB it is
-      grub = {
-        enable = true;
-        efiSupport = true;
-        efiInstallAsRemovable = true;
-        device = "nodev";
-      };
+      grub.efiInstallAsRemovable = true;
     };
   };
 
-  zramSwap = { # Not capable of building itself otherwise
+  frogeye.desktop = {
+    x11_screens = [ "DP-1" "eDP-1" ];
+    maxVideoHeight = 720;
+    phasesBrightness = {
+      enable = true;
+      jour = "3500";
+      crepuscule = "3000";
+      nuit = "700";
+    };
+  };
+
+  zramSwap = {
+    # Not capable of building itself otherwise
     enable = true;
     memoryPercent = 150; # Factory settings
   };

pindakaas/options.nix

@@ -1,15 +0,0 @@
-{ ... }:
-{
-  frogeye.extra = true;
-  frogeye.desktop = {
-    xorg = true;
-    x11_screens = [ "DP-1" "eDP-1" ];
-    maxVideoHeight = 720;
-    phasesBrightness = {
-      enable = true;
-      jour = "3500";
-      crepuscule = "3000";
-      nuit = "700";
-    };
-  };
-}

pindakaas/os.nix

@@ -1,10 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./hardware.nix
-    ./dk.nix
-    ./options.nix
-  ];
-
-  networking.hostName = "pindakaas";
-}

pindakaas/sd.nix

@@ -0,0 +1,13 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    boot.loader.grub.efiInstallAsRemovable = true;
+    disk."${config.networking.hostName}".device = "/dev/disk/by-id/mmc-SN32G_0xfb19ae99";
+    networking.hostName = "pindakaas-sd";
+  };
+  imports = [
+    ../common/disko/single_uefi_btrfs.nix
+    ./features.nix
+    ./hardware.nix
+  ];
+}