From 6847a123d5c82320110d1ef448c8c046084b0d0c Mon Sep 17 00:00:00 2001 From: Johannes Knopp Date: Tue, 12 May 2026 12:20:27 +0200 Subject: [PATCH] update quickshell conf --- roles/hyprland/files/hypr/hyprland.conf | 9 ++++++++- roles/hyprland/files/hypr/monitors_jk-pc.conf | 4 ++-- roles/nvim/files/after/ftplugin/typescript.lua | 2 +- roles/quickshell/files/shell.qml | 6 +++--- roles/quickshell/tasks/main.yml | 18 +++++++++++++----- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/roles/hyprland/files/hypr/hyprland.conf b/roles/hyprland/files/hypr/hyprland.conf index f3d1052..7da418e 100644 --- a/roles/hyprland/files/hypr/hyprland.conf +++ b/roles/hyprland/files/hypr/hyprland.conf @@ -196,7 +196,7 @@ animations { # See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more dwindle { - pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + # pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true # You probably want this } @@ -330,6 +330,13 @@ windowrule { suppress_event = maximize } +xwayland { + enabled = true + use_nearest_neighbor = true + force_zero_scaling = false + create_abstract_socket = false +} + # Fix some dragging issues with XWayland windowrule { name = fix-xwayland-drags diff --git a/roles/hyprland/files/hypr/monitors_jk-pc.conf b/roles/hyprland/files/hypr/monitors_jk-pc.conf index c2b20aa..c9929a3 100644 --- a/roles/hyprland/files/hypr/monitors_jk-pc.conf +++ b/roles/hyprland/files/hypr/monitors_jk-pc.conf @@ -1,7 +1,7 @@ -# Generated by nwg-displays on 2026-02-28 at 11:47:04. Do not edit manually. +# Generated by nwg-displays on 2026-04-20 at 01:17:12. Do not edit manually. monitor=DP-1,2560x1440@165.0,6626x876,1.0 monitor=DP-2,2560x1440@165.0,4066x876,1.0 -monitor=HDMI-A-1,disable monitor=HDMI-A-2,1920x1080@60.0,9186x396,1.0 monitor=HDMI-A-2,transform,3 +monitor=HDMI-A-1,disable diff --git a/roles/nvim/files/after/ftplugin/typescript.lua b/roles/nvim/files/after/ftplugin/typescript.lua index a1efa40..adec580 100644 --- a/roles/nvim/files/after/ftplugin/typescript.lua +++ b/roles/nvim/files/after/ftplugin/typescript.lua @@ -1 +1 @@ -vim.opt_local.shiftwidth = 4 +vim.opt_local.shiftwidth = 2 diff --git a/roles/quickshell/files/shell.qml b/roles/quickshell/files/shell.qml index e4af72e..46e2fc3 100644 --- a/roles/quickshell/files/shell.qml +++ b/roles/quickshell/files/shell.qml @@ -6,8 +6,8 @@ ShellRoot { Variants { model: Quickshell.screens - Bar { - // modelData injected by Variants; Bar.qml binds screen: modelData internally - } + Bar { } + // // modelData injected by Variants; Bar.qml binds screen: modelData internally + // } } } diff --git a/roles/quickshell/tasks/main.yml b/roles/quickshell/tasks/main.yml index 8b4490e..07255af 100644 --- a/roles/quickshell/tasks/main.yml +++ b/roles/quickshell/tasks/main.yml @@ -32,11 +32,19 @@ # Shared components module - { src: components/Theme.qml, dest: components/Theme.qml } - { src: components/Enclosure.qml, dest: components/Enclosure.qml } + - { src: components/TrayIcon.qml, dest: components/TrayIcon.qml } - { src: components/qmldir, dest: components/qmldir } # Bar module (imported as "bar" in shell.qml) - - { src: bar/Bar.qml, dest: bar/Bar.qml } - - { src: bar/MusicPlayer.qml, dest: bar/MusicPlayer.qml } + - { src: bar/Bar.qml, dest: bar/Bar.qml } + - { src: bar/CalendarContent.qml, dest: bar/CalendarContent.qml } + - { src: bar/Clock.qml, dest: bar/Clock.qml } + - { src: bar/MusicPlayer.qml, dest: bar/MusicPlayer.qml } - { src: bar/MusicPlayerControls.qml, dest: bar/MusicPlayerControls.qml } - - { src: bar/Workspaces.qml, dest: bar/Workspaces.qml } - - { src: bar/WorkspaceButton.qml, dest: bar/WorkspaceButton.qml } - - { src: bar/qmldir, dest: bar/qmldir } + - { src: bar/NetworkStatus.qml, dest: bar/NetworkStatus.qml } + - { src: bar/PopoutWindow.qml, dest: bar/PopoutWindow.qml } + - { src: bar/SysTray.qml, dest: bar/SysTray.qml } + - { src: bar/VolumeControl.qml, dest: bar/VolumeControl.qml } + - { src: bar/VolumeMixerContent.qml, dest: bar/VolumeMixerContent.qml } + - { src: bar/Workspaces.qml, dest: bar/Workspaces.qml } + - { src: bar/WorkspaceButton.qml, dest: bar/WorkspaceButton.qml } + - { src: bar/qmldir, dest: bar/qmldir }