diff --git a/flake.lock b/flake.lock index 6ad695b..293aefd 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1769526953, - "narHash": "sha256-HIBfW2JODixwfblH7b+WhO94h+JM1L2Bxlgv9Ql2fR4=", + "lastModified": 1770072491, + "narHash": "sha256-tTYck5pk+Aio5gju+AlaYi862dh8OLog9NxSwqvV3J0=", "owner": "KoenDR06", "repo": "nix-hyprland", - "rev": "902971932de932f21ae41ffc068ec1f2d5f606f5", + "rev": "eaaba884058f7ebdf9a9c7db40fadb90c11a78a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c6bf3a3..ae95711 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ nix-hyprland = { url = "github:KoenDR06/nix-hyprland"; + # url = "path:/home/horseman/Programming/nix-hyprland"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; diff --git a/modules/wm/hyprland/animations.nix b/modules/wm/hyprland/animations.nix index e4784a2..fa99a61 100644 --- a/modules/wm/hyprland/animations.nix +++ b/modules/wm/hyprland/animations.nix @@ -5,98 +5,90 @@ }: let inherit (lib) mkIf; cfg = config.horseman.wm.hyprland; + + easeOut = { + startX = 0.23; + startY = 1.0; + endX = 0.32; + endY = 1.0; + }; + easeInOut = { + startX = 0.65; + startY = 0.05; + endX = 0.36; + endY = 1.0; + }; + linear = { + startX = 0.0; + startY = 0.0; + endX = 1.0; + endY = 1.0; + }; + bounce = { + startX = 0.6; + startY = 1.5; + endX = 0.8; + endY = 1; + }; + slowFade = { + startX = 0.4; + startY = 1.0; + endX = 0.4; + endY = 1.0; + }; in { config = mkIf cfg.enable { nix-hyprland = { animations = { enabled = true; - beziers = [ - { - name = "easeOut"; - startX = 0.23; - startY = 1.0; - endX = 0.32; - endY = 1.0; - } - { - name = "easeInOut"; - startX = 0.65; - startY = 0.05; - endX = 0.36; - endY = 1.0; - } - { - name = "linear"; - startX = 0.0; - startY = 0.0; - endX = 1.0; - endY = 1.0; - } - { - name = "bounce"; - startX = 0.6; - startY = 1.5; - endX = 0.8; - endY = 1; - } - { - name = "slowFade"; - startX = 0.4; - startY = 1.0; - endX = 0.4; - endY = 1.0; - } - ]; + animations = { + global = { + enabled = false; + }; - animations = [ - { - name = "global"; - enabled = false; - } - { - name = "border"; + border = { speed = 3; - curve = "linear"; - } - { - name = "workspaces"; + curve = easeOut; + }; + + workspaces = { speed = 1.5; - curve = "easeInOut"; + curve = easeInOut; style = "fade"; - } - { - name = "specialWorkspace"; - speed = 1.5; - curve = "easeOut"; - style = "slidevert"; - } - { - name = "fadeDpms"; + }; + + specialWorkspace = { + speed = 4; + curve = easeInOut; + style = "slidefadevert 10%"; + }; + + fadeDpms = { speed = 20; - curve = "slowFade"; - } - { - name = "windows"; + curve = slowFade; + }; + + windows = { speed = 2; - curve = "bounce"; + curve = bounce; style = "gnomed"; - } - { - name = "windowsOut"; + }; + + windowsOut = { enabled = false; - } - { - name = "layers"; + }; + + layers = { speed = 1.5; - curve = "slowFade"; + curve = slowFade; style = "popin"; - } - { - name = "fadeLayers"; + }; + + fadeLayers = { speed = 1.5; - curve = "linear"; - } - ]; + curve = linear; + }; + }; }; }; }; diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index 00148b2..4e6b294 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -78,7 +78,8 @@ in { "float, initialTitle:^Picture-in-Picture$" "center, initialTitle:^Picture-in-Picture$" - "size 33% 33%, initialTitle:^Picture-in-Picture$" + "size 1280 720, initialTitle:^Picture-in-Picture$" + "opacity 1.0 override, initialTitle:^Picture-in-Picture$" "float, initialClass:CImg" "float, initialTitle:GLFW"