fixes to hyprland config
This commit is contained in:
parent
3a5ddaa025
commit
be430a28ff
4 changed files with 54 additions and 211 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
{
|
{ lib, config, pkgs, ... }: {
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
bind = let
|
bind = let
|
||||||
terminal = config.home.sessionVariables.TERMINAL;
|
terminal = config.home.sessionVariables.TERMINAL;
|
||||||
|
|
@ -13,80 +14,80 @@
|
||||||
in [
|
in [
|
||||||
|
|
||||||
# Program Launch
|
# Program Launch
|
||||||
"SUPER,b,exec,${browser}";
|
"SUPER,b,exec,${browser}"
|
||||||
"SUPER,return,exec,${terminal}";
|
"SUPER,return,exec,${terminal}"
|
||||||
"SUPER,e,exec,${editor}";
|
"SUPER,e,exec,${editor}"
|
||||||
|
|
||||||
#Media
|
#Media
|
||||||
|
|
||||||
",XF86AudioNext,exec,${playerctl} next";
|
",XF86AudioNext,exec,${playerctl} next"
|
||||||
",XF86AudioPrev,exec,${playerctl} previous";
|
",XF86AudioPrev,exec,${playerctl} previous"
|
||||||
",XF86AudioPlay,exec,${playerctl} play-pause";
|
",XF86AudioPlay,exec,${playerctl} play-pause"
|
||||||
",XF86AudioStop,exec,${playerctl} stop";
|
",XF86AudioStop,exec,${playerctl} stop"
|
||||||
|
|
||||||
# Window Management
|
# Window Management
|
||||||
|
|
||||||
"SUPER,Q,killactive";
|
"SUPER,Q,killactive"
|
||||||
"SUPERSHIFT ALT,delete,exit";
|
"SUPERSHIFT ALT,delete,exit"
|
||||||
"SUPER,F,fullscreen";
|
"SUPER,F,fullscreen"
|
||||||
"SUPER,Space,togglefloating";
|
"SUPER,Space,togglefloating"
|
||||||
"SUPER,P,pseudo"; # dwindle
|
"SUPER,P,pseudo" # dwindle
|
||||||
"SUPER,S,togglesplit"; # dwindle
|
"SUPER,S,togglesplit" # dwindle
|
||||||
|
|
||||||
# Focus
|
# Focus
|
||||||
|
|
||||||
"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"
|
||||||
|
|
||||||
# Move
|
# Move
|
||||||
|
|
||||||
"SUPERSHIFT,left,movewindow,l";
|
"SUPERSHIFT,left,movewindow,l"
|
||||||
"SUPERSHIFT,right,movewindow,r";
|
"SUPERSHIFT,right,movewindow,r"
|
||||||
"SUPERSHIFT,up,movewindow,u";
|
"SUPERSHIFT,up,movewindow,u"
|
||||||
"SUPERSHIFT,down,movewindow,d";
|
"SUPERSHIFT,down,movewindow,d"
|
||||||
|
|
||||||
#Resize
|
#Resize
|
||||||
|
|
||||||
"SUPER CTRL,left,resizeactive,-20 0";
|
"SUPER CTRL,left,resizeactive,-20 0"
|
||||||
"SUPERCTRL,right,resizeactive,20 0";
|
"SUPERCTRL,right,resizeactive,20 0"
|
||||||
"SUPER CTRL,up,resizeactive, 0 -20";
|
"SUPER CTRL,up,resizeactive, 0 -20"
|
||||||
"SUPERCTRL,down,resizeactive, 0 20";
|
"SUPERCTRL,down,resizeactive, 0 20"
|
||||||
|
|
||||||
# Switch workspace
|
# Switch workspace
|
||||||
|
|
||||||
"SUPER,1,workspace,1";
|
"SUPER,1,workspace,1"
|
||||||
"SUPER,2,workspace,2";
|
"SUPER,2,workspace,2"
|
||||||
"SUPER,3,workspace,3";
|
"SUPER,3,workspace,3"
|
||||||
"SUPER,4,workspace,4";
|
"SUPER,4,workspace,4"
|
||||||
"SUPER,5,workspace,5";
|
"SUPER,5,workspace,5"
|
||||||
"SUPER,6,workspace,6";
|
"SUPER,6,workspace,6"
|
||||||
"SUPER,7,workspace,7";
|
"SUPER,7,workspace,7"
|
||||||
"SUPER,8,workspace,8";
|
"SUPER,8,workspace,8"
|
||||||
"SUPER,9,workspace,9";
|
"SUPER,9,workspace,9"
|
||||||
"SUPER,0,workspace,10";
|
"SUPER,0,workspace,10"
|
||||||
"SUPERALT,up,workspace,e+1";
|
"SUPERALT,up,workspace,e+1"
|
||||||
"SUPERALT,down,workspace,e-1";
|
"SUPERALT,down,workspace,e-1"
|
||||||
"SUPER,tab,focusCurrentOrLast";
|
"SUPER,tab,focusCurrentOrLast"
|
||||||
|
|
||||||
# Move workspace
|
# Move workspace
|
||||||
|
|
||||||
"SUPERSHIFT,1,movetoworkspace,1";
|
"SUPERSHIFT,1,movetoworkspace,1"
|
||||||
"SUPERSHIFT,2,movetoworkspace,2";
|
"SUPERSHIFT,2,movetoworkspace,2"
|
||||||
"SUPERSHIFT,3,movetoworkspace,3";
|
"SUPERSHIFT,3,movetoworkspace,3"
|
||||||
"SUPERSHIFT,4,movetoworkspace,4";
|
"SUPERSHIFT,4,movetoworkspace,4"
|
||||||
"SUPERSHIFT,5,movetoworkspace,5";
|
"SUPERSHIFT,5,movetoworkspace,5"
|
||||||
"SUPERSHIFT,6,movetoworkspace,6";
|
"SUPERSHIFT,6,movetoworkspace,6"
|
||||||
"SUPERSHIFT,7,movetoworkspace,7";
|
"SUPERSHIFT,7,movetoworkspace,7"
|
||||||
"SUPERSHIFT,8,movetoworkspace,8";
|
"SUPERSHIFT,8,movetoworkspace,8"
|
||||||
"SUPERSHIFT,9,movetoworkspace,9";
|
"SUPERSHIFT,9,movetoworkspace,9"
|
||||||
"SUPERSHIFT,0,movetoworkspace,10";
|
"SUPERSHIFT,0,movetoworkspace,10"
|
||||||
];
|
];
|
||||||
# ----- MOUSE KEYBINDS ----- #
|
# ----- MOUSE KEYBINDS ----- #
|
||||||
bindm = [
|
bindm = [
|
||||||
"SUPER,mouse:272,movewindow";
|
"SUPER,mouse:272,movewindow"
|
||||||
"SUPER,mouse:273,resizewindow":
|
"SUPER,mouse:273,resizewindow"
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,79 +0,0 @@
|
||||||
{ home, colorscheme }:
|
|
||||||
let
|
|
||||||
inherit (home.sessionVariables) TERMINAL BROWSER EDITOR;
|
|
||||||
in
|
|
||||||
d
|
|
||||||
''
|
|
||||||
general {
|
|
||||||
gaps_in=15
|
|
||||||
gaps_out=20
|
|
||||||
|
|
||||||
border_size=2.7
|
|
||||||
col.active_border=0xff${colorscheme.colors.base0C}
|
|
||||||
col.inactive_border=0xff${colorscheme.colors.base02}
|
|
||||||
col.group_border_active=0xff${colorscheme.colors.base0B}
|
|
||||||
col.group_border=0xff${colorscheme.colors.base04}
|
|
||||||
|
|
||||||
cursor_inactive_timeout=4
|
|
||||||
}
|
|
||||||
|
|
||||||
decoration {
|
|
||||||
active_opacity=0.94
|
|
||||||
inactive_opacity=0.84
|
|
||||||
fullscreen_opacity=1.0
|
|
||||||
|
|
||||||
rounding=5
|
|
||||||
|
|
||||||
blur=true
|
|
||||||
blur_size=5
|
|
||||||
blur_passes=3
|
|
||||||
blur_new_optimizations=true
|
|
||||||
blur_ignore_opacity=true
|
|
||||||
|
|
||||||
drop_shadow=true
|
|
||||||
shadow_range=12
|
|
||||||
shadow_offset=3 3
|
|
||||||
col.shadow=0x44000000
|
|
||||||
col.shadow_inactive=0x66000000
|
|
||||||
}
|
|
||||||
|
|
||||||
animations {
|
|
||||||
enabled=true
|
|
||||||
|
|
||||||
bezier=easein,0.11, 0, 0.5, 0
|
|
||||||
bezier=easeout,0.5, 1, 0.89, 1
|
|
||||||
bezier=easeinout,0.45, 0, 0.55, 1
|
|
||||||
|
|
||||||
animation=windowsIn,1,3,easeout,slide
|
|
||||||
animation=windowsOut,1,3,easein,slide
|
|
||||||
animation=windowsMove,1,3,easeout
|
|
||||||
|
|
||||||
animation=fadeIn,1,3,easeout
|
|
||||||
animation=fadeOut,1,3,easein
|
|
||||||
animation=fadeSwitch,1,3,easeout
|
|
||||||
animation=fadeShadow,1,3,easeout
|
|
||||||
animation=fadeDim,1,3,easeout
|
|
||||||
animation=border,1,3,easeout
|
|
||||||
|
|
||||||
animation=workspaces,1,2,easeout,slide
|
|
||||||
}
|
|
||||||
|
|
||||||
misc {
|
|
||||||
animate_manual_resizes = false
|
|
||||||
enable_swallow = true
|
|
||||||
swallow_regex = ^(kitty)$
|
|
||||||
focus_on_activate = true
|
|
||||||
disable_hyprland_logo = true
|
|
||||||
vfr = on
|
|
||||||
}
|
|
||||||
|
|
||||||
dwindle {
|
|
||||||
pseudotile = yes
|
|
||||||
preserve_split = yes
|
|
||||||
}
|
|
||||||
|
|
||||||
master {
|
|
||||||
new_is_master = true
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -74,87 +74,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
exec = [
|
exec = [
|
||||||
# need to fix "${pkgs.swaybg}/bin/swaybg -i --mode fill"
|
need to fix "${pkgs.swaybg}/bin/swaybg -i ~/.dotfiles/walls/everforest/megacity.png --mode fill"
|
||||||
];
|
];
|
||||||
|
|
||||||
bind = let
|
|
||||||
playerctl = "${config.services.playerctld.package}/bin/playerctl";
|
|
||||||
playerctld = "${config.services.playerctld.package}/bin/playerctld";
|
|
||||||
makoctl = "${config.services.mako.package}/bin/makoctl";
|
|
||||||
|
|
||||||
grimblast = "${pkgs.inputs.hyprwm-contrib.grimblast}/bin/grimblast";
|
|
||||||
pactl = "${pkgs.pulseaudio}/bin/pactl";
|
|
||||||
|
|
||||||
gtk-launch = "${pkgs.gtk3}/bin/gtk-launch";
|
|
||||||
xdg-mime = "${pkgs.xdg-utils}/bin/xdg-mime";
|
|
||||||
defaultApp = type: "${gtk-launch} $(${xdg-mime} query default ${type})";
|
|
||||||
|
|
||||||
terminal = config.home.sessionVariables.TERMINAL;
|
|
||||||
browser = defaultApp "x-scheme-handler/https";
|
|
||||||
editor = defaultApp "text/plain";
|
|
||||||
in [
|
|
||||||
# Program bindings
|
|
||||||
"SUPER,Return,exec,${terminal}"
|
|
||||||
"SUPER,e,exec,${editor}"
|
|
||||||
"SUPER,b,exec,${browser}"
|
|
||||||
# Brightness control (only works if the system has lightd)
|
|
||||||
",XF86MonBrightnessUp,exec,light -A 10"
|
|
||||||
",XF86MonBrightnessDown,exec,light -U 10"
|
|
||||||
# Volume
|
|
||||||
",XF86AudioRaiseVolume,exec,${pactl} set-sink-volume @DEFAULT_SINK@ +5%"
|
|
||||||
",XF86AudioLowerVolume,exec,${pactl} set-sink-volume @DEFAULT_SINK@ -5%"
|
|
||||||
",XF86AudioMute,exec,${pactl} set-sink-mute @DEFAULT_SINK@ toggle"
|
|
||||||
"SHIFT,XF86AudioMute,exec,${pactl} set-source-mute @DEFAULT_SOURCE@ toggle"
|
|
||||||
",XF86AudioMicMute,exec,${pactl} set-source-mute @DEFAULT_SOURCE@ toggle"
|
|
||||||
# Screenshotting
|
|
||||||
",Print,exec,${grimblast} --notify copy output"
|
|
||||||
"SHIFT,Print,exec,${grimblast} --notify copy active"
|
|
||||||
"CONTROL,Print,exec,${grimblast} --notify copy screen"
|
|
||||||
"SUPER,Print,exec,${grimblast} --notify copy window"
|
|
||||||
"ALT,Print,exec,${grimblast} --notify copy area"
|
|
||||||
] ++
|
|
||||||
|
|
||||||
(lib.optionals config.services.playerctld.enable [
|
|
||||||
# Media control
|
|
||||||
",XF86AudioNext,exec,${playerctl} next"
|
|
||||||
",XF86AudioPrev,exec,${playerctl} previous"
|
|
||||||
",XF86AudioPlay,exec,${playerctl} play-pause"
|
|
||||||
",XF86AudioStop,exec,${playerctl} stop"
|
|
||||||
"ALT,XF86AudioNext,exec,${playerctld} shift"
|
|
||||||
"ALT,XF86AudioPrev,exec,${playerctld} unshift"
|
|
||||||
"ALT,XF86AudioPlay,exec,systemctl --user restart playerctld"
|
|
||||||
]) ++
|
|
||||||
# Screen lock
|
|
||||||
(lib.optionals config.programs.swaylock.enable [
|
|
||||||
",XF86Launch5,exec,${swaylock} -S"
|
|
||||||
",XF86Launch4,exec,${swaylock} -S"
|
|
||||||
"SUPER,backspace,exec,${swaylock} -S"
|
|
||||||
]) ++
|
|
||||||
# Notification manager
|
|
||||||
(lib.optionals config.services.mako.enable [
|
|
||||||
"SUPER,w,exec,${makoctl} dismiss"
|
|
||||||
]) ++
|
|
||||||
|
|
||||||
|
|
||||||
monitor = map (m: let
|
|
||||||
resolution = "${toString m.width}x${toString m.height}@${toString m.refreshRate}";
|
|
||||||
position = "${toString m.x}x${toString m.y}";
|
|
||||||
in
|
|
||||||
"${m.name},${if m.enabled then "${resolution},${position},1" else "disable"}"
|
|
||||||
) (config.monitors);
|
|
||||||
|
|
||||||
workspace = map (m:
|
|
||||||
"${m.name},${m.workspace}"
|
|
||||||
) (lib.filter (m: m.enabled && m.workspace != null) config.monitors);
|
|
||||||
|
|
||||||
};
|
};
|
||||||
# This is order sensitive, so it has to come here.
|
|
||||||
extraConfig = ''
|
|
||||||
# Passthrough mode (e.g. for VNC)
|
|
||||||
bind=SUPER,P,submap,passthrough
|
|
||||||
submap=passthrough
|
|
||||||
bind=SUPER,P,submap,reset
|
|
||||||
submap=reset
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
hardware.enableRedistibutableFirmware = true;
|
#hardware.enableRedistibutableFirmware = true;
|
||||||
environment.enableAllTerminfo = true;
|
environment.enableAllTerminfo = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue