merge zenix onto alpine

home/desktop/niri/default.nix

@@ -35,7 +35,7 @@
       input.keyboard = {
         xkb.layout = "us,gb";
         xkb.variant = "dvorak,";
-        xkb.options = "caps:escape";
+        xkb.options = "caps:escape,esperanto:qwerty,lv3:ralt_switch";
       };
       input.mouse = {
         accel-profile = "flat";
@@ -47,9 +47,9 @@
         dwt = true; # disable when typing
       };
       prefer-no-csd = true;
-      spawn-at-startup = [
-        {command = [(lib.getExe pkgs.xwayland-satellite)];}
-      ];
+      xwayland-satellite = {
+        path = lib.getExe pkgs.xwayland-satellite;
+      };
       layout = {
         preset-column-widths = [
           {proportion = 1.0;}
@@ -58,7 +58,6 @@
       };
       environment = {
         NIXOS_OZONE_WL = "1";
-        DISPLAY = ":0";
       };
       binds = with config.lib.niri.actions; {
         "Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)];
@@ -113,7 +112,7 @@
         "Mod+G".action = toggle-window-floating;
         "Mod+Shift+Ctrl+Alt+Space".action = switch-layout "next";
 
-        "Print".action = screenshot;
+        "Print".action.screenshot = [];
 
         "XF86AudioRaiseVolume".action.spawn = ["raise-volume"];
         "XF86AudioLowerVolume".action.spawn = ["lower-volume"];

home/modules/email.nix

@@ -71,7 +71,6 @@ in {
       sidebar.enable = true;
     };
     programs.mbsync.enable = cfg.terminal;
-    services.mbsync.enable = cfg.terminal;
 
     programs.aerc = {
       enable = cfg.terminal;

home/programs/gamer.nix

@@ -8,7 +8,6 @@
 
     # Helpers
     heroic
-    lutris
     gamescope
     gamemode
     mangohud