diff --git a/flake.lock b/flake.lock index afbb44a..b9819d9 100644 --- a/flake.lock +++ b/flake.lock @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1749200714, - "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", + "lastModified": 1749436314, + "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", "owner": "nix-community", "repo": "disko", - "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", + "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1749248684, - "narHash": "sha256-5Upy6vLXAguCrd1alanuKc0XwAa+tQRWGeq+bDM0XXw=", + "lastModified": 1749432877, + "narHash": "sha256-z3fWdIANU38HVqgqAhBM0lHq7OTa3Ncxs4Hh/dejEk8=", "owner": "helix-editor", "repo": "helix", - "rev": "f4b488e380e28aa36a06ad400d6656fa864ba5b7", + "rev": "2b26d27416b4b0fb2286bf05aae173ec23dd6592", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1749243446, - "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", + "lastModified": 1749400020, + "narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", + "rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749242294, - "narHash": "sha256-kRoYNsL0fwNVXFAr5dl/7esQK8vtJUJYnU+P5/w+ZJQ=", + "lastModified": 1749396815, + "narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2b3bd97df72f2d0b021afcb7a6077e7f71fc2f8d", + "rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749112952, - "narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=", + "lastModified": 1749327170, + "narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=", "owner": "YaLTeR", "repo": "niri", - "rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a", + "rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749252229, - "narHash": "sha256-zIXU2Z+OBmkI+qjryUtVILP6qgZo+0bnIEy3UAw0CAE=", + "lastModified": 1749424580, + "narHash": "sha256-mt45T2JVYPLwJs3Gi0Hr6Eo5TE+sPyWUDq/H6Qg66ek=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "821627b7fe15013554cab4e9db4b8cb6fa9e8baf", + "rev": "fae5ebd4d5da1db8323a673728ebecc06b9dc653", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", + "lastModified": 1749237914, + "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1748995628, - "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=", + "lastModified": 1749173751, + "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", + "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -650,11 +650,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1749143092, - "narHash": "sha256-IrVT37SUU8/B3X53rwEzDrx3djGLIfa8tmsyqVJxpR4=", + "lastModified": 1749269004, + "narHash": "sha256-20eV5kl7iP7ODy9ZNW2SAg8bIg2ttud+IWs7UHxsbE0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d62d10f250ca6a37cbbe05a35a0e1e7ae3b4b5c2", + "rev": "c579adeca940c70ac7dd661a1cda662f2d1fb158", "type": "gitlab" }, "original": { @@ -714,11 +714,11 @@ ] }, "locked": { - "lastModified": 1749177458, - "narHash": "sha256-9HNq3EHZIvvxXQyEn0sYOywcESF1Xqw2Q8J1ZewcXuk=", + "lastModified": 1749350575, + "narHash": "sha256-ltLegOYrp69v/7BXlNfSwUPrt2DvF7N668pV4a6rWRA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d58933b88cef7a05e9677e94352fd6fedba402cd", + "rev": "24d5806474b0779d373f381f00d75ad51fd45099", "type": "github" }, "original": { @@ -775,11 +775,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749236315, - "narHash": "sha256-Ndtdvwz8D4WOYHl5mj9d5F5iC8WPH6uPNF7RcU3QzmE=", + "lastModified": 1749398498, + "narHash": "sha256-Usx6sGnT/D8ZnWiZg+J1OY3dp4ZssMQiN1XeXcsL/cs=", "owner": "danth", "repo": "stylix", - "rev": "29d006198ee05143cca8b4b89f37025823da1bcc", + "rev": "5869510e48e64d916dc6905dc664a02b0f85f1bd", "type": "github" }, "original": { @@ -959,11 +959,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1749315541, + "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", "type": "github" }, "original": { diff --git a/home/david/configurations/Akun/niri.nix b/home/david/configurations/Akun/niri.nix index f2ce7ec..e95a084 100644 --- a/home/david/configurations/Akun/niri.nix +++ b/home/david/configurations/Akun/niri.nix @@ -2,7 +2,6 @@ inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; in { david.programs.niri = { - DISPLAY = ":1"; extraConfig = let output = node "output"; in [ diff --git a/home/david/configurations/Tytonidae/niri.nix b/home/david/configurations/Tytonidae/niri.nix index 86c00ba..d762830 100644 --- a/home/david/configurations/Tytonidae/niri.nix +++ b/home/david/configurations/Tytonidae/niri.nix @@ -2,7 +2,6 @@ inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; in { david.programs.niri = { - DISPLAY = ":1"; extraConfig = let output = node "output"; in [ @@ -36,33 +35,5 @@ in { (leaf "transform" "normal") ]) ]; - # settings = { - # outputs = { - # DP-1 = { - # mode = { - # width = 2560; - # height = 1440; - # refresh = 169.900; - # }; - # scale = 1; - # position = { - # x = 0; - # y = 0; - # }; - # }; - # eDP-1 = { - # mode = { - # width = 2560; - # height = 1440; - # refresh = 165.003; - # }; - # scale = 1.5; - # position = { - # x = 2560; - # y = 0; - # }; - # }; - # }; - # }; }; } diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index 5252132..33e403b 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -4,7 +4,6 @@ lib, inputs, osConfig ? null, - DISPLAY, ... }: let inherit (lib) getExe getExe'; @@ -33,7 +32,6 @@ waybar = getExe config.programs.waybar.package; swaync = getExe config.services.swaync.package; fcitx5 = lib.getExe' osConfig.i18n.inputMethod.package "fcitx5"; - xwayland-satellite = lib.getExe pkgs.xwayland-satellite; sleep = lib.getExe' pkgs.coreutils "sleep"; polkit-kde-agent = getExe' pkgs.kdePackages.polkit-kde-agent-1 "polkit-kde-agent"; @@ -392,7 +390,6 @@ in (spawn-at-startup [swaybg "-i" "${config.home.homeDirectory}/wallpaper/01.png"]) (spawn-at-startup [polkit-kde-agent]) (spawn-at-startup [wl-paste "--watch" cliphist "store"]) - (spawn-at-startup [xwayland-satellite "${DISPLAY}"]) (spawn-at-startup [sh "-c" "${sleep} 10; ${fcitx5} --replace"]) (plain "input" [ (plain "touchpad" [ @@ -447,9 +444,6 @@ in }) ]) ]) - (plain "environment" [ - (leaf "DISPLAY" DISPLAY) - ]) (plain "overview" [ ]) ] # others diff --git a/home/david/modules/programs/niri/default.nix b/home/david/modules/programs/niri/default.nix index f5cdddb..a1611d7 100644 --- a/home/david/modules/programs/niri/default.nix +++ b/home/david/modules/programs/niri/default.nix @@ -13,9 +13,6 @@ in { extraConfig = lib.mkOption { type = inputs.niri-flake.lib.kdl.types.kdl-document; }; - DISPLAY = lib.mkOption { - type = lib.types.str; - }; }; }; config = lib.mkMerge [ @@ -24,16 +21,9 @@ in { } ( lib.mkIf cfg.enable { - home.sessionVariables = { - inherit (cfg) DISPLAY; - }; youthlic.programs.niri = { - # settings = lib.mkMerge [(import ./settings.nix args) cfg.settings]; config = - (lib.toList (import ./config.nix (args - // { - inherit (cfg) DISPLAY; - }))) + (lib.toList (import ./config.nix args)) ++ (lib.toList cfg.extraConfig); }; david.programs.wluma.enable = true; diff --git a/home/modules/programs/niri.nix b/home/modules/programs/niri.nix index 663ad38..4897600 100644 --- a/home/modules/programs/niri.nix +++ b/home/modules/programs/niri.nix @@ -12,9 +12,6 @@ in { options = { youthlic.programs.niri = { enable = lib.mkEnableOption "niri"; - # settings = lib.mkOption { - # type = lib.types.attrs; - # }; config = lib.mkOption { type = inputs.niri-flake.lib.kdl.types.kdl-document; }; @@ -30,7 +27,6 @@ in { (with pkgs; [ swaynotificationcenter swaybg - xwayland-satellite kdePackages.polkit-kde-agent-1 wl-clipboard cliphist @@ -71,7 +67,6 @@ in { swaylock.enable = true; }; programs.niri = { - # settings = cfg.settings; config = cfg.config; package = niri; }; diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index 4fd56e0..dd23430 100644 --- a/nixos/modules/gui/niri.nix +++ b/nixos/modules/gui/niri.nix @@ -23,6 +23,7 @@ in { cosmic-files kdePackages.qt6ct libsForQt5.qt5ct + xwayland-satellite-unstable ]; xdg = { terminal-exec = {