concatenation fixes

modules/apps/art.nix

@@ -13,38 +13,32 @@ let
       patches = (old.patches or [ ]) ++ [ ../../patches/libpng.patch ];
     });
   };
+  attrValuesIf = cond: attrs: if cond then builtins.attrValues attrs else [ ];
+  artPackages = attrValuesIf config.my.apps.art.enable {
+    inherit patched-krita; # art to your heart desire!
+    inherit (pkgs)
+      eyedropper # color picker
+      emulsion-palette # self explanatory
+      gimp # the coolest bestest art program to never exist
+      mypaint # not the best art program
+      mypaint-brushes # but it's got some
+      mypaint-brushes1 # nice damn brushes
+      blender # cgi animation and sculpting
+      drawpile # arty party with friends!!
+      pureref # create inspiration/reference boards
+      ;
+  };
+  gameDevPackages = attrValuesIf config.my.dev.gameDev.enable {
+    inherit (pkgs)
+      godot_4 # game development
+      gdtoolkit_4 # gdscript language server
+      ;
+  };
 in
 {
   options.my = {
     apps.art.enable = lib.mkEnableOption "enable";
     dev.gameDev.enable = lib.mkEnableOption "enable";
   };
-  config = lib.mkIf config.my.apps.art.enable {
-    users.users.jawz.packages =
-      builtins.attrValues {
-        inherit patched-krita; # art to your heart desire!
-        inherit (pkgs)
-          eyedropper # color picker
-          emulsion-palette # self explanatory
-          gimp # the coolest bestest art program to never exist
-          mypaint # not the best art program
-          mypaint-brushes # but it's got some
-          mypaint-brushes1 # nice damn brushes
-          blender # cgi animation and sculpting
-          drawpile # arty party with friends!!
-          pureref # create inspiration/reference boards
-          ;
-      }
-      ++ (
-        if config.my.dev.gameDev.enable then
-          builtins.attrValues {
-            inherit (pkgs)
-              godot_4 # game development
-              gdtoolkit_4 # gdscript language server
-              ;
-          }
-        else
-          [ ]
-      );
-  };
+  config.users.users.jawz.packages = artPackages ++ gameDevPackages;
 }

modules/dev/emacs.nix

@@ -46,6 +46,7 @@
     };
     services.emacs = {
       enable = true;
+      defaultEditor = true;
       package = pkgs.emacsWithDoom {
         doomDir = ../../dotfiles/doom;
         doomLocalDir = "/home/jawz/.local/share/nix-doom";
@@ -58,23 +59,17 @@
               extraConfig
               ;
             extra = extraPackages epkgs;
+            themes = lib.optional config.stylix.enable [
+              (epkgs.trivialBuild {
+                pname = "stylix-theme";
+                src = pkgs.writeText "stylix-theme.el" extraConfig;
+                version = "0.1.0";
+                packageRequires = extra;
+              })
+            ];
           in
-          extra
-          ++ (
-            if config.stylix.enable then
-              [
-                (epkgs.trivialBuild {
-                  pname = "stylix-theme";
-                  src = pkgs.writeText "stylix-theme.el" extraConfig;
-                  version = "0.1.0";
-                  packageRequires = extra;
-                })
-              ]
-            else
-              [ ]
-          );
+          extra ++ themes;
       };
-      defaultEditor = true;
     };
   };
 }

modules/servers/jellyfin.nix

@@ -27,7 +27,7 @@ in
     networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];
     environment = {
       systemPackages = lib.mkIf cfg.enable (
-        [ pkgs.jellyfin-ffmpeg ] ++ (if cfg.enableCron then sub-sync-path else [ ])
+        [ pkgs.jellyfin-ffmpeg ] ++ (lib.optional cfg.enableCron [ sub-sync-path ])
       );
     };
     services = {