hand7s: upstream

Signed-off-by: s0me1newithhand7s <git+me@hand7s.org>
This commit is contained in:
s0me1newithhand7s 2026-02-08 22:43:08 +03:00
parent e6c9d19b0f
commit e4222e5423
48 changed files with 282 additions and 1097 deletions

View file

@ -1,5 +1,5 @@
{
inputs,
self,
config,
pkgs,
lib,
@ -14,8 +14,8 @@
)
true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
package = self.inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = self.inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
settings = {
monitor = ", 2560x1440@165.00Hz, 0x0, 1";
@ -92,9 +92,7 @@
"${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service"
# "${lib.getExe' pkgs.systemd "systemctl"} --user start noctalis.service"
"${lib.getExe inputs.noctalia.packages.${pkgs.system}.default}"
"${lib.getExe self.inputs.noctalia.packages.${pkgs.system}.default}"
"${lib.getExe' pkgs.hyprland "hyprctl"} setcursor material_light_cursors 20"
];
@ -102,13 +100,12 @@
bind = [
"ALT, return, exec, ${lib.getExe pkgs.ghostty}"
"ALT, Q, killactive,"
"ALT, S, exec, ${lib.getExe inputs.noctalia.packages.${pkgs.system}.default} ipc call launcher toggle"
"ALT, S, exec, ${lib.getExe self.inputs.noctalia.packages.${pkgs.system}.default} ipc call launcher toggle"
"ALT, F, fullscreen, 0"
"ALT, L, exec, ${lib.getExe pkgs.hyprlock}"
"ALT SHIFT, E, exit,"
"ALT SHIFT, space, togglefloating, active"
"ALT SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"
"ALT SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png | , killall -9 hyprpicker"
"ALT, left, movefocus, l"
"ALT, right, movefocus, r"
@ -139,6 +136,8 @@
"ALT SHIFT, 0, movetoworkspacesilent, 10"
"ALT SHIFT, H, movetoworkspacesilent, special"
"ALT, Tab, hyprexpo:expo, toggle"
"ALT, mouse_down, workspace, e+1"
"ALT, mouse_up, workspace, e-1"
];
@ -166,14 +165,16 @@
animation = [
"enabled = true"
"bezier = bez, 0.05, 0.9, 0.1, 1.05"
"animation = windows, 1, 7, popin"
"animation = windowsOut, 1, 7, popin"
"animation = windows, 1, 7, bez"
"animation = windowsOut, 1, 7, default, popin 80%"
"animation = border, 1, 10, default"
"animation = borderangle, 1, 10, default"
"animation = fade, 1, 7, default"
"animation = workspaces, 1, 7, default"
"animation = layers, 1, 7, fade"
"animation = border, 1, 10"
"animation = borderangle, 1, 10"
"animation = workspaces, 1, 7, slidevert"
"animation = specialWorkspace, 1, 7, slidevert"
];
misc = {
@ -216,10 +217,15 @@
hyprscrolling = {
fullscreen_on_one_column = true;
follow_focus = true;
column_width = 0.7;
focus_fit_method = "center";
};
easymotion = {
only_special = false;
hyprexpo = {
columns = 2;
gap_size = 10;
skip_empty = true;
workspace_method = "workspace";
};
dynamic-cursors = {
@ -228,7 +234,7 @@
threshold = 2;
stretch = {
limit = 4000;
function = "quadratic";
function = "linear";
};
shake = {
@ -256,17 +262,10 @@
};
};
plugins = [
# pkgs.hyprlandPlugins.hypr-dynamic-cursors
# pkgs.hyprlandPlugins.xtra-dispatchers
# pkgs.hyprlandPlugins.hyprwinwrap
# pkgs.hyprlandPlugins.hyprgrass
# pkgs.hyprlandPlugins.hyprscrolling
# inputs.hyprcurs.packages.${pkgs.system}.hypr-dynamic-cursors
# inputs.hyprplugs.packages.${pkgs.system}.hyprscrolling
# inputs.hyprplugs.packages.${pkgs.system}.xtra-dispatchers
# inputs.hyprplugs.packages.${pkgs.system}.hyprwinwrap
plugins = with pkgs.hyprlandPlugins; [
hypr-dynamic-cursors
hyprscrolling
hyprexpo
];
};
};

View file

@ -1,112 +0,0 @@
{
config,
pkgs,
lib,
...
}: {
wayland = {
windowManager = {
river = {
enable =
lib.mkIf (
config.home.gui.sessionType == "River"
)
true;
settings = {
default-layout = "rivertile";
focus-follows-cursor = "normal";
border-width = 2;
declare-mod = [
"locked"
"normal"
];
xwayland = {
enable = true;
};
map = {
normal = {
"Alt Q" = "close";
"Alt S" = "spawn fuzzel";
"Alt Return" = "spawn ghostty";
"Alt L" = "spawn hyprlock";
"Alt F" = "toggle-fullscreen";
"Alt+Shift S" = "spawn wayshot --clipboard";
"Alt+Shift E" = "exit";
"Alt+Shift Space" = "toggle-float";
"Alt Up" = "send-to-output next";
"Alt Down" = "send-to-output previous";
"Alt Right" = "send-to-output next";
"Alt Left" = "send-to-output previous";
"Alt 1" = "set-focused-tags 0";
"Alt 2" = "set-focused-tags 1";
"Alt 3" = "set-focused-tags 2";
"Alt 4" = "set-focused-tags 3";
"Alt 5" = "set-focused-tags 4";
"Alt 6" = "set-focused-tags 5";
"Alt 7" = "set-focused-tags 6";
"Alt 8" = "set-focused-tags 7";
"Alt 9" = "set-focused-tags 8";
"Alt H" = "toggle-focused-tags 20";
"Alt+Shift 1" = "set-view-tags 0";
"Alt+Shift 2" = "set-view-tags 1";
"Alt+Shift 3" = "set-view-tags 2";
"Alt+Shift 4" = "set-view-tags 3";
"Alt+Shift 5" = "set-view-tags 4";
"Alt+Shift 6" = "set-view-tags 5";
"Alt+Shift 7" = "set-view-tags 6";
"Alt+Shift 8" = "set-view-tags 7";
"Alt+Shift 9" = "set-view-tags 8";
"Alt+Shift H" = "set-view-tags 20";
"Alt+Control 1" = "toggle-focused-tags 0";
"Alt+Control 2" = "toggle-focused-tags 1";
"Alt+Control 3" = "toggle-focused-tags 2";
"Alt+Control 4" = "toggle-focused-tags 3";
"Alt+Control 5" = "toggle-focused-tags 4";
"Alt+Control 6" = "toggle-focused-tags 5";
"Alt+Control 7" = "toggle-focused-tags 6";
"Alt+Control 8" = "toggle-focused-tags 7";
"Alt+Control 9" = "toggle-focused-tags 8";
"Alt+Control H" = "toggle-focused-tags 20";
"Alt+Shift+Control 1" = "toggle-view-tags 0";
"Alt+Shift+Control 2" = "toggle-view-tags 1";
"Alt+Shift+Control 3" = "toggle-view-tags 2";
"Alt+Shift+Control 4" = "toggle-view-tags 3";
"Alt+Shift+Control 5" = "toggle-view-tags 4";
"Alt+Shift+Control 6" = "toggle-view-tags 5";
"Alt+Shift+Control 7" = "toggle-view-tags 6";
"Alt+Shift+Control 8" = "toggle-view-tags 7";
"Alt+Shift+Control 9" = "toggle-view-tags 8";
"Alt+Shift+Control H" = "toggle-view-tags 20";
};
map-pointer = {
normal = {
"Alt BTN_LEFT" = "move-view";
"Alt BTN_RIGHT" = "resize-view";
};
};
};
};
extraConfig = ''
${lib.getExe' pkgs.river "riverctl"} keyboard-layout -options "grp:caps_toggle" "us,ru"
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=300 ${lib.getExe pkgs.brightnessctl} -s set 10
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=600 ${lib.getExe pkgs.waylock}
'';
};
};
};
}

View file

@ -1,185 +0,0 @@
{
config,
pkgs,
lib,
...
}: {
wayland = {
windowManager = {
sway = {
enable =
lib.mkIf (
config.home.gui.sessionType == "Sway"
)
true;
package = pkgs.sway;
config = {
bindkeysToCode = true;
defaultWorkspace = "workspace number 1";
workspaceAutoBackAndForth = true;
bars = [];
window = {
border = 2;
titlebar = false;
hideEdgeBorders = "both";
};
floating = {
border = 2;
titlebar = false;
modifier = "Mod1";
};
focus = {
forceWrapping = true;
mouseWarping = true;
followMouse = "always";
newWindow = "smart";
wrapping = "yes";
};
gaps = {
vertical = null;
horizontal = null;
outer = null;
inner = null;
top = null;
bottom = null;
left = null;
right = null;
smartGaps = false;
smartBorders = "no_gaps";
};
startup = [
{
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service";
}
{
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service";
}
{
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service";
}
{
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service";
}
{
command = "${lib.getExe pkgs.sway-audio-idle-inhibit}";
}
{
command = "${lib.getExe pkgs.autotiling-rs}";
}
{
command = "${lib.getExe pkgs.swaykbdd}";
}
];
keybindings = lib.mkOptionDefault {
"Mod1+q" = "kill";
"Mod1+s" = "exec ${lib.getExe pkgs.fuzzel}";
"Mod1+Return" = "exec ${lib.getExe pkgs.ghostty}";
"Mod1+l" = "exec ${lib.getExe pkgs.swaylock}";
"Mod1+f" = "fullscreen toggle";
"Mod1+Shift+s" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} --notify copy area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png";
"Mod1+Shift+e" = "exec ${lib.getExe' pkgs.sway "swaymsg"} exit";
"Mod1+Space" = "floating toggle";
"Mod1+r" = "mode resize";
"Mod1+Left" = "focus left";
"Mod1+Right" = "focus right";
"Mod1+Up" = "focus up";
"Mod1+Down" = "focus down";
"Mod1+1" = "workspace number 1";
"Mod1+2" = "workspace number 2";
"Mod1+3" = "workspace number 3";
"Mod1+4" = "workspace number 4";
"Mod1+5" = "workspace number 5";
"Mod1+6" = "workspace number 6";
"Mod1+7" = "workspace number 7";
"Mod1+8" = "workspace number 8";
"Mod1+9" = "workspace number 9";
"Mod1+0" = "workspace number 10";
"Mod1+h" = "scratchpad show";
"Mod1+Shift+1" = "move container to workspace number 1";
"Mod1+Shift+2" = "move container to workspace number 2";
"Mod1+Shift+3" = "move container to workspace number 3";
"Mod1+Shift+4" = "move container to workspace number 4";
"Mod1+Shift+5" = "move container to workspace number 5";
"Mod1+Shift+6" = "move container to workspace number 6";
"Mod1+Shift+7" = "move container to workspace number 7";
"Mod1+Shift+8" = "move container to workspace number 8";
"Mod1+Shift+9" = "move container to workspace number 9";
"Mod1+Shift+0" = "move container to workspace number 10";
"Mod1+Shift+h" = "move scratchpad";
"XF86AudioRaiseVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+";
"XF86AudioLowerVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-";
"XF86AudioMute" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle";
"XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause";
"XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous";
"XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next";
"XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.brightnessctl} set 5%-";
"XF86MonBrightnessUp" = "exec ${lib.getExe pkgs.brightnessctl} set +5%";
};
modes = {
resize = {
"Left" = "resize shrink width 10px";
"Right" = "resize shrink width 10px";
"Up" = "resize shrink height 10px";
"Down" = "resize shrink height 10px";
"Shift+Left" = "resize grow width 10px";
"Shift+Right" = "resize grow width 10px";
"Shift+Up" = "resize grow height 10px";
"Shift+Down" = "resize grow height 10px";
"Escape" = "mode default";
"Return" = "mode default";
};
};
input = {
"type:pointer" = {
accel_profile = "flat";
pointer_accel = "0";
};
"type:keyboard" = {
xkb_layout = "us,ru";
xkb_options = "grp:caps_toggle";
};
"type:touchpad" = {
natural_scroll = "enabled";
tap = "enabled";
};
};
};
extraConfig = ''
bindswitch lid:on exec swaylock
'';
};
};
};
}