diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index a8d711e..cc97e51 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -127,10 +127,7 @@ with lib; { synology-drive-client ]; - programs = { - chromium.enable = true; - nix-ld.enable = true; - }; + programs.chromium.enable = true; home-manager.users.moritz = { services.nextcloud-client = { diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 70316e6..943db5e 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -6,10 +6,6 @@ with lib; let - cfg = config.my.programs.hyprland; - - boolToYesNo = bool: if bool then "yes" else "no"; - mkRule = rule: windowRegexes: "windowrulev2 = ${rule},${concatStringsSep "," windowRegexes}"; mkRules = rules: windowRegexes: concatStringsSep "\n" (map (flip mkRule windowRegexes) rules); in @@ -59,12 +55,12 @@ in # See https://wiki.hyprland.org/Configuring/Variables/ for more rounding = 3 - blur = ${boolToYesNo cfg.blur} + blur = yes blur_size = 3 blur_passes = 3 blur_new_optimizations = on - drop_shadow = ${boolToYesNo cfg.shadows} + drop_shadow = yes shadow_range = 10 shadow_render_power = 2 @@ -113,19 +109,17 @@ in # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - ${optionalString cfg.blur '' # Kitty windowrulev2 = opacity 0.95 0.95, class:^kitty$ - # Rofi - ${mkRules ["float" "opacity 0.85 0.85" "noborder"] ["class:^([rR]ofi)$"]} - windowrulev2 = opacity 0.85 0.85, floating:1 - ''} # Firefox Sharing Indicator ${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator)$"]} + # Rofi + ${mkRules ["float" "opacity 0.85 0.85" "noborder"] ["class:^([rR]ofi)$"]} + # Emacs windowrulev2 = opaque, class:^emacs$ diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index b8758d0..059c8a4 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -15,16 +15,6 @@ in options.my.programs.hyprland = { enable = mkEnableOption "hyprland"; nvidiaSupport = mkEnableOption "enable nvidia Support"; - blur = mkOption { - type = types.bool; - description = "enable window blurring"; - default = true; - }; - shadows = mkOption { - type = types.bool; - description = "enable window shadows"; - default = true; - }; }; config = mkIf cfg.enable { @@ -145,7 +135,6 @@ in # only consider graphical-session.target started when hyprland-sesstion.target is reached systemd.user.targets.hyprland-session = { wantedBy = [ "graphical-session.target" ]; - before = [ "graphical-session.target" ]; };