Server, deploy-rs

homes/x86_64-linux/kylekrein/default.nix

@@ -17,25 +17,30 @@ in
           enable = true;
           firstNixOSInstall = 1729112485;
         };
-        librewolf = enabled;
+        librewolf.enable = osConfig.custom.presets.wayland.enable;
         prismlauncher.enable = osConfig.custom.presets.gaming.enable;
-        bottles = enabled;
+        bottles.enable = osConfig.custom.presets.wayland.enable;
       };
     };
     home = {
       packages = with pkgs;
         [
+          neovim
+        ]
+        ++ lib.optionals osConfig.custom.presets.wayland.enable [
           gdb
           element-desktop
           obs-studio
-          neovim
           localsend
           kdePackages.kdenlive
         ]
         ++ lib.optionals osConfig.custom.presets.gaming.enable [mcpelauncher-ui-qt];
 
       sessionVariables = {
-        EDITOR = "emacsclient -c";
+        EDITOR =
+          if osConfig.custom.presets.wayland.enable
+          then "emacsclient -c"
+          else "nvim";
         NH_OS_FLAKE = "${home}/nixos-config";
         NH_HOME_FLAKE = "${home}/nixos-config";
         NH_DARWIN_FLAKE = "${home}/nixos-config";

homes/x86_64-linux/kylekrein/emacs.nix

@@ -2,15 +2,18 @@
   pkgs,
   system,
   inputs,
+  osConfig,
+  lib,
+  config,
   ...
 }: let
   emacs = inputs.emacs-kylekrein.packages.${system}.with-lsps-native;
 in {
   programs.emacs = {
-    enable = true;
+    enable = osConfig.custom.presets.wayland.enable;
     package = emacs;
   };
-  systemd.user.services.emacs = {
+  systemd.user.services.emacs = lib.mkIf config.programs.emacs.enable {
     Unit = {
       Description = "Launches (and relaunches) emacs";
     };