Working on reshuffling

Droidnix/README.org

@@ -779,96 +779,28 @@ This will import all packages listed in ./assets/system/apps/flatpaks.conf
 let
   moduleName = "flatpaks";
 
-  # --- Path to your Flatpak list ---
+  # Relative path for assets
   flatpakConfPath = ./assets/system/apps/flatpaks.conf;
 
-  # --- Read and split file ---
+  enableProgram = config.enableFlatpaks or false;
-  raw = builtins.readFile flatpakConfPath;
-  rawLines = lib.splitString "\n" raw;
-
-  # --- Guard against splitting per character ---
-  _guard =
-    assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw);
-    true;
-
-  # --- Clean each line ---
-  cleanLine = line:
-    let
-      noCR = lib.replaceStrings [ "\r" ] [ "" ] line;
-      noComment = lib.head (lib.splitString "#" noCR);
-    in
-      lib.strings.trim noComment;
-
-  entries = builtins.filter (l: l != "") (map cleanLine rawLines);
-
-  # --- Validate reverse-DNS style ---
-  dotCount = s: builtins.length (lib.splitString "." s) - 1;
-  isValidId = s: (dotCount s) >= 2;
-
-  _validate = builtins.seq _guard (
-    builtins.map (id:
-      if isValidId id then true
-      else throw ''
-        ${moduleName}: invalid Flatpak ID in flatpaks.conf (needs reverse-DNS with at least 2 dots)
-        Token         : ${builtins.toJSON id}
-        flatpaks.conf : ${toString flatpakConfPath}
-        Fix: remove stray tokens or comment them out with '#'.
-      ''
-    ) entries
-  );
-
-  flatpakApps = builtins.seq _validate entries;
-
-  # --- Script to install Flatpaks ---
-  syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
-    set -euo pipefail
-
-    CONF="/etc/flatpak/flatpaks.conf"
-    if [[ -f "$CONF" ]]; then
-      echo "flatpak-sync: using $CONF"
-    else
-      echo "flatpak-sync: WARNING: $CONF not found, using embedded list"
-    fi
-
-    if ! flatpak remotes --system --columns=name | grep -qx flathub; then
-      flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-    fi
-
-    desired_apps=(
-      ${lib.concatStringsSep " " (map (a: ''"${a}"'') flatpakApps)}
-    )
-
-    for app in $desired_apps; do
-      if ! flatpak info --system "$app" >/dev/null 2>&1; then
-        flatpak install --system -y --noninteractive flathub "$app"
-      fi
-    done
-  '';
 in
 {
-  # --- Top-level toggle ---
+  # Top-level toggle
   options.enableFlatpaks = lib.mkEnableOption "Enable automatic Flatpak installation";
 
-  # --- Configuration wrapped in mkIf ---
+  config = lib.mkIf enableProgram {
-  config = lib.mkIf (config.enableFlatpaks or false) {
     myApps = {
       flatpaks = {
         enable    = true;
         assetsDir = flatpakConfPath;
-        files     = entries;
+        files     = []; # don't read at evaluation
         user      = config.defaultUser or "henrov";
-        script    = syncFlatpaks;
       };
     };
 
-    # Enable Flatpak service
+    # Deploy the conf file and systemd script
-    services.flatpak.enable = true;
+    environment.etc."flatpak/flatpaks.conf".source = flatpakConfPath;
-    xdg.portal.enable = true;
 
-    # Deploy flatpaks.conf to /etc
-    environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
-
-    # Systemd service for auto-install
     systemd.services.flatpak-sync = {
       description = "Install Flatpak apps listed in flatpaks.conf";
       wantedBy = [ "multi-user.target" ];
@@ -877,7 +809,21 @@ in
 
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = syncFlatpaks;
+        ExecStart = ''
+          set -euo pipefail
+          CONF="${flatpakConfPath}"
+          if ! flatpak remotes --system --columns=name | grep -qx flathub; then
+            flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+          fi
+          while read -r app; do
+            app=$(echo "$app" | sed 's/#.*//;s/^[[:space:]]*//;s/[[:space:]]*$//')
+            if [[ -n "$app" ]]; then
+              if ! flatpak info --system "$app" >/dev/null 2>&1; then
+                flatpak install --system -y --noninteractive flathub "$app"
+              fi
+            fi
+          done < "$CONF"
+        '';
       };
 
       restartTriggers = [ flatpakConfPath ];
@@ -889,6 +835,9 @@ in
         pkgs.gnused
       ];
     };
+
+    services.flatpak.enable = true;
+    xdg.portal.enable = true;
   };
 }
 #+END_SRC

