well niri work please

home/afoucaultc/packages/niri/conf/animations.nix

@@ -11,13 +11,17 @@
     };
 
     window-open = {
-      duration-ms = 150;
-      curve = "ease-out-expo";
+      kind.easing = {
+        duration-ms = 150;
+        curve = "ease-out-expo";
+      };
     };
 
     window-close = {
-      duration-ms = 150;
-      curve = "ease-out-quad";
+      kind.easing = {
+        duration-ms = 150;
+        curve = "ease-out-quad";
+      };
     };
 
     horizontal-view-movement.spring = {
@@ -44,8 +48,12 @@
       epsilon = 0.001;
     };
 
-    screenshot-ui-open.duration-ms = 200;
-
+    screenshot-ui-open = {
+      kind.easing = {
+        duration-ms = 200;
+        curve = "ease-out-quad";
+      };
+    };
     overview-open-close.spring = {
       damping-ratio = 1.0;
       stiffness = 800;

home/afoucaultc/packages/niri/conf/input.nix

@@ -15,7 +15,7 @@
       numlock = true;
     };
     touchpad = {
-      off = true;
+      enable = false;
       tap = true;
       dwt = true;
       dwtp = true;
@@ -39,9 +39,6 @@
       scroll-method = null;
     };
 
-    mouse-scroll-factor = 1.0;
-    touchpad-scroll-factor = 1.0;
-
     focus-follows-mouse = {
       enable = true;
       # max-scroll-amount = "0%";

home/afoucaultc/packages/niri/conf/keybind.nix

@@ -10,15 +10,15 @@
       "-e"
       "nvim"
     ];
-    "Alt+F".spawn = [ "zen-beta" ];
-    "Alt+Z".spawn = [ "zotero" ];
-    "Alt+T".spawn = [ "thunderbird" ];
+    "Alt+F".action.spawn = [ "zen-beta" ];
+    "Alt+Z".action.spawn = [ "zotero" ];
+    "Alt+T".action.spawn = [ "thunderbird" ];
 
     # other actions
     "ALT+F4".action.close-window = { };
     "ALT+V".action.toggle-window-floating = { };
-    "ALT+M".action.maximize-column = { };
-    "ALT+F".action.fullscreen-window = { };
+    "Ctrl+M".action.maximize-column = { };
+    "Ctrl+F".action.fullscreen-window = { };
 
     "ALT+H".action.focus-column-left = { };
     "ALT+L".action.focus-column-right = { };
@@ -52,8 +52,8 @@
 
     # multimédia / luminosité
     "XF86MonBrightnessUp" = {
-      _props.allow-when-locked = true;
-      spawn = [
+      allow-when-locked = true;
+      action.spawn = [
         "brightnessctl"
         "-e4"
         "-n2"
@@ -62,8 +62,8 @@
       ];
     };
     "XF86MonBrightnessDown" = {
-      _props.allow-when-locked = true;
-      spawn = [
+      allow-when-locked = true;
+      action.spawn = [
         "brightnessctl"
         "-e4"
         "-n2"
@@ -72,8 +72,8 @@
       ];
     };
     "XF86AudioRaiseVolume" = {
-      _props.allow-when-locked = true;
-      spawn = [
+      allow-when-locked = true;
+      action.spawn = [
         "wpctl"
         "set-volume"
         "-l"
@@ -83,8 +83,8 @@
       ];
     };
     "XF86AudioLowerVolume" = {
-      _props.allow-when-locked = true;
-      spawn = [
+      allow-when-locked = true;
+      action.spawn = [
         "wpctl"
         "set-volume"
         "@DEFAULT_AUDIO_SINK@"
@@ -92,8 +92,8 @@
       ];
     };
     "XF86AudioMute" = {
-      _props.allow-when-locked = true;
-      spawn = [
+      allow-when-locked = true;
+      action.spawn = [
         "wpctl"
         "set-mute"
         "@DEFAULT_AUDIO_SINK@"
@@ -101,8 +101,8 @@
       ];
     };
     "XF86AudioMicMute" = {
-      _props.allow-when-locked = true;
-      spawn = [
+      allow-when-locked = true;
+      action.spawn = [
         "wpctl"
         "set-mute"
         "@DEFAULT_AUDIO_SOURCE@"
@@ -111,11 +111,10 @@
     };
 
     # Verrouillage d'écran
-    "Ctrl+Alt+L".action = {
-      spawn = [ "swaylock" ];
+    "Ctrl+Alt+L" = {
+      action.spawn = [ "swaylock" ];
       allow-when-locked = true;
     };
-
     # Aperçu global (overview)
     "Alt+Tab".action.toggle-overview = { };
   };

home/afoucaultc/packages/niri/conf/misc.nix

@@ -18,8 +18,8 @@
       MOZ_ENABLE_WAYLAND = "1";
     };
     cursor = {
-      xcursor-theme = "Bibata-Modern-Ice";
-      xcursor-size = 24;
+      theme = "Bibata-Modern-Ice";
+      size = 24;
       hide-when-typing = true;
       hide-after-inactive-ms = null;
     };

home/afoucaultc/packages/niri/conf/output.nix

@@ -14,7 +14,7 @@
         height = 1080;
         refresh = 120.0;
       };
-      variable-refresh-rate = null; # true, false, on-demand
+      variable-refresh-rate = true; # true, false, on-demand
       # background-color = "#000000";
     };
     # 2nd screen

home/afoucaultc/packages/niri/conf/window-rules.nix

@@ -21,7 +21,6 @@
       open-floating = true;
     }
     {
-      # Exemple : bordure/opacité par app
       matches = [ { app-id = "^kitty$"; } ];
       opacity = 0.95;
       geometry-corner-radius = {
@@ -32,10 +31,5 @@
       };
       clip-to-geometry = true;
     }
-    {
-      exclude-from-window-list = false;
-      matches = [ { is-active = false; } ];
-      opacity = 1.0;
-    }
   ];
 }

home/afoucaultc/packages/niri/niri.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  programs.niri.package = pkgs.niri;
   imports = [
     ./settings.nix
   ];