Reshuffling stuff

Droidnix/README.org

@@ -826,22 +826,24 @@ in
 ** =generated/modules/apps/flatpaks.nix=
 This will import all packages listed in ./assets/system/apps/flatpaks.conf
 #+BEGIN_SRC nix :tangle generated/modules/apps/flatpaks.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, flakeRoot, ... }:
+{ lib, ... }:
 
 let
   moduleName = "install-flatpaks";
-  flatpakConfPath = "${flakeRoot}/assets/system/apps/flatpaks.conf";
 
-  # Lees en split het bestand
+  # --- Relatief pad binnen deze module (geen flakeRoot) ---
+  flatpakConfPath = ./assets/system/apps/flatpaks.conf;
+
+  # --- Lees en split het bestand ---
   raw = builtins.readFile flatpakConfPath;
   rawLines = lib.splitString "\n" raw;
 
-  # Guard: check dat we niet per karakter hebben gesplit
+  # --- Guard: check dat we niet per karakter hebben gesplit ---
   _guard =
     assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw);
     true;
 
-  # Cleanup per regel: CR verwijderen, commentaar weghalen, trim
+  # --- Cleanup per regel ---
   cleanLine = line:
     let
       noCR = lib.replaceStrings [ "\r" ] [ "" ] line;
@@ -849,10 +851,9 @@ let
     in
       lib.strings.trim noInlineComment;
 
-  # Filter lege regels
   entries = builtins.filter (l: l != "") (map cleanLine rawLines);
 
-  # Validatie: check reverse-DNS stijl (min 2 dots)
+  # --- Validatie: min 2 dots (reverse-DNS stijl) ---
   dotCount = s: builtins.length (lib.splitString "." s) - 1;
   isValidId = s: (dotCount s) >= 2;
 
@@ -870,10 +871,14 @@ let
     ) entries
   );
 
-  # Gebruik de gevalideerde lijst
   flatpakApps = builtins.seq _validate entries;
 
-  # Maak systemd script
+in
+{
+  # --- Export as NixOS module via flake.nixosModules ---
+  flake.nixosModules.flatpaks = { config, pkgs, lib, ... }:
+
+  let
     syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
       set -euo pipefail
 
@@ -898,21 +903,18 @@ let
         fi
       done
     '';
-in
+  in
-{
+  {
-  options.mySystem.system.flatpak.enable = lib.mkEnableOption "Enable automatic Flatpak installation";
+    options.mySystem.system.flatpaks.enable = lib.mkEnableOption "Enable automatic Flatpak installation";
 
-  config = lib.mkIf (config.mySystem.system.flatpak.enable or false) {
+    config = lib.mkIf (config.mySystem.system.flatpaks.enable or false) {
-
-    # Flatpak service zelf
       services.flatpak.enable = true;
-
       xdg.portal.enable = true;
 
-    # Deploy config voor runtime/debug
+      # Deploy de conf voor runtime/debug
       environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
 
-    # systemd service
+      # Systemd service voor automatische installatie
       systemd.services.flatpak-sync = {
         description = "Install Flatpak apps listed in flatpaks.conf";
         wantedBy = [ "multi-user.target" ];
@@ -934,6 +936,7 @@ in
         ];
       };
     };
+  };
 }
 #+END_SRC
 

Droidnix/generated/modules/apps/flatpaks.nix

@@ -1,19 +1,21 @@
-{ lib, config, pkgs, flakeRoot, ... }:
+{ lib, ... }:
 
 let
   moduleName = "install-flatpaks";
-  flatpakConfPath = "${flakeRoot}/assets/system/apps/flatpaks.conf";
 
-  # Lees en split het bestand
+  # --- Relatief pad binnen deze module (geen flakeRoot) ---
+  flatpakConfPath = ./assets/system/apps/flatpaks.conf;
+
+  # --- Lees en split het bestand ---
   raw = builtins.readFile flatpakConfPath;
   rawLines = lib.splitString "\n" raw;
 
-  # Guard: check dat we niet per karakter hebben gesplit
+  # --- Guard: check dat we niet per karakter hebben gesplit ---
   _guard =
     assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw);
     true;
 
-  # Cleanup per regel: CR verwijderen, commentaar weghalen, trim
+  # --- Cleanup per regel ---
   cleanLine = line:
     let
       noCR = lib.replaceStrings [ "\r" ] [ "" ] line;
@@ -21,10 +23,9 @@ let
     in
       lib.strings.trim noInlineComment;
 
-  # Filter lege regels
   entries = builtins.filter (l: l != "") (map cleanLine rawLines);
 
-  # Validatie: check reverse-DNS stijl (min 2 dots)
+  # --- Validatie: min 2 dots (reverse-DNS stijl) ---
   dotCount = s: builtins.length (lib.splitString "." s) - 1;
   isValidId = s: (dotCount s) >= 2;
 
@@ -42,10 +43,14 @@ let
     ) entries
   );
 
-  # Gebruik de gevalideerde lijst
   flatpakApps = builtins.seq _validate entries;
 
-  # Maak systemd script
+in
+{
+  # --- Export as NixOS module via flake.nixosModules ---
+  flake.nixosModules.flatpaks = { config, pkgs, lib, ... }:
+
+  let
     syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
       set -euo pipefail
 
@@ -70,21 +75,18 @@ let
         fi
       done
     '';
-in
+  in
-{
+  {
-  options.mySystem.system.flatpak.enable = lib.mkEnableOption "Enable automatic Flatpak installation";
+    options.mySystem.system.flatpaks.enable = lib.mkEnableOption "Enable automatic Flatpak installation";
 
-  config = lib.mkIf (config.mySystem.system.flatpak.enable or false) {
+    config = lib.mkIf (config.mySystem.system.flatpaks.enable or false) {
-
-    # Flatpak service zelf
       services.flatpak.enable = true;
-
       xdg.portal.enable = true;
 
-    # Deploy config voor runtime/debug
+      # Deploy de conf voor runtime/debug
       environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
 
-    # systemd service
+      # Systemd service voor automatische installatie
       systemd.services.flatpak-sync = {
         description = "Install Flatpak apps listed in flatpaks.conf";
         wantedBy = [ "multi-user.target" ];
@@ -106,4 +108,5 @@ in
         ];
       };
     };
+  };
 }