Modules/Niri: Set Qt theme

flake.nix

@@ -57,6 +57,12 @@
     niri.url = "github:sodiboo/niri-flake";
     niri.inputs.nixpkgs.follows = "nixpkgs";
 
+    # Hyprland
+    hyprland.url = "github:hyprwm/Hyprland";
+    # hyprland.inputs.nixpkgs.follows = "nixpkgs";
+    hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
+    hyprland-plugins.inputs.hyprland.follows = "hyprland";
+
     # Walker
     elephant.url = "github:abenz1267/elephant";
     walker.url = "github:abenz1267/walker";
@@ -86,6 +92,9 @@
     # musnix.url = "github:musnix/musnix";
     # musnix.inputs.nixpkgs.follows = "nixpkgs";
 
+    stylix.url = "github:nix-community/stylix";
+    stylix.inputs.nixpkgs.follows = "nixpkgs";
+
     # HyTale
     hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
 
@@ -205,6 +214,7 @@
       inputs.sops-nix.nixosModules.sops
       inputs.impermanence.nixosModules.impermanence
       inputs.lanzaboote.nixosModules.lanzaboote
+      inputs.stylix.nixosModules.stylix
 
       # We need the niri module also on the headless hosts
       # so nix can parse the config (although it is disabled...)
@@ -226,6 +236,7 @@
         headless = false;
         extraModules = [
           inputs.sops-nix.darwinModules.sops
+          inputs.stylix.darwinModules.stylix
         ];
       };
     };

home/christoph/default.nix

@@ -54,7 +54,7 @@ in
         cursorSize = 24;
         cursorPackage = pkgs.bibata-cursors;
 
-        iconTheme = "Papirus";
+        iconTheme = "Papirus-Dark";
         iconPackage = pkgs.papirus-icon-theme;
 
         scheme = "catppuccin-mocha";
