From bfbfeb5fe87be3dbedeb5b9ece9f9d70f8b65fca Mon Sep 17 00:00:00 2001
From: DerGrumpf
Date: Mon, 24 Mar 2025 23:01:13 +0100
Subject: [PATCH] Added: Hyprland
---
home/hyprland/default.nix | 61 ++++++++++++---------------------------
modules/hyprland.nix | 0
modules/system.nix | 2 ++
users/phil/home.nix | 1 +
4 files changed, 21 insertions(+), 43 deletions(-)
delete mode 100644 modules/hyprland.nix
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 23d697d..d650002 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,47 +1,22 @@
{
pkgs,
- config,
- lib,
- anyrun,
...
-} @ args:
-with lib; let
- cfg = config.modules.desktop.hyprland;
-in {
- imports = [
- anyrun.homeManagerModules.default
- ./options
- ];
-
- options.modules.desktop.hyprland = {
- enable = mkEnableOption "hyprland compositor";
- settings = lib.mkOption {
- type = with lib.types; let
- valueType =
- nullOr (oneOf [
- bool
- int
- float
- str
- path
- (attrsOf valueType)
- (listOf valueType)
- ])
- // {
- description = "Hyprland configuration value";
- };
- in
- valueType;
- default = {};
- };
- };
-
- config = mkIf cfg.enable (
- mkMerge ([
- {
- wayland.windowManager.hyprland.settings = cfg.settings;
- }
- ]
- ++ (import ./values args))
- );
+}
+
+{
+ programs.hyprland.enable = true;
+ environment.sessionVariables = {
+ NIXOS_OZONE_WL = "1";
+ WLR_NO_HARDWARE_CURSORS = "1";
+ };
+
+ environment.systemPackages = with pkgs; [
+ kitty # Terminal
+
+ hyprpicker
+ hyprcursor
+ hyprlock
+ hypridle
+ hyprpaper
+ ];
}
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/system.nix b/modules/system.nix
index 70d3983..e6821cd 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -24,10 +24,12 @@
substituters = [
"https://cache.nixos.org"
+ "https://hyprland.cachix.org"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
builders-use-substitutes = true;
};
diff --git a/users/phil/home.nix b/users/phil/home.nix
index 96613ad..9df3934 100644
--- a/users/phil/home.nix
+++ b/users/phil/home.nix
@@ -8,6 +8,7 @@
imports = [
../../home/core.nix
+ ../../home/hyprland
../../home/programs
../../home/rofi
];