diff --git a/flake.lock b/flake.lock index 46db645..90fa6c7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,31 @@ { "nodes": { + "Hyprspace": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "hyprlandPlugins": "hyprlandPlugins", + "nixpkgs": [ + "Hyprspace", + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712850504, + "narHash": "sha256-s1cUVFgoukNsAfU7bpLP3G0qL0Q2un/AimUxnQ+u6ig=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "18e4b1d6a35acbcea2cef05a4a8eece83f1da5ae", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -124,6 +150,33 @@ "type": "github" } }, + "hyprlandPlugins": { + "inputs": { + "hyprland": [ + "Hyprspace", + "hyprland" + ], + "systems": [ + "Hyprspace", + "hyprlandPlugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1712836056, + "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprlang": { "inputs": { "nixpkgs": [ @@ -197,6 +250,7 @@ }, "root": { "inputs": { + "Hyprspace": "Hyprspace", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", diff --git a/flake.nix b/flake.nix index 7f872ff..0ef5ed8 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,22 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + + # hyprfocus = { + # url = "github:VortexCoyote/hyprfocus"; + # inputs.hyprland.follows = "hyprland"; + # }; + + Hyprspace = { + url = "github:KZDKM/Hyprspace"; + inputs.hyprland.follows = "hyprland"; + }; + + # hycov = { + # url = "github:DreamMaoMao/hycov"; + # inputs.hyprland.follows = "hyprland"; + # }; + }; outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: diff --git a/home-modules/hyprland/hyprland.nix b/home-modules/hyprland/hyprland.nix index cd699d6..a5f3a9f 100644 --- a/home-modules/hyprland/hyprland.nix +++ b/home-modules/hyprland/hyprland.nix @@ -93,8 +93,11 @@ in package = inputs.hyprland.packages.${pkgs.system}.hyprland; xwayland.enable = true; systemd.enable = true; - plugins = let plugins = inputs.hyprland-plugins.packages.${pkgs.system}; in with plugins; [ - hyprexpo + plugins = [ + inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo + # inputs.hyprfocus.packages.${pkgs.system}.hyprfocus + # inputs.hycov.packages.${pkgs.system}.hycov + inputs.Hyprspace.packages.${pkgs.system}.Hyprspace ]; settings = { @@ -217,7 +220,7 @@ in # bezier = "myBezier, 0.01, 0.9, 0.1, 1.0"; #o # bezier = "myBezier, 0.83, 0, 0.17, 1"; # io bezier = "myBezier, 0.33, 1, 0.68, 1"; - animation = let direction = if host == "NxXPS" then "slide" else "slidevert"; in [ + animation = let direction = if host == "NxXPS" then "slide" else "fade"; in [ "windows, 1, ${animation-speed}, myBezier, slide" "border, 1, ${animation-speed}, myBezier" "fade, 1, ${animation-speed}, myBezier" @@ -353,7 +356,7 @@ in ########################################################################### ## ROW 1: - # "SUPER, ^," + # "SUPER, ^, " "SUPER, 1, workspace, 11" "SUPER SHIFT, 1, movetoworkspace, 11" "SUPER, 2, workspace, 12" @@ -383,7 +386,8 @@ in ## ROW 2: #bind = SUPER, TAB, hycov:toggleoverview - "SUPER, TAB, hyprexpo:expo, toggle" + "SUPER, TAB, overview:toggle" + "SUPER SHIFT, TAB, hyprexpo:expo, toggle" "ALT, TAB, focuscurrentorlast" "SUPER, Q, killactive" "SUPER, W, exec, waybar_mode set '󰈹 '" @@ -425,7 +429,7 @@ in ########################################################################### ## ROW 4: - # "SUPER, <," + # "SUPER, <, overview:toggle" "SUPER, Y, execr, waybar_mode set '󰹑 '" "SUPER, Y, submap, scrR" "SUPER, X, exec, pkill wlogout || wlogout --protocol layer-shell -b 3" @@ -819,6 +823,34 @@ in gesture_positive = true # positive = swipe down. Negative = swipe up. } } + + + plugin { + overview { + panelColor = rgba(00000088) + workspaceActiveBackground = rgba(00ff00ff) + workspaceInactiveBackground = rgba(0000ffff) + # workspaceActiveBorder = + # workspaceInactiveBorder = + dragAlpha = 0.5 + panelHeight = 200 + workspaceMargin = 30 + workspaceBorderSize = 3 + centerAligned = true + overrideGaps = 10 + gapsIn = 10 + gapsOut = 10 + hideBackgroundLayers = false + drawActiveWorkspace = true + autoDrag = true + autoScroll = true + exitOnClick = false + switchOnDrop = false + exitOnSwitch = false + showNewWorkspace = true + showEmptyWorkspace = false + } + } ''; };