@@ -79,34 +79,38 @@ in
 
       hyprland = {
         enable = nixosConfig.programs.hyprland.enable;
-        dunst.enable = !config.homemodules.hyprpanel.enable; # Disable for hyprpanel
         bars.enable = false;
-        dynamicCursor.enable = false;
-        trails.enable = true;
-        hyprspace.enable = false; # Always broken
         hyprpanel.enable = false;
-        caelestia.enable = false;
 
         keybindings = {
           main-mod = "SUPER";
 
-          bindings = lib.mergeAttrsList [
+          bindings = let
-            # Use Rofi if we don't have caelestia
+            sessionMenu = mylib.rofi.mkMenu {
-            (lib.optionalAttrs (!config.homemodules.hyprland.caelestia.enable) {
+              prompt = "Session2";
-              "$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
+              layers = [
-              "$mainMod, c" = ["exec, clipman pick --tool=rofi"];
+                {
-              "$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
+                  "󰤂  Poweroff" = "poweroff";
-            })
+                  "󰜉  Reboot" = "reboot";
-
+                  "󰌾  Lock" = "loginctl lock-session";
-            # Caelestia
+                  # "  Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
-            (lib.optionalAttrs (config.homemodules.hyprland.caelestia.enable) {
+                  "  Reload Hyprland" = "hyprctl reload";
-              "$mainMod, a" = ["exec, caelestia shell drawers toggle launcher"];
+                  "  Exit Hyprland" = "hyprctl dispatch exit";
-              # "$mainMod, c" = ["exec, caelestia clipboard"];
+                  # "  Exit Niri" = "niri msg action quit";
-              "$mainMod SHIFT, l" = ["exec, caelestia shell lock lock"];
+                }
-
+              ];
-              "$mainMod, escape" = ["exec, caelestia shell drawers toggle session"];
+              prompts = ["Select Session Action"];
-            })
+              rofiCmd = "walker -d";
-
+            };
+          in
+            lib.mergeAttrsList [
+              {
+                "$mainMod SHIFT, a" = ["exec, walker -m providerlist"];
+                "$mainMod, a" = ["exec, walker -m desktopapplications"];
+                "$mainMod, c" = ["exec, walker -m clipboard"];
+                "$mainMod, Escape" = ["exec, ${sessionMenu}/bin/rofi-menu-Session2"];
+                "$mainMod CTRL, w" = ["exec, waypaper"];
+              }
               {
                 # Applications
                 "$mainMod, t" = ["exec, kitty"];
@@ -173,19 +177,18 @@ in
             "10" = "0";
           };
 
-          special-ws-bindings = {
+          # special-ws-bindings = {
-            "ferdium" = "x";
+          #   "ferdium" = "x";
-            "msty" = "z";
+          #   "msty" = "z";
-            "btop" = "b";
+          #   "btop" = "b";
-            "rmpc" = "r";
+          #   "rmpc" = "r";
-          };
+          # };
         };
 
         autostart = {
           immediate = [
             "kitty --hold fastfetch"
             # "zeal"
-            "nextcloud --background"
             # "protonvpn-app"
 
             # "kdeconnect-indicator" # started by services.kdeconnect.indicator
@@ -193,6 +196,7 @@ in
 
           delayed = [
             # "keepassxc" # The tray doesn't work when started too early
+            "nextcloud --background"
           ];
 
           special-silent = {
@@ -211,15 +215,15 @@ in
 
         workspacerules = {
           "1" = [];
-          "2" = ["neovide" "code-url-handler"];
+          "2" = ["neovide" "code-url-handler" "dev.zed.Zed" "code" "jetbrains-(.+)"];
           "3" = ["obsidian" "Zotero"];
           "4" = ["firefox" "Google-chrome" "chromium-browser" "org.qutebrowser.qutebrowser"];
           "5" = ["steam"];
-          "6" = ["steam_app_(.+)"];
+          "6" = ["steam_app_(.+)" "factorio"];
           "7" = ["signal"];
-          "8" = ["tidal-hifi"];
+          "8" = [];
           "9" = ["discord"];
-          "10" = ["python3"];
+          "10" = [];
         };
 
         floating = [
@@ -230,9 +234,10 @@ in
           }
           {class = "ffplay";}
           {class = "Unity";}
+          {class = "code-url-handler";}
         ];
 
-        transparent-opacity = "0.75";
+        transparent-opacity = "0.85";
 
         transparent = [
           "kitty"
@@ -318,9 +323,11 @@ in
 
           # Enable wayland
           XDG_SESSION_TYPE = "wayland";
-          QT_QPA_PLATFORM = "wayland;xcb";
+          # QT_QPA_PLATFORM = "wayland;xcb";
+          QT_QPA_PLATFORM = "wayland";
           NIXOS_OZONE_WL = "1";
-          # SDL_VIDEODRIVER = "wayland"; # Leave unset as gamescope uses xwayland
+          # ELECTRON_OZONE_PLATFORM_HINT = "auto";
+          SDL_VIDEODRIVER = "wayland"; # Leave unset as gamescope uses xwayland
 
           # Run SSH_ASKPASS as GUI, not TTY for Obsidian git
           SSH_ASKPASS_REQUIRE = "prefer";

home/christoph/nixinator/default.nix

@@ -36,7 +36,7 @@
             y = 0;
             scale = 1;
             bitdepth = 10;
-            cm = "hdr";
+            cm = "auto"; # with render:cm_auto_hdr, we don't need hdr here
           };
 
           "DP-2" = {

home/christoph/nixtop/default.nix

@@ -4,28 +4,28 @@
     homemodules = {
       # TODO: Niri config (needs to modularize niri module)
 
-      # hyprland = {
+      hyprland = {
-      #   keyboard = {
+        keyboard = {
-      #     layout = "us";
+          layout = "us";
-      #     variant = "altgr-intl";
+          variant = "altgr-intl";
-      #     option = "nodeadkeys";
+          option = "nodeadkeys";
-      #   };
+        };
-      #
+
-      #   monitors = {
+        monitors = {
-      #     "eDP-1" = {
+          "eDP-1" = {
-      #       width = 1920;
+            width = 1920;
-      #       height = 1080;
+            height = 1080;
-      #       rate = 60;
+            rate = 60;
-      #       x = 0;
+            x = 0;
-      #       y = 0;
+            y = 0;
-      #       scale = 1;
+            scale = 1;
-      #     };
+          };
-      #   };
+        };
-      #
+
-      #   workspaces = {
+        workspaces = {
-      #     "eDP-1" = [1 2 3 4 5 6 7 8 9];
+          "eDP-1" = [1 2 3 4 5 6 7 8 9];
-      #   };
+        };
-      # };
+      };
 
       waybar.monitors = ["eDP-1"];
     };

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

@@ -5,16 +5,12 @@
   hyprland,
 }:
 builtins.concatLists [
-  (lib.optionals hyprland.dunst.enable ["dunst"]) # Notifications
   (lib.optionals hyprland.hyprpanel.enable ["hyprpanel"]) # Panel
-  (lib.optionals hyprland.caelestia.enable ["caelestia shell"]) # Panel/Shell # TODO: Crashes on startup
   [
-    # Start clipboard management
-    "wl-paste -t text --watch clipman store --no-persist"
-    "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
-
     "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"
@@ -26,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/caelestia.nix

@@ -1,516 +0,0 @@
-{
-  config,
-  hyprland,
-  color,
-}: {
-  enable = hyprland.caelestia.enable;
-
-  systemd = {
-    enable = false; # Start from hyprland autostart
-    target = "graphical-session.target";
-    environment = [];
-  };
-
-  settings = {
-    appearance = {
-      anim = {durations = {scale = 1;};};
-      font = {
-        family = {
-          clock = "Rubik";
-          material = "Material Symbols Rounded";
-          mono = color.font;
-          sans = color.font;
-        };
-        size = {scale = 1;};
-      };
-
-      padding = {scale = 1;};
-      rounding = {scale = 1;};
-      spacing = {scale = 1;};
-
-      transparency = {
-        base = 0.85;
-        enabled = false;
-        layers = 0.4;
-      };
-    };
-
-    background = {
-      desktopClock = {enabled = false;};
-      enabled = true;
-
-      # Lags when visible on both monitors (different refresh rates?)
-      visualiser = {
-        autoHide = true;
-        blur = true;
-        enabled = false;
-        rounding = 1;
-        spacing = 1;
-      };
-    };
-
-    bar = {
-      clock = {showIcon = true;};
-      dragThreshold = 20;
-
-      entries = [
-        {
-          enabled = true;
-          id = "logo";
-        }
-        {
-          enabled = true;
-          id = "workspaces";
-        }
-        {
-          enabled = true;
-          id = "spacer";
-        }
-        {
-          enabled = true;
-          id = "activeWindow";
-        }
-        {
-          enabled = true;
-          id = "spacer";
-        }
-        {
-          enabled = true;
-          id = "clock";
-        }
-        {
-          enabled = true;
-          id = "tray";
-        }
-        {
-          enabled = true;
-          id = "statusIcons";
-        }
-        {
-          enabled = true;
-          id = "power";
-        }
-      ];
-
-      persistent = true;
-
-      popouts = {
-        activeWindow = true;
-        statusIcons = true;
-        tray = true;
-      };
-
-      scrollActions = {
-        brightness = false;
-        volume = true;
-        workspaces = true;
-      };
-
-      showOnHover = true;
-
-      status = {
-        showAudio = true;
-        showBattery = false;
-        showBluetooth = true;
-        showKbLayout = false;
-        showLockStatus = true;
-        showMicrophone = false;
-        showNetwork = true;
-      };
-
-      tray = {
-        background = true;
-        compact = false;
-        iconSubs = [];
-        recolour = false;
-      };
-
-      workspaces = {
-        activeIndicator = true;
-        activeLabel = "󰮯";
-        activeTrail = true;
-        label = "  ";
-        occupiedBg = false;
-        occupiedLabel = "󰮯";
-        perMonitorWorkspaces = false;
-        showWindows = false;
-        shown = 10;
-
-        # Pick them here: https://fonts.google.com/icons
-        specialWorkspaceIcons = [
-          {
-            icon = "music_note";
-            name = "rmpc";
-          }
-          {
-            icon = "memory";
-            name = "btop";
-          }
-          {
-            icon = "mark_chat_unread";
-            name = "ferdium";
-          }
-          {
-            icon = "network_intelligence";
-            name = "msty";
-          }
-        ];
-      };
-    };
-
-    border = {
-      rounding = 25;
-      thickness = 10;
-    };
-
-    dashboard = {
-      dragThreshold = 50;
-      enabled = true;
-      mediaUpdateInterval = 500;
-      showOnHover = true;
-    };
-
-    general = {
-      apps = {
-        audio = ["kitty" "--title=NcpaMixer" "-e" "ncpamixer"];
-        explorer = ["kitty" "--title=Yazi" "-e" "yazi"];
-        playback = ["mpv"];
-        terminal = ["kitty"];
-      };
-
-      battery = {
-        criticalLevel = 3;
-        warnLevels = [
-          {
-            icon = "battery_android_frame_2";
-            level = 20;
-            message = "You might want to plug in a charger";
-            title = "Low battery";
-          }
-          {
-            icon = "battery_android_frame_1";
-            level = 10;
-            message = "You should probably plug in a charger <b>now</b>";
-            title = "Did you see the previous message?";
-          }
-          {
-            critical = true;
-            icon = "battery_android_alert";
-            level = 5;
-            message = "PLUG THE CHARGER RIGHT NOW!!";
-            title = "Critical battery level";
-          }
-        ];
-      };
-
-      idle = {
-        inhibitWhenAudio = true;
-        lockBeforeSleep = true;
-        timeouts = [
-          {
-            idleAction = "lock";
-            timeout = 600;
-          }
-          {
-            # idleAction = "dpms off";
-            # returnAction = "dpms on";
-            idleAction = "echo 'idle'";
-            returnAction = "echo 'return'";
-            timeout = 10000;
-          }
-          {
-            # idleAction = ["systemctl" "suspend-then-hibernate"];
-            idleAction = ["echo" "'idle'"];
-            timeout = 20000;
-          }
-        ];
-      };
-    };
-
-    launcher = {
-      actionPrefix = ">";
-      actions = [
-        {
-          command = ["autocomplete" "calc"];
-          dangerous = false;
-          description = "Do simple math equations (powered by Qalc)";
-          enabled = true;
-          icon = "calculate";
-          name = "Calculator";
-        }
-        {
-          command = ["autocomplete" "scheme"];
-          dangerous = false;
-          description = "Change the current colour scheme";
-          enabled = true;
-          icon = "palette";
-          name = "Scheme";
-        }
-        {
-          command = ["autocomplete" "wallpaper"];
-          dangerous = false;
-          description = "Change the current wallpaper";
-          enabled = true;
-          icon = "image";
-          name = "Wallpaper";
-        }
-        {
-          command = ["autocomplete" "variant"];
-          dangerous = false;
-          description = "Change the current scheme variant";
-          enabled = true;
-          icon = "colors";
-          name = "Variant";
-        }
-        {
-          command = ["autocomplete" "transparency"];
-          dangerous = false;
-          description = "Change shell transparency";
-          enabled = false;
-          icon = "opacity";
-          name = "Transparency";
-        }
-        {
-          command = ["caelestia" "wallpaper" "-r"];
-          dangerous = false;
-          description = "Switch to a random wallpaper";
-          enabled = false;
-          icon = "casino";
-          name = "Random";
-        }
-        {
-          command = ["setMode" "light"];
-          dangerous = false;
-          description = "Change the scheme to light mode";
-          enabled = true;
-          icon = "light_mode";
-          name = "Light";
-        }
-        {
-          command = ["setMode" "dark"];
-          dangerous = false;
-          description = "Change the scheme to dark mode";
-          enabled = true;
-          icon = "dark_mode";
-          name = "Dark";
-        }
-        {
-          command = ["systemctl" "poweroff"];
-          dangerous = true;
-          description = "Shutdown the system";
-          enabled = true;
-          icon = "power_settings_new";
-          name = "Shutdown";
-        }
-        {
-          command = ["systemctl" "reboot"];
-          dangerous = true;
-          description = "Reboot the system";
-          enabled = true;
-          icon = "cached";
-          name = "Reboot";
-        }
-        {
-          command = ["loginctl" "terminate-user" ""];
-          dangerous = true;
-          description = "Log out of the current session";
-          enabled = true;
-          icon = "exit_to_app";
-          name = "Logout";
-        }
-        {
-          command = ["loginctl" "lock-session"];
-          dangerous = false;
-          description = "Lock the current session";
-          enabled = true;
-          icon = "lock";
-          name = "Lock";
-        }
-        {
-          command = ["systemctl" "suspend-then-hibernate"];
-          dangerous = false;
-          description = "Suspend then hibernate";
-          enabled = false;
-          icon = "bedtime";
-          name = "Sleep";
-        }
-      ];
-
-      dragThreshold = 50;
-      enableDangerousActions = true;
-      hiddenApps = [];
-      maxShown = 7;
-      maxWallpapers = 9;
-      showOnHover = false;
-      specialPrefix = "@";
-      useFuzzy = {
-        actions = false;
-        apps = false;
-        schemes = false;
-        variants = false;
-        wallpapers = false;
-      };
-      vimKeybinds = false;
-    };
-
-    lock = {recolourLogo = false;};
-
-    notifs = {
-      actionOnClick = false;
-      clearThreshold = 0.3;
-      defaultExpireTimeout = 5000;
-      expandThreshold = 20;
-      expire = true;
-    };
-
-    osd = {
-      enableBrightness = false;
-      enableMicrophone = true;
-      enabled = true;
-      hideDelay = 2000;
-    };
-
-    paths = {
-      mediaGif = "root:/assets/bongocat.gif";
-      sessionGif = "root:/assets/kurukuru.gif";
-      wallpaperDir = "~/NixFlake/wallpapers";
-    };
-
-    services = {
-      audioIncrement = 0.1;
-      defaultPlayer = "MPD";
-      gpuType = "";
-      maxVolume = 1;
-      playerAliases = [
-        {
-          from = "com.github.th_ch.youtube_music";
-          to = "YT Music";
-        }
-      ];
-      smartScheme = true;
-      useFahrenheit = false;
-      useTwelveHourClock = false;
-      visualiserBars = 45;
-      weatherLocation = "Dortmund, Germany";
-    };
-
-    session = {
-      commands = {
-        hibernate = ["systemctl" "hibernate"];
-        logout = ["loginctl" "terminate-user" ""];
-        reboot = ["systemctl" "reboot"];
-        shutdown = ["systemctl" "poweroff"];
-      };
-      dragThreshold = 30;
-      enabled = true;
-      vimKeybinds = false;
-    };
-
-    sidebar = {
-      dragThreshold = 80;
-      enabled = true;
-    };
-
-    utilities = {
-      enabled = true;
-      maxToasts = 4;
-      toasts = {
-        audioInputChanged = true;
-        audioOutputChanged = true;
-        capsLockChanged = true;
-        chargingChanged = true;
-        configLoaded = true;
-        dndChanged = true;
-        gameModeChanged = true;
-        kbLayoutChanged = false;
-        nowPlaying = false;
-        numLockChanged = true;
-        vpnChanged = true;
-      };
-
-      vpn = {
-        enabled = false;
-        provider = [
-          {
-            displayName = "Wireguard (Your VPN)";
-            interface = "your-connection-name";
-            name = "wireguard";
-          }
-        ];
-      };
-    };
-  };
-
-  cli = {
-    enable = hyprland.caelestia.enable;
-
-    settings = {
-      record = {extraArgs = [];};
-
-      theme = {
-        enableBtop = false;
-        enableDiscord = false;
-        enableFuzzel = false;
-        enableGtk = false;
-        enableHypr = false;
-        enableQt = false;
-        enableSpicetify = false;
-        enableTerm = false;
-      };
-
-      toggles = {
-        communication = {
-          discord = {
-            command = ["discord"];
-            enable = false;
-            match = [{class = "discord";}];
-            move = true;
-          };
-          whatsapp = {
-            enable = false;
-            match = [{class = "whatsapp";}];
-            move = true;
-          };
-        };
-
-        music = {
-          feishin = {
-            enable = false;
-            match = [{class = "feishin";}];
-            move = true;
-          };
-          spotify = {
-            command = ["spicetify" "watch" "-s"];
-            enable = false;
-            match = [{class = "Spotify";} {initialTitle = "Spotify";} {initialTitle = "Spotify Free";}];
-            move = true;
-          };
-        };
-
-        sysmon = {
-          btop = {
-            command = ["kitty" "--title" "Btop" "-e" "btop"];
-            enable = false;
-            match = [
-              {
-                class = "btop";
-                title = "Btop";
-                workspace = {name = "special:sysmon";};
-              }
-            ];
-          };
-        };
-
-        todo = {
-          todoist = {
-            command = ["todoist"];
-            enable = false;
-            match = [{class = "Todoist";}];
-            move = true;
-          };
-        };
-      };
-      wallpaper = {postHook = "echo $WALLPAPER_PATH";};
-    };
-  };
-}

home/homemodules/hyprland/default.nix

@@ -34,10 +34,6 @@ in {
         assertion = builtins.hasAttr "hyprlock" nixosConfig.security.pam.services;
         message = "Can't enable Hyprland module without Hyprlock PAM service!";
       }
-      {
-        assertion = hyprland.hyprpanel.enable != hyprland.caelestia.enable;
-        message = "Can't enable Hyprpanel and Caelestia at the same time!";
-      }
     ];
 
     gtk = {
@@ -60,110 +56,55 @@ in {
       };
 
       packages = with pkgs; [
-        hyprpaper # Wallpaper setter
         hyprpicker # Color picker
         # hyprpolkitagent # Ugly polkit authentication GUI
         hyprland-qt-support
         hyprsunset # Blue light filter
 
         wl-clipboard
-        clipman # Clipboard manager (wl-paste)
+        # clipman # Clipboard manager (wl-paste)
         libnotify
         inotify-tools # Includes inotifywait
 
-        ncpamixer # Audio control
+        # ncpamixer # Audio control
         slurp # Region selector for screensharing
         grim # Grab images from compositor
 
         # 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 = {
       hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
-      caelestia = import ./caelestia.nix {inherit config hyprland color;};
     };
 
     services = {
-      dunst = import ./dunst.nix {inherit pkgs config hyprland color;};
       hypridle = import ./hypridle.nix {inherit config hyprland color;};
-      hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;};
     };
 
     # Make sure the units only start when using Hyprland
-    systemd.user.services.dunst.Unit.After = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
-    systemd.user.services.dunst.Unit.PartOf = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Unit.After = lib.mkForce ["hyprland-session.target"];
-    systemd.user.services.hypridle.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.hypridle.Unit.PartOf = lib.mkForce ["hyprland-session.target"];
-    systemd.user.services.hypridle.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.elephant.Install.WantedBy = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
-    systemd.user.services.hypridle.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.elephant.Unit.After = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
-    systemd.user.services.hyprpaper.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
+    systemd.user.services.elephant.Unit.PartOf = lib.mkForce ["hyprland-session.target" "graphical-session.target"];
-    systemd.user.services.hyprpaper.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
-    systemd.user.services.hyprpaper.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-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";
 
       systemd.enable = true; # Enable hyprland-session.target
       systemd.variables = ["--all"]; # Import PATH into systemd
       xwayland.enable = true;
 
-      plugins = builtins.concatLists [
-        (lib.optionals
-          hyprland.bars.enable
-          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars])
-        (lib.optionals
-          hyprland.dynamicCursor.enable
-          [inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors])
-        (lib.optionals
-          hyprland.trails.enable
-          [inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails])
-        (lib.optionals
-          hyprland.hyprspace.enable
-          [inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace])
-      ];
-
       settings = import ./settings.nix {
         inherit
           lib

home/homemodules/hyprland/dunst.nix

@@ -1,36 +0,0 @@
-{
-  pkgs,
-  config,
-  hyprland,
-  color,
-}: {
-  enable = hyprland.dunst.enable;
-
-  iconTheme.package = color.iconPackage;
-  iconTheme.name = color.iconTheme;
-
-  settings = {
-    global = {
-      monitor = config.homemodules.waybar.monitor;
-      font = "${color.font} 11";
-      offset = "10x10";
-      background = color.hexS.base;
-      foreground = color.hexS.text;
-      frame_width = 2;
-      corner_radius = 6;
-      separator_color = "frame";
-    };
-
-    urgency_low = {
-      frame_color = color.hexS.green;
-    };
-
-    urgency_normal = {
-      frame_color = color.hexS.green;
-    };
-
-    urgency_critical = {
-      frame_color = color.hexS.red;
-    };
-  };
-}

home/homemodules/hyprland/hypridle.nix

@@ -3,7 +3,7 @@
   hyprland,
   color,
 }: {
-  enable = !hyprland.caelestia.enable;
+  enable = true;
 
   settings = {
     general = {

home/homemodules/hyprland/hyprland-nixinator.nix

@@ -1,44 +0,0 @@
-{
-  keyboard = {
-    layout = "us";
-    variant = "altgr-intl";
-    option = "nodeadkeys";
-  };
-
-  monitors = {
-    "DP-1" = {
-      width = 3440;
-      height = 1440;
-      rate = 165;
-      x = 1920;
-      y = 0;
-      scale = 1;
-    };
-
-    "DP-2" = {
-      width = 1920;
-      height = 1080;
-      rate = 60;
-      x = 0;
-      y = 0;
-      scale = 1;
-    };
-  };
-
-  workspaces = {
-    "DP-1" = [1 2 3 4 5 6 7 8 9];
-    "DP-2" = [10];
-  };
-
-  autostart = {
-    delayed = [
-      "fcitx5"
-    ];
-  };
-
-  floating = [
-    {
-      class = "fcitx";
-    }
-  ];
-}

home/homemodules/hyprland/hyprland.nix

@@ -1,186 +0,0 @@
-{
-  nixosConfig,
-  config,
-  lib,
-  pkgs,
-}: {
-  enable = nixosConfig.programs.hyprland.enable;
-  dunst.enable = !config.homemodules.hyprpanel.enable; # Disable for hyprpanel
-  bars.enable = false;
-  dynamicCursor.enable = false;
-  trails.enable = true;
-  hyprspace.enable = false; # Always broken
-  hyprpanel.enable = false;
-  caelestia.enable = false;
-
-  keybindings = {
-    main-mod = "SUPER";
-
-    bindings = lib.mergeAttrsList [
-      # Use Rofi if we don't have caelestia
-      (lib.optionalAttrs (!config.homemodules.hyprland.caelestia.enable) {
-        "$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
-        "$mainMod, c" = ["exec, clipman pick --tool=rofi"];
-        "$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
-      })
-
-      # Caelestia
-      (lib.optionalAttrs (config.homemodules.hyprland.caelestia.enable) {
-        "$mainMod, a" = ["exec, caelestia shell drawers toggle launcher"];
-        # "$mainMod, c" = ["exec, caelestia clipboard"];
-        "$mainMod SHIFT, l" = ["exec, caelestia shell lock lock"];
-
-        "$mainMod, escape" = ["exec, caelestia shell drawers toggle session"];
-      })
-
-      {
-        # Applications
-        "$mainMod, t" = ["exec, kitty"];
-        "$mainMod, e" = ["exec, kitty --title=Yazi yazi"];
-        "$mainMod, n" = ["exec, neovide"];
-        # "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
-        "$mainMod CTRL, n" = ["exec, kitty --title=Navi navi"];
-        "$mainMod SHIFT, n" = ["exec, neovide ${config.paths.dotfiles}/navi/christoph.cheat"];
-        "$mainMod SHIFT, f" = ["exec, neovide ${config.paths.dotfiles}/flake.nix"];
-        # "ALT, tab" = ["exec, rofi -show window"];
-
-        # Screenshots
-        "$mainMod, p" = ["exec, hyprpicker --autocopy --format=hex"];
-        "$mainMod, s" = ["exec, grim -g \"$(slurp)\""];
-        "$mainMod SHIFT, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
-
-        # Audio
-        ", XF86AudioRaiseVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"];
-        ", XF86AudioLowerVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"];
-        ", XF86AudioPlay" = ["exec, playerctl play-pause"];
-        ", XF86AudioPrev" = ["exec, playerctl previous"];
-        ", XF86AudioNext" = ["exec, playerctl next"];
-
-        # Brightness
-        ", XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset gamma -10"];
-        ", XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset gamma +10"];
-        "$mainMod, XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset temperature 5750"];
-        "$mainMod, XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset identity"];
-
-        "CTRL ALT, f" = let
-          hyprctl = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl";
-          grep = "${pkgs.gnugrep}/bin/grep";
-          awk = "${pkgs.gawk}/bin/gawk";
-          notify = "${pkgs.libnotify}/bin/notify-send";
-
-          toggleMouseFocus = pkgs.writeScriptBin "hypr-toggle-mouse-focus" ''
-            CURRENT=$(${hyprctl} getoption input:follow_mouse | ${grep} int | ${awk} -F' ' '{print $2}')
-
-            if [[ "$CURRENT" == "1" ]]; then
-              ${hyprctl} keyword input:follow_mouse 0
-              ${notify} "Disabled Mouse Focus!"
-            else
-              ${hyprctl} keyword input:follow_mouse 1
-              ${notify} "Enabled Mouse Focus!"
-            fi
-          '';
-        in ["exec, ${toggleMouseFocus}/bin/hypr-toggle-mouse-focus"];
-
-        # "CTRL ALT, t" = ["exec, bash -c 'systemctl --user restart hyprpanel.service'"];
-      }
-    ];
-
-    ws-bindings = {
-      # "<Workspace>" = "<Key>";
-      "1" = "1";
-      "2" = "2";
-      "3" = "3";
-      "4" = "4";
-      "5" = "5";
-      "6" = "6";
-      "7" = "7";
-      "8" = "8";
-      "9" = "9";
-      "10" = "0";
-    };
-
-    special-ws-bindings = {
-      "ferdium" = "x";
-      "msty" = "z";
-      "btop" = "b";
-      "rmpc" = "r";
-    };
-  };
-
-  autostart = {
-    immediate = [
-      "kitty --hold fastfetch"
-      "zeal"
-      "nextcloud --background"
-      "protonvpn-app"
-
-      # "kdeconnect-indicator" # started by services.kdeconnect.indicator
-    ];
-
-    delayed = [
-      "keepassxc" # The tray doesn't work when started too early
-    ];
-
-    special-silent = {
-      "ferdium" = ["ferdium"];
-      "msty" = ["msty"];
-      "btop" = ["kitty --title=Btop btop"];
-      "rmpc" = ["kitty --title=Rmpc rmpc"];
-    };
-  };
-
-  windowrules = [
-    # Fix jetbrains tooltip flicker
-    "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
-    "match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
-  ];
-
-  workspacerules = {
-    "1" = [];
-    "2" = ["Zotero" "neovide" "code-url-handler"];
-    "3" = ["obsidian"];
-    "4" = ["firefox" "Google-chrome" "chromium-browser" "org.qutebrowser.qutebrowser"];
-    "5" = ["steam"];
-    "6" = ["steam_app_(.+)"];
-    "7" = ["signal"];
-    "8" = ["tidal-hifi"];
-    "9" = ["discord"];
-    "10" = ["python3"];
-  };
-
-  floating = [
-    {class = "org.kde.polkit-kde-authentication-agent-1";}
-    {
-      class = "thunar";
-      title = "File Operation Progress";
-    }
-    {class = "ffplay";}
-    {class = "Unity";}
-  ];
-
-  transparent-opacity = "0.75";
-
-  transparent = [
-    "kitty"
-    "Alacritty"
-    "discord"
-    "signal"
-    "vesktop"
-    "Spotify"
-    "tidal-hifi"
-    "obsidian"
-    "firefox"
-    "org.qutebrowser.qutebrowser"
-    "jetbrains-clion"
-    "jetbrains-idea"
-    "jetbrains-pycharm"
-    "jetbrains-rustrover"
-    "jetbrains-rider"
-    "jetbrains-webstorm"
-    "code-url-handler"
-    "neovide"
-    "steam"
-    "ferdium"
-    "Msty"
-  ];
-}

home/homemodules/hyprland/hyprpaper.nix

@@ -1,28 +0,0 @@
-{
-  config,
-  hyprland,
-  color,
-}: {
-  enable = !hyprland.caelestia.enable;
-
-  settings = {
-    ipc = "on";
-    splash = false;
-    splash_offset = 2.0;
-
-    # Wallpapers have to be preloaded to be displayed
-    preload = let
-      mkPreload = name: "${config.paths.nixflake}/wallpapers/${name}.jpg";
-    in
-      color.wallpapers |> builtins.map mkPreload;
-
-    wallpaper = let
-      mkWallpaper = monitor:
-        "${monitor}, "
-        + "${config.paths.nixflake}/wallpapers/${color.wallpaper}.jpg";
-    in
-      hyprland.monitors
-      |> builtins.attrNames
-      |> builtins.map mkWallpaper;
-  };
-}

home/homemodules/hyprland/options.nix

@@ -5,13 +5,8 @@
 }: {
   enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";
 
-  dunst.enable = lib.mkEnableOption "Enable Dunst notification daemon";
   bars.enable = lib.mkEnableOption "Enable window bars";
-  dynamicCursor.enable = lib.mkEnableOption "Enable dynamic cursors";
-  trails.enable = lib.mkEnableOption "Enable dynamic window trails";
-  hyprspace.enable = lib.mkEnableOption "Enable Hyprspace workspace overview";
   hyprpanel.enable = lib.mkEnableOption "Enable Hyprpanel";
-  caelestia.enable = lib.mkEnableOption "Enable Caelestia";
 
   keyboard = {
     layout = lib.mkOption {

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;
   };
 
@@ -237,123 +241,5 @@
         on_double_click = "hyprctl dispatch fullscreen 1";
       };
     })
