Compare commits

...

4 commits

40 changed files with 58 additions and 99 deletions

View file

@ -37,6 +37,9 @@ 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

71
flake.lock generated
View file

@ -96,11 +96,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1750594492,
"narHash": "sha256-8AP008pMieuJMFll32Qlyi2BkNNqqIq8FRqM7uXzr5o=",
"lastModified": 1750649006,
"narHash": "sha256-P313UXYYRhGqQpaVpkrrwQugFK16tFKXLNJ2Gl7YgtQ=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "1cbd3ce75615ab95c9dcca1d64e638e762fe4975",
"rev": "c11fb47645d24baaf5074a4dcfa7ca4a756ab545",
"type": "github"
},
"original": {
@ -163,11 +163,11 @@
]
},
"locked": {
"lastModified": 1750040002,
"narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
"lastModified": 1750680230,
"narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=",
"owner": "nix-community",
"repo": "disko",
"rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
"rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01",
"type": "github"
},
"original": {
@ -415,11 +415,11 @@
]
},
"locked": {
"lastModified": 1750304462,
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
"lastModified": 1750614446,
"narHash": "sha256-6WH0aRFay79r775RuTqUcnoZNm6A4uHxU1sbcNIk63s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
"rev": "7c35504839f915abec86a96435b881ead7eb6a2b",
"type": "github"
},
"original": {
@ -435,11 +435,11 @@
]
},
"locked": {
"lastModified": 1750304462,
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
"lastModified": 1750654717,
"narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
"rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b",
"type": "github"
},
"original": {
@ -522,11 +522,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1750471128,
"narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=",
"lastModified": 1750634718,
"narHash": "sha256-wVCB2iwu1sP9GfUVLSYJTE/U9I8InxCUlqK5WIwOUaw=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49",
"rev": "e291d0634368fe8406cf237d3e8bc0326079752d",
"type": "github"
},
"original": {
@ -630,11 +630,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1750365781,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
"lastModified": 1750506804,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
"type": "github"
},
"original": {
@ -644,22 +644,6 @@
"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,
@ -741,11 +725,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1750365781,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
"lastModified": 1750506804,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
"type": "github"
},
"original": {
@ -800,11 +784,11 @@
"nur-rycee": {
"flake": false,
"locked": {
"lastModified": 1750565010,
"narHash": "sha256-eetTl1TpPoD5W52RX02Lo8SLQdVcU2m7usCSh5VhnwE=",
"lastModified": 1750651402,
"narHash": "sha256-mT97WT4FlJyvfWp7rso3tUZca0qKU46czyi/HBJHG4w=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "a24c53d008d362cfd5a96270b2bb331e26902af5",
"rev": "13fa5e2e89062281dee88508f97e93360bfe2e2d",
"type": "gitlab"
},
"original": {
@ -830,7 +814,6 @@
"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",
@ -846,11 +829,11 @@
]
},
"locked": {
"lastModified": 1750473400,
"narHash": "sha256-wiW2j63MyGQyyijRF25hf7Ab7vx4G8pCiGjUe3OGV4c=",
"lastModified": 1750560265,
"narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "3d7d4c4e284f26d6dc4840491c66884912be0062",
"rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1",
"type": "github"
},
"original": {

View file

@ -45,13 +45,6 @@
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 = {

View file

@ -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"

View file

@ -1,7 +1,6 @@
{
pkgs,
unixName,
config,
...
}: {
youthlic = {

View file

@ -2,7 +2,6 @@
pkgs,
unixName,
config,
rootPath,
...
}: {
imports = [

View file

@ -1,5 +1,5 @@
{inputs, ...}: let
inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
inherit (inputs.niri-flake.lib.kdl) node leaf flag;
in {
david.programs.niri = {
extraConfig = let

View file

@ -1,8 +1,6 @@
{
pkgs,
config,
rootPath,
inputs,
unixName,
...
}: {

View file

@ -1,5 +1,5 @@
{inputs, ...}: let
inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
inherit (inputs.niri-flake.lib.kdl) node leaf flag;
in {
david.programs.niri = {
extraConfig = let

View file

@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
inputs,
...
} @ args: let

View file

@ -56,7 +56,11 @@ 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,

View file

@ -2,7 +2,6 @@
lib,
pkgs,
config,
outputs,
...
}: {
options = {

View file

@ -2,7 +2,6 @@
lib,
pkgs,
inputs,
config,
...
}: {
imports =

View file

@ -1,4 +1,4 @@
{pkgs, ...}: let
{...}: let
extraConfig = ''
output "DP-3" {
mode "2560x1440@169.900"

View file

@ -1,7 +1,6 @@
{
config,
lib,
pkgs,
...
}: let
cfg = config.youthlic.gui;

View file

@ -1,8 +1,4 @@
{
config,
lib,
...
}: {
{...}: {
imports = [
./transfer-sh.nix
./rustypaste

View file

@ -1,5 +1,4 @@
{
pkgs,
config,
lib,
...

View file

@ -1,6 +1,5 @@
{
rootPath,
config,
...
}: {
config = {

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (outputs.packages.${system}) OuterWildsTextAdventure;

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (outputs.packages."${system}") TrackersListCollection;

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (outputs.packages.${system}) editor-runtime;

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
qq = outputs.packages."${system}".QQ;

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (outputs.packages."${system}") cliphist;

View file

@ -1,4 +1,4 @@
{inputs, ...}: final: prev: let
{inputs, ...}: final: _prev: let
inherit (final) stdenv;
inherit (stdenv.hostPlatform) system;
in {

View file

@ -12,7 +12,6 @@ in
./helix.nix
./cliphist.nix
./fix-hurl.nix
./fix-handbrake.nix
]
|> map (file: import file args)
|> (overlays: (lib.composeManyExtensions overlays) final prev)

View file

@ -1,5 +0,0 @@
{inputs, ...}: final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (inputs.nixpkgs-handbrake.legacyPackages.${system}) handbrake;
}

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
helix = outputs.packages."${system}".helix;

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
juicity = outputs.packages."${system}".juicity;

View file

@ -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;

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
spotify = outputs.packages."${system}".spotifyx;

View file

@ -1,4 +1,4 @@
{outputs, ...}: final: prev: let
{outputs, ...}: _final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
wshowkeys = outputs.packages.${system}.wshowkeys-mao;

View file

@ -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"

View file

@ -5,7 +5,7 @@
}: let
source = srcs.noto-sans-cjk;
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation (_finalAttrs: {
pname = "noto-sans-cjk";
version = source.version;

View file

@ -5,7 +5,7 @@
}: let
source = srcs.noto-serif-cjk;
in
stdenvNoCC.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation (_finalAttrs: {
pname = "noto-serif-cjk";
version = source.version;

View file

@ -7,7 +7,7 @@
srcs,
}: let
inherit (srcs) spotx;
spotifyx = spotify.overrideAttrs (final: prev: {
spotifyx = spotify.overrideAttrs (_final: prev: {
nativeBuildInputs =
prev.nativeBuildInputs
++ [

View file

@ -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;

View file

@ -6,13 +6,11 @@
};
};
outputs = {
self,
flake-utils,
nixpkgs,
...
}:
flake-utils.lib.eachDefaultSystem (system: let
inherit (pkgs) lib;
pkgs = import nixpkgs {
inherit system;
};

View file

@ -12,7 +12,6 @@
...
}:
flake-utils.lib.eachDefaultSystem (system: let
inherit (pkgs) lib;
pkgs = import nixpkgs {
inherit system;
};

View file

@ -6,7 +6,6 @@
};
};
outputs = {
self,
flake-utils,
nixpkgs,
...

View file

@ -40,7 +40,7 @@
inherit system;
overlays = [
(import rust-overlay)
(final: prev: {
(_final: prev: {
lib = prev.lib // (import ./nix/lib.nix prev.lib);
})
];