fixed capslock with modifier keys not trigger popup

This commit is contained in:
Asaki Yuki 2026-04-13 01:29:05 +07:00
parent 06a099aeb5
commit 6f07cf2b90
5 changed files with 106 additions and 89 deletions

View file

@ -6,7 +6,7 @@
}:
let
ENABLE_HDR = false;
in
in
{
imports = [
./hardware-configuration.nix
@ -50,29 +50,32 @@ in
wm.niri.enable = false;
wm.hyprland.enable = true;
wm.hyprland.monitors = [
({
output = "eDP-1";
mode = "1920x1200@60";
position = "0x0";
scale = 1;
} // lib.optionalAttrs ENABLE_HDR {
bitdepth = 10;
cm = "hdr";
supports_wide_color = 1;
supports_hdr = 1;
(
{
output = "eDP-1";
mode = "1920x1200@60";
position = "0x0";
scale = 1;
}
// lib.optionalAttrs ENABLE_HDR {
bitdepth = 10;
cm = "hdr";
supports_wide_color = 1;
supports_hdr = 1;
sdrbrightness = 1.0;
sdrsaturation = 1.0;
sdrbrightness = 1.0;
sdrsaturation = 1.0;
sdr_min_luminance = 0.005;
sdr_max_luminance = 200;
sdr_min_luminance = 0.005;
sdr_max_luminance = 200;
min_luminance = 0.0005;
max_luminance = 400;
max_avg_luminance = 250;
min_luminance = 0.0005;
max_luminance = 400;
max_avg_luminance = 250;
sdr_eotf = 2;
})
sdr_eotf = 2;
}
)
];
bluetooth.enable = true;

View file

@ -17,19 +17,27 @@ in
};
home-manager.users.asakiyuki = {
_module.args = { inherit inputs unstable osconfig custom libs; };
_module.args = {
inherit
inputs
unstable
osconfig
custom
libs
;
};
imports = [
./modules/programs.nix
./modules/files.nix
./modules/env.nix
../../modules/features/home/theme.nix
inputs.nixvim.homeModules.nixvim
inputs.nixcord.homeModules.nixcord
inputs.niri.homeModules.niri
];
home = {
username = "asakiyuki";
stateVersion = "25.11";
@ -42,4 +50,3 @@ in
};
};
}

View file

@ -1,6 +1,7 @@
{ unstable, ... }: {
programs.vscode = {
enable = true;
package = unstable.vscode;
};
}
{ unstable, ... }:
{
programs.vscode = {
enable = true;
package = unstable.vscode;
};
}

View file

