diff --git a/.justfile b/.justfile index e69a1f8..8ad8ffd 100755 --- a/.justfile +++ b/.justfile @@ -37,9 +37,6 @@ buildHome host=DEFAULT_HOST $USER=DEFAULT_USER: @echo HOST: {{ host }} nh home build -b backup {{ if host != DEFAULT_HOST { "-c \"" + USER + "@" + host + "\"" } else { "" } }} {{ FLAKE_HOME }} -deadNix: - nix run github:astro/deadnix -- . --exclude ./pkgs/_sources/generated.nix ./nixos/configurations/{Akun,Tytonidae,Cape}/hardware-configuration.nix - alias s := switch alias u := update alias d := deploy diff --git a/flake.lock b/flake.lock index 2d57f6a..d9b185a 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750649006, - "narHash": "sha256-P313UXYYRhGqQpaVpkrrwQugFK16tFKXLNJ2Gl7YgtQ=", + "lastModified": 1750594492, + "narHash": "sha256-8AP008pMieuJMFll32Qlyi2BkNNqqIq8FRqM7uXzr5o=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c11fb47645d24baaf5074a4dcfa7ca4a756ab545", + "rev": "1cbd3ce75615ab95c9dcca1d64e638e762fe4975", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1750680230, - "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", + "lastModified": 1750040002, + "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "owner": "nix-community", "repo": "disko", - "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", + "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1750614446, - "narHash": "sha256-6WH0aRFay79r775RuTqUcnoZNm6A4uHxU1sbcNIk63s=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c35504839f915abec86a96435b881ead7eb6a2b", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1750654717, - "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -522,11 +522,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750634718, - "narHash": "sha256-wVCB2iwu1sP9GfUVLSYJTE/U9I8InxCUlqK5WIwOUaw=", + "lastModified": 1750471128, + "narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e291d0634368fe8406cf237d3e8bc0326079752d", + "rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -644,6 +644,22 @@ "type": "github" } }, + "nixpkgs-handbrake": { + "locked": { + "lastModified": 1749936441, + "narHash": "sha256-MfdTzz/ArELrweWK7FLofbK/NMvbpEhV8QCo6f7UBII=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c74daf34b6de017d7d43196c494f887a2b956f0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c74daf34b6de017d7d43196c494f887a2b956f0f", + "type": "github" + } + }, "nixpkgs-hurl": { "locked": { "lastModified": 1750581657, @@ -725,11 +741,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -784,11 +800,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1750651402, - "narHash": "sha256-mT97WT4FlJyvfWp7rso3tUZca0qKU46czyi/HBJHG4w=", + "lastModified": 1750565010, + "narHash": "sha256-eetTl1TpPoD5W52RX02Lo8SLQdVcU2m7usCSh5VhnwE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "13fa5e2e89062281dee88508f97e93360bfe2e2d", + "rev": "a24c53d008d362cfd5a96270b2bb331e26902af5", "type": "gitlab" }, "original": { @@ -814,6 +830,7 @@ "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", + "nixpkgs-handbrake": "nixpkgs-handbrake", "nixpkgs-hurl": "nixpkgs-hurl", "nur-rycee": "nur-rycee", "sops-nix": "sops-nix", @@ -829,11 +846,11 @@ ] }, "locked": { - "lastModified": 1750560265, - "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", + "lastModified": 1750473400, + "narHash": "sha256-wiW2j63MyGQyyijRF25hf7Ab7vx4G8pCiGjUe3OGV4c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", + "rev": "3d7d4c4e284f26d6dc4840491c66884912be0062", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a26d667..1b78b84 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,13 @@ ref = "refs/pull/418842/head"; }; + nixpkgs-handbrake = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + rev = "c74daf34b6de017d7d43196c494f887a2b956f0f"; + }; + lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; inputs = { diff --git a/flake/home.nix b/flake/home.nix index 50e7a26..a4a5aff 100644 --- a/flake/home.nix +++ b/flake/home.nix @@ -10,9 +10,9 @@ ( (rootPath + "/home") |> builtins.readDir - |> lib.filterAttrs (_key: value: value == "directory") + |> lib.filterAttrs (key: value: value == "directory") |> lib.filterAttrs ( - key: _value: + key: value: !builtins.elem key [ "modules" "extra" diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix index 244289b..d42bd6b 100644 --- a/home/alice/configurations/Cape/default.nix +++ b/home/alice/configurations/Cape/default.nix @@ -1,6 +1,7 @@ { pkgs, unixName, + config, ... }: { youthlic = { diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix index 308530f..9f342a3 100644 --- a/home/david/configurations/Akun/default.nix +++ b/home/david/configurations/Akun/default.nix @@ -2,6 +2,7 @@ pkgs, unixName, config, + rootPath, ... }: { imports = [ diff --git a/home/david/configurations/Akun/niri.nix b/home/david/configurations/Akun/niri.nix index ccd2a2d..8d149a6 100644 --- a/home/david/configurations/Akun/niri.nix +++ b/home/david/configurations/Akun/niri.nix @@ -1,5 +1,5 @@ {inputs, ...}: let - inherit (inputs.niri-flake.lib.kdl) node leaf flag; + inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; in { david.programs.niri = { extraConfig = let diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index aa9aa6b..296217f 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -1,6 +1,8 @@ { pkgs, config, + rootPath, + inputs, unixName, ... }: { diff --git a/home/david/configurations/Tytonidae/niri.nix b/home/david/configurations/Tytonidae/niri.nix index 1097e49..cab1141 100644 --- a/home/david/configurations/Tytonidae/niri.nix +++ b/home/david/configurations/Tytonidae/niri.nix @@ -1,5 +1,5 @@ {inputs, ...}: let - inherit (inputs.niri-flake.lib.kdl) node leaf flag; + inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; in { david.programs.niri = { extraConfig = let diff --git a/home/david/modules/programs/niri/default.nix b/home/david/modules/programs/niri/default.nix index 76261ba..a1611d7 100644 --- a/home/david/modules/programs/niri/default.nix +++ b/home/david/modules/programs/niri/default.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, inputs, ... } @ args: let diff --git a/home/modules/i18n/default.custom.yaml b/home/modules/i18n/default.custom.yaml index d09e481..cd210ce 100644 --- a/home/modules/i18n/default.custom.yaml +++ b/home/modules/i18n/default.custom.yaml @@ -56,11 +56,7 @@ patch: toggle: traditionalization, accept: Control+Shift+dollar, } # 切换简繁 - - { - when: always, - toggle: full_shape, - accept: Control+Shift+5, - } # 切换全半角 + - { when: always, toggle: full_shape, accept: Control+Shift+5 } # 切换全半角 - { when: always, toggle: full_shape, diff --git a/home/modules/programs/helix/default.nix b/home/modules/programs/helix/default.nix index 0389ba7..ed41aef 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -2,6 +2,7 @@ lib, pkgs, config, + outputs, ... }: { options = { diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index d0e5a4c..b728f54 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -2,6 +2,7 @@ lib, pkgs, inputs, + config, ... }: { imports = diff --git a/nixos/configurations/Tytonidae/gui.nix b/nixos/configurations/Tytonidae/gui.nix index bbafc39..91d916c 100644 --- a/nixos/configurations/Tytonidae/gui.nix +++ b/nixos/configurations/Tytonidae/gui.nix @@ -1,4 +1,4 @@ -{...}: let +{pkgs, ...}: let extraConfig = '' output "DP-3" { mode "2560x1440@169.900" diff --git a/nixos/modules/gui/cosmic.nix b/nixos/modules/gui/cosmic.nix index 4da6b65..40d616a 100644 --- a/nixos/modules/gui/cosmic.nix +++ b/nixos/modules/gui/cosmic.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let cfg = config.youthlic.gui; diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index a69c343..da48a0e 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -1,4 +1,8 @@ -{...}: { +{ + config, + lib, + ... +}: { imports = [ ./transfer-sh.nix ./rustypaste diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index bae07d7..70594dd 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -1,4 +1,5 @@ { + pkgs, config, lib, ... diff --git a/nixos/modules/sops.nix b/nixos/modules/sops.nix index 44b1aee..4b78e6c 100644 --- a/nixos/modules/sops.nix +++ b/nixos/modules/sops.nix @@ -1,5 +1,6 @@ { rootPath, + config, ... }: { config = { diff --git a/overlays/additions/OuterWildsTextAdventure.nix b/overlays/additions/OuterWildsTextAdventure.nix index b8a687f..8ab28c7 100644 --- a/overlays/additions/OuterWildsTextAdventure.nix +++ b/overlays/additions/OuterWildsTextAdventure.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages.${system}) OuterWildsTextAdventure; diff --git a/overlays/additions/TrackersListCollection.nix b/overlays/additions/TrackersListCollection.nix index 17da85c..e7ca1cf 100644 --- a/overlays/additions/TrackersListCollection.nix +++ b/overlays/additions/TrackersListCollection.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages."${system}") TrackersListCollection; diff --git a/overlays/additions/editor-runtime.nix b/overlays/additions/editor-runtime.nix index bfba19f..c23213a 100644 --- a/overlays/additions/editor-runtime.nix +++ b/overlays/additions/editor-runtime.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages.${system}) editor-runtime; diff --git a/overlays/modifications/QQ.nix b/overlays/modifications/QQ.nix index 16d5d7b..823e01e 100644 --- a/overlays/modifications/QQ.nix +++ b/overlays/modifications/QQ.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { qq = outputs.packages."${system}".QQ; diff --git a/overlays/modifications/cliphist.nix b/overlays/modifications/cliphist.nix index 85d18c3..a123457 100644 --- a/overlays/modifications/cliphist.nix +++ b/overlays/modifications/cliphist.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages."${system}") cliphist; diff --git a/overlays/modifications/dae.nix b/overlays/modifications/dae.nix index 8437b0b..3ee2db2 100644 --- a/overlays/modifications/dae.nix +++ b/overlays/modifications/dae.nix @@ -1,4 +1,4 @@ -{inputs, ...}: final: _prev: let +{inputs, ...}: final: prev: let inherit (final) stdenv; inherit (stdenv.hostPlatform) system; in { diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 61b8c26..9c2b5e2 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -12,6 +12,7 @@ in ./helix.nix ./cliphist.nix ./fix-hurl.nix + ./fix-handbrake.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/overlays/modifications/fix-handbrake.nix b/overlays/modifications/fix-handbrake.nix new file mode 100644 index 0000000..868b962 --- /dev/null +++ b/overlays/modifications/fix-handbrake.nix @@ -0,0 +1,5 @@ +{inputs, ...}: final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + inherit (inputs.nixpkgs-handbrake.legacyPackages.${system}) handbrake; +} diff --git a/overlays/modifications/helix.nix b/overlays/modifications/helix.nix index a759145..3b15a52 100644 --- a/overlays/modifications/helix.nix +++ b/overlays/modifications/helix.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { helix = outputs.packages."${system}".helix; diff --git a/overlays/modifications/juicity.nix b/overlays/modifications/juicity.nix index 82f5472..61c970c 100644 --- a/overlays/modifications/juicity.nix +++ b/overlays/modifications/juicity.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { juicity = outputs.packages."${system}".juicity; diff --git a/overlays/modifications/radicle-explorer.nix b/overlays/modifications/radicle-explorer.nix index 216e7b1..3e2b33e 100644 --- a/overlays/modifications/radicle-explorer.nix +++ b/overlays/modifications/radicle-explorer.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { radicle-explorer = outputs.packages."${system}".radicle-explorer; diff --git a/overlays/modifications/spotifyx.nix b/overlays/modifications/spotifyx.nix index 6395e95..820b1d3 100644 --- a/overlays/modifications/spotifyx.nix +++ b/overlays/modifications/spotifyx.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { spotify = outputs.packages."${system}".spotifyx; diff --git a/overlays/modifications/wshowkeys.nix b/overlays/modifications/wshowkeys.nix index 455b646..eee953b 100644 --- a/overlays/modifications/wshowkeys.nix +++ b/overlays/modifications/wshowkeys.nix @@ -1,4 +1,4 @@ -{outputs, ...}: _final: prev: let +{outputs, ...}: final: prev: let inherit (prev.stdenv.hostPlatform) system; in { wshowkeys = outputs.packages.${system}.wshowkeys-mao; diff --git a/pkgs/cliphist.nix b/pkgs/cliphist.nix index 7f107c8..40f08f9 100644 --- a/pkgs/cliphist.nix +++ b/pkgs/cliphist.nix @@ -11,7 +11,7 @@ }: let inherit (srcs.cliphist) src date version; in - cliphist.overrideAttrs (_final: prev: { + cliphist.overrideAttrs (final: prev: { inherit src; version = if prev.version != "0.6.1" diff --git a/pkgs/noto-sans-cjk.nix b/pkgs/noto-sans-cjk.nix index 50d3d42..41d6596 100644 --- a/pkgs/noto-sans-cjk.nix +++ b/pkgs/noto-sans-cjk.nix @@ -5,7 +5,7 @@ }: let source = srcs.noto-sans-cjk; in - stdenvNoCC.mkDerivation (_finalAttrs: { + stdenvNoCC.mkDerivation (finalAttrs: { pname = "noto-sans-cjk"; version = source.version; diff --git a/pkgs/noto-serif-cjk.nix b/pkgs/noto-serif-cjk.nix index 80b8f74..b0af26b 100644 --- a/pkgs/noto-serif-cjk.nix +++ b/pkgs/noto-serif-cjk.nix @@ -5,7 +5,7 @@ }: let source = srcs.noto-serif-cjk; in - stdenvNoCC.mkDerivation (_finalAttrs: { + stdenvNoCC.mkDerivation (finalAttrs: { pname = "noto-serif-cjk"; version = source.version; diff --git a/pkgs/spotifyx.nix b/pkgs/spotifyx.nix index bb9ab7f..d15bb46 100644 --- a/pkgs/spotifyx.nix +++ b/pkgs/spotifyx.nix @@ -7,7 +7,7 @@ srcs, }: let inherit (srcs) spotx; - spotifyx = spotify.overrideAttrs (_final: prev: { + spotifyx = spotify.overrideAttrs (final: prev: { nativeBuildInputs = prev.nativeBuildInputs ++ [ diff --git a/pkgs/wshowkeys-mao.nix b/pkgs/wshowkeys-mao.nix index 4e85026..f9049f8 100644 --- a/pkgs/wshowkeys-mao.nix +++ b/pkgs/wshowkeys-mao.nix @@ -4,7 +4,7 @@ }: let inherit (srcs) wshowkeys-mao; in - wshowkeys.overrideAttrs (_final: _prev: { + wshowkeys.overrideAttrs (final: prev: { inherit (wshowkeys-mao) src; pname = "wshowkeys-mao"; version = wshowkeys-mao.date + "-" + wshowkeys-mao.version; diff --git a/templates/cxx/flake.nix b/templates/cxx/flake.nix index 0de5c71..ac11c54 100644 --- a/templates/cxx/flake.nix +++ b/templates/cxx/flake.nix @@ -6,11 +6,13 @@ }; }; outputs = { + self, flake-utils, nixpkgs, ... }: flake-utils.lib.eachDefaultSystem (system: let + inherit (pkgs) lib; pkgs = import nixpkgs { inherit system; }; diff --git a/templates/cxxWithXmake/flake.nix b/templates/cxxWithXmake/flake.nix index 90fa65e..f7c2478 100644 --- a/templates/cxxWithXmake/flake.nix +++ b/templates/cxxWithXmake/flake.nix @@ -12,6 +12,7 @@ ... }: flake-utils.lib.eachDefaultSystem (system: let + inherit (pkgs) lib; pkgs = import nixpkgs { inherit system; }; diff --git a/templates/python/flake.nix b/templates/python/flake.nix index 3dd3a56..f1f811f 100644 --- a/templates/python/flake.nix +++ b/templates/python/flake.nix @@ -6,6 +6,7 @@ }; }; outputs = { + self, flake-utils, nixpkgs, ... diff --git a/templates/rust/flake.nix b/templates/rust/flake.nix index 13917fc..d83b4f1 100644 --- a/templates/rust/flake.nix +++ b/templates/rust/flake.nix @@ -40,7 +40,7 @@ inherit system; overlays = [ (import rust-overlay) - (_final: prev: { + (final: prev: { lib = prev.lib // (import ./nix/lib.nix prev.lib); }) ];