chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix yoga config

Browse Source
This commit is contained in:
陈浩南
2023-08-21 00:37:36 +08:00
parent f7bd41ee94
commit 84ba2e1c95
3 changed files with 14 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
flake.nix
View File

@@ -574,22 +574,16 @@
{
mount =
{
vfat."/dev/disk/by-uuid/3F57-0EBE" = "/boot/efi";
vfat."/dev/disk/by-uuid/86B8-CF80" = "/boot/efi";
btrfs =
{
"/dev/disk/by-uuid/02e426ec-cfa2-4a18-b3a5-57ef04d66614"."/" = "/boot";
"/dev/disk/by-uuid/e252f81d-b4b3-479f-8664-380a9b73cf83"."/boot" = "/boot";
"/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
};
};
decrypt.auto =
{
"/dev/disk/by-uuid/55fdd19f-0f1d-4c37-bd4e-6df44fc31f26" = { mapper = "root"; ssd = true; };
"/dev/md/swap" = { mapper = "swap"; ssd = true; before = [ "root" ]; };
};
mdadm =
"ARRAY /dev/md/swap metadata=1.2 name=chn-PC:swap UUID=2b546b8d:e38007c8:02990dd1:df9e23a4";
swap = [ "/dev/mapper/swap" ];
resume = "/dev/mapper/swap";
decrypt.auto."/dev/disk/by-uuid/e252f81d-b4b3-479f-8664-380a9b73cf83" =
{ mapper = "root"; ssd = true; };
swap = [ "/nix/swap/swap" ];
rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
};
kernel.patches = [ "cjktty" "preempt" ];
@@ -623,79 +617,15 @@
enable = true;
serverAddress = "74.211.99.69";
serverName = "vps6.xserver.chn.moe";
dns =
{
extraInterfaces = [ "docker0" ];
hosts =
{
"mirism.one" = "216.24.188.24";
"beta.mirism.one" = "216.24.188.24";
"ng01.mirism.one" = "216.24.188.24";
"debug.mirism.one" = "127.0.0.1";
"initrd.vps6.chn.moe" = "74.211.99.69";
"nix-store.chn.moe" = "127.0.0.1";
};
};
dns.extraInterfaces = [ "docker0" ];
};
firewall.trustedInterfaces = [ "virbr0" ];
frpClient =
{
enable = true;
serverName = "frp.chn.moe";
user = "xmupc1";
tcp.store = { localPort = 443; remotePort = 7676; };
};
smartd.enable = true;
};
};})
];
};
# sudo HTTPS_PROXY=socks5://127.0.0.1:10884 nixos-install --flake .#bootstrap --option substituters http://127.0.0.1:5000 --option require-sigs false
"bootstrap" = inputs.nixpkgs.lib.nixosSystem
{
system = "x86_64-linux";
specialArgs = { topInputs = inputs; inherit localLib; };
modules = localLib.mkModules
[
(inputs: { config.nixpkgs.overlays = [(final: prev: { localPackages =
(import ./local/pkgs { inherit (inputs) lib; pkgs = final; });})]; })
./modules
(inputs: { config.nixos =
{
fileSystems.mount =
{
btrfs =
{
"/dev/disk/by-uuid/e163b2c7-835b-4ff6-8626-7278762540da"."/boot" = "/boot";
"/dev/mapper/root"."/nix" = "/";
};
vfat."/dev/disk/by-uuid/5B2E-D1B9" = "/boot/efi";
};
packages.packageSet = "desktop";
services.sshd.enable = true;
boot.grub.installDevice = "efi";
system = { hostname = "bootstrap"; march = "silvermont"; };
};})
];
};
};
deploy =
{
sshUser = "root";
user = "root";
fastConnection = true;
nodes = builtins.listToAttrs (builtins.map
(node:
{
name = node;
value =
{
hostname = node;
profiles.system.path = inputs.self.nixosConfigurations.${node}.pkgs.deploy-rs.lib.activate.nixos
inputs.self.nixosConfigurations.${node};
};
})
[ "vps6" "vps4" "vps7" ]);
};
};
}

7
secrets/vps6.yaml
View File