@ -7,7 +7,7 @@
{
environment.systemPackages =
with pkgs;
[
[
git
vim
wget
@ -23,12 +23,13 @@
unzip
python3
jdk25
nixfmt
wine
wine64
winetricks
protontricks
quickshell
papirus-icon-theme
]

View file

@ -1,71 +1,76 @@
{ osconfig, config, ... }:
{
wayland.windowManager.hyprland.settings.bind = [
"CTRL ALT, T, exec, ${osconfig.device.programs.terminal}"
wayland.windowManager.hyprland.settings = {
bind = [
"CTRL ALT, T, exec, ${osconfig.device.programs.terminal}"
"SUPER SHIFT, L, exit,"
"SUPER SHIFT, TAB, togglefloating,"
"SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z"
"SUPER, J, togglesplit,"
"SUPER, E, exec, dolphin"
"SUPER SHIFT, L, exit,"
"SUPER SHIFT, TAB, togglefloating,"
"SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z"
"SUPER, J, togglesplit,"
"SUPER, E, exec, dolphin"
"SUPER, C, killactive"
"SUPER, C, killactive"
"SUPER SHIFT, LEFT, resizeactive, -25 0"
"SUPER SHIFT, RIGHT, resizeactive, 25 0"
"SUPER SHIFT, UP, resizeactive, 0 -25"
"SUPER SHIFT, DOWN, resizeactive, 0 25"
"SUPER SHIFT, LEFT, resizeactive, -25 0"
"SUPER SHIFT, RIGHT, resizeactive, 25 0"
"SUPER SHIFT, UP, resizeactive, 0 -25"
"SUPER SHIFT, DOWN, resizeactive, 0 25"
"SUPER, LEFT, movefocus, l"
"SUPER, RIGHT, movefocus, r"
"SUPER, UP, movefocus, u"
"SUPER, DOWN, movefocus, d"
"SUPER, LEFT, movefocus, l"
"SUPER, RIGHT, movefocus, r"
"SUPER, UP, movefocus, u"
"SUPER, DOWN, movefocus, d"
"SUPER CTRL, LEFT, movewindow, l"
"SUPER CTRL, RIGHT, movewindow, r"
"SUPER CTRL, UP, movewindow, u"
"SUPER CTRL, DOWN, movewindow, d"
"SUPER SHIFT, h, resizeactive, -25 0"
"SUPER SHIFT, l, resizeactive, 25 0"
"SUPER SHIFT, k, resizeactive, 0 -25"
"SUPER SHIFT, j, resizeactive, 0 25"
"SUPER CTRL, LEFT, movewindow, l"
"SUPER CTRL, RIGHT, movewindow, r"
"SUPER CTRL, UP, movewindow, u"
"SUPER CTRL, DOWN, movewindow, d"
"SUPER, h, movefocus, l"
"SUPER, l, movefocus, r"
"SUPER, k, movefocus, u"
"SUPER, j, movefocus, d"
"SUPER SHIFT, h, resizeactive, -25 0"
"SUPER SHIFT, l, resizeactive, 25 0"
"SUPER SHIFT, k, resizeactive, 0 -25"
"SUPER SHIFT, j, resizeactive, 0 25"
"SUPER CTRL, h, movewindow, l"
"SUPER CTRL, l, movewindow, r"
"SUPER CTRL, k, movewindow, u"
"SUPER CTRL, j, movewindow, d"
"SUPER, h, movefocus, l"
"SUPER, l, movefocus, r"
"SUPER, k, movefocus, u"
"SUPER, j, movefocus, d"
"SUPER, TAB, workspace, e+1"
"SUPER ALT, TAB, workspace, e-1"
"SUPER, MOUSE_DOWN, workspace, e-1"
"SUPER, MOUSE_UP, workspace, e+1"
"SUPER CTRL, h, movewindow, l"
"SUPER CTRL, l, movewindow, r"
"SUPER CTRL, k, movewindow, u"
"SUPER CTRL, j, movewindow, d"
"ALT, SPACE, global, asakiyuki:launcher"
", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle"
", Caps_Lock, global, asakiyuki:capslock"
"SUPER, TAB, workspace, e+1"
"SUPER ALT, TAB, workspace, e-1"
"SUPER, MOUSE_DOWN, workspace, e-1"
"SUPER, MOUSE_UP, workspace, e+1"
",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
",XF86MonBrightnessUp, exec, brightnessctl s +5%"
]
++ builtins.concatLists (
builtins.genList (i: [
"SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}"
"SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}"
]) 9
)
++ [
"SUPER, 0, workspace, 10"
"SUPER SHIFT, 0, movetoworkspace, 10"
];
", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle"
"ALT, SPACE, global, asakiyuki:launcher"
wayland.windowManager.hyprland.settings.bindm = [
"SUPER, mouse:272, movewindow"
"SUPER, mouse:273, resizewindow"
];
",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
",XF86MonBrightnessUp, exec, brightnessctl s +5%"
]
++ builtins.concatLists (
builtins.genList (i: [
"SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}"
"SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}"
]) 9
)
++ [
"SUPER, 0, workspace, 10"
"SUPER SHIFT, 0, movetoworkspace, 10"
];
bindi = [
", Caps_Lock, global, asakiyuki:capslock"
];
bindm = [
"SUPER, mouse:272, movewindow"
"SUPER, mouse:273, resizewindow"
];
};
}