move hyprland config to modules/wm/hyprland.nix

This commit is contained in:
Emile Clark-Boman 2025-08-31 15:09:20 +10:00
parent d1cfd55e67
commit 940a79292e
3 changed files with 15 additions and 8 deletions

View file

@ -1,18 +1,20 @@
{ {
lib, lib,
pkgs, pkgs,
pkgs-unstable,
inputs, inputs,
config, config,
... ...
}: let }: let
home-manager = builtins.fetchTarball { home-manager = builtins.fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
sha256 = "1kk5qzfb87mkgy6vzm7x8z8akxr3k8k7839yjdy48z034pvidhsr"; sha256 = "1y919cqrlmq0k44rgnacaq4zq37jj4rdh6f2swp6y2jiz28xb0iq";
}; };
in { in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
../modules/wm/hyprland.nix
../modules/steam.nix ../modules/steam.nix
../modules/obsidian.nix ../modules/obsidian.nix

View file

@ -0,0 +1,9 @@
{...}: {
programs = {
hyprland = {
enable = true;
withUWSM = true; # Universal Wayland Session Manager
xwayland.enable = true;
};
};
}

View file

@ -14,6 +14,8 @@ in {
./hardware-configuration.nix ./hardware-configuration.nix
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
../modules/wm/hyprland.nix
../modules/steam.nix ../modules/steam.nix
../modules/obsidian.nix ../modules/obsidian.nix
@ -110,7 +112,7 @@ in {
defaultSession = defaultSession =
"hyprland" "hyprland"
+ ( + (
if config.programs.hyprland.withUWSM == true if config.programs.hyprland.withUWSM
then "-uwsm" then "-uwsm"
else null else null
); );
@ -318,12 +320,6 @@ in {
#}; #};
programs = { programs = {
hyprland = {
enable = true;
withUWSM = true; # Universal Wayland Session Manager
xwayland.enable = true;
};
zsh.enable = true; zsh.enable = true;
fish.enable = true; fish.enable = true;