Merge branch 'development'

niri/config.kdl

@@ -51,6 +51,8 @@ output "DVI-I-1" {
 // Find the full list of options on the wiki:
 // https://yalter.github.io/niri/Configuration:-Input
 input {
+    mod-key "Alt"
+    mod-key-nested "Super"
     keyboard {
         xkb {
             // You can set rules, model, layout, variant and options.
@@ -167,7 +169,7 @@ layout {
         // off
 
         // How many logical pixels the ring extends out from the windows.
-        width 4
+        width 6
 
         // Colors can be set in a variety of ways:
         // - CSS named colors: "red"
@@ -175,7 +177,7 @@ layout {
         // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
 
         // Color of the ring on the active monitor.
-        active-color "#7fc8ff"
+        active-color "#2fddbdff"
 
         // Color of the ring on inactive monitors.
         //
@@ -190,7 +192,7 @@ layout {
         // You can use any CSS linear-gradient tool on the web to set these up.
         // Changing the color space is also supported, check the wiki for more info.
         //
-        // active-gradient from="#80c8ff" to="#c7ff7f" angle=45
+        active-gradient from="#80c8ff" to="#c7ff7f" angle=45
 
         // You can also color the gradient relative to the entire view
         // of the workspace, rather than relative to just the window itself.
@@ -265,7 +267,7 @@ layout {
     struts {
         // left 64
         // right 64
-        // top 64
+        top -2
         // bottom 64
     }
 
@@ -285,6 +287,7 @@ layout {
 
 // This line starts waybar, a commonly used bar for Wayland compositors.
 spawn-at-startup "qs" "-c" "noctalia-shell"
+spawn-at-startup "fcitx5"
 
 // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
 // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
@@ -299,7 +302,7 @@ hotkey-overlay {
 // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
 // This option will also fix border/focus ring drawing behind some semitransparent windows.
 // After enabling or disabling this, you need to restart the apps for this to take effect.
-// prefer-no-csd
+prefer-no-csd
 
 // You can change the path where screenshots are saved.
 // A ~ at the front will be expanded to the home directory.
@@ -362,17 +365,12 @@ window-rule {
 
 // Example: enable rounded corners for all windows.
 // (This example rule is commented out with a "/-" in front.)
-/-window-rule {
+window-rule {
     geometry-corner-radius 12
     clip-to-geometry true
 }
 
 // noctalia window rules
-window-rule {
-    geometry-corner-radius 20
-    clip-to-geometry true
-}
-
 layer-rule {
     match namespace="^quickshell-overview$"
     place-within-backdrop true
@@ -398,10 +396,10 @@ binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
-    Alt+Return hotkey-overlay-title="Open a Terminal" { spawn "gnome-terminal"; }
-    Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
+    Mod+Return hotkey-overlay-title="Open a Terminal" { spawn "gnome-terminal"; }
+    Super+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
     Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
-    Mod+I hotkey-overlay-title="Brave" { spawn-sh "flatpak run com.brave.Browser/x86_64/stable"; }
+    Super+I hotkey-overlay-title="Brave" { spawn-sh "flatpak run com.brave.Browser/x86_64/stable"; }
 
     // 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`.
@@ -425,27 +423,27 @@ binds {
     // Open/close the Overview: a zoomed-out view of workspaces and windows.
     // You can also move the mouse into the top-left hot corner,
     // or do a four-finger swipe up on a touchpad.
-    Mod+grave repeat=false { toggle-overview; }
-
-    Alt+Shift+Q repeat=false { close-window; }
-
-    Alt+A     { focus-column-left; }
-    Alt+D     { focus-window-down; }
-    Alt+S     { focus-window-up; }
-    Alt+F     { focus-column-right; }
-    Alt+H     { focus-column-left; }
-    Alt+J     { focus-window-down; }
-    Alt+K     { focus-window-up; }
-    Alt+L     { focus-column-right; }
-
-    Alt+Shift+A     { move-column-left; }
-    Alt+Shift+D     { move-window-down; }
-    Alt+Shift+S     { move-window-up; }
-    Alt+Shift+F     { move-column-right; }
-    Alt+Shift+H     { move-column-left; }
-    Alt+Shift+J     { move-window-down; }
-    Alt+Shift+K     { move-window-up; }
-    Alt+Shift+L     { move-column-right; }
+    Mod+Q repeat=false { toggle-overview; }
+
+    Mod+Shift+Q repeat=false { close-window; }
+
+    Mod+A     { focus-column-left; }
+    Mod+D     { focus-window-down; }
+    Mod+S     { focus-window-up; }
+    Mod+F     { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    Mod+Shift+A     { move-column-left; }
+    Mod+Shift+D     { move-window-down; }
+    Mod+Shift+S     { move-window-up; }
+    Mod+Shift+F     { move-column-right; }
+    Mod+Shift+H     { move-column-left; }
+    Mod+Shift+J     { move-window-down; }
+    Mod+Shift+K     { move-window-up; }
+    Mod+Shift+L     { move-column-right; }
 
     //Mod+Left  { focus-column-left; }
     //Mod+Down  { focus-window-down; }
@@ -477,14 +475,14 @@ binds {
     Mod+Ctrl+Home { move-column-to-first; }
     Mod+Ctrl+End  { move-column-to-last; }
 
-    Mod+Shift+Left  { focus-monitor-left; }
-    Mod+Shift+Down  { focus-monitor-down; }
-    Mod+Shift+Up    { focus-monitor-up; }
-    Mod+Shift+Right { focus-monitor-right; }
-    Mod+Shift+H     { focus-monitor-left; }
-    Mod+Shift+J     { focus-monitor-down; }
-    Mod+Shift+K     { focus-monitor-up; }
-    Mod+Shift+L     { focus-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; }
@@ -512,6 +510,11 @@ binds {
     //Mod+Ctrl+U         { move-column-to-workspace-down; }
     //Mod+Ctrl+I         { move-column-to-workspace-up; }
  
+    Mod+X              { focus-workspace-down; }
+    Mod+Z              { focus-workspace-up; }
+    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:
     // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
     // ...
@@ -593,26 +596,26 @@ binds {
     Mod+BracketRight { consume-or-expel-window-right; }
 
     // Consume one window from the right to the bottom of the focused column.
-    Mod+Z  { consume-window-into-column; }
+    Mod+C  { consume-window-into-column; }
     // Expel the bottom window from the focused column to the right.
-    Mod+X { expel-window-from-column; }
+    Mod+Shift+C { expel-window-from-column; }
 
     Mod+R { switch-preset-column-width; }
     // Cycling through the presets in reverse order is also possible.
     // Mod+R { switch-preset-column-width-back; }
     Mod+Shift+R { switch-preset-window-height; }
     Mod+Ctrl+R { reset-window-height; }
-    Mod+F { maximize-column; }
-    Mod+Shift+F { fullscreen-window; }
+    Super+F { maximize-column; }
+    Super+Shift+F { fullscreen-window; }
 
     // Expand the focused column to space not taken up by other fully visible columns.
     // Makes the column "fill the rest of the space".
     Mod+Ctrl+F { expand-column-to-available-width; }
 
-    Mod+C { center-column; }
+    Mod+grave { center-column; }
 
     // Center all fully visible columns on screen.
-    Mod+Ctrl+C { center-visible-columns; }
+    //Mod+Shift+Q { center-visible-columns; }
 
     // Finer width adjustments.
     // This command can also:
@@ -630,8 +633,8 @@ binds {
     Mod+Shift+Equal { set-window-height "+10%"; }
 
     // Move the focused window between the floating and the tiling layout.
-    Mod+V       { toggle-window-floating; }
-    Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+    Mod+Shift+space { toggle-window-floating; }
+    Mod+Ctrl+space { switch-focus-between-floating-and-tiling; }
 
     // Toggle tabbed column display mode.
     // Windows in this column will appear as vertical tabs,
@@ -648,7 +651,7 @@ binds {
 
     Print { screenshot; }
     Ctrl+Print { screenshot-screen; }
-    Alt+Print { screenshot-window; }
+    Mod+Print { screenshot-window; }
 
     // Applications such as remote-desktop clients and software KVM switches may
     // request that niri stops processing the keyboard shortcuts defined here
@@ -685,5 +688,5 @@ 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"; }
-    Mod+L { spawn "qs" "-c" "noctalia-shell" "ipc" "call" "lockScreen" "toggle"; }
+    Super+L { spawn "qs" "-c" "noctalia-shell" "ipc" "call" "lockScreen" "toggle"; }
 }