diff --git a/hosts/marty-latitude/home.nix b/hosts/marty-latitude/home.nix index 61e8e09..4cfa19e 100644 --- a/hosts/marty-latitude/home.nix +++ b/hosts/marty-latitude/home.nix @@ -93,7 +93,13 @@ ranger.enable = true; }; window_manager = { - hyprland.enable = true; + hyprland = { + enable = true; + monitors = [ + "desc:InfoVision Optoelectronics (Kunshan) Co.Ltd China 0x057E, 1366x768@60,0x0,1" + ]; + numlock = false; + }; waybar.enable = true; walker.enable = true; wallpaper.enable = true; diff --git a/hosts/marty-pc/home.nix b/hosts/marty-pc/home.nix index 8165a60..717b81b 100644 --- a/hosts/marty-pc/home.nix +++ b/hosts/marty-pc/home.nix @@ -90,7 +90,10 @@ kitty.enable = true; }; window_manager = { - hyprland.enable = true; + hyprland = { + enable = false; + numlock = true; + }; waybar.enable = true; walker.enable = true; wallpaper.enable = true; diff --git a/hosts/marty-server/home.nix b/hosts/marty-server/home.nix index e268a7b..72c2533 100644 --- a/hosts/marty-server/home.nix +++ b/hosts/marty-server/home.nix @@ -90,7 +90,9 @@ kitty.enable = false; }; window_manager = { - hyprland.enable = false; + hyprland = { + enable = false; + }; waybar.enable = false; walker.enable = false; wallpaper.enable = true; diff --git a/modules/window_manager/hyprland.nix b/modules/window_manager/hyprland.nix index 5ccc564..45105e5 100644 --- a/modules/window_manager/hyprland.nix +++ b/modules/window_manager/hyprland.nix @@ -8,7 +8,16 @@ { options = { window_manager = { - hyprland.enable = lib.mkEnableOption "enable hyprland"; + hyprland= { + enable = lib.mkEnableOption "enable hyprland"; + monitors = lib.mkOption { + default = [ + ",preferred,auto,1" + ]; + description = ''declare monitors''; + }; + numlock = lib.mkEnableOption "numlock by default"; + }; }; }; @@ -26,17 +35,47 @@ wayland.windowManager.hyprland = { enable = true; settings = { + monitor = config.window_manager.hyprland.monitors; exec-once = [ + (lib.mkIf (config.window_manager.walker.enable) "elephant") + (lib.mkIf (config.window_manager.waybar.enable) "waybar") + (lib.mkIf (config.window_manager.wallpaper.enable) "waypaper --restore --random") ]; "$mod" = "SUPER"; "$shiftmod" = "SUPER_SHIFT"; bind = [ - "$mod, D, exec, walker" + (lib.mkIf (config.window_manager.walker.enable) "$mod, D, exec, walker") + (lib.mkIf (config.terminal.kitty.enable) "$mod, return, exec, kitty") "$shiftmod, Q, killactive," - "$mod, return, exec, kitty" ]; input = { kb_layout = "de"; + numlock_by_default = config.window_manager.hyprland.numlock; + follow_mouse = 2; + mouse_refocus = false; + accel_profile = "flat"; + sensitivity = 0.2; + touchpad = { + natural_scroll = "no"; + disable_while_typing = true; + }; + }; + cursor = { + inactive_timeout = 0; + no_warps = true; + }; + decoration = { + rounding = 20; + blur = { + enabled = true; + size = 3; + passes = 1; + }; + shadow = { + range = 4; + render_power = 3; + color = "rgba(1a1a1aee)"; + }; }; }; };