concatenation fixes

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;
     };
   };
 }