diff --git a/flake.nix b/flake.nix index c2ccb06..6554cf6 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; claude-code.url = "github:ryoppippi/claude-code-overlay"; - hyprland.url = "github:hyprwm/Hyprland"; }; outputs = @@ -20,7 +19,6 @@ nixos-hardware, zen-browser, claude-code, - hyprland, ... }: let @@ -120,13 +118,13 @@ home-manager.backupFileExtension = "bak"; home-manager.users.barrett = import ./home/home.nix; home-manager.extraSpecialArgs = { - inherit zen-browser hyprland; + inherit zen-browser; hostConfig = xps15Config; }; } ]; specialArgs = { - inherit nixpkgs hyprland; + inherit nixpkgs; }; }; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 6eba9ee..05e336a 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -3,7 +3,6 @@ lib, config, hostConfig, - hyprland ? null, ... }: @@ -38,13 +37,7 @@ in { wayland.windowManager.hyprland = { enable = true; - package = - if !hostConfig.isNixOS then - null - else if hyprland != null then - hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland - else - pkgs.hyprland; + package = if hostConfig.isNixOS then pkgs.hyprland else null; portalPackage = null; systemd.enable = hostConfig.isNixOS; diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix index aedc8c9..2b88564 100644 --- a/hosts/xps15/configuration.nix +++ b/hosts/xps15/configuration.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - hyprland, ... }: @@ -23,7 +22,7 @@ in efiSupport = true; device = "nodev"; useOSProber = true; - configurationLimit = 10; + configurationLimit = 5; gfxmodeEfi = "1920x1200,auto"; fontSize = 36; }; @@ -99,7 +98,6 @@ in }; programs.hyprland = { enable = true; - package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland; }; @@ -185,8 +183,6 @@ in "root" "barrett" ]; - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; nix.gc = {