From c804a493c29dbf45704de1e3e203c638a22f7f34 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Sat, 18 Nov 2023 22:13:22 +0800
Subject: [PATCH] calcite: bump version
---
flake.lock | 58 ++++++++++++++++++-------------------
flake.nix | 2 +-
home/xin/common/default.nix | 1 -
machines/secrets.yaml | 6 ++--
machines/sing-box.nix | 2 +-
5 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/flake.lock b/flake.lock
index a242d44..a84647f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,11 +74,11 @@
]
},
"locked": {
- "lastModified": 1695738267,
- "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=",
+ "lastModified": 1700087144,
+ "narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486",
+ "rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506",
"type": "github"
},
"original": {
@@ -96,11 +96,11 @@
]
},
"locked": {
- "lastModified": 1695691129,
- "narHash": "sha256-tUbgZOgmR/9vh4yvW3Bw6Xd+1f4DDcEI/EoqbO0SOuI=",
+ "lastModified": 1700097605,
+ "narHash": "sha256-nVqtih7bV5zso/y8tCSYwqmkEdMDU6R5NBb8D7w5mEY=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
- "rev": "bd2d4d8c383ca5236a174742ef2d8d42307de40f",
+ "rev": "4192069cbb3f98b114e6f0bc0e7e4720c6c98c09",
"type": "github"
},
"original": {
@@ -132,11 +132,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1695541019,
- "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=",
+ "lastModified": 1699997707,
+ "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296",
+ "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
"type": "github"
},
"original": {
@@ -148,15 +148,15 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1695750249,
- "narHash": "sha256-uE7t9hJwa6ngwWvOiQxVpWRX8iOWgiU7+STXbTFttMI=",
- "owner": "xinyangli",
+ "lastModified": 1699781429,
+ "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "0e6469c77887662764a5e65808641b1ecf6d106c",
+ "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
"type": "github"
},
"original": {
- "owner": "xinyangli",
+ "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -164,11 +164,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1695559356,
- "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
+ "lastModified": 1699994397,
+ "narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
+ "rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8",
"type": "github"
},
"original": {
@@ -180,11 +180,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1694908564,
- "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=",
+ "lastModified": 1699756042,
+ "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "596611941a74be176b98aeba9328aa9d01b8b322",
+ "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff",
"type": "github"
},
"original": {
@@ -196,11 +196,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1694760568,
- "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
+ "lastModified": 1699374756,
+ "narHash": "sha256-X21OIoVcJejN9JKoLuoZSx3ZZkMh/iSpJ+GGrSNQyGU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
+ "rev": "9b92dad3804b543a8b5db878aabf7132d601fa91",
"type": "github"
},
"original": {
@@ -212,11 +212,11 @@
},
"nur": {
"locked": {
- "lastModified": 1695750428,
- "narHash": "sha256-IAT2N9tmdV6Rp2UYQsF/dv7d6iUsgmW9OtPa8D6TzAQ=",
+ "lastModified": 1700127871,
+ "narHash": "sha256-Vc+CZ/Ev/MhzYdKGIX/qp8GGiKfztvfL6bJZSW2m6zE=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "e0da1a7ac4f93eec44939d6f75eaa5b7242a179f",
+ "rev": "7cf29aef2e074a1ad6c12a196f3e4a140837f33f",
"type": "github"
},
"original": {
@@ -244,11 +244,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1695284550,
- "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=",
+ "lastModified": 1699951338,
+ "narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78",
+ "rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 7153504..3865656 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
{
inputs = {
# Pin nixpkgs to a specific commit
- nixpkgs.url = "github:xinyangli/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
home-manager = {
diff --git a/home/xin/common/default.nix b/home/xin/common/default.nix
index a4ee121..e461b9c 100644
--- a/home/xin/common/default.nix
+++ b/home/xin/common/default.nix
@@ -28,7 +28,6 @@
tealdeer
neofetch
rclone
- clash
inetutils
];
diff --git a/machines/secrets.yaml b/machines/secrets.yaml
index 9006057..a6c2d77 100644
--- a/machines/secrets.yaml
+++ b/machines/secrets.yaml
@@ -2,7 +2,7 @@ clash_subscription_link: ENC[AES256_GCM,data:Vwy0c8gOeR1XG/QNp8TGuBe/5kezD7SSStN
autofs-nas: ENC[AES256_GCM,data:wcrA2t8/i9PaxA1PQ3CDVJZUhVchGV4vCfa5j/ReNahKV3cfDf2owbpeB827sMpjYyyvSH6nri7mra/BLMAPcgySCpZNAgdR9DQZXAQ=,iv:QJzsS5a6vWeoBxkB13yXdVbyn0tt2QTvqj0LaHn6S2g=,tag:TtgubLgWBBzl67MVal5BvQ==,type:str]
autofs-nas-secret: ENC[AES256_GCM,data:OBh8h5CFv1Z4G6bMesna4zmXNASKhYdjFBvg47T9aKBCLDp/xVWnnQj8N7AFGg49wJ+0gYuqb33lIqpSnQ==,iv:UCaGeE8j4RqJzA0xhu3oB2xvzombzQD3fjLKCWd5fDg=,tag:+Oc78ddpLH7R2aT7gW3Ouw==,type:str]
github_public_token: ENC[AES256_GCM,data:SYj6F8jXhAvpYgPllyJca4cdekp52ayYPndCaGtg9GFLBAVt1Y+d2Q07l/zGFlcLXDTE4FI9kAHVzpXchZlfCWcjJGJ/gCHr306s0zoaa5zVfAsfQaLmkYNvYBuOu8WHifsL3RNvkQrx4xWiH5KlCbrKelAsUaoj,iv:/bYv5+PtVcqNKgrOy8ojY09GtS0+U1W8JI34CcBeoHE=,tag:Xsh6XOVrn06RQL6s1ze4PA==,type:str]
-singbox_domain: ENC[AES256_GCM,data:26WBV6F6JsdR81BzFbeFA0c8,iv:SRkEJdAxH/0in5oq7kCz6sBeMQzjDcV9242SqwFwMis=,tag:u6sn2Xs3Pwsmo8xwAfObCA==,type:str]
+singbox_domain: ENC[AES256_GCM,data:D14hCWxVZG3EL/fIIYVs8G/bWGo=,iv:slK/UPnLtT2Uu4aXWLCOGSTGZ8U41ZhUexB9/Yy/AaE=,tag:NQ2PtV6jcT4jTZLgDzTfAg==,type:str]
singbox_password: ENC[AES256_GCM,data:yEDny7bjaUpCoo0fXInfi/6phc6na4tJFwJhsW1yprn+Xm/x,iv:I+lmPWGdCOhpxL5tzfBR4KtIR3Bl5ECrBD95gUkwL+Y=,tag:OPzAxS7K5QQ6xEYFQ5gy4A==,type:str]
sops:
kms: []
@@ -37,8 +37,8 @@ sops:
dWVDd2VSd213NmpYdDcvNUZXTHdzSDgKj68TLxSYYExtGg/hyuAiPqmdXPGIWzou
DnCdBitTPPswI+BVwYufnGmHdt8xz5nofBxACWg/bS3NUTGFcnIPWQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2023-09-26T15:10:12Z"
- mac: ENC[AES256_GCM,data:R1y2LCVbIcJ4hHLrgRT+H45jdSPUIE8uuW1EoJattnciLExlpZzNtuUxV6yVUKoUxh/Bdl4gUwRP6YINegMflUJIlby9vUyDTVAwzFpk5p4Ev0YF/X8ZgXcerwOZjEkHqekqEtDjEsnOt2U41XsXOzQsFXkmWl/aBRlxGYiTHcU=,iv:jFM3EKnTIJbBP1FHw3t7Q1+NvGIQYWtVCV+4Z9snPIQ=,tag:NkdeGL6IFA0iQoUqWmPZgw==,type:str]
+ lastmodified: "2023-11-11T19:16:18Z"
+ mac: ENC[AES256_GCM,data:iyqD4XJHw072IYKyRnWKJRVLex/GfnYn5QY4/YPkGK9cHjVML/97k1IWM76zXOpoJ9wSENvTqQirjMZz0TS92Ak2Ps/3fsyPj2f9BEFmF+q8r+VWEj9ZGEzHb52uMKyj3vYs5Mg9O5eeDmdAifdvC3RmRkoQ7WFoLDVCwcVFKoU=,iv:AuqLIPVMhX537MPaqnrYgOuHPH+P8Ili8tkg4p1jC1I=,tag:t2gQZzO1dIXnM3UqOnn/FA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.8.0
diff --git a/machines/sing-box.nix b/machines/sing-box.nix
index c77aefc..050267f 100644
--- a/machines/sing-box.nix
+++ b/machines/sing-box.nix
@@ -34,7 +34,7 @@ in
server = "_dns_doh_mainland";
}
{
- domain_suffix = "tiktokuu.xyz";
+ domain_suffix = server;
server = "_dns_doh_mainland";
}
];