diff --git a/home/wayland/default.nix b/home/wayland/default.nix index e1c3034..817ac46 100644 --- a/home/wayland/default.nix +++ b/home/wayland/default.nix @@ -8,10 +8,9 @@ let name = "dbus-hyprland-environment"; destination = "/bin/dbus-hyprland-environment"; executable = true; - text = '' dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=hyprland - systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr xdg-desktop-portal-kde + systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr systemctl --user start pipewire wireplumber pipewire-media-session xdg-desktop-portal xdg-desktop-portal-hyprland ''; }; @@ -41,6 +40,10 @@ let xdg.portal = { enable = true; wlr.enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-hyprland + xdg-desktop-portal-gtk + ]; }; programs.xwayland.enable = true; @@ -70,7 +73,4 @@ let Hyprland ''; - -} - - +} \ No newline at end of file diff --git a/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix index fcdee5a..c266b7a 100644 --- a/home/wayland/hyprland/config.nix +++ b/home/wayland/hyprland/config.nix @@ -1,22 +1,14 @@ { - config, ... }: { wayland.windowManager.hyprland.extraConfig = '' -monitor=HDMI-A-1,1920x1080,5760x0,1 -monitor=DP-2,1920x1080,1920x0,1 -monitor=DP-3,1920x1080@144,3840x0,1 - -exec-once = waybar & dunst - -# SWWW -exec-once=swww init - -# swayidle / lock -exec-once=~/.local/bin/lock +monitor = HDMI-A-1,1920x1080,5760x0,1 #right +monitor = DP-2,1920x1080,1920x0,1 #left +monitor = DP-3,1920x1080@144,3840x0,1 #middle input { + kb_layout = us kb_variant = kb_model = @@ -25,10 +17,6 @@ input { follow_mouse = 1 - touchpad { - natural_scroll = no - } - sensitivity = -0.5 # -1.0 - 1.0, 0 means no modification. force_no_accel = true } @@ -36,7 +24,7 @@ input { general { gaps_in = 6 - gaps_out = 20 + gaps_out = 15 border_size = 4 col.active_border = rgb(f5c2e7) col.inactive_border = rgb(6c7086) @@ -47,22 +35,29 @@ general { decoration { rounding = 8 + + #blur blur = yes - blur_size = 4 - blur_passes = 2 + blur_size = 5 + blur_passes = 3 blur_new_optimizations = on multisample_edges = true - inactive_opacity = 0.9 - - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - - col.shadow = rgba(1a1a1aee) + #opactity + inactive_opacity = 1.0 + active_opacity = 1.0 + fullscreen_opacity = 1.0 + + # shadow + drop_shadow = yes + shadow_range = 60 + shadow_offset = 0 5 + shadow_render_power = 4 + col.shadow = rgba(00000099) } animations { + enabled = yes bezier = myBezier, 0.05, 0.9, 0.1, 1.05 @@ -75,22 +70,51 @@ animations { } dwindle { - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this + + pseudotile = yes + preserve_split = yes + } master { + new_is_master = true + } gestures { + workspace_swipe = off + } device:epic mouse V1 { + sensitivity = -0.5 } +exec-once = eww open bar & dunst + +exec-once = swww init +exec-once = swww img ./wallpapers/annystartingshort.gif + +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = /nix/store/gjbi20m2wz9xhm18ifmcdl45cpgd7hpz-polkit-gnome-0.105/libexec/polkit-gnome-authentication-agent-1 + +# swayidle / lock +exec-once = ~/.local/bin/lock + +#windowrules +windowrulev2 = noshadow, floating:0 +windowrulev2 = float, title:^(Volume Control)$ +windowrulev2 = float, title:^(Picture-in-Picture)$ +windowrulev2 = float, title:^(RuneLite)$ +windowrulev2 = move 500 300, title:^(RuneLite)$ +windowrulev2 = size 810 580, title:^(RuneLite)$ +windowrulev2 = float, title:^(Firefox — Sharing Indicator)$ +windowrulev2 = move 0 0, title:^(Firefox — Sharing Indicator)$ + +#binds $mainMod = SUPER bind = $mainMod, Return, exec, wezterm @@ -134,9 +158,5 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow -exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once=/nix/store/gjbi20m2wz9xhm18ifmcdl45cpgd7hpz-polkit-gnome-0.105/libexec/polkit-gnome-authentication-agent-1 -exec-once=/nix/store/wv4rwqbxvpfn73zh2ma1asdf9f0mpaan-xdg-desktop-portal-hyprland-0.pre+date=2022-12-05_af840a9/libexec/xdg-desktop-portal-hyprland - ''; }