matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: clean up hyprland module

Browse source
This commit is contained in:
matt1432 2023-11-25 13:37:11 -05:00
parent f0a1e6f3f8
commit b29f4e9862
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
home/hyprland/default.nix
View file

@ -9,18 +9,11 @@
}: let }: let
configDir = config.services.device-vars.configDir; configDir = config.services.device-vars.configDir;
symlink = config.lib.file.mkOutOfStoreSymlink; symlink = config.lib.file.mkOutOfStoreSymlink;
optionals = lib.lists.optionals;
isNvidia = osConfig.hardware.nvidia.modesetting.enable;
gset = pkgs.gsettings-desktop-schemas; gset = pkgs.gsettings-desktop-schemas;
polkit = pkgs.plasma5Packages.polkit-kde-agent; polkit = pkgs.plasma5Packages.polkit-kde-agent;
mainPkg =
if osConfig.hardware.nvidia.modesetting.enable
then {
hyprland = pkgs.hyprland;
}
else {
hyprland = hyprland.packages.x86_64-linux.default;
};
in { in {
imports = [ imports = [
./theme.nix ./theme.nix
@ -34,12 +27,13 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = mainPkg.hyprland; enableNvidiaPatches = isNvidia;
enableNvidiaPatches = osConfig.hardware.nvidia.modesetting.enable; package = lib.mkIf (!isNvidia)
hyprland.packages.x86_64-linux.default;
plugins = plugins =
[] []
++ (lib.lists.optionals (osConfig.hardware.sensor.iio.enable) [ ++ (optionals (osConfig.hardware.sensor.iio.enable) [
hyprgrass.packages.${pkgs.system}.default hyprgrass.packages.${pkgs.system}.default
]); ]);
@ -53,7 +47,7 @@ in {
"$XDG_DATA_DIRS" "$XDG_DATA_DIRS"
]}" ]}"
] ]
++ (lib.lists.optionals (osConfig.hardware.nvidia.modesetting.enable) [ ++ (optionals (isNvidia) [
"LIBVA_DRIVER_NAME, nvidia" "LIBVA_DRIVER_NAME, nvidia"
"XDG_SESSION_TYPE, wayland" "XDG_SESSION_TYPE, wayland"
"GBM_BACKEND, nvidia-drm" "GBM_BACKEND, nvidia-drm"
@ -99,11 +93,11 @@ in {
"swww init --no-cache && swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png" "swww init --no-cache && swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png"
"wl-paste --watch cliphist store" "wl-paste --watch cliphist store"
] ]
++ (lib.lists.optionals (osConfig.programs.kdeconnect.enable) [ ++ (optionals (osConfig.programs.kdeconnect.enable) [
"${osConfig.programs.kdeconnect.package}/libexec/kdeconnectd" "${osConfig.programs.kdeconnect.package}/libexec/kdeconnectd"
"kdeconnect-indicator" "kdeconnect-indicator"
]) ])
++ (lib.lists.optionals (osConfig.services.gnome.gnome-keyring.enable) [ ++ (optionals (osConfig.services.gnome.gnome-keyring.enable) [
"gnome-keyring-daemon --start --components=secrets" "gnome-keyring-daemon --start --components=secrets"
]); ]);
@ -185,7 +179,7 @@ in {
source = source =
[] []
++ lib.lists.optionals (configDir != null) [ ++ optionals (configDir != null) [
"~/.config/hypr/main.conf" "~/.config/hypr/main.conf"
]; ];
}; };