diff --git a/flake.lock b/flake.lock index c51b2f9..728b61a 100644 --- a/flake.lock +++ b/flake.lock @@ -207,6 +207,26 @@ "type": "github" } }, + "hyprspace": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1724608787, + "narHash": "sha256-t2BzxfdLhMY8pnzmQe76bLGL8bB5p5bdIXHhkSV+xr8=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "b328501fbad4159e404697e25cdaaab0ad9f81a4", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -330,6 +350,7 @@ "gBar": "gBar", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprspace": "hyprspace", "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index de2de62..4d985ea 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,10 @@ inputs.nixpkgs.follows = "unstable"; inputs.systems.follows = "systems"; }; + hyprspace = { + url = "github:KZDKM/Hyprspace"; + inputs.hyprland.follows = "hyprland"; + }; # Home manager home-manager = { url = "github:nix-community/home-manager/release-24.05"; @@ -40,6 +44,7 @@ , nix-darwin , gBar , hyprland + , hyprspace }: let user = { @@ -94,6 +99,7 @@ inputs = { inherit gBar + hyprspace hyprland; }; }; diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix index bef64c2..97e6473 100644 --- a/modules/nixos/desktop/hyprland/mine.nix +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -1,11 +1,12 @@ -{ config, lib, pkgs, ... }: -with lib; - +{ config, lib, pkgs, inputs, ... }: let cfg = config.skyg.nixos.desktop.hyprland; in { - config = mkIf (cfg.enabled && !cfg.useNWG) { + config = lib.mkIf (cfg.enabled && !cfg.useNWG) { + home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland.plugins = [ + inputs.hyprspace.packages.${pkgs.system}.Hyprspace + ]; programs.hyprlock.enable = true; environment.systemPackages = with pkgs; [ # general utilities