improve gitignore, make niri shared config more modular

dotfiles/shared/niri/biri-shared.kdl

@@ -0,0 +1,16 @@
+binds {
+    Mod+Slash { spawn "niri-scratch-workspace-toggle"; }
+    Mod+Shift+Slash { move-window-to-workspace "x" focus=false; }
+}
+workspace "x" {
+    hidden true
+    layout {
+        focus-ring {
+            width 3
+            active-color "#a33d3d"
+        }
+    }
+}
+
+spawn-at-startup "niri-listen-for-scratch-workspace-change"
+spawn-at-startup "niri-clear-state"

dotfiles/shared/niri/noctalia-shared.kdl

@@ -0,0 +1,34 @@
+binds {
+    Mod+D hotkey-overlay-title="Application launcher" { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
+    Mod+C hotkey-overlay-title="Open calculator" { spawn "noctalia" "msg" "panel-toggle" "yuuto/calculator:panel"; }
+
+    Mod+L hotkey-overlay-title="Lock session" { spawn "noctalia" "msg" "session" "lock"; }
+    Mod+Shift+D hotkey-overlay-title="Edit desktop widgets" { spawn "noctalia" "msg" "desktop-widgets-edit"; }
+    Mod+Shift+B hotkey-overlay-title="Open bar settings" { spawn "noctalia" "msg" "settings-open" "bar"; }
+    Mod+Shift+S hotkey-overlay-title="Open settings" { spawn "noctalia" "msg" "settings-open"; }
+    Mod+Period hotkey-overlay-title="Open control center" { spawn "noctalia" "msg" "panel-toggle" "control-center"; }
+    Mod+Shift+P hotkey-overlay-title="Open power menu" { spawn "noctalia" "msg" "panel-toggle" "session"; }
+    Mod+V hotkey-overlay-title="Show clipboard helper" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
+    Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; }
+    Mod+W hotkey-overlay-title="Show wallpaper panel" { spawn "noctalia" "msg" "panel-toggle" "wallpaper"; }
+    Mod+Shift+W { spawn "noctalia" "msg" "panel-toggle" "noctalia/wallhaven:browser"; }
+    Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; }
+    Mod+R hotkey-overlay-title="Open Remmina panel" { spawn "noctalia" "msg" "panel-toggle" "rylos/remmina:connections"; }
+
+    XF86AudioLowerVolume { spawn "noctalia" "msg" "volume-down" "5"; }
+    XF86AudioRaiseVolume { spawn "noctalia" "msg" "volume-up" "5"; }
+    XF86AudioMute { spawn "noctalia" "msg" "volume-mute"; }
+    XF86AudioMicMute { spawn "noctalia" "msg" "mic-mute"; }
+    XF86MonBrightnessDown { spawn "noctalia" "msg" "brightness-down" "5"; }
+    XF86MonBrightnessUp { spawn "noctalia" "msg" "brightness-up" "5"; }
+    XF86NotificationCenter { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; }
+
+    Pause { spawn "noctalia" "msg" "media" "toggle"; }
+}
+
+spawn-at-startup "noctalia"
+
+layer-rule {
+  match namespace="^noctalia-backdrop"
+  place-within-backdrop true
+}

dotfiles/shared/niri/shared.kdl

@@ -14,8 +14,11 @@ input {
     focus-follows-mouse max-scroll-amount="0%"
 }
 prefer-no-csd