-
-    (lib.optionalAttrs hyprland.dynamicCursor.enable {
-      dynamic-cursors = {
-        # enables the plugin
-        enabled = true;
-
-        # sets the cursor behaviour, supports these values:
-        # tilt    - tilt the cursor based on x-velocity
-        # rotate  - rotate the cursor based on movement direction
-        # stretch - stretch the cursor shape based on direction and velocity
-        # none    - do not change the cursors behaviour
-        mode = "rotate";
-
-        # minimum angle difference in degrees after which the shape is changed
-        # smaller values are smoother, but more expensive for hw cursors
-        threshold = 2;
-
-        # for mode = rotate
-        rotate = {
-          # length in px of the simulated stick used to rotate the cursor
-          # most realistic if this is your actual cursor size
-          length = 20;
-
-          # clockwise offset applied to the angle in degrees
-          # this will apply to ALL shapes
-          offset = 0.0;
-        };
-
-        # for mode = tilt
-        tilt = {
-          # controls how powerful the tilt is, the lower, the more power
-          # this value controls at which speed (px/s) the full tilt is reached
-          # the full tilt being 60° in both directions
-          limit = 1000;
-
-          # relationship between speed and tilt, supports these values:
-          # linear             - a linear function is used
-          # quadratic          - a quadratic function is used (most realistic to actual air drag)
-          # negative_quadratic - negative version of the quadratic one, feels more aggressive
-          # see `activation` in `src/mode/utils.cpp` for how exactly the calculation is done
-          function = "negative_quadratic";
-
-          # time window (ms) over which the speed is calculated
-          # higher values will make slow motions smoother but more delayed
-          window = 100;
-        };
-
-        # configure shake to find
-        # magnifies the cursor if its is being shaken
-        shake = {
-          # enables shake to find
-          enabled = false;
-
-          # use nearest-neighbour (pixelated) scaling when shaking
-          # may look weird when effects are enabled
-          nearest = true;
-
-          # controls how soon a shake is detected
-          # lower values mean sooner
-          threshold = 3.0;
-
-          # magnification level immediately after shake start
-          base = 1.5;
-          # magnification increase per second when continuing to shake
-          speed = 0.0;
-          # how much the speed is influenced by the current shake intensitiy
-          influence = 0.0;
-
-          # maximal magnification the cursor can reach
-          # values below 1 disable the limit (e.g. 0)
-          limit = 0.0;
-
-          # time in millseconds the cursor will stay magnified after a shake has ended
-          timeout = 1000;
-
-          # show cursor behaviour `tilt`, `rotate`, etc. while shaking
-          effects = true;
-
-          # enable ipc events for shake
-          # see the `ipc` section below
-          ipc = false;
-        };
-
-        # use hyprcursor to get a higher resolution texture when the cursor is magnified
-        # see the `hyprcursor` section below
-        hyprcursor = {
-          # use nearest-neighbour (pixelated) scaling when magnifing beyond texture size
-          # this will also have effect without hyprcursor support being enabled
-          # 0 / false - never use pixelated scaling
-          # 1 / true  - use pixelated when no highres image
-          # 2         - always use pixleated scaling
-          nearest = true;
-
-          # enable dedicated hyprcursor support
-          enabled = true;
-
-          # resolution in pixels to load the magnified shapes at
-          # be warned that loading a very high-resolution image will take a long time and might impact memory consumption
-          # -1 means we use [normal cursor size] * [shake:base option]
-          resolution = -1;
-
-          # shape to use when clientside cursors are being magnified
-          # see the shape-name property of shape rules for possible names
-          # specifying clientside will use the actual shape, but will be pixelated
-          fallback = "clientside";
-        };
-      };
-    })
-
-    (lib.optionalAttrs hyprland.trails.enable {
-      hyprtrails = {
-        color = "rgb(${color.hex.accent})";
-      };
-    })
-
-    (lib.optionalAttrs hyprland.hyprspace.enable {
-      overview = {};
-    })
   ];
 }

