From 400930449ccfe999e16e81197ffbfc222eff4bf9 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 31 May 2024 14:53:26 -0500 Subject: [PATCH] added hyprman --- flake.lock | 21 ++++++++++ flake.nix | 4 ++ modules/desktop/window-managers/hyprland.nix | 44 ++++++++++---------- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 70700cd..1df0711 100644 --- a/flake.lock +++ b/flake.lock @@ -355,6 +355,26 @@ "type": "github" } }, + "hyprman": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717185053, + "narHash": "sha256-Ve57FpjYukpmRoNJsiDyCiKy9wRbnCCbWe2PsO0aD7M=", + "ref": "refs/heads/main", + "rev": "42ac8bee8c3fc78f6a8a2d3aee11a62c63bc556a", + "revCount": 4, + "type": "git", + "url": "https://git.dayl.in/daylin/hyprman.git" + }, + "original": { + "type": "git", + "url": "https://git.dayl.in/daylin/hyprman.git" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -755,6 +775,7 @@ "f1multiviewer": "f1multiviewer", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", + "hyprman": "hyprman", "lix": "lix", "lix-module": "lix-module", "nix-index-database": "nix-index-database", diff --git a/flake.nix b/flake.nix index 1d91210..a91302d 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,10 @@ tsm.url = "github:daylinmorgan/tsm?dir=nix"; tsm.inputs.nixpkgs.follows = "nixpkgs"; + + hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; + hyprman.inputs.nixpkgs.follows = "nixpkgs"; + f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; pixi.url = "github:daylinmorgan/pixi-flake"; }; diff --git a/modules/desktop/window-managers/hyprland.nix b/modules/desktop/window-managers/hyprland.nix index 4b89228..f289ccc 100644 --- a/modules/desktop/window-managers/hyprland.nix +++ b/modules/desktop/window-managers/hyprland.nix @@ -22,33 +22,35 @@ mkOizysModule config "hyprland" { # Optional, hint electron apps to use wayland: environment.sessionVariables.NIXOS_OZONE_WL = "1"; - environment.systemPackages = with pkgs; [ - wlr-randr - kanshi + environment.systemPackages = + (with pkgs; [ + wlr-randr + kanshi - brightnessctl - udiskie - eww + brightnessctl + udiskie + eww - # notifications - libnotify - mako + # notifications + libnotify + mako - # utils - grimblast - ksnip - wl-clipboard - rofi-wayland - pavucontrol + # utils + grimblast + ksnip + wl-clipboard + rofi-wayland + pavucontrol - catppuccin-cursors.mochaDark + catppuccin-cursors.mochaDark - #hypr ecosystem - hyprlock - hypridle + #hypr ecosystem + hyprlock + hypridle - swww - ]; + swww + ]) + ++ [ inputs.hyprman.packages.${pkgs.system}.default ]; nixpkgs.overlays = [ inputs.hyprland-contrib.overlays.default