christoph/flake-nixinator
1
Fork 0
Code Activity

Further refactor hyprland keybindings + integrate with rofi

Browse Source
This commit is contained in:
Christoph Urlacher
2023-05-25 20:25:26 +02:00
parent 62ef5ed0e2
commit c87226e644
6 changed files with 52 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
home/modules/hyprland/default.nix
View File

@ -95,26 +95,27 @@ in {
# Keybindings
home.file.".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"];
"$mainMod, T" = ["exec, kitty"];
"ALT, tab" = ["changegroupactive"];
};
mkBind = key: action: "bind = ${key}, ${action}";
mkBinds = key: actions: builtins.map (mkBind key) actions;
binds = lib.pipe cfg.keybindings.bindings [
binds = lib.pipe (lib.mergeAttrs cfg.keybindings.bindings always-bind) [
(builtins.mapAttrs mkBinds)
builtins.attrValues
builtins.concatLists
(builtins.concatStringsSep "\n")
];
mkModBind = key: action: "bind = $mainMod, ${key}, ${action}";
mkModBinds = key: actions: builtins.map (mkModBind key) actions;
mod-binds = lib.pipe cfg.keybindings.mod-bindings [
(builtins.mapAttrs mkModBinds)
builtins.attrValues
builtins.concatLists
(builtins.concatStringsSep "\n")
];
in ''
$mainMod = ${cfg.keybindings.main-mod}
${mod-binds}
${binds}
'';
@ -170,6 +171,19 @@ in {
(builtins.concatStringsSep "\n")
];
# Set wallpaper for each configured monitor
home.file.".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
home.file.".config/hypr/input.conf".text = ''
input {
@ -189,19 +203,6 @@ in {
}
'';
# Set wallpaper for each configured monitor
home.file.".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}
'';
home.activation = {
# NOTE: Keep the hyprland config symlinked, to allow easy changes with hotreload
# TODO: Don't symlink at all, why not just tell Hyprland where the config is? Much easier

13
home/modules/hyprland/options.nix
View File

@ -110,22 +110,13 @@ with mylib.modules; {
example = ''
"SUPER"
'';
};
mod-bindings = mkOption {
type = types.attrs;
description = "Hyprland keyboard shortcuts using the modifier key";
example = ''
{
"Q" = ["killactive"];
"V" = ["togglefloating"];
}
'';
default = "SUPER";
};
bindings = mkOption {
type = types.attrs;
description = "Hyprland keyboard shortcuts";
default = {};
example = ''
{
"CTRL ALT, R" = [