From e629204c182ea08649093afee3ab172650b9fe02 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 20 Jun 2025 03:38:56 +0800 Subject: [PATCH] flake: Synchronize upstream inputs for flake and fix niri config --- flake.lock | 96 ++++----- home/david/configurations/Akun/niri.nix | 18 +- home/david/configurations/Tytonidae/niri.nix | 54 ++--- home/david/modules/programs/niri/config.nix | 216 ++++++++++--------- 4 files changed, 201 insertions(+), 183 deletions(-) diff --git a/flake.lock b/flake.lock index 8ceecae..c1f619e 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750212424, - "narHash": "sha256-qVefRn4cmrH3nNjT3sP5U2I9dsCTJKWzl8uDhwfAGFw=", + "lastModified": 1750330289, + "narHash": "sha256-16+LlTyw9wmINhxXB8BxGnSvngwm4nfrQ7GDKi7Cbdw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6725337207f86ac50a0ae4075718f47b5cb9174e", + "rev": "ed44dff18a42ae3852f0d182cd39eb10d6a723e3", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1749975763, - "narHash": "sha256-27qcno2+7CHU6ssR4i8SDNxIoXO+pmM0932oxnjR+Qs=", + "lastModified": 1750260393, + "narHash": "sha256-DJtTX/hxht6X0mway2HMEKCm9bbFNkecz7SNte5GaAw=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "c7fcf3fad955f7e028e16d00a274825737ad7cdf", + "rev": "1e51d98b6e606f935faaf08f68c1a3a68d5ee441", "type": "github" }, "original": { @@ -393,11 +393,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1750169866, - "narHash": "sha256-3gCFhONErZ13S0ixwLaQ4cfgaIOXOUHH2g/yzt3ZFg8=", + "lastModified": 1750344736, + "narHash": "sha256-pPktfkA5r1zhza2Gw+u7K4g/s9EfpXXMh7m/IQ3mIbs=", "owner": "helix-editor", "repo": "helix", - "rev": "1491cbc8f3694e52a565d192eaef1a7bf200d33f", + "rev": "036729211a94d058b835f5ee212ab15de83bc037", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1750127463, - "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", + "lastModified": 1750275572, + "narHash": "sha256-upC/GIlsIgtdtWRGd1obzdXWYQptNkfzZeyAFWgsgf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", + "rev": "0f355844e54e4c70906b1ef5cc35a0047d666c04", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1750127463, - "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1750172631, - "narHash": "sha256-XwqAqM1UmKahdCwzp2UQHTpjnY0b82/VTfA8VpZIR6g=", + "lastModified": 1750230721, + "narHash": "sha256-rg/lnazeno/f4VNSv+t2Zwio/OyCYKx5zV9/8hfhfgA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7de24ceed8c7693191b74a7bda6d89c91f94c8f5", + "rev": "6c88df8c85ad3f80a5832edc50534a5add255b47", "type": "github" }, "original": { @@ -522,11 +522,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750230031, - "narHash": "sha256-h1aDeX8j10N0pHqdvmVoLQsnTwj1TbxeTPos7x1wuZA=", + "lastModified": 1750390275, + "narHash": "sha256-k0cDsEK8aQLCYhBXXEMgBVdFWrPWd19JEtwJ5+DA91w=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1fc50d02ad4fe47daa5c22f9fa116ca220ab5154", + "rev": "3bebe770ebe600fc7f28cc593df14a9e90a3c02e", "type": "github" }, "original": { @@ -555,11 +555,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750225787, - "narHash": "sha256-7O/8CChaOhSBSu94McHE0vyH0o+J5R4exq2DDq4zHAg=", + "lastModified": 1750334747, + "narHash": "sha256-nsD1Z6vVP2Hhdgrd0uYHacre2+NhaH/53TFRXn6pRcs=", "owner": "YaLTeR", "repo": "niri", - "rev": "ed14e8da8476d5fde27b14d1dde03256a2f6e11b", + "rev": "e0b0b04b445f7044f383e50104f861e632e1c905", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1750244952, - "narHash": "sha256-678XeoTKUT1tEKSXaGA/rwHYQ2cBntr1I3Xw2D5Onew=", + "lastModified": 1750331408, + "narHash": "sha256-Rjc9aW5Dxn+KeBsx1DvkC+4SyLvdjEEyKJSVD5Q5UZw=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "fd677bef9e0172bc0cea0daccae3d28a74be882c", + "rev": "39eb68d021d698bc4d0cd86bf0c75a70285726cd", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -661,11 +661,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "lastModified": 1750259320, + "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", "type": "github" }, "original": { @@ -768,11 +768,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1750219402, - "narHash": "sha256-b3y7V7db0VwLGtpcLRmT1Aa9dpAKoHQdem55UhgB/fw=", + "lastModified": 1750392203, + "narHash": "sha256-rJU+WeeLxDinRWEGXw5OT4tToIAO8zy/ULFVWHhLp/Q=", "owner": "rycee", "repo": "nur-expressions", - "rev": "a00ce73b626ed274fbfe9f51627861e140b08f6d", + "rev": "09e3cfed476fc06384610a7e6027df221fc93bd3", "type": "gitlab" }, "original": { @@ -812,11 +812,11 @@ ] }, "locked": { - "lastModified": 1750127910, - "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", + "lastModified": 1750214276, + "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", + "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", "type": "github" }, "original": { @@ -854,11 +854,11 @@ ] }, "locked": { - "lastModified": 1750214276, - "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "lastModified": 1750300711, + "narHash": "sha256-4XHPocwP+66PhxyyObPXfI+Rql4PoGe/xBK791N8I78=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", + "rev": "4178888556c15e0a1c57850d2f103ac300a6e9e2", "type": "github" }, "original": { @@ -915,11 +915,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750205637, - "narHash": "sha256-49wV81h1jnHJky1XNHfgwxNA0oCwSTLMz4hhrtWCM8A=", + "lastModified": 1750369088, + "narHash": "sha256-njtrVYrl+4I3ikgAoKLyQ+5MZ1BKwazAiEpLq2efwrE=", "owner": "danth", "repo": "stylix", - "rev": "82323751bcd45579c8d3a5dd05531c3c2a78e347", + "rev": "8c1421ae02475a874f2a09cc4a7ad6de63fbc9e8", "type": "github" }, "original": { @@ -1099,11 +1099,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1749315541, - "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", + "lastModified": 1750388715, + "narHash": "sha256-6WMpcn3Ga/L71NiX9SdWw7ZELpNfrFnWJ0Gt2uAHjJg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", + "rev": "03cbb2ee3a9da931bb9a39eb917674297a0b9318", "type": "github" }, "original": { diff --git a/home/david/configurations/Akun/niri.nix b/home/david/configurations/Akun/niri.nix index e95a084..8d149a6 100644 --- a/home/david/configurations/Akun/niri.nix +++ b/home/david/configurations/Akun/niri.nix @@ -5,15 +5,17 @@ in { extraConfig = let output = node "output"; in [ - (output "eDP-1" [ - (leaf "mode" "1920x1200@60.018") - (leaf "scale" 1.0) + (output ["eDP-1"] [ + (leaf "mode" ["1920x1200@60.018"]) + (leaf "scale" [1.0]) (flag "focus-at-startup") - (leaf "position" { - x = 0; - y = 0; - }) - (leaf "transform" "normal") + (leaf "position" [ + { + x = 0; + y = 0; + } + ]) + (leaf "transform" ["normal"]) ]) ]; }; diff --git a/home/david/configurations/Tytonidae/niri.nix b/home/david/configurations/Tytonidae/niri.nix index d762830..cab1141 100644 --- a/home/david/configurations/Tytonidae/niri.nix +++ b/home/david/configurations/Tytonidae/niri.nix @@ -5,34 +5,40 @@ in { extraConfig = let output = node "output"; in [ - (output "DP-3" [ - (leaf "mode" "2560x1440@169.900") - (leaf "scale" 1.0) - (leaf "position" { - x = 0; - y = 0; - }) - (leaf "transform" "normal") + (output ["DP-3"] [ + (leaf "mode" ["2560x1440@169.900"]) + (leaf "scale" [1.0]) + (leaf "position" [ + { + x = 0; + y = 0; + } + ]) + (leaf "transform" ["normal"]) (flag "focus-at-startup") ]) - (output "DP-1" [ - (leaf "mode" "2560x1440@169.900") - (leaf "scale" 1.0) - (leaf "position" { - x = 0; - y = 0; - }) - (leaf "transform" "normal") + (output ["DP-1"] [ + (leaf "mode" ["2560x1440@169.900"]) + (leaf "scale" [1.0]) + (leaf "position" [ + { + x = 0; + y = 0; + } + ]) + (leaf "transform" ["normal"]) (flag "focus-at-startup") ]) - (output "eDP-1" [ - (leaf "mode" "2560x1440@165.003") - (leaf "scale" 1.5) - (leaf "position" { - x = 2560; - y = 0; - }) - (leaf "transform" "normal") + (output ["eDP-1"] [ + (leaf "mode" ["2560x1440@165.003"]) + (leaf "scale" [1.5]) + (leaf "position" [ + { + x = 2560; + y = 0; + } + ]) + (leaf "transform" ["normal"]) ]) ]; }; diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index 0e9986a..e9e45ab 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -64,24 +64,24 @@ in (flag "toggle-column-tabbed-display") ]) (plain "Mod+Space" [ - (spawn fuzzel) + (spawn [fuzzel]) ]) - (node "XF86AudioRaiseVolume" {allow-when-locked = true;} [ + (node "XF86AudioRaiseVolume" [{allow-when-locked = true;}] [ (spawn [wpctl "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"]) ]) - (node "XF86AudioLowerVolume" {allow-when-locked = true;} [ + (node "XF86AudioLowerVolume" [{allow-when-locked = true;}] [ (spawn [wpctl "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"]) ]) - (node "XF86AudioMute" {allow-when-locked = true;} [ + (node "XF86AudioMute" [{allow-when-locked = true;}] [ (spawn [wpctl "set-volume" "@DEFAULT_AUDIO_SINK@" "toggle"]) ]) - (node "XF86AudioMicMute" {allow-when-locked = true;} [ + (node "XF86AudioMicMute" [{allow-when-locked = true;}] [ (spawn [wpctl "set-volume" "@DEFAULT_AUDIO_SOURCE@" "toggle"]) ]) (plain "Mod+Q" [ (flag "close-window") ]) - (node "Mod+O" {repeat = false;} [ + (node "Mod+O" [{repeat = false;}] [ (flag "toggle-overview") ]) (plain "Mod+Left" [ @@ -228,10 +228,10 @@ in (plain "Mod+Ctrl+I" [ (flag "move-workspace-up") ]) - (node "Mod+Shift+WheelScrollDown" {cooldown-ms = 150;} [ + (node "Mod+Shift+WheelScrollDown" [{cooldown-ms = 150;}] [ (flag "focus-workspace-down") ]) - (node "Mod+Shift+WheelScrollUp" {cooldown-ms = 150;} [ + (node "Mod+Shift+WheelScrollUp" [{cooldown-ms = 150;}] [ (flag "focus-workspace-up") ]) (plain "Mod+WheelScrollDown" [ @@ -241,58 +241,58 @@ in (flag "focus-column-left") ]) (plain "Mod+1" [ - (leaf "focus-workspace" 1) + (leaf "focus-workspace" [1]) ]) (plain "Mod+2" [ - (leaf "focus-workspace" 2) + (leaf "focus-workspace" [2]) ]) (plain "Mod+3" [ - (leaf "focus-workspace" 3) + (leaf "focus-workspace" [3]) ]) (plain "Mod+4" [ - (leaf "focus-workspace" 4) + (leaf "focus-workspace" [4]) ]) (plain "Mod+5" [ - (leaf "focus-workspace" 5) + (leaf "focus-workspace" [5]) ]) (plain "Mod+6" [ - (leaf "focus-workspace" 6) + (leaf "focus-workspace" [6]) ]) (plain "Mod+7" [ - (leaf "focus-workspace" 7) + (leaf "focus-workspace" [7]) ]) (plain "Mod+8" [ - (leaf "focus-workspace" 8) + (leaf "focus-workspace" [8]) ]) (plain "Mod+9" [ - (leaf "focus-workspace" 9) + (leaf "focus-workspace" [9]) ]) (plain "Mod+Shift+1" [ - (leaf "move-column-to-workspace" 1) + (leaf "move-column-to-workspace" [1]) ]) (plain "Mod+Shift+2" [ - (leaf "move-column-to-workspace" 2) + (leaf "move-column-to-workspace" [2]) ]) (plain "Mod+Shift+3" [ - (leaf "move-column-to-workspace" 3) + (leaf "move-column-to-workspace" [3]) ]) (plain "Mod+Shift+4" [ - (leaf "move-column-to-workspace" 4) + (leaf "move-column-to-workspace" [4]) ]) (plain "Mod+Shift+5" [ - (leaf "move-column-to-workspace" 5) + (leaf "move-column-to-workspace" [5]) ]) (plain "Mod+Shift+6" [ - (leaf "move-column-to-workspace" 6) + (leaf "move-column-to-workspace" [6]) ]) (plain "Mod+Shift+7" [ - (leaf "move-column-to-workspace" 7) + (leaf "move-column-to-workspace" [7]) ]) (plain "Mod+Shift+8" [ - (leaf "move-column-to-workspace" 8) + (leaf "move-column-to-workspace" [8]) ]) (plain "Mod+Shift+9" [ - (leaf "move-column-to-workspace" 9) + (leaf "move-column-to-workspace" [9]) ]) (plain "Mod+F" [ (flag "toggle-window-floating") @@ -318,35 +318,35 @@ in (plain "Mod+Period" [ (flag "expel-window-from-column") ]) - (node "Mod+R" {repeat = false;} [ + (node "Mod+R" [{repeat = false;}] [ (flag "switch-preset-column-width") ]) - (node "Mod+Shift+R" {repeat = false;} [ + (node "Mod+Shift+R" [{repeat = false;}] [ (flag "switch-preset-window-height") ]) (plain "Mod+Ctrl+R" [ (flag "reset-window-height") ]) - (node "Mod+M" {repeat = false;} [ + (node "Mod+M" [{repeat = false;}] [ (flag "maximize-column") ]) - (node "Mod+Shift+M" {repeat = false;} [ + (node "Mod+Shift+M" [{repeat = false;}] [ (flag "fullscreen-window") ]) (plain "Mod+Z" [ (flag "center-column") ]) - (node "Mod+Minus" {repeat = false;} [ - (leaf "set-column-width" "-10%") + (node "Mod+Minus" [{repeat = false;}] [ + (leaf "set-column-width" ["-10%"]) ]) - (node "Mod+Equal" {repeat = false;} [ - (leaf "set-column-width" "+10%") + (node "Mod+Equal" [{repeat = false;}] [ + (leaf "set-column-width" ["+10%"]) ]) - (node "Mod+Shift+Minus" {repeat = false;} [ - (leaf "set-window-height" "-10%") + (node "Mod+Shift+Minus" [{repeat = false;}] [ + (leaf "set-window-height" ["-10%"]) ]) - (node "Mod+Shift+Equal" {repeat = false;} [ - (leaf "set-window-height" "+10%") + (node "Mod+Shift+Equal" [{repeat = false;}] [ + (leaf "set-window-height" ["+10%"]) ]) (plain "Print" [ (flag "screenshot") @@ -379,7 +379,7 @@ in let spawn-at-startup = leaf "spawn-at-startup"; in [ - (leaf "screenshot-path" "${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%d_%H:%M:%S.png") + (leaf "screenshot-path" ["${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%d_%H:%M:%S.png"]) (plain "hotkey-overlay" [ (flag "skip-at-startup") ]) @@ -393,55 +393,57 @@ in (spawn-at-startup [fcitx5 "--replace"]) (plain "input" [ (plain "touchpad" [ - (leaf "click-method" "clickfinger") + (leaf "click-method" ["clickfinger"]) (flag "dwt") - (leaf "scroll-method" "two-finger") - (leaf "tap-button-map" "left-right-middle") + (leaf "scroll-method" ["two-finger"]) + (leaf "tap-button-map" ["left-right-middle"]) ]) ]) (plain "cursor" [ - (leaf "hide-after-inactive-ms" 3000) + (leaf "hide-after-inactive-ms" [3000]) (flag "hide-when-typing") ]) (plain "layout" [ (plain "border" [ - (leaf "width" 4) - (leaf "active-color" "#7fc8ff") - (leaf "inactive-color" "#505050") + (leaf "width" [4]) + (leaf "active-color" ["#7fc8ff"]) + (leaf "inactive-color" ["#505050"]) ]) (plain "focus-ring" [ (flag "off") - (leaf "width" 4) - (leaf "active-color" "#7fc8ff") - (leaf "inactive-color" "#505050") + (leaf "width" [4]) + (leaf "active-color" ["#7fc8ff"]) + (leaf "inactive-color" ["#505050"]) ]) (plain "tab-indicator" [ (flag "hide-when-single-tab") ]) (plain "preset-column-widths" [ - (leaf "proportion" (1. / 4.)) - (leaf "proportion" (1. / 3.)) - (leaf "proportion" (1. / 2.)) - (leaf "proportion" (2. / 3.)) - (leaf "proportion" (3. / 4.)) - (leaf "proportion" (4. / 4.)) + (leaf "proportion" [(1. / 4.)]) + (leaf "proportion" [(1. / 3.)]) + (leaf "proportion" [(1. / 2.)]) + (leaf "proportion" [(2. / 3.)]) + (leaf "proportion" [(3. / 4.)]) + (leaf "proportion" [(4. / 4.)]) ]) (flag "always-center-single-column") - (leaf "center-focused-column" "never") - (leaf "default-column-display" "tabbed") + (leaf "center-focused-column" ["never"]) + (leaf "default-column-display" ["tabbed"]) (plain "default-column-width" [ - (leaf "proportion" (1. / 2.)) + (leaf "proportion" [(1. / 2.)]) ]) (flag "empty-workspace-above-first") - (leaf "gaps" 16) + (leaf "gaps" [16]) ]) (plain "animations" [ (plain "window-close" [ - (leaf "spring" { - damping-ratio = 1.0; - stiffness = 800; - epsilon = 0.0001; - }) + (leaf "spring" [ + { + damping-ratio = 1.0; + stiffness = 800; + epsilon = 0.0001; + } + ]) ]) ]) (plain "overview" [ @@ -454,59 +456,67 @@ in match = leaf "match"; in [ (window-rule [ - (leaf "draw-border-with-background" true) - (leaf "geometry-corner-radius" 12.0) - (leaf "clip-to-geometry" true) + (leaf "draw-border-with-background" [true]) + (leaf "geometry-corner-radius" [12.0]) + (leaf "clip-to-geometry" [true]) ]) (window-rule [ - (match {app-id = "^org\\.keepassxc\\.KeePassXC$";}) - (match {app-id = "^org\\.gnome\\.World\\.Secrets$";}) - (leaf "block-out-from" "screen-capture") + (match [{app-id = "^org\\.keepassxc\\.KeePassXC$";}]) + (match [{app-id = "^org\\.gnome\\.World\\.Secrets$";}]) + (leaf "block-out-from" ["screen-capture"]) ]) (window-rule [ - (match { - app-id = "^com\\.mitchellh\\.ghostty$"; - is-active = true; - }) - (leaf "draw-border-with-background" false) + (match [ + { + app-id = "^com\\.mitchellh\\.ghostty$"; + is-active = true; + } + ]) + (leaf "draw-border-with-background" [false]) ]) (window-rule [ - (match { - app-id = "^com\\.mitchellh\\.ghostty$"; - is-active = false; - }) - (leaf "opacity" 0.8) - (leaf "draw-border-with-background" false) + (match [ + { + app-id = "^com\\.mitchellh\\.ghostty$"; + is-active = false; + } + ]) + (leaf "opacity" [0.8]) + (leaf "draw-border-with-background" [false]) ]) (window-rule [ - (match {is-window-cast-target = true;}) + (match [{is-window-cast-target = true;}]) (plain "focus-ring" [ - (leaf "active-color" "#f38ba8") - (leaf "inactive-color" "#7d0d2d") + (leaf "active-color" ["#f38ba8"]) + (leaf "inactive-color" ["#7d0d2d"]) ]) (plain "border" [ - (leaf "active-color" "#f38ba8") - (leaf "inactive-color" "#7d0d2d") + (leaf "active-color" ["#f38ba8"]) + (leaf "inactive-color" ["#7d0d2d"]) ]) (plain "tab-indicator" [ - (leaf "active-color" "#f38ba8") - (leaf "inactive-color" "#7d0d2d") + (leaf "active-color" ["#f38ba8"]) + (leaf "inactive-color" ["#7d0d2d"]) ]) (plain "shadow" [ (flag "on") ]) ]) (window-rule [ - (match { - app-id = "^org\\.telegram\\.desktop$"; - title = "Media viewer"; - }) - (match { - app-id = "^QQ$"; - title = "图片查看器"; - }) - (leaf "open-floating" true) - (leaf "open-fullscreen" false) + (match [ + { + app-id = "^org\\.telegram\\.desktop$"; + title = "Media viewer"; + } + ]) + (match [ + { + app-id = "^QQ$"; + title = "图片查看器"; + } + ]) + (leaf "open-floating" [true]) + (leaf "open-fullscreen" [false]) ]) ] # window-rule ) @@ -516,16 +526,16 @@ in match = leaf "match"; in [ (layer-rule [ - (match {namespace = "^swaync-notification-window$";}) - (match {namespace = "^swaync-control-center$";}) - (leaf "block-out-from" "screen-capture") + (match [{namespace = "^swaync-notification-window$";}]) + (match [{namespace = "^swaync-control-center$";}]) + (leaf "block-out-from" ["screen-capture"]) ]) (layer-rule [ - (match {namespace = "^launcher$";}) + (match [{namespace = "^launcher$";}]) (plain "shadow" [ (flag "on") ]) - (leaf "geometry-corner-radius" 10.0) + (leaf "geometry-corner-radius" [10.0]) ]) ] # layer-rule )