lib/modules/programs.nix

@@ -5,20 +5,17 @@ let
 
   mkUsersOption = programs: osConfig: mkOption {
     type = types.attrsOf (types.submodule (
-      { config, ... }: {
+      { ... }: {
         options = {
           inherit programs;
         };
 
         config = {
-          programs = lib.attrsets.concatMapAttrs
+          programs = builtins.mapAttrs
             (
-              name: program:
+              name: config: {
-                if (builtins.elem name (builtins.attrNames config.programs)) then {
+                enable = mkDefault config.enable;
-                  ${name} = {
+              }
-                    enable = mkDefault program.enable;
-                  };
-                } else { }
             )
             osConfig.programs;
         };

profiles/machines/manuel/server.nix

@@ -5,8 +5,6 @@ in {
 
   config = {
     valhalla = {
-      boot.label = "Arch";
-
       fileSystems = {
         diskSetup.devices = {
           OS = {

scripts/Arch/Software/systemd-networkd/main.fish

@@ -5,8 +5,8 @@ begin
     inherit "$dir/../../../Common/Software/systemd-networkd/main.fish"
 
     function configureSW -V dir
-        sudo systemctl enable systemd-networkd
+        systemctl enable systemd-networkd
-        sudo systemctl enable systemd-resolved
+        systemctl enable systemd-resolved
         configureSWBase $argv
     end
 

scripts/Common/OS/setup.fish

@@ -101,7 +101,7 @@ function runSetup
                                 end
                             end) \
                             (string escape $script) "&&")) \
-                    "rm $tmp  ||" \
+                    "rm $tmp  ||"
                     "mv $tmp $profile"
             end | runChroot "$mountDir" tee "$profile" >/dev/null
         end

scripts/lib/action.fish

@@ -84,7 +84,7 @@ function runSetupUserAction -V dir
                     disposeAction
                     rm "$sudoConfig"
                     userdel -rf "$name"
-                    $success
+                    success
                 end
             end
         end