From 949f2ca150fcef32e280ec3c9144621d90da2c36 Mon Sep 17 00:00:00 2001 From: afoucaultc Date: Fri, 7 Aug 2026 21:14:07 +0200 Subject: [PATCH] add niri again ? --- flake.lock | 97 ++++++++++--------- flake.nix | 1 + .../afoucaultc/packages/niri/conf/keybind.nix | 50 +++++----- .../packages/niri/conf/layerrules.nix | 5 - home/afoucaultc/packages/niri/conf/layout.nix | 2 +- home/afoucaultc/packages/niri/conf/misc.nix | 2 +- home/afoucaultc/packages/niri/conf/output.nix | 2 +- .../packages/niri/conf/switch-events.nix | 5 - .../packages/niri/conf/workspaces.nix | 13 ++- home/afoucaultc/packages/niri/niri.nix | 3 - home/afoucaultc/packages/niri/settings.nix | 2 +- hosts/nixos-home/config/niri.nix | 4 + 12 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 home/afoucaultc/packages/niri/conf/layerrules.nix delete mode 100644 home/afoucaultc/packages/niri/conf/switch-events.nix create mode 100644 hosts/nixos-home/config/niri.nix diff --git a/flake.lock b/flake.lock index 1ebc49e..d006547 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1785330427, - "narHash": "sha256-RTKedehLwWxGblFY5Nop3T08EGKH1T+4zmDTddmZ8k4=", + "lastModified": 1785877886, + "narHash": "sha256-H2CrAlJD9FsUbSEIhPVK3IyVjnK0vSxPruBef17GcBs=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "fc39af0ccec9171aec8185eaea8afb71a46eff90", + "rev": "1a10fe26a9f7d989c359e6a9ea61aa2e44d06c36", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1782007937, - "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=", + "lastModified": 1783570805, + "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "981bd332015397fb1ca033fa982bd61635160c78", + "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225", "type": "github" }, "original": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1785531816, - "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", + "lastModified": 1786031233, + "narHash": "sha256-TIDlLTLI1/pB7IqgjzcKQjpODQsZE2oII4XGG9B6KjI=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", + "rev": "7834e82588860aaf780cec1366524456a70898d7", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1782566056, - "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", + "lastModified": 1785855875, + "narHash": "sha256-dpW3UKG2NTboxxYGzOX4nZiH8YI++CpgosHmVaquOEI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", + "rev": "8699c38f0e4a1ca3bfc84f84ba020509ced1f133", "type": "github" }, "original": { @@ -284,11 +284,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1785664969, - "narHash": "sha256-0IZG3tmw1hWq187VT9U/7gjet0fH0lgOuErRbtGyEHI=", + "lastModified": 1786114408, + "narHash": "sha256-AvVYhJCOtgvzMcJqVFMBdNAw2aGmM8bzIJRWwhNzRpI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "41b0fffdec53454c31e098a0030bd15500802c16", + "rev": "face6d144be7e33c7f49798d8cc5e8fe416de43c", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1784458610, - "narHash": "sha256-A9Gb5wW2vMkYEec7DyCOBpEM6LwwpmQ/TIXEHhGgHUY=", + "lastModified": 1785843795, + "narHash": "sha256-DFc543bQN94Kt+RsD3Hiu7qCA1uKdqaFJKPMjzANKGU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "83da5ee98d806cef2d05a1072b8d8b832bf52891", + "rev": "5a7b8cf221914ce4714407950e4ffbdddcd8b66f", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785454630, - "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", + "lastModified": 1785828668, + "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", + "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb", "type": "github" }, "original": { @@ -651,11 +651,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1785571196, - "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", + "lastModified": 1785967620, + "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", + "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436", "type": "github" }, "original": { @@ -677,11 +677,11 @@ ] }, "locked": { - "lastModified": 1783439237, - "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=", + "lastModified": 1785549842, + "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=", "owner": "nix-community", "repo": "NUR", - "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503", + "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308", "type": "github" }, "original": { @@ -743,11 +743,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1785668978, - "narHash": "sha256-KlNkHvnTAutW62BFvMAH/jpzmUvVaz9DJn1yda/7GnU=", + "lastModified": 1786128941, + "narHash": "sha256-xjrN7ziovhkScO/neQAg8g7Wkl1wmf9YcL6+wMlDYPw=", "owner": "danth", "repo": "stylix", - "rev": "3542f21b7a1078b6ae0bcc72b62c9501825c83c8", + "rev": "ce31340522e54e072cb3504ba082f1ecdde47639", "type": "github" }, "original": { @@ -773,15 +773,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1774449309, + "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", "owner": "nix-systems", "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", "type": "github" }, "original": { "owner": "nix-systems", + "ref": "future-26.11", "repo": "default", "type": "github" } @@ -805,11 +806,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1781968807, - "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=", + "lastModified": 1785153830, + "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7", + "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8", "type": "github" }, "original": { @@ -821,11 +822,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1782012462, - "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=", + "lastModified": 1785031658, + "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4", + "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257", "type": "github" }, "original": { @@ -837,11 +838,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1782009766, - "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=", + "lastModified": 1785030526, + "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1", + "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02", "type": "github" }, "original": { @@ -878,11 +879,11 @@ ] }, "locked": { - "lastModified": 1785359135, - "narHash": "sha256-sRAGZVUPgwxpx19uZwaSERa86g1AbsBUQ3SxhaRPgeg=", + "lastModified": 1785846792, + "narHash": "sha256-sNIGmqZJiOM/lCWUuslV53zuk/p5sGCRcS3kHKfxQvA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "cc8e5ef8fb2acef3db488b9a33b0c48c2a4ee204", + "rev": "b653ab53a435e92cc00f34771e6823bc59f2f740", "type": "github" }, "original": { @@ -934,11 +935,11 @@ ] }, "locked": { - "lastModified": 1785652409, - "narHash": "sha256-0273OvIPfkJcdv0+Z3iPL8+eSRavAwGRCnr+Y6tRjYY=", + "lastModified": 1786118193, + "narHash": "sha256-RhkiElXANPrHOXTncgUmKHVw8FHuRZjAXmtUPQfB91c=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "12224626d0d1cead79603f19601666360c715379", + "rev": "43272965c62be2c512630bc80deeb6792b2f285b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2498b4b..0c46ec8 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,7 @@ ./hosts/nixos-home/configuration.nix stylix.nixosModules.stylix home-manager.nixosModules.home-manager + niri.nixosModules.niri { home-manager = { # default config diff --git a/home/afoucaultc/packages/niri/conf/keybind.nix b/home/afoucaultc/packages/niri/conf/keybind.nix index f7d873b..9022ec1 100644 --- a/home/afoucaultc/packages/niri/conf/keybind.nix +++ b/home/afoucaultc/packages/niri/conf/keybind.nix @@ -16,39 +16,39 @@ # other actions "ALT+F4".action.close-window = { }; - "ALT+V".toggle-window-floating = { }; - "ALT+M".maximize-column = { }; - "ALT+F".fullscreen-window = { }; + "ALT+V".action.toggle-window-floating = { }; + "ALT+M".action.maximize-column = { }; + "ALT+F".action.fullscreen-window = { }; - "ALT+H".focus-column-left = { }; - "ALT+L".focus-column-right = { }; - "ALT+K".focus-window-up = { }; - "ALT+J".focus-window-down = { }; + "ALT+H".action.focus-column-left = { }; + "ALT+L".action.focus-column-right = { }; + "ALT+K".action.focus-window-up = { }; + "ALT+J".action.focus-window-down = { }; - "Ctrl+Super+H".move-column-left = { }; - "Ctrl+Super+L".move-column-right = { }; - "Ctrl+Super+K".move-window-up = { }; - "Ctrl+Super+J".move-window-down = { }; + "Ctrl+Super+H".action.move-column-left = { }; + "Ctrl+Super+L".action.move-column-right = { }; + "Ctrl+Super+K".action.move-window-up = { }; + "Ctrl+Super+J".action.move-window-down = { }; - "Super+L".focus-workspace-down = { }; - "Super+H".focus-workspace-up = { }; - "Super+K".move-column-to-workspace-down = { }; - "Super+J".move-column-to-workspace-up = { }; + "Super+L".action.focus-workspace-down = { }; + "Super+H".action.focus-workspace-up = { }; + "Super+K".action.move-column-to-workspace-down = { }; + "Super+J".action.move-column-to-workspace-up = { }; - "Alt+A".focus-monitor-left = { }; - "Alt+B".focus-monitor-right = { }; - "Ctrl+Super+A".move-column-to-monitor-left = { }; - "Ctrl+Super+B".move-column-to-monitor-right = { }; + "Alt+A".action.focus-monitor-left = { }; + "Alt+B".action.focus-monitor-right = { }; + "Ctrl+Super+A".action.move-column-to-monitor-left = { }; + "Ctrl+Super+B".action.move-column-to-monitor-right = { }; - "Alt+R".switch-preset-column-width = { }; - "Ctrl+H".set-column-width = [ "-10%" ]; - "Ctrl+L".set-column-width = [ "+10%" ]; + "Alt+R".action.switch-preset-column-width = { }; + "Ctrl+H".action.set-column-width = [ "-10%" ]; + "Ctrl+L".action.set-column-width = [ "+10%" ]; "Ctrl+K".action.set-window-height = "-10%"; "Ctrl+J".action.set-window-height = "+10%"; - "Print".screenshot = { }; - "Ctrl+Print".screenshot-screen = { }; - "Alt+Print".screenshot-window = { }; + "Print".action.screenshot = { }; + "Ctrl+Print".action.screenshot-screen = { }; + "Alt+Print".action.screenshot-window = { }; # multimédia / luminosité "XF86MonBrightnessUp" = { diff --git a/home/afoucaultc/packages/niri/conf/layerrules.nix b/home/afoucaultc/packages/niri/conf/layerrules.nix deleted file mode 100644 index 1288b3f..0000000 --- a/home/afoucaultc/packages/niri/conf/layerrules.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: -{ - programs.niri.settings.ENTER = { - }; -} diff --git a/home/afoucaultc/packages/niri/conf/layout.nix b/home/afoucaultc/packages/niri/conf/layout.nix index 5d8ea8f..2f9fb44 100644 --- a/home/afoucaultc/packages/niri/conf/layout.nix +++ b/home/afoucaultc/packages/niri/conf/layout.nix @@ -5,7 +5,7 @@ center-focused-column = "never"; # never, always, on-overflow always-center-single-column = false; - preset-column-widths._children = [ + preset-column-widths = [ { proportion = 0.33333; } { proportion = 0.5; } { proportion = 0.66667; } diff --git a/home/afoucaultc/packages/niri/conf/misc.nix b/home/afoucaultc/packages/niri/conf/misc.nix index d044457..cb61b6a 100644 --- a/home/afoucaultc/packages/niri/conf/misc.nix +++ b/home/afoucaultc/packages/niri/conf/misc.nix @@ -26,7 +26,7 @@ xwayland-satellite = { enable = true; - path = "xwayland-satellit"; + path = "xwayland-satellite"; }; clipboard.disable-primary = false; hotkey-overlay.skip-at-startup = false; diff --git a/home/afoucaultc/packages/niri/conf/output.nix b/home/afoucaultc/packages/niri/conf/output.nix index 8a93c83..d684cc0 100644 --- a/home/afoucaultc/packages/niri/conf/output.nix +++ b/home/afoucaultc/packages/niri/conf/output.nix @@ -1,6 +1,6 @@ { ... }: { - programs.niri.settings.output = { + programs.niri.settings.outputs = { "eDP-1" = { enable = true; scale = 1.0; diff --git a/home/afoucaultc/packages/niri/conf/switch-events.nix b/home/afoucaultc/packages/niri/conf/switch-events.nix deleted file mode 100644 index 1288b3f..0000000 --- a/home/afoucaultc/packages/niri/conf/switch-events.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: -{ - programs.niri.settings.ENTER = { - }; -} diff --git a/home/afoucaultc/packages/niri/conf/workspaces.nix b/home/afoucaultc/packages/niri/conf/workspaces.nix index 3310fd1..946cbe5 100644 --- a/home/afoucaultc/packages/niri/conf/workspaces.nix +++ b/home/afoucaultc/packages/niri/conf/workspaces.nix @@ -1,8 +1,15 @@ { ... }: { programs.niri.settings.workspaces = { - # "1" = { name = "web"; open-on-output = "eDP-1"; }; - # "2" = { name = "code"; }; - # "3" = { name = "chat"; }; + "1" = { + name = "web"; + open-on-output = "eDP-1"; + }; + "2" = { + name = "code"; + }; + "3" = { + name = "chat"; + }; }; } diff --git a/home/afoucaultc/packages/niri/niri.nix b/home/afoucaultc/packages/niri/niri.nix index d225017..27f6813 100644 --- a/home/afoucaultc/packages/niri/niri.nix +++ b/home/afoucaultc/packages/niri/niri.nix @@ -3,9 +3,6 @@ imports = [ ./settings.nix ]; - programs.niri = { - enable = true; - }; home.packages = with pkgs; [ fuzzel kitty diff --git a/home/afoucaultc/packages/niri/settings.nix b/home/afoucaultc/packages/niri/settings.nix index 052129d..9e74233 100644 --- a/home/afoucaultc/packages/niri/settings.nix +++ b/home/afoucaultc/packages/niri/settings.nix @@ -10,6 +10,6 @@ conf/misc.nix conf/output.nix conf/window-rules.nix - conf/workspaces.nix + #conf/workspaces.nix ]; } diff --git a/hosts/nixos-home/config/niri.nix b/hosts/nixos-home/config/niri.nix new file mode 100644 index 0000000..fded7bf --- /dev/null +++ b/hosts/nixos-home/config/niri.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + programs.niri.enable = true; +}