diff --git a/modules/home/environment/hyprland/desktop.nix b/modules/home/environment/hyprland/config.nix similarity index 99% rename from modules/home/environment/hyprland/desktop.nix rename to modules/home/environment/hyprland/config.nix index 7d5a9cd..37d9079 100644 --- a/modules/home/environment/hyprland/desktop.nix +++ b/modules/home/environment/hyprland/config.nix @@ -152,7 +152,7 @@ "super, c, killactive," "super, e, exec, [float;size 45% 70%;move 10 50] kitty btop" "super, n, exec, [float;size 50% 35%;move 10 50] pavucontrol" - "super, p, exec, [float;size 25% 30%;move onscreen cursor 0 0] [ ! -f /tmp/passhelperfile ] && kitty passhelper" + "super, p, exec, [float;size 25% 30%;move onscreen cursor 10 10] [ ! -f /tmp/passhelperfile ] && kitty passhelper" "super, 0, exec, aplay ~/media/sound/soundtest.wav" "super shift, q, exit," "super, m, exec, fuzzel" diff --git a/modules/home/environment/hyprland/default.nix b/modules/home/environment/hyprland/default.nix index e46ace5..c66a001 100644 --- a/modules/home/environment/hyprland/default.nix +++ b/modules/home/environment/hyprland/default.nix @@ -2,14 +2,9 @@ inputs, host, ... -}: let - host_config = - if (host == "oganesson") - then [./desktop.nix] - else [./laptop.nix]; -in { +}: +{ imports = [(import ./hyprland.nix)] -# ++ [(import ./hyprpaper.nix)] - ++ host_config; + ++ [(import ./config.nix)]; } diff --git a/modules/home/environment/hyprland/laptop.nix b/modules/home/environment/hyprland/laptop.nix deleted file mode 100644 index 1008a5c..0000000 --- a/modules/home/environment/hyprland/laptop.nix +++ /dev/null @@ -1,193 +0,0 @@ -{username, ...}: { - wayland.windowManager.hyprland = { - settings = { - monitor = [ - "eDP-1, 1920x1080@144, 1920x0, 1" - ]; - - exec-once = [ - "waybar &" - "swaync &" - "wl-paste --watch cliphist store &" - "wl-clip-persist --clipboard both" - "systemctl --user import-environment &" - "hash dbus-update-activation-environment 2>/dev/null &" - "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &" - "aplay /home/${username}/sound/sys/login.wav &" - ]; - - workspace = [ - "1,persistent=true,monitor:eDP-1" - "2,persistent=true,monitor:eDP-1" - "3,persistent=true,monitor:eDP-1" - "4,persistent=true,monitor:eDP-1" - "5,persistent=true,monitor:eDP-1" - "6,persistent=true,monitor:eDP-1" - ]; - - input = { - kb_layout = "us"; - follow_mouse = 1; - accel_profile = "flat"; - force_no_accel = 1; - sensitivity = 0; - }; - - general = { - "$mainMod" = "super"; - layout = "dwindle"; - gaps_in = 4; - gaps_out = 8; - border_size = 2; - "col.active_border" = "rgb(cba6f7) rgb(94e2d5) 45deg"; - "col.inactive_border" = "0x00000000"; - border_part_of_window = false; - no_border_on_floating = false; - }; - misc = { - disable_autoreload = true; - disable_hyprland_logo = true; - always_follow_on_dnd = true; - layers_hog_keyboard_focus = true; - animate_manual_resizes = false; - enable_swallow = true; - focus_on_activate = true; - }; - - dwindle = { - no_gaps_when_only = false; - force_split = 0; - special_scale_factor = 1.0; - split_width_multiplier = 1.0; - use_active_for_splits = true; - pseudotile = "yes"; - preserve_split = "yes"; - }; - - master = { - new_status = "master"; - special_scale_factor = 1; - no_gaps_when_only = false; - }; - - decoration = { - rounding = 7; - # active_opacity = 0.90; - # inactive_opacity = 0.90; - # fullscreen_opacity = 1.0; - - blur = { - enabled = true; - size = 1; - passes = 1; - # size = 4; - # passes = 2; - brightness = 1; - contrast = 1.400; - ignore_opacity = true; - noise = 0; - new_optimizations = true; - xray = true; - }; - - drop_shadow = true; - - shadow_ignore_window = true; - shadow_offset = "0 2"; - shadow_range = 20; - shadow_render_power = 3; - "col.shadow" = "rgba(00000055)"; - }; - - animations = { - enabled = true; - - bezier = [ - "fluent_decel, 0, 0.2, 0.4, 1" - "easeOutCirc, 0, 0.55, 0.45, 1" - "easeOutCubic, 0.33, 1, 0.68, 1" - "easeinoutsine, 0.37, 0, 0.63, 1" - ]; - - animation = [ - # Windows - "windowsIn, 1, 3, easeOutCubic, popin 30%" # window open - "windowsOut, 1, 3, fluent_decel, popin 70%" # window close. - "windowsMove, 1, 2, easeinoutsine, slide" # everything in between, moving, dragging, resizing. - - # Fade - "fadeIn, 1, 3, easeOutCubic" # fade in (open) -> layers and windows - "fadeOut, 1, 2, easeOutCubic" # fade out (close) -> layers and windows - "fadeSwitch, 0, 1, easeOutCirc" # fade on changing activewindow and its opacity - "fadeShadow, 1, 10, easeOutCirc" # fade on changing activewindow for shadows - "fadeDim, 1, 4, fluent_decel" # the easing of the dimming of inactive windows - "border, 1, 2.7, easeOutCirc" # for animating the border's color switch speed - "borderangle, 1, 30, fluent_decel, once" # for animating the border's gradient angle - styles: once (default), loop - "workspaces, 1, 4, easeOutCubic, fade" # styles: slide, slidevert, fade, slidefade, slidefadevert - ]; - - bind = [ - "super, up, exec, pactl set-sink-volume @default_sink@ +10%" - "super, down, exec, pactl set-sink-volume @default_sink@ -10%" - "super, print, exec, grimblast copy area" - "super, t, exec, swaync-client -t -sw" - "super, a, exec, firefox" - "super, q, exec, kitty --title Kitty" - "super, d, exec, switchmon" - "super, c, killactive," - "super, e, exec, [float;size 45% 70%;move 10 50] kitty btop" - "super, n, exec, [float;size 50% 35%;move 10 50] pavucontrol" - "super, p, exec, [float;size 25% 30%;move onscreen cursor 0 0] [ ! -f /tmp/passhelperfile ] && kitty passhelper" - "super, 0, exec, aplay ~/media/sound/soundtest.wav" - "super shift, q, exit," - "super, m, exec, fuzzel" - "super, r, exec, neovide" - "super, b, togglesplit, # dwindle" - "super, f, togglefloating" - "super, g, fullscreen" - "super, home, exec, /home/${username}/scripts/home.sh" - "super, h, movefocus, l" - "super, l, movefocus, r" - "super, k, movefocus, u" - "super, j, movefocus, d" - "super, 1, exec, hyprctl 'dispatch workspace 1'" - "super, 2, exec, hyprctl 'dispatch workspace 2'" - "super, 3, exec, hyprctl 'dispatch workspace 3'" - "super, 4, exec, hyprctl 'dispatch workspace 4'" - "super, 5, exec, hyprctl 'dispatch workspace 5'" - "super, 6, exec, hyprctl 'dispatch workspace 6'" - "super, 7, exec, hyprctl 'dispatch workspace 7'" - "super, 8, exec, hyprctl 'dispatch workspace 8'" - "super, 9, exec, hyprctl 'dispatch workspace 9'" - "super, 0, exec, hyprctl 'dispatch workspace 10'" - "super alt, g, togglegroup" - "super alt, h, changegroupactive, b" - "super alt, l, changegroupactive, f" - "super shift, h, movewindoworgroup, l" - "super shift, l, movewindoworgroup, r" - "super shift, k, movewindoworgroup, u" - "super shift, j, movewindoworgroup, d" - "super shift, 1, movetoworkspace, 1" - "super shift, 2, movetoworkspace, 2" - "super shift, 3, movetoworkspace, 3" - "super shift, 4, movetoworkspace, 4" - "super shift, 5, movetoworkspace, 5" - "super shift, 6, movetoworkspace, 6" - "super shift, 7, movetoworkspace, 7" - "super shift, 8, movetoworkspace, 8" - "super shift, 9, movetoworkspace, 9" - "super shift, 0, movetoworkspace, 10" - "super, s, togglespecialworkspace, magic" - "super shift, s, movetoworkspace, special:magic" - "alt, grave, togglespecialworkspace, console" - "super, mouse_down, workspace, e+1" - "super, mouse_up, workspace, e-1" - ]; - bindm = [ - "super, mouse:272, movewindow" - "super, mouse:273, resizewindow" - ]; - }; - }; - }; -}