1

Hyprland: Use HM module for config instead of generating own files

This commit is contained in:
2024-10-12 21:42:21 +02:00
parent 675c94dede
commit eaf1f39923
4 changed files with 298 additions and 336 deletions

View File

@ -1,146 +0,0 @@
# Source a file (multi-file configs)
# NOTE: Many of these are generated depending on the NixOS config
source = ~/.config/hypr/autostart.conf
source = ~/.config/hypr/floatingrules.conf
source = ~/.config/hypr/input.conf
source = ~/.config/hypr/keybindings.conf
source = ~/.config/hypr/monitors.conf
source = ~/.config/hypr/polkit.conf
source = ~/.config/hypr/translucentrules.conf
source = ~/.config/hypr/workspaces.conf
source = ~/.config/hypr/workspacerules.conf
layerrule = blur,rofi
layerrule = blur,waybar
general {
gaps_in = 5
gaps_out = 20
border_size = 2
col.inactive_border = rgba(463a2eff)
col.active_border = rgba(865e4dff)
layout = dwindle
}
group {
groupbar {
render_titles = false
font_size = 10
gradients = false
}
col.border_active = rgba(e4b074ff)
col.border_inactive = rgba(997b66ff)
}
decoration {
rounding = 5
# multisample_edges = on # Deprecated
blur {
enabled = true
size = 10
passes = 3
new_optimizations = true
ignore_opacity = true
xray = true
}
drop_shadow = off
shadow_range = 4
shadow_render_power = 3
col.shadow = rgba(1a1a1aee)
}
misc {
force_default_wallpaper = 0
}
animations {
enabled = yes
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 7, myBezier
animation = windowsOut, 1, 7, default, popin 80%
animation = border, 1, 10, default
animation = borderangle, 1, 8, default
animation = fade, 1, 7, default
animation = workspaces, 1, 6, default
}
dwindle {
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes # you probably want this
}
master {
new_status = master
}
gestures {
workspace_swipe = off
}
# TODO: Rofi
bind = $mainMod, D, exec, ~/NixFlake/config/rofi/menus/systemd-podman.fish
bind = $mainMod, O, exec, ~/NixFlake/config/rofi/menus/lectures.fish
bind = $mainMod, M, exec, ~/NixFlake/config/rofi/menus/keybinds.fish
bind = $mainMod, U, exec, ~/NixFlake/config/rofi/menus/vpn.fish
# TODO: These should probably be generated depending on the NixOS workspace config?
# Move focus with mainMod + arrow keys
bind = $mainMod, h, movefocus, l
bind = $mainMod, l, movefocus, r
bind = $mainMod, k, movefocus, u
bind = $mainMod, j, movefocus, d
# Swap windows
bind = $mainMod CTRL, h, movewindow, l
bind = $mainMod CTRL, l, movewindow, r
bind = $mainMod CTRL, k, movewindow, u
bind = $mainMod CTRL, d, movewindow, d
# Switch workspaces with mainMod + [1-9] for main monitor, mainMod + 0 for secondary monitor
bind = $mainMod, tab, workspace, previous
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [1-9] for main monitor, mainMod + SHIFT + 0 for secondary monitor
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Reset the workspace positions after disabling and reenabling a monitor
bind = CTRL ALT, R, moveworkspacetomonitor, 1 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 2 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 3 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 4 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 5 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 6 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 7 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 8 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 9 HDMI-A-1
bind = CTRL ALT, R, moveworkspacetomonitor, 10 DP-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow

View File

