diff --git a/home-manager/nathan/programs/hyprland/default.nix b/home-manager/nathan/programs/hyprland/default.nix index 8f51447..d585308 100644 --- a/home-manager/nathan/programs/hyprland/default.nix +++ b/home-manager/nathan/programs/hyprland/default.nix @@ -14,17 +14,27 @@ home.packages = with pkgs; [ pyprland ]; + wayland.windowManager.hyprland = { - home.file.".config/hypr/hyprland.conf".text = let - monitor = if config.homeconfig.host == "laptop" then '' - monitor=eDP-1,1920x1080@60,0x0,1 - '' else if config.homeconfig.host == "homebox" then '' - monitor=HDMI-A-2,1920x1080@60,0x0,1 - monitor=HEADLESS-2,1920x1080@60,0x0,1 - exec-once=kitty -e tmux new-session -s hypr - '' else ''''; - in '' - source = /home/nathan/.config/hypr/main.conf - '' + monitor; + enable = true; + + systemd = { + enable = true; + variables = [ "--all" ]; + }; + + extraConfig = let + monitor = if config.homeconfig.host == "laptop" then '' + monitor=eDP-1,1920x1080@60,0x0,1 + '' else if config.homeconfig.host == "homebox" then '' + monitor=HDMI-A-2,1920x1080@60,0x0,1 + monitor=HEADLESS-2,1920x1080@60,0x0,1 + exec-once=kitty -e tmux new-session -s hypr + '' else ''''; + in '' + source = /home/nathan/.config/hypr/main.conf + '' + monitor; + + }; }; } diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix index cfccd56..fee0884 100644 --- a/system-config/configuration/laptop/default.nix +++ b/system-config/configuration/laptop/default.nix @@ -191,7 +191,7 @@ }; nix = { - nixPath = [ "nixpkgs=${inputs.nixpkgs}" "unstable=${inputs.nixpkgs-us}" ]; + nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; settings = { experimental-features = [ "nix-command" "flakes" ]; };