misc cleanup

home-manager/shared/wayland/default.nix

@@ -2,7 +2,8 @@
   pkgs,
   config,
   ...
-}: {
+}:
+{
   imports = [
     ./alacritty
     ./hyprland
@@ -37,16 +38,10 @@
     };
     swayidle = {
       enable = true;
-      events = [
-        {
-          event = "before-sleep";
-          command = "${config.programs.swaylock.package}/bin/swaylock";
-        }
-        {
-          event = "lock";
-          command = "${config.programs.swaylock.package}/bin/swaylock";
-        }
-      ];
+      events = {
+        "before-sleep" = "${config.programs.swaylock.package}/bin/swaylock";
+        "lock" = "${config.programs.swaylock.package}/bin/swaylock";
+      };
     };
     mako.enable = true;
     mako.settings = {
@@ -69,11 +64,9 @@
     };
     swaylock = {
       enable = true;
-      package = pkgs.swaylock-effects;
       settings = {
-        color = "#152528";
+        image = "/home/pape";
         daemonize = true;
-        clock = true;
         ignore-empty-password = true;
       };
     };

home-manager/shared/wayland/hyprland/default.nix

@@ -6,7 +6,6 @@
     extraConfig = ''
       monitor=,preferred,auto,1
     '';
-    plugins = [ pkgs.hyprlandPlugins.hyprexpo ];
     settings = {
       "$mod" = "SUPER";
       general = {
@@ -16,9 +15,14 @@
       };
       misc = {
         disable_hyprland_logo = true;
-        new_window_takes_over_fullscreen = 1;
+        on_focus_under_fullscreen = 1;
         exit_window_retains_fullscreen = 1;
         vfr = true;
+        middle_click_paste = false;
+      };
+      ecosystem = {
+        no_update_news = true;
+        no_donation_nag = true;
       };
       decoration = {
         blur = {
@@ -71,7 +75,6 @@
         "$mod ALT, k, resizeactive, 0 -50"
       ];
       bind = [
-        "$mod, a, hyprexpo:expo, toggle"
         "$mod, Return, exec, alacritty"
         "$mod, x, killactive"
         "$mod, f, fullscreen"
@@ -158,8 +161,10 @@
   services.hyprpaper = {
     enable = true;
     settings = {
-      preload = [ "/home/pape" ];
-      wallpaper = ",/home/pape";
+      wallpaper = {
+        monitor = "";
+        path = "/home/pape";
+      };
       ipc = "off";
       splash = false;
     };