diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index b1243b9..1cda04f 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -1,18 +1,20 @@ { lib, pkgs, + pkgs-unstable, inputs, config, ... }: let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; - sha256 = "1kk5qzfb87mkgy6vzm7x8z8akxr3k8k7839yjdy48z034pvidhsr"; + sha256 = "1y919cqrlmq0k44rgnacaq4zq37jj4rdh6f2swp6y2jiz28xb0iq"; }; in { imports = [ ./hardware-configuration.nix (import "${home-manager}/nixos") + ../modules/wm/hyprland.nix ../modules/steam.nix ../modules/obsidian.nix diff --git a/hosts/modules/wm/hyprland.nix b/hosts/modules/wm/hyprland.nix new file mode 100644 index 0000000..f2960ed --- /dev/null +++ b/hosts/modules/wm/hyprland.nix @@ -0,0 +1,9 @@ +{...}: { + programs = { + hyprland = { + enable = true; + withUWSM = true; # Universal Wayland Session Manager + xwayland.enable = true; + }; + }; +} diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 486c59d..1f22c62 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -14,6 +14,8 @@ in { ./hardware-configuration.nix (import "${home-manager}/nixos") + ../modules/wm/hyprland.nix + ../modules/steam.nix ../modules/obsidian.nix @@ -110,7 +112,7 @@ in { defaultSession = "hyprland" + ( - if config.programs.hyprland.withUWSM == true + if config.programs.hyprland.withUWSM then "-uwsm" else null ); @@ -318,12 +320,6 @@ in { #}; programs = { - hyprland = { - enable = true; - withUWSM = true; # Universal Wayland Session Manager - xwayland.enable = true; - }; - zsh.enable = true; fish.enable = true;