@@ -8,12 +8,13 @@ xray-server:
user0: ENC[AES256_GCM,data:rJ00sfe/oJSry6Ixn4Bn+p41syqsOrdWv6fRGVCwPvn/unMY,iv:htTvFMvhIRkORA/gIU8J7CgA+tOncYQWh7sUh+F6XDs=,tag:VrSJBD7ti9WtSLHoWjMClw==,type:str]
#ENC[AES256_GCM,data:OVgDU+zqcQ==,iv:8KuEqBuL5Ca6pUOFFA+vySJx/h3BhGAAC0CgnxiW46o=,tag:TY1MajSSy2RjKVI2SSAAFw==,type:comment]
user1: ENC[AES256_GCM,data:S3IHO9FcVHTJOsRxjSohM9MgnrEwLdDpFU+efLkQaXT2jNJG,iv:KOesvPzjDfm1EDLFiegbk0wgjp7di5mUwUuuY2hwvOQ=,tag:ZsYyUyyEhO5S3weCw/gPMw==,type:str]
#ENC[AES256_GCM,data:fyAsWhGePQ==,iv:kbf56dmGoHir3LjhP/EnViXhpFkiQQJWBTkg9cBuik0=,tag:59vcH3znCl1BcCQKmSa8/g==,type:comment]
#ENC[AES256_GCM,data:OQOPobpbbhajgA==,iv:4jG3bHKzWcR+JnvSlJsc0Qlv5kywqVN5UE96J31CP7Q=,tag:P+jJkRxPu99tLXyO5k6dRA==,type:comment]
user2: ENC[AES256_GCM,data:e7ITe2ZouKr8dXT7SYATyzbzHaVeu6AKt1OcQKk3U0nsQgoa,iv:UbOOuojy6OAFEH8lGhKe5Hs+2K6FX5MZ8Br9AB007gs=,tag:5XeB4YngzTcHZvCpXe/ZXA==,type:str]
#ENC[AES256_GCM,data:vEit6GESM5G+Xw==,iv:A7uisdmzB2qiPeYkut6k8D3xxpVIBy/JE9cctC/cDQQ=,tag:ZY7Ttu5AUqjIxB4BIHEucQ==,type:comment]
user3: ENC[AES256_GCM,data:Q3GlAiELNXurVN3nv5k8Zt1/zqctYb3gvHZ4KnXApCRdShHT,iv:ihJ76k4NcwitdYCS0y4/UlH4K63vwmAY63bCWSi9dkk=,tag:XaH97gpAdaFkUiUTb50aLw==,type:str]
#ENC[AES256_GCM,data:4gqZh391hg==,iv:No22DrD6EBs2FA4/qH8msWEjs20fc+ZpEeZep+HIv+c=,tag:aHrYNbI83POI4PRj1nd+Yw==,type:comment]
user4: ENC[AES256_GCM,data:ujiml/r4aFiKOkSJkaD/KE8rKuBtLSnpZREBH3vRJUzDT0QM,iv:a3VFlXpMLNFihvFa7gloANtHmBLg4szTL5LTm8E2kNs=,tag:W9KZ1GAVx9IBKfda7Zedng==,type:str]
#ENC[AES256_GCM,data:bnnxo/I=,iv:8jOo0P+8gk05O1vnxOiyGhaeD4wyuaaA3CCr8/DbzII=,tag:J6VSJZoko3EiWyn0ATcmqA==,type:comment]
user5: ENC[AES256_GCM,data:iDuLRb4dhLUOjpamioMwoTYrn7Cy+Ln4SaedVXkwVD05rjJ0,iv:AqzBBvLpJuIJCUJq0IyDcHrlqb0e84nQC0c94Rj85uw=,tag:0xou1i/iwAxGngO74OIMXg==,type:str]
user6: ENC[AES256_GCM,data:WLAKPPIHGvZrTaGMLFRQIgEYWFHYy0mD6sLJEYjCD+g93wek,iv:fCOxekJSBczJz/ODYwWgk1CqERc5q/87C+G/9ETuaSI=,tag:rkpBLQoEOPnWuE+U+BnzIQ==,type:str]
user7: ENC[AES256_GCM,data:7rxvmKbtYrDKBlo8kZIfd86KLd9EcSWB0ikasIRqfCZ24W0h,iv:Uplz4fnFymmBVZ9YTniHFFY3EVSrTYsg1+CTFqBu1WY=,tag:l3EPeYRHSeRsCyRhqFRrEg==,type:str]
@@ -71,8 +72,8 @@ sops:
ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-08-13T12:43:32Z"
mac: ENC[AES256_GCM,data:DlYEvBfUjXknkSe2WWlN4BJT/LmSWdpEqfMhsAlqkH0vuaR8YCrOkerroZ2rq/lMkbEAEegnvLGRrasdsEYNwNqObijx46G0CK1qd3Bk0BsSqTn7BKkkFtKnTBVgXlbKUh0W5Nj0d1xOmxfXxUcihrWv10VIv/tW5qCR6MG+zr0=,iv:prSTzD3eeSusnBQkU3lmQwqDctSJ7h9ByzzlYk2ACFU=,tag:Uv/VLGVxCXKbBHFaAT5BYQ==,type:str]
lastmodified: "2023-08-20T16:39:11Z"
mac: ENC[AES256_GCM,data:PXRJ3JEUWoSip3sRX75WfWQo9g72itVVeN2xlubG0ouriBSy5lp2n85FrSf+GrKh8ZjX7j2Oz6jsAUhzQYnHWECNT2vW0J57xOdirU+1sSkaUhFyOk3yuHGQdgQjS769O/gXkM14wq4cC6zbdN8VlY8TWq/8sUoO9h9Q+hhFRZQ=,iv:YF23woMamgxcM33+/Lo6SuRsecr6IKMIo9yE4sVikhA=,tag:zRdCIJUhoYTqinmoa/3N+Q==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3

7
secrets/yoga.yaml
View File

@@ -1,4 +1,5 @@
hello: ENC[AES256_GCM,data:88CuphC/m60V/xFAaAzb7zcn6sZba+kqY8P2PuYFxKAxK7sPjZ2duquSq0/JJw==,iv:wzfxShOJZMGVY/Y+TCZBQfj29L1Mq2g220YszIMKOXQ=,tag:pnBTkq4n+k1CQ19hMWZ+kw==,type:str]
xray-client:
uuid: ENC[AES256_GCM,data:tt9kH0LiG7wSwCeKx14kDHYcHFlJhZ6jVs1CtvVU3rJGI+bX,iv:y0SLiJME+oMiSt72ks1bVd0B4QOWv7jomslKy29GzPE=,tag:n76T3qZsGXLPOyBX61cPLw==,type:str]
sops:
kms: []
gcp_kms: []
@@ -14,8 +15,8 @@ sops:
ODZ1V0QyZGJTZUpsM3FyQ3VOVWZlS0UKUA2zFy0Kvt2jBVxpoCqL7JIyWG0y760C
Kj/66GCgM9zITDibByKbCRjJqLg30DhjCU4Zl8kXiAdU4x9btldBbQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-08-19T04:08:30Z"
mac: ENC[AES256_GCM,data:HFvdCftji5Dj2eAH8+zx2g3vV04Y1iFkaVXrVXEFJNOBMg/pNxlG7zIk9mRMqGoTLCCewZb6FaEpV18locLZU+PGy2rR7yhHx5cG5IdOUJcfJZYdkeoiKEVn9T4q09hTSVPXsObpSrdAfsa4UPzHrTCN6KZeDtTb5UQclvQfOyg=,iv:Mxx/CddgCb7MrLVIayNN+Mf1rfTojJQJOjNzW3AqoKs=,tag:TWFVD271b/t7+xDTSyJmLA==,type:str]
lastmodified: "2023-08-20T16:39:17Z"
mac: ENC[AES256_GCM,data:phqZeVfRZfBe5MpN3on8oNpso30+QcfREuoJmwZ5NJ8UyNsT1uLPLPdtUdTwrR4BLBBBfIhM+fyuy/KM+Qi8FWNJiLOcyJrFygI2k+poy84B9Yj6aTmJdP8qoOfWozWd26MNeh5aw1AjIh9L0yzrj/pdmRxJiwV4TDT6WLpNFVo=,iv:0Bpcdkbld83ArBOWqLVZJQ+86ueig8Jw32ftuBayI00=,tag:ehszkQRYp6ibpDL4z871Kw==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3