diff --git a/hosts/dunamis/users/user/flatpak.nix b/hosts/dunamis/users/user/flatpak.nix index 4001338..a925f4e 100644 --- a/hosts/dunamis/users/user/flatpak.nix +++ b/hosts/dunamis/users/user/flatpak.nix @@ -17,7 +17,7 @@ ]; packages = [ # misc - "io.github.zen_browser.zen" + "app.zen_browser.zen" "net.mullvad.MullvadBrowser" "com.obsproject.Studio" "com.bitwarden.desktop" diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index ff03912..f6420ed 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -30,15 +30,14 @@ in { }; package = pkgs.hyprland; plugins = with pkgs.hyprlandPlugins; [ - # hyprexpo - hyprspace - hy3 - # hyprsplit + # hyprspace + # hy3 + hyprscroller ]; settings = { input = { kb_layout = "us,ua"; - resolve_binds_by_sym = 1; + resolve_binds_by_sym = 0; repeat_rate = 50; repeat_delay = 300; # mouse @@ -91,6 +90,7 @@ in { rounding = 12; }; misc = { + font_family = "${config.stylix.fonts.sansSerif.name}"; disable_splash_rendering = true; disable_hyprland_logo = true; # vfr = true; @@ -153,6 +153,14 @@ in { }; }; } + { + scroller = { + column_widths = "onethird onehalf twothirds one"; + window_heights = "onethird onehalf twothirds one"; + jump_labels_font = "${config.stylix.fonts.sansSerif.name}"; + jump_labels_color = "0xff${config.lib.stylix.colors.base0A}"; + }; + } ]; dwindle = { @@ -185,7 +193,7 @@ in { gaps_out = 8; border_size = 3; allow_tearing = true; - layout = "hy3"; + layout = "scroller"; }; # group = { @@ -203,7 +211,7 @@ in { # }; # }; - bindn = [", mouse:272, hy3:focustab, mouse"]; + # bindn = [", mouse:272, hy3:focustab, mouse"]; bind = [ "$mod, Return, exec, $terminal" "$mod, Space, exec, $dlauncher" @@ -214,18 +222,33 @@ in { "$modCtrl, G, togglefloating" "$mod, G, pin" + "$mod, Z, scroller:setmode, row" + "$mod, X, scroller:setmode, column" + "$mod, M, scroller:fitwidth, active" + "$mod, H, scroller:setwidth, 1" + "$mod, C, scroller:cyclewidth, next" + "$modShift, C, scroller:cycleheight, next" + "$modShift, M, scroller:fitheight, active" + "$modShift, H, scroller:setheight, onehalf" + "$mod, comma, scroller:admitwindow, l" + "$mod, period, scroller:admitwindow, r" + "$modCtrl, comma, scroller:expelwindow, l" + "$modCtrl, period, scroller:expelwindow, r" + "$mod, backspace, scroller:toggleoverview" + "$modCtrl, backspace, scroller:jump" + # "$mod,T, togglegroup" # "$mod, period, changegroupactive, f" # "$mod, comma, changegroupactive, b" # "$mod, S, hy3:changegroup, opposite" - "$mod, T, hy3:changegroup, toggletab" - "$mod, S, hy3:changegroup, opposite" - "$mod, period, hy3:focustab, r, wrap" - "$mod, comma, hy3:focustab, l, wrap" - "$modCtrl, period, hy3:changefocus, raise" - "$modCtrl, comma, hy3:changefocus, lower" + # "$mod, T, hy3:changegroup, toggletab" + # "$mod, S, hy3:changegroup, opposite" + # "$mod, period, hy3:focustab, r, wrap" + # "$mod, comma, hy3:focustab, l, wrap" + # "$modCtrl, period, hy3:changefocus, raise" + # "$modCtrl, comma, hy3:changefocus, lower" - "$mod, Tab, overview:toggle" + # "$mod, Tab, overview:toggle" # "$mod, Tab, hyprexpo:expo, toggle" "$modCtrl, L, exec, $screenLocker" @@ -237,31 +260,29 @@ in { "CTRL, Print, exec, hyprshot -z -m window -o ${config.xdg.userDirs.pictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png" "SHIFT, Print, exec, hyprshot -z -m output -o ${config.xdg.userDirs.pictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png" ## navigation - "$mod, $left, hy3:movefocus, l" - "$mod, $down, hy3:movefocus, d" - "$mod, $up, hy3:movefocus, u" - "$mod, $right, hy3:movefocus, r" + "$mod, $left, scroller:movefocus, l" + "$mod, $down, scroller:movefocus, d" + "$mod, $up, scroller:movefocus, u" + "$mod, $right, scroller:movefocus, r" "$modShift, $left, workspace, e-1" "$modShift, $right, workspace, e+1" - # "$modShift, $down, focusmonitor, HDMI-A-1" - # "$modShift, $up, focusmonitor, eDP-1" - "$mod, left, hy3:movefocus, l" - "$mod, up, hy3:movefocus, u" - "$mod, down, hy3:movefocus, d" - "$mod, right, hy3:movefocus, r" + "$mod, left, scroller:movefocus, l" + "$mod, up, scroller:movefocus, u" + "$mod, down, scroller:movefocus, d" + "$mod, right, scroller:movefocus, r" "$modShift, left, workspace, e-1" "$modShift, right, workspace, e+1" "$modShift, down, focusmonitor, e+1" "$modShift, up, focusmonitor, e-1" - "$modCtrl, $left, hy3:movewindow, l" - "$modCtrl, $down, hy3:movewindow, d" - "$modCtrl, $up, hy3:movewindow, u" - "$modCtrl, $right, hy3:movewindow, r" - "$modCtrl, left, hy3:movewindow, l" - "$modCtrl, up, hy3:movewindow, u" - "$modCtrl, down, hy3:movewindow, d" - "$modCtrl, right, hy3:movewindow, r" + "$modCtrl, $left, scroller:movewindow, l" + "$modCtrl, $down, scroller:movewindow, d" + "$modCtrl, $up, scroller:movewindow, u" + "$modCtrl, $right, scroller:movewindow, r" + "$modCtrl, left, scroller:movewindow, l" + "$modCtrl, up, scroller:movewindow, u" + "$modCtrl, down, scroller:movewindow, d" + "$modCtrl, right, scroller:movewindow, r" # workspaces "$mod, 1, workspace, 1" "$mod, 2, workspace, 2" @@ -338,7 +359,6 @@ in { ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ]; bindm = [ - # mouse movements "$mod, mouse:272, movewindow" "$mod, mouse:273, resizewindow" "$mod ALT, mouse:272, resizewindow" @@ -377,9 +397,11 @@ in { "float, class:(.blueman-manager-wrapped)" # telegram "maximize, initialTitle:Медіапереглядач" - "float, title:TelegramDesktop" "noborder, title:TelegramDesktop" + "keepaspectratio, title:TelegramDesktop" "noblur, title:TelegramDesktop" + "float, title:TelegramDesktop" + "pin, title:TelegramDesktop" # screenshot editor "noanim, class:com.gabm.satty" "float, class:com.gabm.satty" @@ -411,20 +433,20 @@ in { # "workspace name:game, class:" ]; }; - extraConfig = '' - bind = $modShift, R, submap, resize - submap = resize - binde = , right, resizeactive, 10 0 - binde = , left, resizeactive, -10 0 - binde = , up, resizeactive, 0 -10 - binde = , down, resizeactive, 0 10 - binde = , $right, resizeactive, 10 0 - binde = , $left, resizeactive, -10 0 - binde = , $up, resizeactive, 0 -10 - binde = , $down, resizeactive, 0 10 - bind = , escape, submap, reset - submap = reset - ''; + # extraConfig = '' + # bind = $modShift, R, submap, resize + # submap = resize + # binde = , right, resizeactive, 10 0 + # binde = , left, resizeactive, -10 0 + # binde = , up, resizeactive, 0 -10 + # binde = , down, resizeactive, 0 10 + # binde = , $right, resizeactive, 10 0 + # binde = , $left, resizeactive, -10 0 + # binde = , $up, resizeactive, 0 -10 + # binde = , $down, resizeactive, 0 10 + # bind = , escape, submap, reset + # submap = reset + # ''; }; services = { hyprpaper.enable = true; @@ -485,7 +507,7 @@ in { }; settings = { bar-0 = { - layer = "bottom"; + layer = "top"; position = "bottom"; height = 40; spacing = 6;