-hotkey-overlay { skip-at-startup; }
-screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+hotkey-overlay {
+    skip-at-startup;
+    hide-not-bound;
+}
+screenshot-path "~/Pictures/Screenshots/%Y-%m-%d_%H-%M-%S.png"
 cursor {
     xcursor-theme "Bibata-Modern-Ice"
     xcursor-size 22
@@ -32,8 +35,6 @@ layout {
     }
 }
 binds {
-    Mod+D hotkey-overlay-title="Application launcher" { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
-    Mod+C hotkey-overlay-title="Open calculator" { spawn "noctalia" "msg" "panel-toggle" "yuuto/calculator:panel"; }
     Mod+Return hotkey-overlay-title="Open terminal (Kitty)" { spawn "kitty"; }
     Mod+O hotkey-overlay-title="Open Obsidian" { spawn "obsidian"; }
     Mod+G hotkey-overlay-title="Open GitHub Desktop" { spawn "github-desktop"; }
@@ -47,19 +48,6 @@ binds {
     Mod+Shift+F { fullscreen-window; }
     Mod+Shift+E { quit; }
 
-    Mod+L hotkey-overlay-title="Lock session" { spawn "noctalia" "msg" "session" "lock"; }
-    Mod+Shift+D hotkey-overlay-title="Edit desktop widgets" { spawn "noctalia" "msg" "desktop-widgets-edit"; }
-    Mod+Shift+B hotkey-overlay-title="Open bar settings" { spawn "noctalia" "msg" "settings-open" "bar"; }
-    Mod+Shift+S hotkey-overlay-title="Open settings" { spawn "noctalia" "msg" "settings-open"; }
-    Mod+Period hotkey-overlay-title="Open control center" { spawn "noctalia" "msg" "panel-toggle" "control-center"; }
-    Mod+Shift+P hotkey-overlay-title="Open power menu" { spawn "noctalia" "msg" "panel-toggle" "session"; }
-    Mod+V hotkey-overlay-title="Show clipboard helper" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
-    Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; }
-    Mod+W hotkey-overlay-title="Show wallpaper panel" { spawn "noctalia" "msg" "panel-toggle" "wallpaper"; }
-    Mod+Shift+W { spawn "noctalia" "msg" "panel-toggle" "noctalia/wallhaven:browser"; }
-    Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; }
-    Mod+R hotkey-overlay-title="Open Remmina panel" { spawn "noctalia" "msg" "panel-toggle" "rylos/remmina:connections"; }
-
     Mod+Up { focus-workspace-up; }
     Mod+Down { focus-workspace-down; }
     Mod+Left { focus-column-left; }
@@ -72,33 +60,12 @@ binds {
     Mod+Shift+Left { move-column-left; }
     Mod+Shift+Right { move-column-right; }
 
-    XF86AudioLowerVolume { spawn "noctalia" "msg" "volume-down" "5"; }
-    XF86AudioRaiseVolume { spawn "noctalia" "msg" "volume-up" "5"; }
-    XF86AudioMute { spawn "noctalia" "msg" "volume-mute"; }
-    XF86AudioMicMute { spawn "noctalia" "msg" "mic-mute"; }
-    XF86MonBrightnessDown { spawn "noctalia" "msg" "brightness-down" "5"; }
-    XF86MonBrightnessUp { spawn "noctalia" "msg" "brightness-up" "5"; }
     XF86WLAN { spawn-sh "rfkill toggle 0 || rfkill toggle 1"; }
-    XF86NotificationCenter { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; }
     XF86Display { toggle-overview; }
 
     Print { screenshot; }
     Shift+Print { screenshot-window; }
     Mod+Print { screenshot-screen; }
-
-    Mod+Slash { spawn "niri-scratch-workspace-toggle"; }
-    Mod+Shift+Slash { move-window-to-workspace "x" focus=false; }
-
-    Pause { spawn "noctalia" "msg" "media" "toggle"; }
-}
-workspace "x" {
-    hidden true
-    layout {
-        focus-ring {
-            width 3
-            active-color "#a33d3d"
-        }
-    }
 }
 window-rule {
     draw-border-with-background false
@@ -116,17 +83,9 @@ window-rule { // Steam notifications are not focused and appear in bottom-right
     default-floating-position x=10 y=10 relative-to="bottom-right"
     open-focused false
 }
-spawn-at-startup "noctalia"
-spawn-at-startup "niri-listen-for-scratch-workspace-change"
-spawn-at-startup "niri-clear-state"
 
 gestures { hot-corners { off; }; }
 
-layer-rule {
-  match namespace="^noctalia-backdrop"
-  place-within-backdrop true
-}
-
 animations {
     on
     slowdown 1
@@ -148,6 +107,6 @@ animations {
         spring damping-ratio=0.9 stiffness=750 epsilon=0.0001
     }
     window-resize {
-        spring damping-ratio=0.75 stiffness=700 epsilon=0.0001
+        spring damping-ratio=0.8 stiffness=850 epsilon=0.0001
     }
-}
+}

dotfiles/takamaki/equibop/equicord-settings.json

@@ -4,7 +4,7 @@
         "authenticated": false,
         "settingsSync": false,
         "url": "https://cloud.equicord.org/",
-        "settingsSyncVersion": 1789498433782
+        "settingsSyncVersion": 1789605673754
     },
     "enableOnlineThemes": true,
     "enabledThemeLinks": [

dotfiles/takamaki/niri.kdl

@@ -1,4 +1,6 @@
 include "./shared.kdl"
+include "./noctalia-shared.kdl"
+include "./biri-shared.kdl"
 
 input {
     keyboard {

dotfiles/takamaki/noctalia/plugins/data/icefish/phone-connect/state.json

@@ -0,0 +1 @@
+{"aliasMap":{"c8bbf88c5d984a27be9955a82078621f":"Galaxy A55"},"imageMap":{"c8bbf88c5d984a27be9955a82078621f":"/home/grey/Pictures/rei-ayanami-pfp.jpg"},"selected":"c8bbf88c5d984a27be9955a82078621f"}

dotfiles/takamaki/noctalia/settings.toml

@@ -24,6 +24,7 @@ order = [ "default" ]
     margin_opposite_edge = 8
     padding = 10
     position = "top"
+    radius = 6
     shadow = false
     start = []
     thickness = 44
@@ -284,7 +285,7 @@ polkit_agent = true
 popup_shadows = false
 
     [shell.animation]
-    speed = 1.4000000208616257
+    speed = 1.5000000223517418
 
     [shell.launcher]
     categories = false
@@ -343,7 +344,7 @@ directory = "/home/grey/Pictures/Wallpapers"
     path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
 
     [wallpaper.last]
-    path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
+    path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p-rotated.png"
 
     [wallpaper.monitors.DP-2]
     path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
@@ -366,18 +367,24 @@ directory = "/home/grey/Pictures/Wallpapers"
     path = "/home/grey/Pictures/Wallpapers/everforest.webp"
     theme_mode = "dark"
 
-    [[wallpaper.favorite]]
-    builtin_palette = "Nord"
-    palette_source = "builtin"
-    path = "/home/grey/Pictures/Wallpapers/2560x1440.png"
-    theme_mode = "dark"
-
     [[wallpaper.favorite]]
     palette_source = "wallpaper"
     path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
     theme_mode = "dark"
     wallpaper_scheme = "muted"
 
+    [[wallpaper.favorite]]
+    builtin_palette = "Nord"
+    palette_source = "builtin"
+    path = "/home/grey/Pictures/Wallpapers/frutiger-aero.png"
+    theme_mode = "dark"
+
+    [[wallpaper.favorite]]
+    builtin_palette = "Nord"
+    palette_source = "builtin"
+    path = "/home/grey/Pictures/Wallpapers/clouds.jpg"
+    theme_mode = "dark"
+
 [widget.active_window]
 anchor = true
 display = "icon_and_text"