fix(hyprland): define hyprland in uwsm
This commit is contained in:
parent
54f5244a8b
commit
e8cab9c486
2 changed files with 13 additions and 8 deletions
|
@ -2,9 +2,9 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ inputs, config, pkgs, ... }:
|
{ inputs, config, pkgs, ... }: let
|
||||||
|
hyprland-pkgs = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||||
{
|
in {
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
@ -18,6 +18,7 @@
|
||||||
# Graphics settings are defined here
|
# Graphics settings are defined here
|
||||||
hardware = {
|
hardware = {
|
||||||
graphics.enable = true;
|
graphics.enable = true;
|
||||||
|
graphics.package = hyprland-pkgs.mesa.drivers;
|
||||||
graphics.extraPackages = with pkgs; [
|
graphics.extraPackages = with pkgs; [
|
||||||
nvidia-vaapi-driver
|
nvidia-vaapi-driver
|
||||||
ocl-icd
|
ocl-icd
|
||||||
|
@ -121,6 +122,15 @@
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
|
|
||||||
|
programs.uwsm = {
|
||||||
|
enable = true;
|
||||||
|
waylandCompositors.hyprland = {
|
||||||
|
prettyName = "Hyprland";
|
||||||
|
comment = "Hyprland compositor managed by UWSM";
|
||||||
|
binPath = "/run/current-system/sw/bin/Hyprland";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# Use the packages that we have defined as inputs in our flake.
|
# Use the packages that we have defined as inputs in our flake.
|
||||||
|
|
|
@ -7,11 +7,6 @@
|
||||||
environment.etc."profile.d/hyprland-tty-launch.sh".text = ''
|
environment.etc."profile.d/hyprland-tty-launch.sh".text = ''
|
||||||
#!/bin/$SHELL
|
#!/bin/$SHELL
|
||||||
|
|
||||||
# if uwsm check may-start && uwsm select; then
|
|
||||||
# exec systemd-cat -t uwsm_start uwsm start default
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# OR (to bypass the compositor selection menu):
|
|
||||||
if uwsm check may-start; then
|
if uwsm check may-start; then
|
||||||
exec uwsm start hyprland.desktop
|
exec uwsm start hyprland.desktop
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue