Modules/Hyprland: Slight config cleanup

home/homemodules/default.nix

@@ -44,6 +44,7 @@
     inputs.nixvim.homeModules.nixvim
     inputs.textfox.homeManagerModules.default
     inputs.walker.homeManagerModules.default
+    # inputs.stylix.homeModules.stylix
     # inputs.direnv-instant.homeModules.direnv-instant
     # inputs.niri.homeModules.niri # Imported by system module
     # inputs.noctalia.homeModules.default

home/homemodules/hyprland/autostart.nix

@@ -9,6 +9,8 @@ builtins.concatLists [
   [
     "hyprctl setcursor ${config.home.pointerCursor.name} ${builtins.toString config.home.pointerCursor.size}"
     "hyprsunset --identity"
+    "waypaper --restore"
+    "fcitx5"
 
     # HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
     "setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
@@ -20,6 +22,11 @@ builtins.concatLists [
     # This is used for example when running systemd commands without root.
     # "systemctl --user start hyprpolkitagent.service"
     # "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
-    "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
+
+    # TODO: This is started by niri already (extract to module so niri/hyprland can both use it)
+    # "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
+
+    # TODO: This is started by niri already (extract to module so niri/hyprland can both use it)
+    "dunst"
   ]
 ]

home/homemodules/hyprland/default.nix

@@ -24,11 +24,6 @@
 in {
   options.homemodules.hyprland = import ./options.nix {inherit lib mylib;};
 
-  # TODO: Extract common niri/hyprland stuff to modules (e.g., dunst), so no configs are duplicated
-  # TODO: Remove unnecessary bullshit
-  # TODO: Switch to lua config
-  # TODO: Synchronize with niri mappings
-
   config = lib.mkIf hyprland.enable {
     assertions = [
       {
@@ -78,45 +73,10 @@ in {
         # Deps for Qt5 and Qt6 apps (e.g., Nextcloud)
         qt5.qtwayland
         qt6.qtwayland
+
+        # xwayland
+        # wayland-protocols
       ];
-
-      file = {
-        ".config/hypr/keybindings.info".text = let
-          fixupHomeDir = key:
-            builtins.replaceStrings ["/home/${username}"] ["~"] key;
-
-          fixupNixStore = key: let
-            # The pattern has to match the entire string, otherwise it won't work
-            matches = builtins.match ".*/nix/store/(.*)/.*" key;
-          in
-            if (matches == null)
-            then key
-            else builtins.replaceStrings matches ["..."] key;
-
-          fixupNoMod = key:
-            builtins.replaceStrings ["<-"] ["<"] key;
-
-          mkBindHelpKey = key:
-            builtins.replaceStrings ["$mainMod" " " ","] ["${hyprland.keybindings.main-mod}" "-" ""] key;
-
-          mkBindHelpAction = action:
-            builtins.replaceStrings [","] [""] action;
-
-          mkBindHelp = key: action: "<${mkBindHelpKey key}>: ${mkBindHelpAction action}";
-
-          mkBindsHelp = key: actions:
-            actions
-            |> builtins.map (mkBindHelp key)
-            |> builtins.map fixupNoMod
-            |> builtins.map fixupNixStore
-            |> builtins.map fixupHomeDir;
-        in
-          (hyprland.keybindings.bindings // always-bind)
-          |> builtins.mapAttrs mkBindsHelp
-          |> builtins.attrValues
-          |> builtins.concatLists
-          |> builtins.concatStringsSep "\n";
-      };
     };
 
     programs = {
@@ -131,12 +91,15 @@ in {
     systemd.user.services.hypridle.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
     systemd.user.services.hypridle.Unit.After = lib.mkForce ["hyprland-session.target"];
     systemd.user.services.hypridle.Unit.PartOf = lib.mkForce ["hyprland-session.target"];
+    systemd.user.services.elephant.Install.WantedBy = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
+    systemd.user.services.elephant.Unit.After = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
+    systemd.user.services.elephant.Unit.PartOf = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
 
     wayland.windowManager.hyprland = {
       enable = true;
       package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
       portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-      configType = "hyprlang"; # TODO: lua
+      configType = "hyprlang";
 
       systemd.enable = true; # Enable hyprland-session.target
       systemd.variables = ["--all"]; # Import PATH into systemd

home/homemodules/hyprland/settings.nix

@@ -137,8 +137,12 @@
       hyprland.windowrules
     ];
 
+  render = {
+    cm_enabled = true;
+    cm_auto_hdr = true;
+  };
+
   dwindle = {
-    pseudotile = true;
     preserve_split = true;
   };