youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update flake inputs

Browse source
This commit is contained in:
ulic-youthlic 2025-06-08 16:21:55 +08:00
parent e46a086ab3
commit 11e14b01f9
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
7 changed files with 47 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

90
flake.lock generated
View file

@ -141,11 +141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749200714, "lastModified": 1749436314,
"narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1748821116, "lastModified": 1749398372,
"narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,11 +357,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1749248684, "lastModified": 1749432877,
"narHash": "sha256-5Upy6vLXAguCrd1alanuKc0XwAa+tQRWGeq+bDM0XXw=", "narHash": "sha256-z3fWdIANU38HVqgqAhBM0lHq7OTa3Ncxs4Hh/dejEk8=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "f4b488e380e28aa36a06ad400d6656fa864ba5b7", "rev": "2b26d27416b4b0fb2286bf05aae173ec23dd6592",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749243446, "lastModified": 1749400020,
"narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,11 +443,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1749242294, "lastModified": 1749396815,
"narHash": "sha256-kRoYNsL0fwNVXFAr5dl/7esQK8vtJUJYnU+P5/w+ZJQ=", "narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "2b3bd97df72f2d0b021afcb7a6077e7f71fc2f8d", "rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +476,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749112952, "lastModified": 1749327170,
"narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=", "narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a", "rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1749252229, "lastModified": 1749424580,
"narHash": "sha256-zIXU2Z+OBmkI+qjryUtVILP6qgZo+0bnIEy3UAw0CAE=", "narHash": "sha256-mt45T2JVYPLwJs3Gi0Hr6Eo5TE+sPyWUDq/H6Qg66ek=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "821627b7fe15013554cab4e9db4b8cb6fa9e8baf", "rev": "fae5ebd4d5da1db8323a673728ebecc06b9dc653",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -528,11 +528,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748929857, "lastModified": 1749143949,
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -559,11 +559,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1749086602, "lastModified": 1749237914,
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4792576cb003c994bd7cc1edada3129def20b27d", "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,11 +575,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1748995628, "lastModified": 1749173751,
"narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=", "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,11 +591,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749143949, "lastModified": 1749285348,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,11 +650,11 @@
"nur-rycee": { "nur-rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749143092, "lastModified": 1749269004,
"narHash": "sha256-IrVT37SUU8/B3X53rwEzDrx3djGLIfa8tmsyqVJxpR4=", "narHash": "sha256-20eV5kl7iP7ODy9ZNW2SAg8bIg2ttud+IWs7UHxsbE0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "d62d10f250ca6a37cbbe05a35a0e1e7ae3b4b5c2", "rev": "c579adeca940c70ac7dd661a1cda662f2d1fb158",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -714,11 +714,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749177458, "lastModified": 1749350575,
"narHash": "sha256-9HNq3EHZIvvxXQyEn0sYOywcESF1Xqw2Q8J1ZewcXuk=", "narHash": "sha256-ltLegOYrp69v/7BXlNfSwUPrt2DvF7N668pV4a6rWRA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d58933b88cef7a05e9677e94352fd6fedba402cd", "rev": "24d5806474b0779d373f381f00d75ad51fd45099",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1749236315, "lastModified": 1749398498,
"narHash": "sha256-Ndtdvwz8D4WOYHl5mj9d5F5iC8WPH6uPNF7RcU3QzmE=", "narHash": "sha256-Usx6sGnT/D8ZnWiZg+J1OY3dp4ZssMQiN1XeXcsL/cs=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "29d006198ee05143cca8b4b89f37025823da1bcc", "rev": "5869510e48e64d916dc6905dc664a02b0f85f1bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -959,11 +959,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748488455, "lastModified": 1749315541,
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/david/configurations/Akun/niri.nix
View file

@ -2,7 +2,6 @@
inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
in { in {
david.programs.niri = { david.programs.niri = {
DISPLAY = ":1";
extraConfig = let extraConfig = let
output = node "output"; output = node "output";
in [ in [

29
home/david/configurations/Tytonidae/niri.nix
View file

@ -2,7 +2,6 @@
inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
in { in {
david.programs.niri = { david.programs.niri = {
DISPLAY = ":1";
extraConfig = let extraConfig = let
output = node "output"; output = node "output";
in [ in [
@ -36,33 +35,5 @@ in {
(leaf "transform" "normal") (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;
# };
# };
# };
# };
}; };
} }

6
home/david/modules/programs/niri/config.nix
View file

@ -4,7 +4,6 @@
lib, lib,
inputs, inputs,
osConfig ? null, osConfig ? null,
DISPLAY,
... ...
}: let }: let
inherit (lib) getExe getExe'; inherit (lib) getExe getExe';
@ -33,7 +32,6 @@
waybar = getExe config.programs.waybar.package; waybar = getExe config.programs.waybar.package;
swaync = getExe config.services.swaync.package; swaync = getExe config.services.swaync.package;
fcitx5 = lib.getExe' osConfig.i18n.inputMethod.package "fcitx5"; fcitx5 = lib.getExe' osConfig.i18n.inputMethod.package "fcitx5";
xwayland-satellite = lib.getExe pkgs.xwayland-satellite;
sleep = lib.getExe' pkgs.coreutils "sleep"; sleep = lib.getExe' pkgs.coreutils "sleep";
polkit-kde-agent = getExe' pkgs.kdePackages.polkit-kde-agent-1 "polkit-kde-agent"; 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 [swaybg "-i" "${config.home.homeDirectory}/wallpaper/01.png"])
(spawn-at-startup [polkit-kde-agent]) (spawn-at-startup [polkit-kde-agent])
(spawn-at-startup [wl-paste "--watch" cliphist "store"]) (spawn-at-startup [wl-paste "--watch" cliphist "store"])
(spawn-at-startup [xwayland-satellite "${DISPLAY}"])
(spawn-at-startup [sh "-c" "${sleep} 10; ${fcitx5} --replace"]) (spawn-at-startup [sh "-c" "${sleep} 10; ${fcitx5} --replace"])
(plain "input" [ (plain "input" [
(plain "touchpad" [ (plain "touchpad" [
@ -447,9 +444,6 @@ in
}) })
]) ])
]) ])
(plain "environment" [
(leaf "DISPLAY" DISPLAY)
])
(plain "overview" [ (plain "overview" [
]) ])
] # others ] # others

12
home/david/modules/programs/niri/default.nix
View file

@ -13,9 +13,6 @@ in {
extraConfig = lib.mkOption { extraConfig = lib.mkOption {
type = inputs.niri-flake.lib.kdl.types.kdl-document; type = inputs.niri-flake.lib.kdl.types.kdl-document;
}; };
DISPLAY = lib.mkOption {
type = lib.types.str;
};
}; };
}; };
config = lib.mkMerge [ config = lib.mkMerge [
@ -24,16 +21,9 @@ in {
} }
( (
lib.mkIf cfg.enable { lib.mkIf cfg.enable {
home.sessionVariables = {
inherit (cfg) DISPLAY;
};
youthlic.programs.niri = { youthlic.programs.niri = {
# settings = lib.mkMerge [(import ./settings.nix args) cfg.settings];
config = config =
(lib.toList (import ./config.nix (args (lib.toList (import ./config.nix args))
// {
inherit (cfg) DISPLAY;
})))
++ (lib.toList cfg.extraConfig); ++ (lib.toList cfg.extraConfig);
}; };
david.programs.wluma.enable = true; david.programs.wluma.enable = true;

5
home/modules/programs/niri.nix
View file

@ -12,9 +12,6 @@ in {
options = { options = {
youthlic.programs.niri = { youthlic.programs.niri = {
enable = lib.mkEnableOption "niri"; enable = lib.mkEnableOption "niri";
# settings = lib.mkOption {
# type = lib.types.attrs;
# };
config = lib.mkOption { config = lib.mkOption {
type = inputs.niri-flake.lib.kdl.types.kdl-document; type = inputs.niri-flake.lib.kdl.types.kdl-document;
}; };
@ -30,7 +27,6 @@ in {
(with pkgs; [ (with pkgs; [
swaynotificationcenter swaynotificationcenter
swaybg swaybg
xwayland-satellite
kdePackages.polkit-kde-agent-1 kdePackages.polkit-kde-agent-1
wl-clipboard wl-clipboard
cliphist cliphist
@ -71,7 +67,6 @@ in {
swaylock.enable = true; swaylock.enable = true;
}; };
programs.niri = { programs.niri = {
# settings = cfg.settings;
config = cfg.config; config = cfg.config;
package = niri; package = niri;
}; };

1
nixos/modules/gui/niri.nix
View file

@ -23,6 +23,7 @@ in {
cosmic-files cosmic-files
kdePackages.qt6ct kdePackages.qt6ct
libsForQt5.qt5ct libsForQt5.qt5ct
xwayland-satellite-unstable
]; ];
xdg = { xdg = {
terminal-exec = { terminal-exec = {