flake: update lock file

This commit is contained in:
Guanran Wang 2024-07-02 13:49:41 +08:00
parent 4092bd105b
commit e09f95921d
Signed by: nyancat
GPG key ID: 91F97D9ED12639CF
5 changed files with 57 additions and 127 deletions

View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719619905, "lastModified": 1719675517,
"narHash": "sha256-i8Cbi+176SUig3BEHYQ38cb2c+zWSnG0Kg2G1TLosDM=", "narHash": "sha256-QXMYL1ay66M7T/JdaO4wR8K58GkV5CNN8U15gwifdbY=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "5869e0b884c95bc8791fcf30162d009a0d6267ba", "rev": "4688aa9f107d6d7ac46a98a01f7105cac8e7dbe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,29 +23,6 @@
"type": "github" "type": "github"
} }
}, },
"berberman": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nvfetcher": [
"nvfetcher"
]
},
"locked": {
"lastModified": 1719288828,
"narHash": "sha256-jDKNistAmctLXTJvX8+ALJB2JgXqJHxkCoV+WkmqKhE=",
"owner": "berberman",
"repo": "flakes",
"rev": "a050b5751c88e01135d20fe6c7d7ced20d623bcc",
"type": "github"
},
"original": {
"owner": "berberman",
"repo": "flakes",
"type": "github"
}
},
"crane": { "crane": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -53,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719249093, "lastModified": 1719880336,
"narHash": "sha256-0q1haa3sw6GbmJ+WhogMnducZGjEaCa/iR6hF2vq80I=", "narHash": "sha256-VnUCaGI7FEh7tLVsD6OsychPmqjDYXqJEdFG4jK86zs=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "9791c77eb7e98b8d8ac5b0305d47282f994411ca", "rev": "047c929ad65d8378f18de95ca66769ca04161caf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719582740, "lastModified": 1719864345,
"narHash": "sha256-s4WsLu2L8EzF5Hg2TkelFLVhKGL108AySnlw8voPe5U=", "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "115311bc395f24c1b553338fec4b3aa28cbf5ae2", "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +85,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1719877454,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +145,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719588253, "lastModified": 1719827439,
"narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +198,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718782018, "lastModified": 1719818887,
"narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +247,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719128254, "lastModified": 1719845423,
"narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "50581970f37f06a4719001735828519925ef8310", "rev": "ec12b88104d6c117871fad55e931addac4626756",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -352,11 +329,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719610737, "lastModified": 1719869943,
"narHash": "sha256-CUs7aehu5w/ikdY6L6Spyw9i6y9elELADhma9ngzBus=", "narHash": "sha256-MDd7osBHV/kk2jGyd7v29CKQVVexus4bGSbzUBer63U=",
"owner": "jacekszymanski", "owner": "jacekszymanski",
"repo": "nixcasks", "repo": "nixcasks",
"rev": "1d2ef7c6c6c6c87bdd4a92d4899bc988eb6d9444", "rev": "e41da9d30fc57349150dc9fb39e029f761ce0d9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +344,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719552654, "lastModified": 1719895800,
"narHash": "sha256-PX3msbC5KdwCDnucGtir3qzlzv+1fuiU4tk17nljFIE=", "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3980e7816c99d9e4da7a7b762e5b294055b73b2f", "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +374,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719468428, "lastModified": 1719826879,
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,11 +390,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719234068, "lastModified": 1719663039,
"narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90bd1b26e23760742fdcb6152369919098f05417", "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +445,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1719624082, "lastModified": 1719894733,
"narHash": "sha256-RpeJO2UN+XP1fiA6gPKwvW6+gw9m09lDuWdg67g+Zds=", "narHash": "sha256-T/zofRVToXkbvjBX+wnEOLCpaX3BbvMh9ZN6cKFydaA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e7597af73696a7217e6fa5cacf1da240a2a42165", "rev": "b978045baa040e6953fbe0a18c111749931673af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,32 +458,6 @@
"type": "github" "type": "github"
} }
}, },
"nvfetcher": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1718252448,
"narHash": "sha256-xZZBdKqe1ByITzvx65pVgGQ5jeb73MybjgrcfI84lEo=",
"owner": "berberman",
"repo": "nvfetcher",
"rev": "fa7609950023462c6f91c425de7610c0bb6b86ba",
"type": "github"
},
"original": {
"owner": "berberman",
"repo": "nvfetcher",
"type": "github"
}
},
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -539,7 +490,6 @@
"root": { "root": {
"inputs": { "inputs": {
"aagl": "aagl", "aagl": "aagl",
"berberman": "berberman",
"crane": "crane", "crane": "crane",
"disko": "disko", "disko": "disko",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -561,7 +511,6 @@
"nmd": "nmd", "nmd": "nmd",
"nmt": "nmt", "nmt": "nmt",
"nur": "nur", "nur": "nur",
"nvfetcher": "nvfetcher",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"scss-reset": "scss-reset", "scss-reset": "scss-reset",
@ -578,11 +527,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719627476, "lastModified": 1719886738,
"narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=", "narHash": "sha256-6eaaoJUkr4g9J/rMC4jhj3Gv8Sa62rvlpjFe3xZaSjM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f", "rev": "db12d0c6ef002f16998723b5dd619fa7b8997086",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -617,11 +566,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719268571, "lastModified": 1719873517,
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "rev": "a11224af8d824935f363928074b4717ca2e280db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +586,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719449101, "lastModified": 1719835186,
"narHash": "sha256-rRrz763KKi6GnSZF4WF34kpJ9eMXR3AOPOWN/7hO1Zs=", "narHash": "sha256-o0FB8SQVLOnbsYTk2Bt6gXwsfqEv4ZHsGP50/kM/gR0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "e938f07e5cd9d11576d3860b68c117932c161006", "rev": "14b3b0aa48fa291f1be26ab8948d5b9eadaed0b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -672,11 +621,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719243788, "lastModified": 1719887753,
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -15,11 +15,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
}; };
berberman = {
url = "github:berberman/flakes";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nvfetcher.follows = "nvfetcher";
};
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -125,12 +120,6 @@
url = "sourcehut:~rycee/nmt"; url = "sourcehut:~rycee/nmt";
flake = false; flake = false;
}; };
nvfetcher = {
url = "github:berberman/nvfetcher";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-utils.follows = "flake-utils";
};
pre-commit-hooks-nix = { pre-commit-hooks-nix = {
url = "github:cachix/pre-commit-hooks.nix"; url = "github:cachix/pre-commit-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -1,18 +1,12 @@
{ {pkgs, ...}: {
pkgs,
inputs,
...
}: {
i18n.inputMethod = { i18n.inputMethod = {
enabled = "fcitx5"; enabled = "fcitx5";
fcitx5.addons = fcitx5.addons = with pkgs; [
(with pkgs; [
libsForQt5.fcitx5-chinese-addons libsForQt5.fcitx5-chinese-addons
]) fcitx5-pinyin-minecraft
++ (with inputs.berberman.packages.${pkgs.stdenv.hostPlatform.system}; [
fcitx5-pinyin-moegirl fcitx5-pinyin-moegirl
fcitx5-pinyin-zhwiki fcitx5-pinyin-zhwiki
]); ];
}; };
xdg.configFile."fcitx5/conf/classicui.conf".text = '' xdg.configFile."fcitx5/conf/classicui.conf".text = ''

View file

@ -24,6 +24,8 @@
"steam" "steam"
"steam-original" "steam-original"
"xow_dongle-firmware" "xow_dongle-firmware"
"fcitx5-pinyin-minecraft"
"fcitx5-pinyin-moegirl"
]; ];
}; };
} }

View file

@ -13,15 +13,11 @@
++ [ ++ [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cache.garnix.io" "https://cache.garnix.io"
# Personal cachix-s
"https://berberman.cachix.org"
"https://guanran928.cachix.org" "https://guanran928.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"berberman.cachix.org-1:UHGhodNXVruGzWrwJ12B1grPK/6Qnrx2c3TjKueQPds="
"guanran928.cachix.org-1:BE/iBCj2/pqJXG908wHRrcaV0B2fC+KbFjHsXY6b91c=" "guanran928.cachix.org-1:BE/iBCj2/pqJXG908wHRrcaV0B2fC+KbFjHsXY6b91c="
]; ];