faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hyprland: switch to nixpkgs hyprland package

Browse source
This commit is contained in:
Charlie Root 2024-10-29 18:29:39 +01:00
commit ada6d15a19
Signed by: faukah
SSH key fingerprint: SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/options/usrEnv/desktop.nix
View file

@ -34,14 +34,14 @@ in {
package = mkOption { package = mkOption {
type = package; type = package;
default = inputs'.hyprland.packages.hyprland; default = pkgs.hyprland;
description = '' description = ''
The Hyprland package to be used. The Hyprland package to be used.
''; '';
}; };
portalPackage = mkOption { portalPackage = mkOption {
type = package; type = package;
default = inputs'.hyprland.packages.xdg-desktop-portal-hyprland; default = pkgs.xdg-desktop-portal-hyprland;
description = "The hyprland portal package"; description = "The hyprland portal package";
}; };
}; };

6
modules/services/greetd.nix
View file

@ -25,10 +25,10 @@ with lib; let
#exec-once=[workspace 1;fullscreen;noanim] ${ #exec-once=[workspace 1;fullscreen;noanim] ${
pkgs.greetd.${cfg.greeter} pkgs.greetd.${cfg.greeter}
}/bin/${cfg.greeter} -l; ${ }/bin/${cfg.greeter} -l; ${
inputs'.hyprland.packages.hyprland pkgs.hyprland
}/bin/hyprctl dispatch exit }/bin/hyprctl dispatch exit
#exec-once=${ #exec-once=${
inputs'.hyprland.packages.hyprland pkgs.hyprland
}/bin/hyprctl dispatch focuswindow ${cfg.greeter} }/bin/hyprctl dispatch focuswindow ${cfg.greeter}
''; '';
in { in {
@ -49,7 +49,7 @@ in {
enable = true; enable = true;
settings.default_session = { settings.default_session = {
command = "${ command = "${
inputs'.hyprland.packages.hyprland pkgs.hyprland
}/bin/Hyprland --config ${hyprlandConfig}"; }/bin/Hyprland --config ${hyprlandConfig}";
user = username; user = username;
}; };

12
modules/wms/wayland/hyprland/module.nix
View file

@ -23,17 +23,18 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
inherit (cfg) package portalPackage; package = pkgs.hyprland;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
}; };
# xdg Portal # xdg Portal
xdg.portal = { xdg.portal = {
enable = true; enable = true;
configPackages = mkDefault [ configPackages = mkDefault [
cfg.portalPackage pkgs.xdg-desktop-portal-hyprland
]; ];
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
cfg.portalPackage pkgs.xdg-desktop-portal-hyprland
]; ];
config = { config = {
common.default = ["gtk" "hyprland"]; common.default = ["gtk" "hyprland"];
@ -43,11 +44,12 @@ in {
home-manager.users.${username} = { home-manager.users.${username} = {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
inherit (cfg) package; package = pkgs.hyprland;
# Split-monitor-workspaces provides awesome-like workspace behaviour # Split-monitor-workspaces provides awesome-like workspace behaviour
plugins = [ plugins = [
hyprsplit pkgs.hyprlandPlugins.hyprsplit
pkgs.hyprlandPlugins.hypr-dynamic-cursors
]; ];
# Xwayland for X applications # Xwayland for X applications

11
modules/wms/wayland/hyprland/settings.nix
View file

@ -61,6 +61,17 @@ in {
num_workspaces = 10; num_workspaces = 10;
persistent_workspaces = true; persistent_workspaces = true;
}; };
hypr-dynamic-cursors = {
enabled = true;
mode = "tilt";
rotate = {
length = 20;
offset = 0.0;
};
threshhold = 2;
shake.enabled = false;
};
}; };
}; };
}; };