Modules/Hyprland: Configure Caelestia

flake.lock

@@ -33,6 +33,54 @@
         "type": "github"
       }
     },
+    "caelestia": {
+      "inputs": {
+        "caelestia-cli": "caelestia-cli",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": [
+          "quickshell"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762651107,
+        "narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=",
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "rev": "c0ea060ffecd3f38233652556d3085d094082400",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "shell",
+        "type": "github"
+      }
+    },
+    "caelestia-cli": {
+      "inputs": {
+        "caelestia-shell": [
+          "caelestia"
+        ],
+        "nixpkgs": [
+          "caelestia",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762480719,
+        "narHash": "sha256-TjTMNmndJJIxP/N6owC/CoAPiRuM99fNaQbZqHDtwLw=",
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "rev": "9323fbf1b497204e17dff103cf412daf04a5c723",
+        "type": "github"
+      },
+      "original": {
+        "owner": "caelestia-dots",
+        "repo": "cli",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1754269165,
@@ -974,6 +1022,22 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1750776420,
+        "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -1159,6 +1223,7 @@
     },
     "root": {
       "inputs": {
+        "caelestia": "caelestia",
         "devshell": "devshell",
         "disko": "disko",
         "hardware": "hardware",
@@ -1180,7 +1245,8 @@
         "nur": "nur",
         "quickshell": "quickshell",
         "sops-nix": "sops-nix",
-        "textfox": "textfox"
+        "textfox": "textfox",
+        "waifu-cursors": "waifu-cursors"
       }
     },
     "rust-overlay": {
@@ -1320,6 +1386,24 @@
         "type": "github"
       }
     },
+    "waifu-cursors": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1755614728,
+        "narHash": "sha256-FAzG8sav8N+1T5jsJa2gghkKrWnE+qo11rRZx2KX/Oo=",
+        "owner": "kagurazakei",
+        "repo": "waifu-cursors",
+        "rev": "8cb6137997c1a8d59b4b1ab1945ec00de5ad540a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kagurazakei",
+        "repo": "waifu-cursors",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [

flake.nix

@@ -62,10 +62,13 @@
     noctalia.inputs.nixpkgs.follows = "nixpkgs";
     noctalia.inputs.quickshell.follows = "quickshell";
 
+    # Lol
+    waifu-cursors.url = "github:kagurazakei/waifu-cursors";
+
     # Caelestia shell
-    # caelestia.url = "github:caelestia-dots/shell";
+    caelestia.url = "github:caelestia-dots/shell";
-    # caelestia.inputs.nixpkgs.follows = "nixpkgs";
+    caelestia.inputs.nixpkgs.follows = "nixpkgs";
-    # caelestia.inputs.quickshell.follows = "quickshell";
+    caelestia.inputs.quickshell.follows = "quickshell";
     # caelestia-cli.url = "github:caelestia-dots/cli";
     # caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
 

home/christoph/default.nix

@@ -53,8 +53,19 @@ in
       };
 
       color = {
+        extraPackages = with pkgs; [
+          papirus-icon-theme
+          bibata-cursors
+          inputs.waifu-cursors.packages.${pkgs.system}.all
+        ];
+
         scheme = "catppuccin-mocha";
         font = builtins.head nixosConfig.fonts.fontconfig.defaultFonts.monospace;
+        cursor = "Bibata-Modern-Classic";
+        cursorSize = 24;
+        cursorPackage = pkgs.bibata-cursors;
+        iconTheme = "Papirus";
+        iconPackage = pkgs.papirus-icon-theme;
         wallpaper = "Windows";
 
         accent = "mauve";
@@ -83,8 +94,189 @@ in
         signCommits = true;
       };
 
-      hyprland = import ./hyprland.nix {inherit pkgs config headless;};
+      hyprland = {
-      hyprpanel.enable = !headless;
+        enable = !headless;
+        dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
+        bars.enable = false;
+        dynamicCursor.enable = false;
+        trails.enable = true;
+        hyprspace.enable = false; # Always broken
+        hyprpanel.enable = true;
+        caelestia.enable = false;
+
+        keybindings = {
+          main-mod = "SUPER";
+
+          bindings = lib.mergeAttrsList [
+            # Use Rofi if we don't have caelestia
+            (lib.optionalAttrs (!config.modules.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.modules.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
+          "float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
+          "nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
+        ];
+
+        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"
+        ];
+      };
+
+      # hyprpanel.enable = !headless; # Enabled by hyprland module
 
       kitty.enable = !headless;
       lazygit.enable = true;

home/christoph/hyprland.nix

@@ -1,161 +0,0 @@
-{
-  pkgs,
-  config,
-  headless,
-}: {
-  enable = !headless;
-  dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
-  bars.enable = false;
-  dynamicCursor.enable = false;
-  trails.enable = true;
-  hyprspace.enable = false; # Always broken
-
-  keybindings = {
-    main-mod = "SUPER";
-
-    bindings = {
-      "$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"];
-
-      "$mainMod, p" = ["exec, hyprpicker --autocopy --format=hex"];
-      "$mainMod, s" = ["exec, grim -g \"$(slurp)\""];
-      "$mainMod CTRL, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
-      "$mainMod SHIFT, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
-
-      ", 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"];
-
-      ", 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
-    "float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
-    "nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
-  ];
-
-  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/modules/color/default.nix

@@ -7,7 +7,7 @@
 }: let
   inherit (config.modules) color;
 in {
-  options.modules.color = import ./options.nix {inherit lib mylib;};
+  options.modules.color = import ./options.nix {inherit lib mylib pkgs;};
 
   config = {
     home.packages = let
@@ -50,10 +50,14 @@ in {
             |> builtins.concatStringsSep "\n")
           ''echo ${lib.concatStrings (lib.replicate 20 "=")}''
         ]);
-    in [
+    in
-      applyColors
+      [
-      printNixColors
+        applyColors
-    ];
+        printNixColors
+        color.iconPackage
+        color.cursorPackage
+      ]
+      ++ color.extraPackages;
 
     # This module sets its own options to the values specified in a colorscheme file.
     modules.color = let

home/modules/color/options.nix

@@ -1,6 +1,7 @@
 {
   lib,
   mylib,
+  pkgs,
   ...
 }: let
   colorKeys = [
@@ -50,6 +51,52 @@ in rec {
     default = "JetBrainsMono Nerd Font Mono";
   };
 
+  cursor = lib.mkOption {
+    type = lib.types.str;
+    description = "The cursor to use";
+    example = "Bibata-Modern-Classic";
+    default = "Bibata-Modern-Classic";
+  };
+
+  cursorSize = lib.mkOption {
+    type = lib.types.int;
+    description = "The cursor size";
+    example = 24;
+    default = 24;
+  };
+
+  cursorPackage = lib.mkOption {
+    type = lib.types.package;
+    description = "The cursor package";
+    example = pkgs.bibata-cursors;
+    default = pkgs.bibata-cursors;
+  };
+
+  iconTheme = lib.mkOption {
+    type = lib.types.str;
+    description = "The icon theme to use";
+    example = "Papirus";
+    default = "Papirus";
+  };
+
+  iconPackage = lib.mkOption {
+    type = lib.types.package;
+    description = "The icon theme package";
+    example = pkgs.papirus-icon-theme;
+    default = pkgs.papirus-icon-theme;
+  };
+
+  extraPackages = lib.mkOption {
+    type = lib.types.listOf lib.types.package;
+    description = "Extra packages to install";
+    example = ''
+      [
+        pkgs.bibata-cursors
+      ]
+    '';
+    default = [];
+  };
+
   # This option is set automatically
   wallpapers = let
     # Collect all the available wallpapers.

home/modules/default.nix

@@ -34,6 +34,7 @@
     inputs.textfox.homeManagerModules.default
     # inputs.niri.homeModules.niri # Imported by system module
     inputs.noctalia.homeModules.default
+    inputs.caelestia.homeManagerModules.default
     # inputs.dankMaterialShell.homeModules.dankMaterialShell.default
     # inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
 

home/modules/hyprland/autostart.nix

@@ -6,6 +6,8 @@
 }:
 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"
@@ -13,7 +15,6 @@ builtins.concatLists [
 
     "hyprctl setcursor ${config.home.pointerCursor.name} ${builtins.toString config.home.pointerCursor.size}"
     "hyprsunset --identity"
-    "hyprpanel"
 
     # 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"

home/modules/hyprland/caelestia.nix

@@ -0,0 +1,516 @@
+{
+  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 = ["vlc"];
+        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/modules/hyprland/default.nix

@@ -34,21 +34,29 @@ 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 = {
       enable = true;
-      iconTheme.package = pkgs.papirus-icon-theme;
+      iconTheme.package = lib.mkDefault color.iconPackage;
-      iconTheme.name = "Papirus";
+      iconTheme.name = color.iconTheme;
+    };
+
+    modules = {
+      hyprpanel.enable = hyprland.hyprpanel.enable;
     };
 
     home = {
       pointerCursor = {
-        gtk.enable = true;
+        gtk.enable = lib.mkDefault true;
-        x11.enable = true;
+        x11.enable = lib.mkDefault true;
-        package = pkgs.bibata-cursors;
+        package = lib.mkDefault color.cursorPackage;
-        name = "Bibata-Modern-Classic";
+        name = color.cursor;
-        size = 24;
+        size = color.cursorSize;
       };
 
       packages = with pkgs; [
@@ -113,10 +121,10 @@ in {
 
     programs = {
       hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
+      caelestia = import ./caelestia.nix {inherit config hyprland color;};
     };
 
     services = {
-      # TODO: Dunst shouldn't be part of the hyprland module
       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;};
@@ -125,12 +133,12 @@ in {
     # 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.dunst.Unit.PartOf = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
-    systemd.user.services.hypridle.Install.WantedBy = 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.After = lib.mkForce ["hyprland-session.target"];
+    systemd.user.services.hypridle.Unit.After = 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.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
-    systemd.user.services.hyprpaper.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
+    systemd.user.services.hyprpaper.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
-    systemd.user.services.hyprpaper.Unit.After = lib.mkForce ["hyprland-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.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;

home/modules/hyprland/dunst.nix

@@ -6,8 +6,8 @@
 }: {
   enable = hyprland.dunst.enable;
 
-  iconTheme.package = pkgs.papirus-icon-theme;
+  iconTheme.package = color.iconPackage;
-  iconTheme.name = "Papirus";
+  iconTheme.name = color.iconTheme;
 
   settings = {
     global = {

home/modules/hyprland/hypridle.nix

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

home/modules/hyprland/hyprpaper.nix

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

home/modules/hyprland/mappings.nix

@@ -6,14 +6,10 @@
 lib.mergeAttrsList [
   {
     # Hyprland control
-    "$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
     "$mainMod, q" = ["killactive"];
     "$mainMod, v" = ["togglefloating"];
     "$mainMod, f" = ["fullscreen"];
-    "$mainMod, c" = ["exec, clipman pick --tool=rofi"];
-    "$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
     "$mainMod, tab" = ["workspace, previous"];
-    "ALT, tab" = ["exec, rofi -show window"];
     # "$mainMod, g" = ["togglegroup"];
     # "ALT, tab" = ["changegroupactive"];
 

home/modules/hyprland/options.nix

@@ -5,11 +5,13 @@
 }: {
   enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";
 
-  dunst.enable = lib.mkEnableOption "Enable dunst notification daemon";
+  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";
+  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/modules/hyprpanel/default.nix

@@ -13,7 +13,7 @@ in {
   config = lib.mkIf hyprpanel.enable {
     programs.hyprpanel = {
       enable = true;
-      systemd.enable = false;
+      systemd.enable = hyprpanel.systemd.enable;
 
       settings = {
         #

home/modules/hyprpanel/options.nix

@@ -5,5 +5,6 @@
 }:
 with lib;
 with mylib.modules; {
-  enable = mkEnableOption "hyprpanel";
+  enable = mkEnableOption "Enable Hyprpanel";
+  systemd.enable = mkEnableOption "Start using systemd";
 }

home/modules/niri/default.nix

@@ -3,6 +3,7 @@
   nixosConfig,
   lib,
   mylib,
+  inputs,
   pkgs,
   ...
 }: let
@@ -18,11 +19,24 @@ in {
       }
     ];
 
+    gtk = {
+      enable = true;
+      iconTheme.package = color.iconPackage;
+      iconTheme.name = color.iconTheme;
+    };
+
     home = {
       sessionVariables = {
-        # For Noctalia
+        QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
-        # QS_ICON_THEME = "Papirus";
+        GDK_BACKEND = "wayland"; # For screen sharing
-        QT_QPA_PLATFORMTHEME = "gtk3";
+      };
+
+      pointerCursor = {
+        gtk.enable = true;
+        x11.enable = true;
+        package = color.cursorPackage;
+        name = color.cursor;
+        size = color.cursorSize;
       };
 
       packages = with pkgs; [
@@ -132,8 +146,8 @@ in {
 
           cursor = {
             hide-when-typing = true;
-            theme = "Bibata-Modern-Classic";
+            theme = color.cursor;
-            size = 24;
+            size = color.cursorSize;
           };
 
           layout = {

home/modules/rofi/default.nix

@@ -24,7 +24,7 @@ in {
       extraConfig = {
         modi = "run,drun,ssh,filebrowser";
         show-icons = true;
-        icon-theme = "Papirus";
+        icon-theme = color.iconTheme;
         drun-display-format = "{icon} {name}";
         disable-history = false;
         hide-scrollbar = true;
@@ -184,18 +184,19 @@ in {
         (color.wallpapers
           |> builtins.map (setWallpaperOnMonitors monitors)
           |> lib.mergeAttrsList);
-    in {
+    in
-      bindings = lib.mergeAttrsList [
+      lib.mkIf (!config.modules.hyprland.caelestia.enable) {
-        {
+        bindings = lib.mergeAttrsList [
-          "$mainMod, escape" = ["exec, \"${power-menu}/bin/rofi-menu-power\""];
+          {
-          "$mainMod, m" = ["exec, \"${keybinds-menu}/bin/rofi-menu-keybinds\""];
+            "$mainMod, escape" = ["exec, \"${power-menu}/bin/rofi-menu-power\""];
-          "$mainMod, w" = ["exec, \"${wallpaper-menu}/bin/rofi-menu-wall\""];
+            "$mainMod, m" = ["exec, \"${keybinds-menu}/bin/rofi-menu-keybinds\""];
-          # "$mainMod, o" = ["exec, \"${lectures-menu}\""];
+            "$mainMod, w" = ["exec, \"${wallpaper-menu}/bin/rofi-menu-wall\""];
-        }
+            # "$mainMod, o" = ["exec, \"${lectures-menu}\""];
-        (lib.optionalAttrs (!nixosConfig.modules.network.useNetworkManager) {
+          }
-          "$mainMod, U" = ["exec, \"${vpn-menu}/rofi-menu-vpn\""];
+          (lib.optionalAttrs (!nixosConfig.modules.network.useNetworkManager) {
-        })
+            "$mainMod, U" = ["exec, \"${vpn-menu}/rofi-menu-vpn\""];
-      ];
+          })
-    };
+        ];
+      };
   };
 }

system/default.nix

@@ -41,6 +41,7 @@ with mylib.networking; {
 
       termfilechooser.enable = true;
       hyprland.enable = config.programs.hyprland.enable;
+      niri.enable = config.programs.niri.enable;
     };
 
     docker = {
@@ -324,7 +325,7 @@ with mylib.networking; {
     firejail.enable = true; # Use to run app in network namespace (e.g. through vpn)
     fuse.userAllowOther = true; # Allow users to mount e.g. samba shares (cifs)
     git.enable = true;
-    kdeconnect.enable = !headless; # Use this instead of HM for firewall setup
+    # kdeconnect.enable = !headless; # Use this instead of HM for firewall setup
     neovim.enable = true;
     nix-ld.enable = true; # Load dynamically linked executables
 
@@ -359,10 +360,7 @@ with mylib.networking; {
       flake = "/home/${username}/NixFlake";
     };
 
-    niri = {
+    niri.enable = !headless;
-      enable = !headless;
-    };
-
     ssh.startAgent = true; # Use gnupg
     starship.enable = true;
     xwayland.enable = !headless;
@@ -391,6 +389,21 @@ with mylib.networking; {
       wacom.enable = true;
     };
 
+    # greetd = {
+    #   enable = !headless;
+    #   restart = false;
+    #   useTextGreeter = true;
+    #
+    #   settings = {
+    #     terminal.vt = 1;
+    #
+    #     default_session = {
+    #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd $SHELL";
+    #       user = "greeter";
+    #     };
+    #   };
+    # };
+
     # Enable touchpad support (enabled default in most desktopManager).
     libinput.enable = !headless;
 

system/modules/desktopportal/default.nix

@@ -14,7 +14,7 @@ in {
       portal = {
         enable = true;
         xdgOpenUsePortal = true;
-        wlr.enable = false;
+        wlr.enable = true;
 
         # TODO: Replace lib.optional(s) throughout the config with mkMerge
         config = lib.mkMerge [
@@ -35,6 +35,14 @@ in {
             (desktopportal.hyprland.enable && desktopportal.termfilechooser.enable) {
               hyprland."org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"];
             })
+
+          (lib.mkIf desktopportal.niri.enable {
+            niri.default = ["gtk" "gnome"];
+          })
+
+          (lib.mkIf (desktopportal.niri.enable && desktopportal.termfilechooser.enable) {
+            niri."org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"];
+          })
         ];
 
         extraPortals = with pkgs;

system/modules/desktopportal/options.nix

@@ -6,4 +6,5 @@
   enable = lib.mkEnableOption "Enable XDG desktop portals";
   termfilechooser.enable = lib.mkEnableOption "Enable xdg-desktop-portal-termfilechooser";
   hyprland.enable = lib.mkEnableOption "Configure portals for Hyprland";
+  niri.enable = lib.mkEnableOption "Configure portals for Niri";
 }