Droidnix/generated/modules/apps/flatpaks.nix

@@ -3,96 +3,28 @@
 let
   moduleName = "flatpaks";
 
-  # --- Path to your Flatpak list ---
+  # Relative path for assets
   flatpakConfPath = ./assets/system/apps/flatpaks.conf;
 
-  # --- Read and split file ---
+  enableProgram = config.enableFlatpaks or false;
-  raw = builtins.readFile flatpakConfPath;
-  rawLines = lib.splitString "\n" raw;
-
-  # --- Guard against splitting per character ---
-  _guard =
-    assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw);
-    true;
-
-  # --- Clean each line ---
-  cleanLine = line:
-    let
-      noCR = lib.replaceStrings [ "\r" ] [ "" ] line;
-      noComment = lib.head (lib.splitString "#" noCR);
-    in
-      lib.strings.trim noComment;
-
-  entries = builtins.filter (l: l != "") (map cleanLine rawLines);
-
-  # --- Validate reverse-DNS style ---
-  dotCount = s: builtins.length (lib.splitString "." s) - 1;
-  isValidId = s: (dotCount s) >= 2;
-
-  _validate = builtins.seq _guard (
-    builtins.map (id:
-      if isValidId id then true
-      else throw ''
-        ${moduleName}: invalid Flatpak ID in flatpaks.conf (needs reverse-DNS with at least 2 dots)
-        Token         : ${builtins.toJSON id}
-        flatpaks.conf : ${toString flatpakConfPath}
-        Fix: remove stray tokens or comment them out with '#'.
-      ''
-    ) entries
-  );
-
-  flatpakApps = builtins.seq _validate entries;
-
-  # --- Script to install Flatpaks ---
-  syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
-    set -euo pipefail
-
-    CONF="/etc/flatpak/flatpaks.conf"
-    if [[ -f "$CONF" ]]; then
-      echo "flatpak-sync: using $CONF"
-    else
-      echo "flatpak-sync: WARNING: $CONF not found, using embedded list"
-    fi
-
-    if ! flatpak remotes --system --columns=name | grep -qx flathub; then
-      flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-    fi
-
-    desired_apps=(
-      ${lib.concatStringsSep " " (map (a: ''"${a}"'') flatpakApps)}
-    )
-
-    for app in $desired_apps; do
-      if ! flatpak info --system "$app" >/dev/null 2>&1; then
-        flatpak install --system -y --noninteractive flathub "$app"
-      fi
-    done
-  '';
 in
 {
-  # --- Top-level toggle ---
+  # Top-level toggle
   options.enableFlatpaks = lib.mkEnableOption "Enable automatic Flatpak installation";
 
-  # --- Configuration wrapped in mkIf ---
+  config = lib.mkIf enableProgram {
-  config = lib.mkIf (config.enableFlatpaks or false) {
     myApps = {
       flatpaks = {
         enable    = true;
         assetsDir = flatpakConfPath;
-        files     = entries;
+        files     = []; # don't read at evaluation
         user      = config.defaultUser or "henrov";
-        script    = syncFlatpaks;
       };
     };
 
-    # Enable Flatpak service
+    # Deploy the conf file and systemd script
-    services.flatpak.enable = true;
+    environment.etc."flatpak/flatpaks.conf".source = flatpakConfPath;
-    xdg.portal.enable = true;
 
-    # Deploy flatpaks.conf to /etc
-    environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
-
-    # Systemd service for auto-install
     systemd.services.flatpak-sync = {
       description = "Install Flatpak apps listed in flatpaks.conf";
       wantedBy = [ "multi-user.target" ];
@@ -101,7 +33,21 @@ in
 
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = syncFlatpaks;
+        ExecStart = ''
+          set -euo pipefail
+          CONF="${flatpakConfPath}"
+          if ! flatpak remotes --system --columns=name | grep -qx flathub; then
+            flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+          fi
+          while read -r app; do
+            app=$(echo "$app" | sed 's/#.*//;s/^[[:space:]]*//;s/[[:space:]]*$//')
+            if [[ -n "$app" ]]; then
+              if ! flatpak info --system "$app" >/dev/null 2>&1; then
+                flatpak install --system -y --noninteractive flathub "$app"
+              fi
+            fi
+          done < "$CONF"
+        '';
       };
 
       restartTriggers = [ flatpakConfPath ];
@@ -113,5 +59,8 @@ in
         pkgs.gnused
       ];
     };
+
+    services.flatpak.enable = true;
+    xdg.portal.enable = true;
   };
 }