@ -126,6 +126,8 @@ rec {
}
];
transparent-opacity = "0.8";
transparent = [
"kitty"
"Alacritty"

View File

@ -11,6 +11,114 @@
...
}: let
cfg = config.modules.hyprland;
# This function is mapped to the "cfg.monitors" attrSet.
# For each key-value entry in "cfg.monitors",
# the key will be assigned to "name" and the value to "conf".
mkMonitor = name: conf: "${name}, ${toString conf.width}x${toString conf.height}@${toString conf.rate}, ${toString conf.x}x${toString conf.y}, ${toString conf.scale}";
mkWorkspace = monitor: workspace: "${toString workspace}, monitor:${toString monitor}";
mkWorkspaces = monitor: workspace-list: map (mkWorkspace monitor) workspace-list;
mkWorkspaceRule = workspace: class: "workspace ${workspace}, class:^(${class})$";
mkWorkspaceRules = workspace: class-list: builtins.map (mkWorkspaceRule workspace) class-list;
mkFloatingRule = attrs:
"float"
+ (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
+ (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
mkTranslucentRule = class: "opacity ${cfg.transparent-opacity} ${cfg.transparent-opacity}, class:^(${class})$";
mkBind = key: action: "${key}, ${action}";
mkBinds = key: actions: builtins.map (mkBind key) actions;
mkWallpaper = monitor: "${monitor}, ${config.home.homeDirectory}/NixFlake/wallpapers/${cfg.theme}.png";
mkDelayedStart = str: "hyprctl dispatch exec \"sleep 5s && ${str}\"";
delayed-exec = builtins.map mkDelayedStart cfg.autostart.delayed;
mkExec = prog: "${prog}";
always-bind = {
# Hyprland control
"$mainMod, Q" = ["killactive"];
"$mainMod, V" = ["togglefloating"];
"$mainMod, F" = ["fullscreen"];
"$mainMod, C" = ["exec, clipman pick --tool=rofi"];
"$mainMod, G" = ["togglegroup"];
"ALT, tab" = ["changegroupactive"];
"$mainMod, tab" = ["workspace, previous"];
# Move focus with mainMod + arrow keys
"$mainMod, h" = ["movefocus, l"];
"$mainMod, l" = ["movefocus, r"];
"$mainMod, k" = ["movefocus, u"];
"$mainMod, j" = ["movefocus, d"];
# Swap windows
"$mainMod CTRL, h" = ["movewindow, l"];
"$mainMod CTRL, l" = ["movewindow, r"];
"$mainMod CTRL, k" = ["movewindow, u"];
"$mainMod CTRL, d" = ["movewindow, d"];
# Rofi
"$mainMod, D" = ["exec, ~/NixFlake/config/rofi/menus/systemd-podman.fish"];
"$mainMod, O" = ["exec, ~/NixFlake/config/rofi/menus/lectures.fish"];
"$mainMod, M" = ["exec, ~/NixFlake/config/rofi/menus/keybinds.fish"];
"$mainMod, U" = ["exec, ~/NixFlake/config/rofi/menus/vpn.fish"];
# TODO: Somehow write this more compact?
"$mainMod, 1" = ["workspace, 1"];
"$mainMod, 2" = ["workspace, 2"];
"$mainMod, 3" = ["workspace, 3"];
"$mainMod, 4" = ["workspace, 4"];
"$mainMod, 5" = ["workspace, 5"];
"$mainMod, 6" = ["workspace, 6"];
"$mainMod, 7" = ["workspace, 7"];
"$mainMod, 8" = ["workspace, 8"];
"$mainMod, 9" = ["workspace, 9"];
"$mainMod, 0" = ["workspace, 10"];
"$mainMod SHIFT, 1" = ["movetoworkspace, 1"];
"$mainMod SHIFT, 2" = ["movetoworkspace, 2"];
"$mainMod SHIFT, 3" = ["movetoworkspace, 3"];
"$mainMod SHIFT, 4" = ["movetoworkspace, 4"];
"$mainMod SHIFT, 5" = ["movetoworkspace, 5"];
"$mainMod SHIFT, 6" = ["movetoworkspace, 6"];
"$mainMod SHIFT, 7" = ["movetoworkspace, 7"];
"$mainMod SHIFT, 8" = ["movetoworkspace, 8"];
"$mainMod SHIFT, 9" = ["movetoworkspace, 9"];
"$mainMod SHIFT, 0" = ["movetoworkspace, 10"];
"CTRL ALT, R" = [
"moveworkspacetomonitor, 1 HDMI-A-1"
"moveworkspacetomonitor, 2 HDMI-A-1"
"moveworkspacetomonitor, 3 HDMI-A-1"
"moveworkspacetomonitor, 4 HDMI-A-1"
"moveworkspacetomonitor, 5 HDMI-A-1"
"moveworkspacetomonitor, 6 HDMI-A-1"
"moveworkspacetomonitor, 7 HDMI-A-1"
"moveworkspacetomonitor, 8 HDMI-A-1"
"moveworkspacetomonitor, 9 HDMI-A-1"
"moveworkspacetomonitor, 10 DP-1"
];
};
always-bindm = {
"$mainMod, mouse:272" = ["movewindow"];
"$mainMod, mouse:273" = ["resizewindow"];
};
always-exec = [
"dunst" # Notifications
"wl-paste -t text --watch clipman store --no-persist"
"wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
"hyprctl setcursor Bibata-Modern-Classic 16"
# Provide a polkit authentication UI.
# This is used for example when running systemd commands without root.
"${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
];
in {
options.modules.hyprland = import ./options.nix {inherit lib mylib;};
@ -30,6 +138,34 @@ in {
iconTheme.name = "Papirus";
};
home = {
pointerCursor = {
gtk.enable = true;
x11.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 16;
};
packages = with pkgs; [
hyprpaper # Wallpaper setter
hyprpicker # Color picker
wl-clipboard
clipman # Clipboard manager (wl-paste)
libnotify
inotifyTools # Includes inotifywait
ncpamixer # Audio control
slurp # Region selector for screensharing
grim # Grab images from compositor
# Deps for Qt5 and Qt6 apps (e.g., Nextcloud)
libsForQt5.qtwayland
kdePackages.qtwayland
];
};
programs = {
imv = {
enable = true;
@ -39,7 +175,161 @@ in {
};
};
wayland.windowManager.hyprland = {
enable = true;
systemd.enable = true; # Imports some variables into dbus
xwayland.enable = true;
settings = {
"$mainMod" = "${cfg.keybindings.main-mod}";
general = {
gaps_in = 5;
gaps_out = 20;
border_size = 2;
"col.active_border" = "rgba(94E2D5FF)";
"col.inactive_border" = "rgba(B4BEFEFF)";
};
group = {
groupbar = {
render_titles = false;
font_size = 10;
gradients = false;
};
"col.border_active" = "rgba(94E2D5FF)";
"col.border_inactive" = "rgba(B4BEFEFF)";
};
input = {
kb_layout = "${cfg.kb-layout}";
kb_variant = "${cfg.kb-variant}";
kb_model = "pc104";
# kb_options =
# kb_rules =
follow_mouse = true;
touchpad = {
natural_scroll = "no";
};
sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
};
monitor = lib.pipe cfg.monitors [
(builtins.mapAttrs mkMonitor)
builtins.attrValues
];
workspace = lib.pipe cfg.workspaces [
(builtins.mapAttrs mkWorkspaces)
builtins.attrValues
builtins.concatLists
];
bind = lib.pipe (lib.mergeAttrs cfg.keybindings.bindings always-bind) [
(builtins.mapAttrs mkBinds)
builtins.attrValues
builtins.concatLists
];
bindm = lib.pipe always-bindm [
(builtins.mapAttrs mkBinds)
builtins.attrValues
builtins.concatLists
];
exec-once = lib.pipe (always-exec ++ cfg.autostart.immediate ++ delayed-exec) [
(builtins.map mkExec)
];
windowrulev2 =
lib.pipe cfg.workspacerules [
(builtins.mapAttrs mkWorkspaceRules)
builtins.attrValues
builtins.concatLists
]
++ lib.pipe cfg.floating [
(builtins.map mkFloatingRule)
]
++ lib.pipe cfg.transparent [
(builtins.map mkTranslucentRule)
];
dwindle = {
pseudotile = true;
preserve_split = true;
};
master = {
new_status = "master";
};
gestures = {
workspace_swipe = false;
};
misc = {
# Say no to the anime girl
force_default_wallpaper = 0;
};
# Because those are not windows, but layouts,
# we have to blur them explicitly
layerrule = [
"blur,rofi"
"blur,waybar"
];
decoration = {
rounding = 5;
drop_shadow = false;
shadow_range = 4;
shadow_render_power = 3;
"col.shadow" = "rgba(1A1A1AEE)";
blur = {
enabled = true;
size = 10;
passes = 3;
new_optimizations = true;
ignore_opacity = true;
xray = true;
};
};
animations = {
enabled = true;
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
animation = [
"windows, 1, 7, myBezier"
"windowsOut, 1, 7, default,popin 80%"
"border, 1, 10, default"
"borderangle, 1, 8, default"
"fade, 1, 7, default"
"workspaces, 1, 6, default"
];
};
};
};
services = {
hyprpaper = {
enable = true;
settings = {
preload = "~/NixFlake/wallpapers/${cfg.theme}.png";
wallpaper = lib.pipe cfg.monitors [
builtins.attrNames
(builtins.map mkWallpaper)
];
};
};
# Notification service
dunst = {
enable = true;
@ -76,195 +366,5 @@ in {
};
};
};
home = {
pointerCursor = {
gtk.enable = true;
x11.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 16;
};
packages = with pkgs; [
hyprpaper # Wallpaper setter
hyprpicker # Color picker
wl-clipboard
clipman # Clipboard manager (wl-paste)
libnotify
inotifyTools # inotifywait etc.
moc # Audio player
ncpamixer # ncurses pavucontrol
slurp # Region selector for screensharing
grim # Grab images from compositor
# xfce.thunar
# xfce.tumbler # Thunar thumbnails
libsForQt5.polkit-kde-agent
libsForQt5.qtwayland
kdePackages.qtwayland
];
sessionVariables = {
};
#
# Generate many individual config files from the options
#
file = {
# Link the main Hyprland configuration file.
# This file imports all the other generated files.
# TODO: Generate this, so only existing files are imported.
".config/hypr/hyprland.conf".source = ../../../config/hyprland/hyprland.conf;
# Provide a polkit authentication UI.
# This is used for example when running systemd commands without root.
".config/hypr/polkit.conf".text = ''
exec-once = ${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1
'';
# Configure different monitors.
".config/hypr/monitors.conf".text = let
# This function is mapped to the "cfg.monitors" attrSet.
# For each key-value entry in "cfg.monitors",
# the key will be assigned to "name" and the value to "conf".
mkMonitor = name: conf: "monitor = ${name}, ${toString conf.width}x${toString conf.height}@${toString conf.rate}, ${toString conf.x}x${toString conf.y}, ${toString conf.scale}";
in
lib.pipe cfg.monitors [
(builtins.mapAttrs mkMonitor)
builtins.attrValues
(builtins.concatStringsSep "\n")
];
# Configure how workspaces are mapped to monitors.
".config/hypr/workspaces.conf".text = let
mkWorkspace = monitor: workspace: "workspace = ${toString workspace}, monitor:${toString monitor}";
mkWorkspaces = monitor: workspace-list: map (mkWorkspace monitor) workspace-list;
in
lib.pipe cfg.workspaces [
(builtins.mapAttrs mkWorkspaces)
builtins.attrValues
builtins.concatLists
(builtins.concatStringsSep "\n")
];
# Keybindings
".config/hypr/keybindings.conf".text = let
always-bind = {
# Hyprland control
"$mainMod, Q" = ["killactive"];
"$mainMod, V" = ["togglefloating"];
"$mainMod, F" = ["fullscreen"];
"$mainMod, C" = ["exec, clipman pick --tool=rofi"];
"$mainMod, G" = ["togglegroup"];
"ALT, tab" = ["changegroupactive"];
};
mkBind = key: action: "bind = ${key}, ${action}";
mkBinds = key: actions: builtins.map (mkBind key) actions;
binds = lib.pipe (lib.mergeAttrs cfg.keybindings.bindings always-bind) [
(builtins.mapAttrs mkBinds)
builtins.attrValues
builtins.concatLists
(builtins.concatStringsSep "\n")
];
in ''
$mainMod = ${cfg.keybindings.main-mod}
${binds}
'';
# Autostart applications
".config/hypr/autostart.conf".text = let
# Stuff that is not negotiable
always-exec = [
"dunst" # Notifications
"hyprpaper"
"wl-paste -t text --watch clipman store --no-persist"
"wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\""
"hyprctl setcursor Bibata-Modern-Classic 16"
];
# NOTE: The sleep is a hack for tray icons, they need to be launched after waybar
sleepTime = 5;
mkDelayedStart = str: "hyprctl dispatch exec \"sleep ${builtins.toString sleepTime}s && ${str}\"";
delayed-exec = builtins.map mkDelayedStart cfg.autostart.delayed;
mkExec = prog: "exec-once = ${prog}";
in
lib.pipe (always-exec ++ cfg.autostart.immediate ++ delayed-exec) [
(builtins.map mkExec)
(builtins.concatStringsSep "\n")
];
# Assign windows to workspaces
".config/hypr/workspacerules.conf".text = let
mkWorkspaceRule = workspace: class: "windowrulev2 = workspace ${workspace}, class:^(${class})$";
mkWorkspaceRules = workspace: class-list: builtins.map (mkWorkspaceRule workspace) class-list;
in
lib.pipe cfg.workspacerules [
(builtins.mapAttrs mkWorkspaceRules)
builtins.attrValues
builtins.concatLists
(builtins.concatStringsSep "\n")
];
# Make windows float
".config/hypr/floatingrules.conf".text = let
mkFloatingRule = attrs:
"windowrulev2 = float"
+ (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
+ (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
in
lib.pipe cfg.floating [
(builtins.map mkFloatingRule)
(builtins.concatStringsSep "\n")
];
# Make windows translucent
".config/hypr/translucentrules.conf".text = let
opacity = 0.8;
mkTranslucentRule = class: "windowrulev2 = opacity ${toString opacity} ${toString opacity}, class:^(${class})$";
in
lib.pipe cfg.transparent [
(builtins.map mkTranslucentRule)
(builtins.concatStringsSep "\n")
];
# Set wallpaper for each configured monitor
".config/hypr/hyprpaper.conf".text = let
mkWallpaper = monitor: "wallpaper = ${monitor}, ${config.home.homeDirectory}/NixFlake/wallpapers/${cfg.theme}.png";
wallpapers = lib.pipe cfg.monitors [
builtins.attrNames
(builtins.map mkWallpaper)
(builtins.concatStringsSep "\n")
];
in ''
preload = ~/NixFlake/wallpapers/${cfg.theme}.png
${wallpapers}
'';
# Keyboard layout
".config/hypr/input.conf".text = ''
input {
kb_layout = ${cfg.kb-layout}
kb_variant = ${cfg.kb-variant}
kb_model = pc104
kb_options =
kb_rules =
follow_mouse = 1
touchpad {
natural_scroll = no
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
'';
};
};
};
}

View File

@ -89,6 +89,12 @@ with mylib.modules; {
'';
};
transparent-opacity = mkOption {
type = types.str;
description = "The opacity transparent windows should have.";
example = "0.8";
};
floating = mkOption {
type = types.listOf types.attrs;
description = "What programs are floating down here?";