9 files changed, 47 insertions, 111 deletions
diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl
index a8f3d7b..d85892c 100644
--- a/.config/niri/config.kdl
+++ b/.config/niri/config.kdl
@@ -1,10 +1,5 @@
-include "dms/alttab.kdl"
-include "dms/binds.kdl"
-include "dms/cursor.kdl"
-include "dms/layout.kdl"
-include "dms/outputs.kdl"
-include "dms/windowrules.kdl"
-include "dms/wpblur.kdl"
+spawn-at-startup "qs" "-c" "noctalia-shell"
+spawn-at-startup "gentoo-pipewire-launcher"
 
 // https://yalter.github.io/niri/Configuration:-Input
 input {
@@ -40,10 +35,32 @@ input {
 	workspace-auto-back-and-forth
 }
 
+
+output "DP-1" {
+    mode "5120x1440@144.000"
+    scale 1
+    position x=0 y=0
+	focus-at-startup
+}
+
 output "DP-2" {
+    mode "5120x1440@144.000"
+    scale 1
+    position x=0 y=0
 	focus-at-startup
 }
 
+output "eDP-1" {
+    mode "2256x1504@60.000"
+    scale 1
+    position x=1432 y=1440
+}
+
+cursor {
+	xcursor-theme "Adwaita"
+	xcursor-size 24
+}
+
 layout {
 	gaps 12
 	background-color "#2B303B"
@@ -53,12 +70,12 @@ layout {
 
 	preset-column-widths {
 		proportion 0.33333
-		proportion 0.5
+		proportion 0.50000
 		proportion 0.66667
 	}
 
 	default-column-width {
-		proportion 0.5
+		proportion 0.33333
 	}
 
 	focus-ring {
@@ -100,7 +117,7 @@ hotkey-overlay {
 
 prefer-no-csd
 
-screenshot-path "~/media/gfx/screen/%Y-%m-%d_%H-%M-%S.png"
+screenshot-path "~/media/img/screen/%Y-%m-%d_%H-%M-%S.png"
 
 // Animation settings.
 // The wiki explains how to configure individual animations:
@@ -119,13 +136,24 @@ animations {
 
 // Open the Firefox picture-in-picture player as floating by default.
 window-rule {
-	// This app-id regular expression will work for both:
-	// - host Firefox (app-id is "firefox")
-	// - Flatpak Firefox (app-id is "org.mozilla.firefox")
 	match app-id=r#"firefox$"# title="^Picture-in-Picture$"
 	open-floating true
 }
 
+window-rule {
+	match app-id="scratch-term"
+	open-floating true
+	default-column-width { fixed 1200; }
+	default-window-height { fixed 800; }
+}
+
+window-rule {
+	match app-id="qalculate-(gtk|qt)"
+	open-floating true
+	default-column-width { fixed 800; }
+	default-window-height { fixed 600; }
+}
+
 // Example: block out two password managers from screen capture.
 // (This example rule is commented out with a "/-" in front.)
 /-window-rule {
@@ -138,11 +166,9 @@ window-rule {
 	// block-out-from "screencast"
 }
 
-// Example: enable rounded corners for all windows.
-// (This example rule is commented out with a "/-" in front.)
-/-window-rule {
-	geometry-corner-radius 12
-	clip-to-geometry true
+layer-rule {
+	match namespace="^noctalia-overview*"
+	place-within-backdrop true
 }
 
 binds {
@@ -165,6 +191,9 @@ binds {
 	Mod+Return hotkey-overlay-title="Terminal" {
 		spawn "foot"
 	}
+	Mod+Ctrl+Return hotkey-overlay-title="Terminal (Scratch)" {
+		spawn "foot" "--app-id" "scratch-term"
+	}
 	Mod+Space hotkey-overlay-title="App Launcher" {
 		spawn "fuzzel" "-I" "--log-level=warning" "--show-actions"
 	}
diff --git a/.config/niri/dms/alttab.kdl b/.config/niri/dms/alttab.kdl
deleted file mode 100644
index 091ea07..0000000
--- a/.config/niri/dms/alttab.kdl
+++ /dev/null
@@ -1,10 +0,0 @@
-// ! DO NOT EDIT !
-        // ! AUTO-GENERATED BY DMS !
-        // ! CHANGES WILL BE OVERWRITTEN !
-        // ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
-
-        recent-windows {
-        highlight {
-        corner-radius 12
-        }
-        }
diff --git a/.config/niri/dms/binds.kdl b/.config/niri/dms/binds.kdl
deleted file mode 100644
index e69de29..0000000
--- a/.config/niri/dms/binds.kdl
+++ /dev/null
diff --git a/.config/niri/dms/colors.kdl b/.config/niri/dms/colors.kdl
deleted file mode 100644
index 7e6101c..0000000
--- a/.config/niri/dms/colors.kdl
+++ /dev/null
@@ -1,39 +0,0 @@
-// ! Auto-generated file. Do not edit directly.
-// Remove `include "dms/colors.kdl"` from your config to override.
-
-layout {
-    background-color "transparent"
-
-    focus-ring {
-        active-color   "#42a5f5"
-        inactive-color "#8c9199"
-        urgent-color   "#f2b8b5"
-    }
-
-    border {
-        active-color   "#42a5f5"
-        inactive-color "#8c9199"
-        urgent-color   "#f2b8b5"
-    }
-
-    shadow {
-        color "#00000070"
-    }
-
-    tab-indicator {
-        active-color   "#42a5f5"
-        inactive-color "#8c9199"
-        urgent-color   "#f2b8b5"
-    }
-
-    insert-hint {
-        color "#42a5f580"
-    }
-}
-
-recent-windows {
-    highlight {
-        active-color   "#0d47a1"
-        urgent-color   "#f2b8b5"
-    }
-}
diff --git a/.config/niri/dms/cursor.kdl b/.config/niri/dms/cursor.kdl
deleted file mode 100644
index e69de29..0000000
--- a/.config/niri/dms/cursor.kdl
+++ /dev/null
diff --git a/.config/niri/dms/layout.kdl b/.config/niri/dms/layout.kdl
deleted file mode 100644
index 431afbf..0000000
--- a/.config/niri/dms/layout.kdl
+++ /dev/null
@@ -1,22 +0,0 @@
-// ! DO NOT EDIT !
-        // ! AUTO-GENERATED BY DMS !
-        // ! CHANGES WILL BE OVERWRITTEN !
-        // ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
-
-        layout {
-        gaps 4
-
-        border {
-        width 2
-        }
-
-        focus-ring {
-        width 2
-        }
-        }
-        window-rule {
-        geometry-corner-radius 12
-        clip-to-geometry true
-        tiled-state true
-        draw-border-with-background false
-        }
diff --git a/.config/niri/dms/outputs.kdl b/.config/niri/dms/outputs.kdl
deleted file mode 100644
index 8a92851..0000000
--- a/.config/niri/dms/outputs.kdl
+++ /dev/null
@@ -1,13 +0,0 @@
-// Auto-generated by DMS - do not edit manually
-
-output "DP-2" {
-    mode "5120x1440@144.000"
-    scale 1
-    position x=0 y=0
-}
-
-output "eDP-1" {
-    mode "2256x1504@60.000"
-    scale 1
-    position x=1432 y=1440
-}
diff --git a/.config/niri/dms/windowrules.kdl b/.config/niri/dms/windowrules.kdl
deleted file mode 100644
index e69de29..0000000
--- a/.config/niri/dms/windowrules.kdl
+++ /dev/null
diff --git a/.config/niri/dms/wpblur.kdl b/.config/niri/dms/wpblur.kdl
deleted file mode 100644
index 3d58802..0000000
--- a/.config/niri/dms/wpblur.kdl
+++ /dev/null
@@ -1,9 +0,0 @@
-// ! DO NOT EDIT !
-// ! AUTO-GENERATED BY DMS !
-// ! CHANGES WILL BE OVERWRITTEN !
-// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
-
-layer-rule {
-    match namespace="dms:blurwallpaper"
-    place-within-backdrop true
-}