Merge branch 'development'

niri/config.kdl

@@ -112,10 +112,9 @@ input {
 
     // Focus windows and outputs automatically when moving the mouse into them.
     // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
-    // focus-follows-mouse max-scroll-amount="0%"
+    focus-follows-mouse max-scroll-amount="0%"
 }
 
-
 // Settings that influence how windows are positioned and sized.
 // Find more information on the wiki:
 // https://yalter.github.io/niri/Configuration:-Layout
@@ -131,6 +130,12 @@ layout {
     //   together with the previously focused column.
     center-focused-column "never"
 
+    // Center column if only one on workspace
+    always-center-single-column
+ 
+    // show workspace above first
+    empty-workspace-above-first
+
     // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
     preset-column-widths {
         // Proportion sets the width as a fraction of the output width, taking gaps into account.
@@ -169,7 +174,7 @@ layout {
         // off
 
         // How many logical pixels the ring extends out from the windows.
-        width 6
+        width 4
 
         // Colors can be set in a variety of ways:
         // - CSS named colors: "red"
@@ -288,6 +293,7 @@ layout {
 // This line starts waybar, a commonly used bar for Wayland compositors.
 spawn-at-startup "qs" "-c" "noctalia-shell"
 spawn-at-startup "fcitx5"
+spawn-at-startup "/usr/bin/kanshi"
 
 // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
 // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
@@ -332,6 +338,43 @@ overview {
 // Find more information on the wiki:
 // https://yalter.github.io/niri/Configuration:-Window-Rules
 
+window-rule {
+    match app-id="Gromit-mpx"
+    open-floating true
+    //open-focused false
+    //default-floating-position x=0 y=0 relative-to="top-left"
+    draw-border-with-background false
+    //opacity 0.1
+    //tiled-state false
+    //clip-to-geometry false
+    focus-ring {
+        off
+    }
+    border {
+        off
+    }
+}
+
+window-rule {
+    match app-id="wdisplays"
+    open-floating true
+}
+
+/-window-rule {
+    match app-id="smplayer"
+    open-floating true
+    open-focused false
+    default-column-width { fixed 300; }
+    default-window-height { fixed 280; }
+    default-floating-position x=16 y=16 relative-to="bottom-right"
+}
+
+// Zoom screen sharing controls
+window-rule {
+    match app-id=r#"^zoom$"# title="^as_toolbar$"
+    open-floating true
+}
+
 // Work around WezTerm's initial configure bug
 // by setting an empty default-column-width.
 window-rule {
@@ -363,10 +406,10 @@ window-rule {
     // block-out-from "screencast"
 }
 
-// Example: enable rounded corners for all windows.
+// Enable rounded corners for all windows.
 // (This example rule is commented out with a "/-" in front.)
 window-rule {
-    geometry-corner-radius 12
+    geometry-corner-radius 10
     clip-to-geometry true
 }
 
@@ -400,6 +443,13 @@ binds {
     Super+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
     Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
     Super+I hotkey-overlay-title="Brave" { spawn-sh "flatpak run com.brave.Browser/x86_64/stable"; }
+    Super+0 hotkey-overlay-title="Suspend (then hibernate)" { spawn-sh "systemctl suspend-then-hibernate"; }
+    Super+9 hotkey-overlay-title="Hibernate" { spawn-sh "systemctl hibernate"; }
+
+    // audio player binds (includimg smplayer)
+    Super+Shift+Space {spawn-sh "playerctl play-pause"; }
+    Super+Shift+H {spawn-sh "playerctl position 10-"; }
+    Super+Shift+L {spawn-sh "playerctl position 10+"; }
 
     // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc.
     // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`.
@@ -417,8 +467,8 @@ binds {
     // Example brightness key mappings for brightnessctl.
     // You can use regular spawn with multiple arguments too (to avoid going through "sh"),
     // but you need to manually put each argument in separate "" quotes.
-    XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; }
-    XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; }
+    XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--device=intel_backlight" "set" "+10%"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--device=intel_backlight" "set" "10%-"; }
 
     // Open/close the Overview: a zoomed-out view of workspaces and windows.
     // You can also move the mouse into the top-left hot corner,
@@ -475,19 +525,19 @@ binds {
     Mod+Ctrl+Home { move-column-to-first; }
     Mod+Ctrl+End  { move-column-to-last; }
 
-    Super+Shift+Left  { focus-monitor-left; }
-    Super+Shift+Down  { focus-monitor-down; }
-    Super+Shift+Up    { focus-monitor-up; }
-    Super+Shift+Right { focus-monitor-right; }
-    Super+Shift+H     { focus-monitor-left; }
-    Super+Shift+J     { focus-monitor-down; }
-    Super+Shift+K     { focus-monitor-up; }
-    Super+Shift+L     { focus-monitor-right; }
-
-    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
-    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
-    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
-    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    //Super+Shift+Left  { focus-monitor-left; }
+    //Super+Shift+Down  { focus-monitor-down; }
+    //Super+Shift+Up    { focus-monitor-up; }
+    //Super+Shift+Right { focus-monitor-right; }
+    //Super+Shift+H     { focus-monitor-left; }
+    //Super+Shift+J     { focus-monitor-down; }
+    //Super+Shift+K     { focus-monitor-up; }
+    //Super+Shift+L     { focus-monitor-right; }
+
+    //Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    //Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    //Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    //Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
     Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
     Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
     Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
@@ -498,8 +548,10 @@ binds {
     // ...
 
     // And you can also move a whole workspace to another monitor:
-    // Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
-    // ...
+    Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-workspace-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-workspace-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-workspace-to-monitor-right; }
 
     //Mod+Page_Down      { focus-workspace-down; }
     //Mod+Page_Up        { focus-workspace-up; }
@@ -512,7 +564,7 @@ binds {
  
     Mod+X              { focus-workspace-down; }
     Mod+Z              { focus-workspace-up; }
-    Mod+Shift+X         { move-column-to-workspace-down; }
+    Mod+Shift+X        { move-column-to-workspace-down; }
     Mod+Shift+Z        { move-column-to-workspace-up; }
 
     // Alternatively, there are commands to move just a single window:
@@ -688,5 +740,6 @@ binds {
     // Utility shortcuts
     //Mod+V { spawn "qs" "-c" "noctalia-shell" "ipc" "call" "launcher" "clipboard"; }
     //Mod+C { spawn "qs" "-c" "noctalia-shell" "ipc" "call" "launcher" "calculator"; }
-    Super+L { spawn "qs" "-c" "noctalia-shell" "ipc" "call" "lockScreen" "toggle"; }
+    Super+L { spawn "qs" "-c" "noctalia-shell" "ipc" "call" "lockScreen" "lock"; }
+    Mod+Ctrl+B hotkey-overlay-title="Toggle quickshell bar" { spawn "qs" "-c" "noctalia-shell" "ipc" "call" "bar" "toggle"; }
 }