reconfigure services/theming for hyprland

This commit is contained in:
datsudo 2025-06-04 13:02:48 +08:00
parent efb2336713
commit 03f89ba0d3
2 changed files with 30 additions and 14 deletions

View File

@ -4,6 +4,9 @@ let
cfg = config.theming.dock; cfg = config.theming.dock;
in in
{ {
imports = [
../shared/hyprland.nix
];
options.theming.dock = { options.theming.dock = {
enable = lib.mkOption { enable = lib.mkOption {
default = false; default = false;
@ -17,7 +20,7 @@ in
config = { config = {
home.pointerCursor = { home.pointerCursor = {
x11.enable = true; x11.enable = !config.shared.hyprland.enable;
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
gtk.enable = true; gtk.enable = true;

View File

@ -1,34 +1,47 @@
{ config, lib, ... }: { config, lib, pkgs, ... }:
let let
inherit (lib) mkOption mkIf mkMerge types;
cfg = config.utils; cfg = config.utils;
in in
{ {
imports = [ ./subs/sxhkd.nix ]; imports = [ ./subs/sxhkd.nix ../shared/hyprland.nix ];
options.utils = { options.utils = {
rofi.enable = lib.mkOption { rofi.enable = mkOption {
default = true; default = true;
type = lib.types.bool; type = types.bool;
}; };
sxhkd.enable = lib.mkOption { sxhkd.enable = mkOption {
default = true; default = true;
type = lib.types.bool; type = types.bool;
}; };
flameshot.enable = lib.mkOption { flameshot.enable = mkOption {
default = true; default = true;
type = lib.types.bool; type = types.bool;
}; };
mako.enable = lib.mkOption { mako.enable = mkOption {
default = false; default = config.shared.hyprland.enable;
type = lib.types.bool; type = types.bool;
}; };
}; };
config = { config = {
programs.rofi.enable = cfg.rofi.enable; programs = mkMerge [
{ rofi.enable = cfg.rofi.enable; }
subs.sxhkd.enable = cfg.sxhkd.enable; (mkIf (!config.shared.hyprland.enable) {
rofi.package = pkgs.rofi;
})
(mkIf config.shared.hyprland.enable {
rofi.package = pkgs.rofi-wayland;
})
];
subs.sxhkd = mkIf (!config.shared.hyprland.enable && cfg.sxhkd.enable) {
enable = true;
};
services.flameshot = { services.flameshot = {
enable = cfg.flameshot.enable; enable = cfg.flameshot.enable;