diff --git a/hosts/dunamis/stylix.nix b/hosts/dunamis/stylix.nix index 428b27c..97fc6fd 100644 --- a/hosts/dunamis/stylix.nix +++ b/hosts/dunamis/stylix.nix @@ -1,6 +1,7 @@ { pkgs, inputs, + config, ... }: { imports = [ @@ -35,13 +36,10 @@ package = pkgs.nerd-fonts.iosevka; name = "Iosevka Nerd Font Propo"; }; - sansSerif = { - package = pkgs.nerd-fonts.iosevka; - name = "Iosevka Nerd Font Propo"; - }; + sansSerif = config.stylix.fonts.serif; monospace = { - package = pkgs.nerd-fonts.iosevka; - name = "Iosevka Nerd Font Mono"; + package = pkgs.nerd-fonts.iosevka-term; + name = "IosevkaTerm Nerd Font Mono"; }; emoji = { package = pkgs.noto-fonts-emoji; diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index 9394865..a40ebe9 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -16,6 +16,7 @@ else "platform"; xdgPictures = config.xdg.userDirs.pictures; + ifLaptop = lib.mkIf (hostname != "dunamis"); in { options = { desktop.hyprland.enable = @@ -210,10 +211,11 @@ in { "col.border_locked_active" = "0xff${colors.base0A}"; "col.border_locked_inactive" = "0xff${colors.base0F}"; groupbar = { - height = 24; - rounding = 6; - gradient_rounding = 8; - font_size = 24; + height = 16; + rounding = 0; + indicator_height = 0; + gradient_rounding = 4; + font_size = 14; gradients = true; font_family = "${config.stylix.fonts.sansSerif.name}"; "text_color" = "0xff${colors.base00}"; @@ -221,8 +223,8 @@ in { "col.inactive" = "0xff${colors.base03}"; }; }; + binds.scroll_event_delay = 0; - # bindn = [", mouse:272, hy3:focustab, mouse"]; bind = [ "$mod, Return, exec, $terminal" "$mod, Space, exec, $dlauncher" @@ -232,36 +234,12 @@ 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" "$modCtrl, period, movewindoworgroup, r" "$modCtrl, comma, movewindoworgroup, l" - # "$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, Tab, overview:toggle" - # "$mod, Tab, hyprexpo:expo, toggle" "$mod, Tab, cyclenext," "$modShift, Tab, cyclenext, prev" "$mod, Tab, bringactivetotop," @@ -351,6 +329,10 @@ in { "$modShiftCtrl, $right, movetoworkspace, e+1" "$modShiftCtrl, left, movetoworkspace, e-1" "$modShiftCtrl, right, movetoworkspace, e+1" + + ''$mod ALT, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.25}')"'' + ''$mod ALT, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.25}')"'' + "$mod ALT, mouse:274, exec, hyprctl keyword cursor:zoom_factor 1" # middle wheel click ]; # binde = [ # "$mod, comma, resizeactive, -10 0" @@ -523,7 +505,6 @@ in { qt = { enable = true; platformTheme.name = lib.mkDefault "gtk3"; - #style.name = "gtk2"; }; dconf.settings = { "org/gnome/desktop/interface" = { @@ -544,7 +525,6 @@ in { spacing = 4; margin-left = 11; margin-right = 11; - # margin-bottom = 8; reload_style_on_change = true; modules-left = [ "hyprland/language" @@ -554,10 +534,10 @@ in { # modules-center = []; modules-right = [ "wireplumber" - (lib.mkIf (hostname != "dunamis") "group/laptop") + (ifLaptop "group/laptop") "tray" "privacy" - "power-profiles-daemon" + (ifLaptop "power-profiles-daemon") "idle_inhibitor" "custom/notification" "clock" @@ -762,7 +742,6 @@ in { #battery, #backlight, #workspaces, - #power-profiles-daemon, #taskbar, #language, #clock, @@ -774,7 +753,10 @@ in { } #privacy, #tray button, + #privacy-item, #idle_inhibitor, + #custom-notification, + #power-profiles-daemon, #workspaces button { padding: 0 0.2em; } @@ -792,8 +774,7 @@ in { background-color: transparent; } #battery.critical:not(.charging) { - background-color: @base09; - color: @base00; + color: @base09; animation-name: blink; animation-duration: 0.5s; animation-timing-function: steps(12); @@ -801,15 +782,12 @@ in { animation-direction: alternate; } #power-profiles-daemon.performance { - background-color: @base00; color: @base0D; } #power-profiles-daemon.balanced { - background-color: @base00; color: @base0B; } #power-profiles-daemon.power-saver { - background-color: @base00; color: @base0A; } label:focus { @@ -823,16 +801,11 @@ in { background-color: @base08; } #privacy-item.screenshare { - background-color: @base00; color: @base0C; } #privacy-item.audio-in { - background-color: @base00; color: @base0E; } - #privacy-item.audio-out { - background-color: @base; - } ''; }; programs.tofi = {