From b0c0c9e1205ed1417163d445e0562e78b5638af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Czy=C5=BC?= Date: Thu, 8 Feb 2024 23:15:02 +0100 Subject: [PATCH] moved to wayland --- common/.gitconfig | 2 +- hypr/.config/hypr/autostart.sh | 1 - hypr/.config/hypr/hyprland.conf | 188 ++++++++++++++----------------- hypr/.config/hypr/hyprpaper.conf | 2 + waybar/.config/waybar/config | 6 +- zsh/.zshenv | 6 +- zsh/.zshrc | 4 +- 7 files changed, 97 insertions(+), 112 deletions(-) diff --git a/common/.gitconfig b/common/.gitconfig index cc3a712..4bf3cf4 100644 --- a/common/.gitconfig +++ b/common/.gitconfig @@ -1,5 +1,5 @@ [user] - email = mike@czyz.icu + email = mike@c2yz.com name = Michael Czyż signingkey = 78D4829A477DAB25 [commit] diff --git a/hypr/.config/hypr/autostart.sh b/hypr/.config/hypr/autostart.sh index 6bab2d1..0379f8d 100755 --- a/hypr/.config/hypr/autostart.sh +++ b/hypr/.config/hypr/autostart.sh @@ -5,7 +5,6 @@ hyprpaper & disown /usr/lib/polkit-kde-authentication-agent-1 & dunst & fcitx5 -d & -flameshot & easyeffects --gapplication-service & $HOME/.config/waybar/launcher.sh & diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index c2227aa..6c1bc3d 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -8,10 +8,12 @@ # # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=DP-2, highrr, 1920x0, 1 -monitor=DP-1, highrr, 4480x0, 1 monitor=HDMI-A-1, preferred, 0x360, 1 - +workspace=HDMI-A-1, 1 +monitor=DP-1, highrr, 4480x0, 1 +workspace=DP-1, 11 +monitor=DP-2, highrr, 1920x0, 1 +workspace=DP-2, 21 # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -35,6 +37,51 @@ $lock = swaylock --screenshots --effect-pixelate 20 --effect-vignette 0.5:0.5 -- env = XCURSOR_SIZE,16 env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that +# Nvidia +env = _JAVA_AWT_WM_NONREPARENTING,1 +env = _JAVA_OPTIONS,-Dawt.useSystemAAFontSettings=on +env = XDG_SESSION_TYPE,wayland +env = XDG_CURRENT_DESKTOP,Hyprland +env = XDG_SESSION_DESKTOP,Hyprland +env = __GLX_VENDOR_LIBRARY_NAME,nvidia +env = GBM_BACKEND,nvidia-drm +env = WLR_NO_HARDWARE_CURSORS,1 +# env = XDG_SESSION_TYPE,wayland + +# env = GDK_BACKEND,wayland,x11 +# env = SDL_VIDEODRIVER,wayland +# env = CLUTTER_BACKEND,wayland +# env = MOZ_ENABLE_WAYLAND,1 +# env = MOZ_DISABLE_RDD_SANDBOX,1 +# env = _JAVA_AWT_WM_NONREPARENTING=1 +# env = QT_AUTO_SCREEN_SCALE_FACTOR,1 +# env = QT_QPA_PLATFORM,wayland +# env = LIBVA_DRIVER_NAME,nvidia +# env = GBM_BACKEND,nvidia-drm +# env = __GLX_VENDOR_LIBRARY_NAME,nvidia +# env = WLR_NO_HARDWARE_CURSORS,1 +# env = __NV_PRIME_RENDER_OFFLOAD,1 +# env = __VK_LAYER_NV_optimus,NVIDIA_only +# env = PROTON_ENABLE_NGX_UPDATER,1 +# env = NVD_BACKEND,direct +# env = __GL_GSYNC_ALLOWED,1 +# env = __GL_VRR_ALLOWED,1 +# env = WLR_DRM_NO_ATOMIC,1 +# env = WLR_USE_LIBINPUT,1 +# env = XWAYLAND_NO_GLAMOR,1 # with this you'll need to use gamescope for gaming +# env = __GL_MaxFramesAllowed,1 +# env = WLR_RENDERER_ALLOW_SOFTWARE,1 +# env = __GL_THREADED_OPTIMIZATIONS=0 + +# env = WLR_DRM_NO_ATOMIC,1 + +env = SSH_AUTH_SOCK, "$XDG_RUNTIME_DIR/ssh-agent.socket" +# env = GTK_IM_MODULE, fcitx +env = QT_IM_MODULE, fcitx +env = XMODIFIERS=@im=fcitx +env = GLFW_IM_MODULE, ibus + + # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { kb_layout = pl @@ -140,16 +187,15 @@ windowrule=opacity 1.0 override 1.0, ^(firefox)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more windowrulev2 = nomaximizerequest, class:.* # You'll probably like this. +windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ +windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +windowrulev2 = noblur,class:^(xwaylandvideobridge)$ windowrulev2 = float,class:^(flameshot)$ windowrulev2 = pin,class:^(flameshot)$ -plugin { - monitor-workspaces { - count = 10 - } -} - # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER @@ -176,32 +222,34 @@ 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 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 +bind = $mainMod, 1, exec, hyprsome workspace 1 +bind = $mainMod, 2, exec, hyprsome workspace 2 +bind = $mainMod, 3, exec, hyprsome workspace 3 +bind = $mainMod, 4, exec, hyprsome workspace 4 +bind = $mainMod, 5, exec, hyprsome workspace 5 +bind = $mainMod, 6, exec, hyprsome workspace 6 +bind = $mainMod, 7, exec, hyprsome workspace 7 +bind = $mainMod, 8, exec, hyprsome workspace 8 +bind = $mainMod, 9, exec, hyprsome workspace 9 # Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 -bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 -bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 -bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 -bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 -bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 -bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 -bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 -bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 -bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 +bind = $mainMod SHIFT, 1, exec, hyprsome move 1 +bind = $mainMod SHIFT, 2, exec, hyprsome move 2 +bind = $mainMod SHIFT, 3, exec, hyprsome move 3 +bind = $mainMod SHIFT, 4, exec, hyprsome move 4 +bind = $mainMod SHIFT, 5, exec, hyprsome move 5 +bind = $mainMod SHIFT, 6, exec, hyprsome move 6 +bind = $mainMod SHIFT, 7, exec, hyprsome move 7 +bind = $mainMod SHIFT, 8, exec, hyprsome move 8 +bind = $mainMod SHIFT, 9, exec, hyprsome move 9 # Example special workspace (scratchpad) -bind = $mainMod, S, togglespecialworkspace, magic -bind = $mainMod SHIFT, S, movetoworkspace, special:magic +bind = $mainMod, D, togglespecialworkspace, magic +bind = $mainMod SHIFT, D, movetoworkspace, special:magic + +bind = $mainMod, code:60, focusmonitor, -1 # code 60 is a dot (.) +bind = $mainMod, Backspace, focusmonitor, +1 +bind = $mainMod SHIFT, BackSpace, movewindow, mon:+1 # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 @@ -229,75 +277,9 @@ bind=,XF86MonBrightnessDown,exec,brightnessctl set 10%- bind=SHIFT,XF86MonBrightnessDown,exec,brightnessctl set 1% bind=SHIFT,XF86MonBrightnessUp,exec,brightnessctl set 100% -# bind=SUPERSHIFT,R,hyprload,reload -# bind=SUPERSHIFT,U,hyprload,update - -# Envars; to play along with wayland nicely - -# env = QT_QPA_PLATFORMTHEME,qt5ct - -env = XDG_SESSION_TYPE,wayland - -env = GDK_BACKEND,wayland,x11 -env = SDL_VIDEODRIVER,wayland -env = CLUTTER_BACKEND,wayland -env = MOZ_ENABLE_WAYLAND,1 -env = MOZ_DISABLE_RDD_SANDBOX,1 -env = _JAVA_AWT_WM_NONREPARENTING=1 -env = QT_AUTO_SCREEN_SCALE_FACTOR,1 -env = QT_QPA_PLATFORM,wayland -env = LIBVA_DRIVER_NAME,nvidia -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia -env = WLR_NO_HARDWARE_CURSORS,1 -env = __NV_PRIME_RENDER_OFFLOAD,1 -env = __VK_LAYER_NV_optimus,NVIDIA_only -env = PROTON_ENABLE_NGX_UPDATER,1 -env = NVD_BACKEND,direct -env = __GL_GSYNC_ALLOWED,1 -env = __GL_VRR_ALLOWED,1 -env = WLR_DRM_NO_ATOMIC,1 -env = WLR_USE_LIBINPUT,1 -env = XWAYLAND_NO_GLAMOR,1 # with this you'll need to use gamescope for gaming -env = __GL_MaxFramesAllowed,1 -env = WLR_RENDERER_ALLOW_SOFTWARE,1 - - -# env = WLR_DRM_NO_ATOMIC,1 - -# more envs -env = SSH_AUTH_SOCK, "$XDG_RUNTIME_DIR/ssh-agent.socket" -# env = GTK_IM_MODULE, fcitx -env = QT_IM_MODULE, fcitx -env = XMODIFIERS=@im=fcitx -env = GLFW_IM_MODULE, ibus - -plugin:hyprfocus { - enabled = yes - - keyboard_focus_animation = shrink - mouse_focus_animation = shrink - - bezier = bezIn, 0.5,0.0,1.0,0.5 - bezier = bezOut, 0.0,0.5,0.5,1.0 - - flash { - flash_opacity = 0.7 - - in_bezier = bezIn - in_speed = 0.5 - - out_bezier = bezOut - out_speed = 3 - } - - shrink { - shrink_percentage = 0.98 - - in_bezier = bezIn - in_speed = 0.5 - - out_bezier = bezOut - out_speed = 3 - } -} +# Screenshot a window +bind = $mainMod, PRINT, exec, hyprshot -m window +# Screenshot a monitor +bind = , PRINT, exec, hyprshot -m output +# Screenshot a region +bind = $mainMod SHIFT, S, exec, hyprshot -m region diff --git a/hypr/.config/hypr/hyprpaper.conf b/hypr/.config/hypr/hyprpaper.conf index 55fb683..6290c86 100644 --- a/hypr/.config/hypr/hyprpaper.conf +++ b/hypr/.config/hypr/hyprpaper.conf @@ -3,3 +3,5 @@ preload = /home/mike/Wallpapers/tokio.jpg wallpaper = DP-1, contain:/home/mike/Wallpapers/tokio.jpg wallpaper = DP-2, contain:/home/mike/Wallpapers/tokio.jpg wallpaper = HDMI-A-1, contain:/home/mike/Wallpapers/tokio.jpg + +splash = false diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index 56b55c7..10ddfd2 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -15,7 +15,9 @@ "default": "" }, "persistent-workspaces": { - "*": 10 + "HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "DP-1": [ 11, 12, 13, 14, 15, 16, 17, 18, 19 ], + "DP-2": [ 21, 22, 23, 24, 25, 26, 27, 28, 29 ] } }, "keyboard-state": { @@ -132,4 +134,4 @@ "max-length": 200, "separate-outputs": true } -} \ No newline at end of file +} diff --git a/zsh/.zshenv b/zsh/.zshenv index 8ef5d9d..1ae52ac 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,8 +1,8 @@ export QT_STYLE_OVERRIDE="kvantum"; # Defaults -export TERMINAL="alacritty"; -export EDITOR='vim'; +export TERMINAL="kitty"; +export EDITOR='lvim'; export BROWSER='firefox'; export BAT_THEME="Catppuccin-mocha"; @@ -28,4 +28,4 @@ fi export FZF_DEFAULT_OPTS="--color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 --color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 --color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796"; -export PATH=$PATH:$HOME/.local/bin \ No newline at end of file +export PATH=$PATH:$HOME/.local/bin diff --git a/zsh/.zshrc b/zsh/.zshrc index 38a3663..b3d08b5 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -7,8 +7,8 @@ fi # Lines configured by zsh-newuser-install HISTFILE=~/.histfile -HISTSIZE=1000 -SAVEHIST=1000 +HISTSIZE=10000000 +SAVEHIST=10000000 setopt extendedglob unsetopt autocd beep bindkey -e