From 56ae419d488156d14a0752ba2a18b978ff23040b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 27 Apr 2026 17:08:21 -0400 Subject: [PATCH] clean up dms --- configs/niri/config.kdl | 10 +- configs/niri/configs/user.kdl | 157 -------------------------- configs/niri/configs/window-rules.kdl | 0 configs/niri/dms/alttab.kdl | 38 +++++-- configs/niri/dms/binds.kdl | 75 +++++++++++- configs/niri/dms/layout.kdl | 68 ++++++++--- configs/niri/dms/windowrules.kdl | 63 ++++++----- 7 files changed, 190 insertions(+), 221 deletions(-) delete mode 100644 configs/niri/configs/user.kdl delete mode 100644 configs/niri/configs/window-rules.kdl diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 27e8ced..34f56a5 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -1,16 +1,12 @@ // ========================= -// DMS Auto-Generated Includes +// DMS Configuration // ========================= -include "dms/binds.kdl" +include "dms/general.kdl" include "dms/outputs.kdl" include "dms/cursor.kdl" include "dms/layout.kdl" include "dms/colors.kdl" include "dms/wpblur.kdl" include "dms/alttab.kdl" +include "dms/binds.kdl" include "dms/windowrules.kdl" - -// ========================= -// User Configuration -// ========================= -include "configs/user.kdl" diff --git a/configs/niri/configs/user.kdl b/configs/niri/configs/user.kdl deleted file mode 100644 index d66d206..0000000 --- a/configs/niri/configs/user.kdl +++ /dev/null @@ -1,157 +0,0 @@ -// ========================= -// User Configuration -// ========================= -// This file contains user-specific settings that won't be overwritten by DMS. -// Edit this file freely to customize your niri experience. - -// https://github.com/YaLTeR/niri/wiki/Configuration:-Input -input { - touchpad { - tap - natural-scroll - } -} - -overview { - backdrop-color "#777777" -} - -environment { - QT_QPA_PLATFORM "wayland" - QT_WAYLAND_DISABLE_WINDOWDECORATION "1" - NIXOS_OZONE_WL "1" - DISPLAY ":0" - ELECTRON_OZONE_PLATFORM_HINT "auto" -} - -// ========================= -// Layout Overrides -// ========================= -layout { - center-focused-column "never" - tab-indicator { - width 8 - gap 8 - length total-proportion=1.0 - hide-when-single-tab - position "top" - place-within-column - } - shadow {} - preset-column-widths { - proportion 0.33333 - proportion 0.5 - proportion 0.66667 - } - default-column-width { proportion 0.5; } -} - -prefer-no-csd - -animations { - window-movement { - duration-ms 250 - } - workspace-switch { - duration-ms 250 - } - horizontal-view-movement { - duration-ms 250 - } -} - -// ========================= -// Screenshots -// ========================= -screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" - -// ========================= -// System Events -// ========================= -switch-events { - lid-close { spawn "notify-send" "The laptop lid is closed!"; } - lid-open { spawn "notify-send" "The laptop lid is open!"; } -} - -hotkey-overlay { - skip-at-startup -} - -// ========================= -// User Keybindings -// ========================= -binds { - Mod+Shift+H { show-hotkey-overlay; } - Mod+T { spawn "ghostty"; } - Mod+Space { spawn "dms" "ipc" "spotlight" "toggle"; } - Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; } - Mod+B { spawn "chromium"; } - Mod+E { spawn "wofi-emoji"; } - - Mod+Left { focus-column-left; } - Mod+Down { focus-workspace-down; } - Mod+Up { focus-workspace-up; } - Mod+Right { focus-column-right; } - - Mod+Tab { toggle-overview; } - Mod+Shift+Tab { focus-monitor-next; } - - Mod+Ctrl+Right { swap-window-right; } - Mod+Ctrl+Left { swap-window-left; } - Mod+Ctrl+Up { move-window-to-workspace-up; } - Mod+Ctrl+Down { move-window-to-workspace-down; } - - Mod+W { toggle-column-tabbed-display; } - Mod+F { maximize-column; } - Mod+Shift+F { fullscreen-window; } - Mod+Ctrl+F { reset-window-height; } - Mod+V { toggle-window-floating; } - - Mod+C { center-column; } - - Mod+Minus { set-column-width "-10%"; } - Mod+Equal { set-column-width "+10%"; } - - Mod+Shift+Minus { set-window-height "-10%"; } - Mod+Shift+Equal { set-window-height "+10%"; } - - Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - Print { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; } - Mod+P { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; } - - Mod+R { spawn "/home/ari/.config/niri/screen-record.sh"; } - - Mod+Q { close-window; } -} - -// ========================= -// Recent Windows (Alt-Tab) -// ========================= -recent-windows { - debounce-ms 750 - open-delay-ms 150 - - highlight { - active-color "#999999ff" - urgent-color "#ff9999ff" - padding 30 - corner-radius 0 - } - - previews { - max-height 480 - max-scale 0.5 - } - - binds { - Alt+Tab { next-window; } - Alt+Shift+Tab { previous-window; } - Alt+grave { next-window filter="app-id"; } - Alt+Shift+grave { previous-window filter="app-id"; } - - Mod+Tab { next-window; } - Mod+Shift+Tab { previous-window; } - Mod+grave { next-window filter="app-id"; } - Mod+Shift+grave { previous-window filter="app-id"; } - } -} diff --git a/configs/niri/configs/window-rules.kdl b/configs/niri/configs/window-rules.kdl deleted file mode 100644 index e69de29..0000000 diff --git a/configs/niri/dms/alttab.kdl b/configs/niri/dms/alttab.kdl index 091ea07..24998eb 100644 --- a/configs/niri/dms/alttab.kdl +++ b/configs/niri/dms/alttab.kdl @@ -1,10 +1,32 @@ -// ! DO NOT EDIT ! - // ! AUTO-GENERATED BY DMS ! - // ! CHANGES WILL BE OVERWRITTEN ! - // ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! +// ========================= +// DMS Alt-Tab Configuration +// ========================= - recent-windows { - highlight { +recent-windows { + debounce-ms 750 + open-delay-ms 150 + + highlight { + active-color "#999999ff" + urgent-color "#ff9999ff" + padding 30 corner-radius 12 - } - } + } + + previews { + max-height 480 + max-scale 0.5 + } + + binds { + Alt+Tab { next-window; } + Alt+Shift+Tab { previous-window; } + Alt+grave { next-window filter="app-id"; } + Alt+Shift+grave { previous-window filter="app-id"; } + + Mod+Tab { next-window; } + Mod+Shift+Tab { previous-window; } + Mod+grave { next-window filter="app-id"; } + Mod+Shift+grave { previous-window filter="app-id"; } + } +} diff --git a/configs/niri/dms/binds.kdl b/configs/niri/dms/binds.kdl index 366d4aa..2fd02c9 100644 --- a/configs/niri/dms/binds.kdl +++ b/configs/niri/dms/binds.kdl @@ -1,4 +1,68 @@ +// ========================= +// DMS Keybindings +// ========================= + binds { + // ========================= + // General + // ========================= + Mod+Shift+H { show-hotkey-overlay; } + Mod+T { spawn "ghostty"; } + Mod+Space { spawn "dms" "ipc" "spotlight" "toggle"; } + Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; } + Mod+B { spawn "chromium"; } + Mod+E { spawn "wofi-emoji"; } + Mod+Q { close-window; } + + // ========================= + // Navigation + // ========================= + Mod+Left { focus-column-left; } + Mod+Down { focus-workspace-down; } + Mod+Up { focus-workspace-up; } + Mod+Right { focus-column-right; } + + Mod+Tab { toggle-overview; } + Mod+Shift+Tab { focus-monitor-next; } + + // ========================= + // Window Management + // ========================= + Mod+Ctrl+Right { swap-window-right; } + Mod+Ctrl+Left { swap-window-left; } + Mod+Ctrl+Up { move-window-to-workspace-up; } + Mod+Ctrl+Down { move-window-to-workspace-down; } + + Mod+W { toggle-column-tabbed-display; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+Ctrl+F { reset-window-height; } + Mod+V { toggle-window-floating; } + Mod+C { center-column; } + + // ========================= + // Resizing + // ========================= + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // ========================= + // Screenshots & Recording + // ========================= + Print { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; } + Mod+P { spawn "sh" "-c" "dms screenshot --stdout | satty -f -"; } + Mod+R { spawn "/home/ari/.config/niri/screen-record.sh"; } + + // ========================= + // Misc + // ========================= + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + + // ========================= + // DMS Integration + // ========================= Alt+Ctrl+Delete hotkey-overlay-title="Task Manager: Toggle" { spawn "dms" "ipc" "call" "processlist" "toggle"; } Mod+Alt+L hotkey-overlay-title="Notifications: Clear" { spawn "dms" "ipc" "notifications" "dismissAllPopups"; } Mod+Alt+K hotkey-overlay-title="Notifications: Toggle" { spawn "dms" "ipc" "call" "notifications" "toggle"; } @@ -6,6 +70,9 @@ binds { Mod+Alt+P hotkey-overlay-title="Clipboard: Toggle" { spawn "dms" "ipc" "call" "clipboard" "toggle"; } Mod+Shift+Space hotkey-overlay-title="PlayerCtrl: Toggle" { spawn "playerctl" "play-pause"; } + // ========================= + // Monitor Movement + // ========================= Mod+Alt+Down hotkey-overlay-title="Move to Monitor Down" { move-column-to-monitor-down; } Mod+Alt+Left hotkey-overlay-title="Move to Monitor Left" { move-column-to-monitor-left; } Mod+Alt+Right hotkey-overlay-title="Move to Monitor Right" { move-column-to-monitor-right; } @@ -16,15 +83,17 @@ binds { Mod+TouchpadScrollLeft hotkey-overlay-title="Move Workspace to Monitor Right" { move-workspace-to-monitor-right; } Mod+TouchpadScrollDown hotkey-overlay-title="Move Workspace to Monitor Up" { move-workspace-to-monitor-up; } + // ========================= + // Media & Brightness + // ========================= Mod+Shift+Up hotkey-overlay-title="PlayerCtrl: Volume Up" { spawn "dms" "ipc" "audio" "increment" "1"; } Mod+Shift+Down hotkey-overlay-title="PlayerCtrl: Volume Down" { spawn "dms" "ipc" "audio" "decrement" "1"; } - Mod+Shift+Right hotkey-overlay-title="PlayerCtrl: Volume Down" { spawn "playerctl" "next"; } - Mod+Shift+Left hotkey-overlay-title="PlayerCtrl: Volume Down" { spawn "playerctl" "previous"; } + Mod+Shift+Right hotkey-overlay-title="PlayerCtrl: Next" { spawn "playerctl" "next"; } + Mod+Shift+Left hotkey-overlay-title="PlayerCtrl: Previous" { spawn "playerctl" "previous"; } XF86AudioRaiseVolume allow-when-locked=true { spawn "dms" "ipc" "audio" "increment" "1"; } XF86AudioLowerVolume allow-when-locked=true { spawn "dms" "ipc" "audio" "decrement" "1"; } XF86AudioMute allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "mute"; } XF86AudioMicMute allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "micmute"; } XF86MonBrightnessUp allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "increment" "10" ""; } XF86MonBrightnessDown allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "decrement" "10" ""; } - } diff --git a/configs/niri/dms/layout.kdl b/configs/niri/dms/layout.kdl index f8f8e4f..66dcbcc 100644 --- a/configs/niri/dms/layout.kdl +++ b/configs/niri/dms/layout.kdl @@ -1,22 +1,56 @@ -// ! DO NOT EDIT ! - // ! AUTO-GENERATED BY DMS ! - // ! CHANGES WILL BE OVERWRITTEN ! - // ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! +// ========================= +// DMS Layout Configuration +// ========================= - layout { - gaps 5 +layout { + gaps 5 + center-focused-column "never" - border { + border { width 2 - } + } - focus-ring { + focus-ring { width 2 - } - } - window-rule { - geometry-corner-radius 12 - clip-to-geometry true - tiled-state true - draw-border-with-background false - } + } + + tab-indicator { + width 8 + gap 8 + length total-proportion=1.0 + hide-when-single-tab + position "top" + place-within-column + } + + shadow {} + + preset-column-widths { + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + } + + default-column-width { proportion 0.5; } +} + +window-rule { + geometry-corner-radius 12 + clip-to-geometry true + tiled-state true + draw-border-with-background false +} + +prefer-no-csd + +animations { + window-movement { + duration-ms 250 + } + workspace-switch { + duration-ms 250 + } + horizontal-view-movement { + duration-ms 250 + } +} diff --git a/configs/niri/dms/windowrules.kdl b/configs/niri/dms/windowrules.kdl index 6d08801..53f5f55 100644 --- a/configs/niri/dms/windowrules.kdl +++ b/configs/niri/dms/windowrules.kdl @@ -1,3 +1,7 @@ +// ========================= +// DMS Window Rules +// ========================= + window-rule { match app-id=r#"^Slack$"# match app-id=r#"^signal$"# @@ -7,13 +11,13 @@ window-rule { // Open the Firefox picture-in-picture player as floating by default. window-rule { match app-id="org.pipewire.Helvum" - open-focused true open-floating true default-floating-position x=0 y=25 relative-to="top" default-window-height { proportion 0.8; } default-column-width { proportion 0.75; } } + window-rule { match app-id=r#"firefox$"# title="^Picture-in-Picture$" match app-id="org.pulseaudio.pavucontrol" @@ -27,27 +31,30 @@ window-rule { match app-id=r#"^chrome-.*"# match app-id="waypaper" match title="$Huddle:.*" app-id="Slack" - open-focused true open-floating true default-floating-position x=0 y=25 relative-to="top" default-window-height { proportion 0.5; } default-column-width { proportion 0.25; } } + window-rule { - match app-id="remote-viewer" - open-fullscreen true - open-maximized true - open-focused true + match app-id="remote-viewer" + open-fullscreen true + open-maximized true + open-focused true } + window-rule { match is-active=false opacity 0.85 } + window-rule { match is-urgent=true open-focused true } + window-rule { match app-id="satty" open-focused true @@ -55,51 +62,49 @@ window-rule { min-width 800 min-height 400 default-floating-position x=-200 y=200 relative-to="top" - default-window-height { proportion 0.75; } default-column-width { proportion 0.75; } } + window-rule { match app-id="code" match app-id="org.shotcut.Shotcut" exclude app-id=r#"^code$"# title=r#"^Visual Studio Code$"# - open-fullscreen false open-floating false open-maximized true open-focused true opacity 0.95 } + +// Security-sensitive apps - block from screen capture window-rule { -// match app-id=r"Bitwarden" - match app-id="Sparrow" -// match title="Bitwarden" - block-out-from "screen-capture" - // opacity 1 - shadow { + match app-id="Sparrow" + block-out-from "screen-capture" + shadow { on } focus-ring { - width 4 - active-color "#f00f" - inactive-color "#f00f" - } -} -window-rule { - match app-id="Bitwarden" is-focused=false - match app-id="Sparrow" is-focused=false - match title="Bitwarden" is-focused=false - opacity 0.45 + width 4 + active-color "#f00f" + inactive-color "#f00f" + } } +window-rule { + match app-id="Bitwarden" is-focused=false + match app-id="Sparrow" is-focused=false + match title="Bitwarden" is-focused=false + opacity 0.45 +} window-rule { match app-id=r#"^com.slack.Slack$"# clip-to-geometry true border { - on - width 1 - active-color "#0f0f" - inactive-color "#0f0a" - } + on + width 1 + active-color "#0f0f" + inactive-color "#0f0a" + } }