diff --git a/home/wayland/default.nix b/home/wayland/default.nix index 4bbf8c2..becc712 100644 --- a/home/wayland/default.nix +++ b/home/wayland/default.nix @@ -32,15 +32,13 @@ let rofi-wayland swayidle swaylock-effects + swww ]; services.dbus.enable = true; xdg.portal = { enable = true; wlr.enable = true; - extraPortals = with pkgs; [ - - ]; }; programs.xwayland.enable = true; diff --git a/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix index 27ced7c..fcdee5a 100644 --- a/home/wayland/hyprland/config.nix +++ b/home/wayland/hyprland/config.nix @@ -4,23 +4,18 @@ }: { wayland.windowManager.hyprland.extraConfig = '' -# Please note not all available settings / options are set here. -# For a full list, see the wiki - -# See https://wiki.hyprland.org/Configuring/Monitors/ monitor=HDMI-A-1,1920x1080,5760x0,1 monitor=DP-2,1920x1080,1920x0,1 monitor=DP-3,1920x1080@144,3840x0,1 -# See https://wiki.hyprland.org/Configuring/Keywords/ for more - -# Execute your favorite apps at launch exec-once = waybar & dunst -# Source a file (multi-file configs) -# source = ~/.config/hypr/myColors.conf +# SWWW +exec-once=swww init + +# swayidle / lock +exec-once=~/.local/bin/lock -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { kb_layout = us kb_variant = @@ -39,10 +34,9 @@ input { } general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more gaps_in = 6 - gaps_out = 20i + gaps_out = 20 border_size = 4 col.active_border = rgb(f5c2e7) col.inactive_border = rgb(6c7086) @@ -51,7 +45,6 @@ general { } decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more rounding = 8 blur = yes @@ -72,8 +65,6 @@ decoration { animations { enabled = yes - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 animation = windows, 1, 7, myBezier @@ -84,38 +75,24 @@ animations { } dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = yes # you probably want this } master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_is_master = true } gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more workspace_swipe = off } -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more device:epic mouse V1 { sensitivity = -0.5 } -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, Return, exec, wezterm bind = $mainMod, Q, killactive, bind = $mainMod, V, togglefloating, @@ -124,13 +101,11 @@ bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle bind =, Print, exec, grim -g "$(slurp -d)" | wl-copy -# Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d -# Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 bind = $mainMod, 3, workspace, 3 @@ -142,7 +117,6 @@ bind = $mainMod, 8, workspace, 8 bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 -# Move active window to a workspace with mainMod + SHIFT + [0-9] bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 2, movetoworkspace, 2 bind = $mainMod SHIFT, 3, movetoworkspace, 3 @@ -154,11 +128,9 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 -# Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 bind = $mainMod, mouse_up, workspace, e-1 -# Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow @@ -166,12 +138,5 @@ exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRE 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 -# SWWW -exec-once=swww init -exec-once=swww img ~/Pictures/wallpapers/annystartingshort.gif - -# swayidle / lock -exec-once=~/.local/bin/lock - ''; } diff --git a/home/zellij/layouts.nix b/home/zellij/layouts.nix index 49b7e00..94308d3 100644 --- a/home/zellij/layouts.nix +++ b/home/zellij/layouts.nix @@ -9,7 +9,7 @@ plugin location="zellij:tab-bar" } pane split_direction="vertical" { - pane size="120" + pane size="110" pane split_direction="horizontal" { pane pane