fix: hyprland not-nightly

This commit is contained in:
Barrett Ruth 2026-02-18 12:24:26 -05:00
parent bfccff4510
commit efdc25b026
Signed by: barrett
GPG key ID: A6C96C9349D2FC81
3 changed files with 4 additions and 17 deletions

View file

@ -10,7 +10,6 @@
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
claude-code.url = "github:ryoppippi/claude-code-overlay"; claude-code.url = "github:ryoppippi/claude-code-overlay";
hyprland.url = "github:hyprwm/Hyprland";
}; };
outputs = outputs =
@ -20,7 +19,6 @@
nixos-hardware, nixos-hardware,
zen-browser, zen-browser,
claude-code, claude-code,
hyprland,
... ...
}: }:
let let
@ -120,13 +118,13 @@
home-manager.backupFileExtension = "bak"; home-manager.backupFileExtension = "bak";
home-manager.users.barrett = import ./home/home.nix; home-manager.users.barrett = import ./home/home.nix;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit zen-browser hyprland; inherit zen-browser;
hostConfig = xps15Config; hostConfig = xps15Config;
}; };
} }
]; ];
specialArgs = { specialArgs = {
inherit nixpkgs hyprland; inherit nixpkgs;
}; };
}; };

View file

@ -3,7 +3,6 @@
lib, lib,
config, config,
hostConfig, hostConfig,
hyprland ? null,
... ...
}: }:
@ -38,13 +37,7 @@ in
{ {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = package = if hostConfig.isNixOS then pkgs.hyprland else null;
if !hostConfig.isNixOS then
null
else if hyprland != null then
hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
else
pkgs.hyprland;
portalPackage = null; portalPackage = null;
systemd.enable = hostConfig.isNixOS; systemd.enable = hostConfig.isNixOS;

View file

@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
hyprland,
... ...
}: }:
@ -23,7 +22,7 @@ in
efiSupport = true; efiSupport = true;
device = "nodev"; device = "nodev";
useOSProber = true; useOSProber = true;
configurationLimit = 10; configurationLimit = 5;
gfxmodeEfi = "1920x1200,auto"; gfxmodeEfi = "1920x1200,auto";
fontSize = 36; fontSize = 36;
}; };
@ -99,7 +98,6 @@ in
}; };
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
portalPackage = pkgs.xdg-desktop-portal-hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland;
}; };
@ -185,8 +183,6 @@ in
"root" "root"
"barrett" "barrett"
]; ];
substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
}; };
nix.gc = { nix.gc = {