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

View file

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

View file

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

View file

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

View file

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