home/homemodules/niri/default.nix

@@ -74,8 +74,58 @@ in {
       };
     };
 
+    qt = let
+      qtConfig = qtct: {
+        Appearance = {
+          icon_theme = color.iconTheme;
+          standard_dialogs = "xdgdesktopportal";
+          style = "kvantum";
+          custom_palette = true;
+          color_scheme_path = "${config.home.homeDirectory}/.config/${qtct}/colors/catppuccin-mocha-mauve.conf";
+          # color_scheme_path = "${pkgs.catppuccin-qt5ct}/share/${qtct}/colors/catppuccin-mocha-mauve.conf";
+        };
+        Fonts = {
+          fixed = color.font;
+          general = nixosConfig.fonts.fontconfig.defaultFonts.sansSerif;
+        };
+      };
+    in {
+      enable = true;
+      platformTheme.name = "qtct";
+      # style.name = "kvantum";
+
+      kvantum = {
+        enable = true;
+
+        themes = with pkgs; [
+          (catppuccin-kvantum.override {
+            variant = "mocha";
+            accent = "mauve";
+          })
+        ];
+
+        settings = {
+          General.theme = "catppuccin-mocha-mauve";
+        };
+      };
+
+      qt5ctSettings = qtConfig "qt5ct";
+      qt6ctSettings = qtConfig "qt6ct";
+    };
+
+    xdg.configFile = {
+      "qt5ct/colors/catppuccin-mocha-mauve.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-mauve.conf";
+      "qt6ct/colors/catppuccin-mocha-mauve.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-mauve.conf";
+      "dolphinrc".source = (pkgs.formats.ini {}).generate "dolphinrc" {
+        Icons.Theme = color.iconTheme;
+        UiSettings.ColorScheme = "*";
+      };
+    };
+
     # Disable Niri's kde auth agent and start gnome auth agent instead
     systemd.user.services.niri-flake-polkit = lib.mkForce {};
+
+    # TODO: Module
     systemd.user.services.polkit-gnome-authentication-agent-1 = {
       Unit = {
         Description = "polkit-gnome-authentication-agent-1";
@@ -99,6 +149,7 @@ in {
         # Link theme for flatpak
         ".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
 
+        # TODO: Module
         ".config/waypaper/config.ini".text = lib.generators.toINI {} {
           Settings = {
             use_xdg_state = true;
@@ -135,8 +186,9 @@ in {
       };
 
       sessionVariables = {
-        QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
+        # QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
-        GDK_BACKEND = "wayland,x11"; # For screen sharing
+        # GDK_BACKEND = "wayland,x11"; # For screen sharing
+        GDK_BACKEND = "wayland";
       };
 
       pointerCursor = {
@@ -155,14 +207,24 @@ in {
         waypaper
         wtype # For elephant
 
-        # GTK apps (look good and work well with xdg portals)
+        # GTK
         nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
-
-        # Catppuccin-GTK theme
         sassc
         gtk-engine-murrine
         gnome-themes-extra
 
+        # Qt
+        libsForQt5.qtstyleplugin-kvantum
+        kdePackages.qtstyleplugin-kvantum
+        libsForQt5.qt5ct
+        kdePackages.qt6ct
+        kdePackages.dolphin
+        kdePackages.dolphin-plugins
+        kdePackages.qtsvg
+        kdePackages.kio
+        kdePackages.kio-fuse
+        kdePackages.kio-extras
+
         # In case we fallback to the default niri config/keybindings
         alacritty
         fuzzel
@@ -170,6 +232,7 @@ in {
     };
 
     services = {
+      # TODO: Module
       dunst = {
         enable = true;
 
@@ -205,6 +268,7 @@ in {
     };
 
     programs = {
+      # TODO: Module
       walker = {
         enable = true;
         runAsService = true;
@@ -461,13 +525,13 @@ in {
           prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)
 
           spawn-at-startup = [
-            {
+            # {
-              argv = [
+            #   argv = [
-                "ashell"
+            #     "ashell"
-                "-c"
+            #     "-c"
-                "${config.paths.dotfiles}/ashell/config.toml"
+            #     "${config.paths.dotfiles}/ashell/config.toml"
-              ];
+            #   ];
-            }
+            # }
             {
               argv = [
                 "waypaper"
@@ -773,6 +837,7 @@ in {
 
           # TODO: Move values to config option and set in home/christoph/niri.nix
           binds = with config.lib.niri.actions; let
+            # TODO: Module
             sessionMenu = mylib.rofi.mkMenu {
               prompt = "Session";
               layers = [
@@ -982,23 +1047,23 @@ in {
             #     title = "Take a screenshot of the current window.";
             #   };
             # };
-            # "Mod+Ctrl+S" = {
+            "Mod+Ctrl+S" = {
-            #   action.screenshot-screen = {
+              action.screenshot-screen = {
-            #     write-to-disk = true;
+                write-to-disk = true;
-            #     show-pointer = false;
+                show-pointer = false;
-            #   };
+              };
-            #   hotkey-overlay = {
+              hotkey-overlay = {
-            #     title = "Take a screenshot of the current screen.";
+                title = "Take a screenshot of the current screen.";
-            #   };
+              };
-            # };
+            };
-            # "Mod+Shift+S" = {
+            "Mod+Shift+S" = {
-            #   action.screenshot = {
+              action.screenshot = {
-            #     show-pointer = false;
+                show-pointer = false;
-            #   };
+              };
-            #   hotkey-overlay = {
+              hotkey-overlay = {
-            #     title = "Take a screenshot of a region.";
+                title = "Take a screenshot of a region.";
-            #   };
+              };
-            # };
+            };
 
             # Niri
             "Mod+Shift+Slash" = {

home/homemodules/packages/default.nix

@@ -178,7 +178,7 @@ in {
           # gnome-calendar
           # helvum # unmaintained
           crosspipe
-          nautilus # Just in case
+          # nautilus # This is the worst file manager I've ever used
           font-manager # Previews fonts, but doesn't set them
           gparted
           resources

home/homemodules/waybar/default.nix

@@ -23,7 +23,7 @@ in {
           fixed-center = true;
           output = waybar.monitors;
 
-          modules-left = ["custom/launcher" "niri/workspaces" "niri/window"]; # "user"
+          modules-left = ["custom/launcher" "niri/workspaces" "niri/window" "hyprland/workspaces" "hyprland/window"]; # "user"
           modules-center = ["mpris"]; # "systemd-failed-units"
           modules-right = ["privacy" "pulseaudio" "network" "disk" "cpu" "memory" "clock" "tray"];
 
@@ -58,6 +58,27 @@ in {
             icon-size = 22;
           };
 
+          "hyprland/workspaces" = {
+            all-outputs = false;
+            format = "{icon}";
+            format-icons = {
+              default = "";
+              focused = "";
+              active = "";
+            };
+            persistent-workspaces = {
+              DP-1 = [1 2 3 4 5 6 7 8 9];
+              DP-2 = [0];
+            };
+          };
+
+          "hyprland/window" = {
+            format = "{title}";
+            separate-outputs = false;
+            icon = true;
+            icon-size = 22;
+          };
+
           mpris = {
             format = "<span>󰎇</span> {dynamic}";
             format-paused = "<span>{status_icon}</span> <i>{dynamic}</i>";

lib/nixos.nix

@@ -14,7 +14,7 @@
       experimental-features = nix-command flakes pipe-operators
     '';
 
-    settings = {
+    settings = rec {
       trusted-users = ["root" username];
       auto-optimise-store = true;
 
@@ -24,11 +24,13 @@
         "https://cache.nixos.org"
         "https://nix-community.cachix.org"
         # "https://app.cachix.org/cache/nixos-rocm"
+        "https://hyprland.cachix.org"
       ];
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         # "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
     };
 

system/default.nix

@@ -318,7 +318,7 @@ with mylib.networking; {
     gpu-screen-recorder.enable = !headless;
 
     hyprland = {
-      enable = true;
+      enable = false;
       # enable = !headless;
 
       package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;

system/nixinator/default.nix

@@ -195,6 +195,34 @@
     spice-gtk
   ];
 
+  stylix = {
+    enable = true;
+    autoEnable = false;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+
+    # TODO: Duplicated from fonts module (set this inside fonts module?)
+    fonts = {
+      serif = {
+        package = pkgs.noto-fonts-cjk-serif;
+        name = "Noto Serif CJK SC";
+      };
+      sansSerif = {
+        package = pkgs.noto-fonts-cjk-sans;
+        name = "Noto Sans CJK SC";
+      };
+      monospace = {
+        package = pkgs.monolisa;
+        name = "MonoLisa Alt Script";
+      };
+      emoji = {
+        package = pkgs.noto-fonts-color-emoji;
+        name = "Noto Color Emoji";
+      };
+    };
+
+    targets = {};
+  };
+
   virtualisation = {
     libvirtd = {
       enable = true;
@@ -231,6 +259,9 @@
   };
 
   services = {
+    # desktopManager.plasma6.enable = true;
+    # displayManager.gdm.enable = true; # Somehow, Plasma's own manager didn't work
+
     btrfs.autoScrub = {
       enable = true;
       interval = "weekly";

system/systemmodules/fonts/default.nix

@@ -30,6 +30,7 @@ in {
         # Sans/Serif fonts
         noto-fonts
         noto-fonts-color-emoji
+        noto-fonts-cjk-serif
         noto-fonts-cjk-sans
         lxgw-wenkai
       ];