From d08e080d162d0d5fee76635b04d2bcb13d94923e Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 15 Mar 2025 08:15:07 +0800 Subject: [PATCH] update flake inputs --- flake.lock | 108 ++++++++++++++------- flake.nix | 18 ++++ nixos/configurations/Akun/stylix.nix | 5 + nixos/configurations/Cape/stylix.nix | 25 +---- nixos/configurations/Tytonidae/stylix.nix | 5 + nixos/modules/containers/forgejo.nix | 9 +- nixos/modules/containers/miniflux.nix | 9 +- overlays/modifications/default.nix | 2 + overlays/modifications/fix-forgejo-lts.nix | 10 ++ overlays/modifications/fix-pwvucontrol.nix | 10 ++ 10 files changed, 139 insertions(+), 62 deletions(-) create mode 100644 overlays/modifications/fix-forgejo-lts.nix create mode 100644 overlays/modifications/fix-pwvucontrol.nix diff --git a/flake.lock b/flake.lock index 29a270e..428baf5 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1741882256, - "narHash": "sha256-81uvZfscNlIySFMsM1wAyLnJy8cqSQKMbi/9jHFX8Es=", + "lastModified": 1741997456, + "narHash": "sha256-4WhLuADRRr8tRnySlDGMiPKUBwVfxaOUjBkfaE7lbHw=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "537469b1a219b6a1dce34dc75040d538c921aa0d", + "rev": "22a50f839018b5c5c0b4ef2675ea3ad89f12e44e", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1741886369, - "narHash": "sha256-PupKttqs+AQYQnyQuQKBLTiBTs1DtQB5J2LrTi6qBO0=", + "lastModified": 1742002412, + "narHash": "sha256-dw7CLa5+tZmfNCPjH2vSAk7SBfsB2Zp7uOcZ1XAADjE=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "73c7943fff38f679a9a434457b5089bc5722411d", + "rev": "550edd426257fa1976a5f1b8b9539543578f5a35", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741884213, - "narHash": "sha256-qcfEVfhCXSzIz57PFR4AtILp+X0BaiF1zx3omKkxOrI=", + "lastModified": 1741962962, + "narHash": "sha256-68SVpGxlAFWGmolts5yhWw2v9bx+jmA/0rX3wxIRZkU=", "owner": "helix-editor", "repo": "helix", - "rev": "44bddf51b76eab8b4096448e52a33964a52f7d2e", + "rev": "9574e551cf8ea4d868a8c102647fcfe0d41496df", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1741894454, - "narHash": "sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b0baed7b2bf6a5e365d4cba042b580a2bc32e34", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1741890984, - "narHash": "sha256-KOA547ghNe57ytljng+Q4m4VlF8Xbd4J6FVHf3Qfelk=", + "lastModified": 1742003507, + "narHash": "sha256-YqOuNSRC0oduAOWh/EqEaTVHawUyXmNHntqmOVDFaLc=", "owner": "jj-vcs", "repo": "jj", - "rev": "117c2620864715d614e0c658472e116c8bf7cf1d", + "rev": "f8082a052d05fe4424e59bbdf7885452726400f9", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741895343, - "narHash": "sha256-PNvtVEsGkMr6xMe2MiC41VcKW9uiFVUFQOeBGETJC34=", + "lastModified": 1741985426, + "narHash": "sha256-qtvcOFwWVQqKyjtVYXpC8Mp/cP/xc/Na6L4UXyHyJHA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bc7edeaf3499a8031d60bce91867d9e2d0783502", + "rev": "93a1359e5625bb7724298e92c4cddf0e8022dc00", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1741891147, - "narHash": "sha256-hCD/llnO/I0ARk6divzVG3a82nNgrcG58dIe0yhzNo8=", + "lastModified": 1741982253, + "narHash": "sha256-pQYos0sgmAlf7VFZHB4FZMu0CACTLLARS++H64NRB1I=", "owner": "YaLTeR", "repo": "niri", - "rev": "ee0e2c7f1b4edae42d2f1b05466adbdffe156e61", + "rev": "f6aa8c17937fadd1da3c8f2f080ea402ae17da87", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1741864154, - "narHash": "sha256-A39pa4ZmUqSjuE2L4swvHKGUQ2maKiY0P5UduZ+yE90=", + "lastModified": 1742006448, + "narHash": "sha256-8OmMOm7MeuhBYYIu9an/OaeH9+mJLXKVj2g/TY8qAg0=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "05f8b43a311b3a1f914af89a94480b19d2eceac6", + "rev": "d63e6b46e0d080fa7cab2cb3ee37b46873615fa3", "type": "github" }, "original": { @@ -613,6 +613,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f": { + "locked": { + "lastModified": 1741960758, + "narHash": "sha256-pSGMbfkxF7TSeco54W+B1q+g22YCVp1qXHgtrdgtyR4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "845dc1e9cbc2e48640b8968af58b4a19db67aa8f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "845dc1e9cbc2e48640b8968af58b4a19db67aa8f", + "type": "github" + } + }, + "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -623,8 +655,8 @@ }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" } }, @@ -677,11 +709,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1741724370, - "narHash": "sha256-WsD+8uodhl58jzKKcPH4jH9dLTLFWZpVmGq4W1XDVF4=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95600680c021743fd87b3e2fe13be7c290e1cac4", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { @@ -717,11 +749,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1741895547, - "narHash": "sha256-kSb+kLH23exgw0bBO0lycD7sxIqKoYSwNnFzrfMqRtM=", + "lastModified": 1741957870, + "narHash": "sha256-5ahYCLPnBcZX7vlmXzn+m0LDRgYiMDglU6UnH/HngPo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "ec50f84eca2f07eb07e9c8a5e61ee82a83930f53", + "rev": "4021f5dad2a46ff78c1bf82ee45c1656e12164f2", "type": "gitlab" }, "original": { @@ -785,6 +817,8 @@ "nixos-cosmic", "nixpkgs" ], + "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f": "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f", + "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1": "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "nur-rycee": "nur-rycee", "nur-xddxdd": "nur-xddxdd", "oskars-dotfiles": "oskars-dotfiles", @@ -882,11 +916,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1741880767, - "narHash": "sha256-tXtop1zIJMyRt1LDERIWwMAMVKdfDtFp/g37YKy2Ke4=", + "lastModified": 1741976991, + "narHash": "sha256-74Q3Kpzde+S3pWaZihNFMjCn8lo4wmDVmg+Uvw8YLLQ=", "owner": "danth", "repo": "stylix", - "rev": "5053a63c87fea3508439b7e9c1a66fa6979a4694", + "rev": "e43eb4e2a7dfbd96454df2b1c9418299b4373773", "type": "github" }, "original": { @@ -1049,11 +1083,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1741757154, - "narHash": "sha256-Gr0m144I3kTZ4HZxOpAnQYyyhvyAAN0lEMrSQ3HyxMI=", + "lastModified": 1741910413, + "narHash": "sha256-z9bvteu0rf+xmUDj4VifN06XAFJZQGRSOvdN7rn/oDs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3c50b7da7963e299e47295352c9a1da1c37b4254", + "rev": "0325cb1f48a292d873a6844772cca00251cbf945", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f563c03..f3489de 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,26 @@ inputs = { # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + # nixpkgs.url = "github:NixOS/nixpkgs/master"; nixpkgs.follows = "nixos-cosmic/nixpkgs"; + # pr: https://github.com/NixOS/nixpkgs/pull/389740 + nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + rev = "845dc1e9cbc2e48640b8968af58b4a19db67aa8f"; + }; + + # issue: https://github.com/NixOS/nixpkgs/issues/389977 + nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1 = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + rev = "e3e32b642a31e6714ec1b712de8c91a3352ce7e1"; + }; + lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs = { diff --git a/nixos/configurations/Akun/stylix.nix b/nixos/configurations/Akun/stylix.nix index c43cc23..9dee95a 100644 --- a/nixos/configurations/Akun/stylix.nix +++ b/nixos/configurations/Akun/stylix.nix @@ -5,6 +5,11 @@ image = rootPath + "/assets/wallpaper/01.png"; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-dark.yaml"; + cursor = { + package = pkgs.rose-pine-cursor; + name = "BreezeX-RosePineDawn-Linux"; + size = 24; + }; fonts = { serif = { package = pkgs.lxgw-wenkai; diff --git a/nixos/configurations/Cape/stylix.nix b/nixos/configurations/Cape/stylix.nix index 9bff339..d2b5e6f 100644 --- a/nixos/configurations/Cape/stylix.nix +++ b/nixos/configurations/Cape/stylix.nix @@ -1,27 +1,6 @@ -{ pkgs, rootPath, ... }: +{ ... }: { stylix = { - enable = true; - image = rootPath + "/assets/wallpaper/01.png"; - polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-dark.yaml"; - fonts = { - serif = { - package = pkgs.lxgw-wenkai; - name = "LXGW WenKai"; - }; - sansSerif = { - package = pkgs.noto-fonts-cjk-serif; - name = "Noto Serif CJK SC"; - }; - monospace = { - package = pkgs.nerd-fonts.fira-code; - name = "FiraCode Nerd Font"; - }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - }; + enable = false; }; } diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index c43cc23..297ea6f 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -5,6 +5,11 @@ image = rootPath + "/assets/wallpaper/01.png"; polarity = "dark"; base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-dark.yaml"; + cursor = { + package = pkgs.rose-pine-cursor; + name = "BreezeX-RosePineDawn-Linux"; + size = 32; + }; fonts = { serif = { package = pkgs.lxgw-wenkai; diff --git a/nixos/modules/containers/forgejo.nix b/nixos/modules/containers/forgejo.nix index 773e71c..913213d 100644 --- a/nixos/modules/containers/forgejo.nix +++ b/nixos/modules/containers/forgejo.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: let cfg = config.youthlic.containers.forgejo; in @@ -59,6 +64,8 @@ in ./../programs/postgresql.nix ]; + nixpkgs.pkgs = pkgs; + systemd.tmpfiles.rules = [ "d /var/lib/forgejo 770 forgejo forgejo -" "d /var/lib/postgresql 770 postgres postgres -" diff --git a/nixos/modules/containers/miniflux.nix b/nixos/modules/containers/miniflux.nix index 2408067..43516b3 100644 --- a/nixos/modules/containers/miniflux.nix +++ b/nixos/modules/containers/miniflux.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: let cfg = config.youthlic.containers.miniflux; in @@ -41,6 +46,8 @@ in ./../programs/postgresql.nix ]; + nixpkgs.pkgs = pkgs; + systemd.tmpfiles.rules = [ "d /var/lib/miniflux 770 miniflux miniflux -" "d /var/lib/postgresql 770 postgres postgres -" diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 82bba99..de14be9 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -10,6 +10,8 @@ in ./juicity.nix ./dae.nix ./jujutsu.nix + ./fix-pwvucontrol.nix + ./fix-forgejo-lts.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/overlays/modifications/fix-forgejo-lts.nix b/overlays/modifications/fix-forgejo-lts.nix new file mode 100644 index 0000000..4bb8619 --- /dev/null +++ b/overlays/modifications/fix-forgejo-lts.nix @@ -0,0 +1,10 @@ +{ inputs, ... }: +final: prev: +let + inherit (final) stdenv; + inherit (stdenv.hostPlatform) system; +in +{ + forgejo-lts = + inputs.nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1.legacyPackages."${system}".forgejo-lts; +} diff --git a/overlays/modifications/fix-pwvucontrol.nix b/overlays/modifications/fix-pwvucontrol.nix new file mode 100644 index 0000000..3a2ee87 --- /dev/null +++ b/overlays/modifications/fix-pwvucontrol.nix @@ -0,0 +1,10 @@ +{ inputs, ... }: +final: prev: +let + inherit (final) stdenv; + inherit (stdenv.hostPlatform) system; +in +{ + pwvucontrol = + inputs.nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f.legacyPackages."${system}".pwvucontrol; +}