Compare commits
5 commits
be2eeb3025
...
45fedb189e
| Author | SHA1 | Date | |
|---|---|---|---|
45fedb189e
|
|||
|
7ab4a7ba9e
|
|||
| c1920e0036 | |||
|
2c19dabe24
|
|||
|
ab58849e80
|
17 changed files with 129 additions and 193 deletions
|
|
@ -4,7 +4,6 @@ keys:
|
|||
|
||||
# Hosts
|
||||
# nix-shell -p ssh-to-age --run 'cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age'
|
||||
- &aristotle age1hm6pkvt4d640wmjhxg5wxfwkp9zhcqre9klr4zg5kx2qx7vyhuuqlytmnp
|
||||
- &blacksteel age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
|
||||
- &dust age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl
|
||||
- &lightsail-tokyo age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
|
||||
|
|
@ -14,7 +13,7 @@ creation_rules:
|
|||
- age:
|
||||
- *guanranwang
|
||||
- *blacksteel
|
||||
- path_regex: hosts/lightsail-tokyo/secrets.yaml$
|
||||
- path_regex: hosts/tyo0/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
|
|
@ -23,21 +22,17 @@ creation_rules:
|
|||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
- *aristotle
|
||||
- *blacksteel
|
||||
- *dust
|
||||
- path_regex: nixos/profiles/opt-in/wireless/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
- *aristotle
|
||||
- *blacksteel
|
||||
- *dust
|
||||
- path_regex: secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *guanranwang
|
||||
- *aristotle
|
||||
- *blacksteel
|
||||
- *dust
|
||||
- *lightsail-tokyo
|
||||
|
|
|
|||
60
flake.lock
60
flake.lock
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722960479,
|
||||
"narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=",
|
||||
"lastModified": 1724006180,
|
||||
"narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4",
|
||||
"rev": "7ce92819802bc583b7e82ebc08013a530f22209f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -27,11 +27,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723426710,
|
||||
"narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=",
|
||||
"lastModified": 1724290508,
|
||||
"narHash": "sha256-dtL4vielmrko/0XpZ3Wfd7czVvv3NC5oiwh8PKJN9hw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0d510fe40b56ed74907a021d7e1ffd0042592914",
|
||||
"rev": "4b866c9942d0f771ae934f04ca9859936f9bfbcf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -122,11 +122,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723399884,
|
||||
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
||||
"lastModified": 1723986931,
|
||||
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
||||
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -137,11 +137,11 @@
|
|||
},
|
||||
"impermanence": {
|
||||
"locked": {
|
||||
"lastModified": 1719091691,
|
||||
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
|
||||
"lastModified": 1724146542,
|
||||
"narHash": "sha256-MLxtqDtu+y/4UDhXX5pFypX9/qbH54TDP6Z90oFzd/A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
|
||||
"rev": "03fe473c731cda2900bae9894b8dfc68e3492db5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -221,11 +221,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722924007,
|
||||
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
|
||||
"lastModified": 1724299755,
|
||||
"narHash": "sha256-P5zMA17kD9tqiqMuNXwupkM7buM3gMNtoZ1VuJTRDE4=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
|
||||
"rev": "a8968d88e5a537b0491f68ce910749cd870bdbef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -236,11 +236,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1723310128,
|
||||
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
|
||||
"lastModified": 1724067415,
|
||||
"narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
|
||||
"rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -251,11 +251,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1723603349,
|
||||
"narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
|
||||
"lastModified": 1724271409,
|
||||
"narHash": "sha256-z4nw9HxkaXEn+5OT8ljLVL2oataHvAzUQ1LEi8Fp+SY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
|
||||
"rev": "36a9aeaaa17a2d4348498275f9fe530cd4f9e519",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -281,11 +281,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723202784,
|
||||
"narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
|
||||
"lastModified": 1724227338,
|
||||
"narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "c7012d0c18567c889b948781bc74a501e92275d1",
|
||||
"rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -323,11 +323,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723602049,
|
||||
"narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=",
|
||||
"lastModified": 1724293269,
|
||||
"narHash": "sha256-x/XhOAszT/ejditCHUtGOjQcVg2AQhrC/QVew3i7kTI=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "ea0bf33a11a26a62c60123c49d96011da396602c",
|
||||
"rev": "6dc6d34a3a217457d7044dcce32b6d537480a6a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -381,11 +381,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723454642,
|
||||
"narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
|
||||
"lastModified": 1723808491,
|
||||
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "349de7bc435bdff37785c2466f054ed1766173be",
|
||||
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -12,11 +12,6 @@
|
|||
["nix" "nom" "nh" "podman" "docker" "atuin" "hugo" "adb"]
|
||||
# default
|
||||
++ ["cargo" "go" "git" "npm" "yarn" "pnpm" "kubectl"];
|
||||
|
||||
common_prefix =
|
||||
["env"]
|
||||
# default
|
||||
++ ["sudo"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
home.packages = with pkgs; [
|
||||
alejandra
|
||||
colmena
|
||||
comma
|
||||
deadnix
|
||||
nh
|
||||
nil
|
||||
|
|
@ -14,7 +13,6 @@
|
|||
nix-update
|
||||
nixfmt-rfc-style
|
||||
nixpkgs-review
|
||||
nurl
|
||||
sops
|
||||
statix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@
|
|||
../swaylock
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
NIXOS_OZONE_WL = "1"; # let electron applications use wayland
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
pwvucontrol
|
||||
|
|
|
|||
|
|
@ -18,30 +18,21 @@
|
|||
timeout = 60 * 9;
|
||||
command = "${brightness} -s set 20%";
|
||||
resumeCommand = "${brightness} -r";
|
||||
} # dim screen
|
||||
}
|
||||
{
|
||||
timeout = 60 * 10;
|
||||
command = lock;
|
||||
} # lock screen
|
||||
{
|
||||
timeout = 60 * 20;
|
||||
command = ''${pkgs.sway}/bin/swaymsg "output * power off"'';
|
||||
resumeCommand = ''${pkgs.sway}/bin/swaymsg "output * power on"'';
|
||||
} # turn off screen
|
||||
{
|
||||
timeout = 60 * 30;
|
||||
command = "systemctl suspend";
|
||||
} # suspend
|
||||
}
|
||||
];
|
||||
events = [
|
||||
{
|
||||
event = "lock";
|
||||
command = lock;
|
||||
} # loginctl lock-session
|
||||
}
|
||||
{
|
||||
event = "before-sleep";
|
||||
command = lock;
|
||||
} # systemctl suspend
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,8 +72,7 @@
|
|||
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
configFile = pkgs.substituteAll {
|
||||
src = ./Caddyfile;
|
||||
configFile = pkgs.replaceVars ./Caddyfile {
|
||||
robots = toString ../tyo0/robots.txt;
|
||||
inherit (pkgs) mastodon;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
home-manager.users.guanranwang = import ./home;
|
||||
|
||||
boot.tmp.useTmpfs = true;
|
||||
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
|
|
|
|||
|
|
@ -18,14 +18,12 @@
|
|||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
amberol
|
||||
dconf-editor
|
||||
file-roller
|
||||
fractal
|
||||
gnome-calculator
|
||||
hyperfine
|
||||
loupe
|
||||
mousai
|
||||
seahorse
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,5 +15,10 @@
|
|||
allowUnfreePredicate = pkg:
|
||||
lib.elem (lib.getName pkg) [
|
||||
];
|
||||
|
||||
permittedInsecurePackages = [
|
||||
"cinny-4.1.0"
|
||||
"cinny-unwrapped-4.1.0"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,20 +67,8 @@
|
|||
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
configFile = pkgs.substituteAll {
|
||||
src = ./Caddyfile;
|
||||
|
||||
configFile = pkgs.replaceVars ./Caddyfile {
|
||||
"element" = pkgs.element-web.override {
|
||||
element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: {
|
||||
version = "1.11.74-rc.0";
|
||||
src = oldAttrs.src.overrideAttrs {
|
||||
outputHash = "sha256-Dik4vBzybkb6Q7OgEDrQ3FBaUGOmUxr9SplyNm1JWZU=";
|
||||
};
|
||||
offlineCache = oldAttrs.offlineCache.overrideAttrs {
|
||||
outputHash = "sha256-+SSsFUVIVuNpy+CQT6+oFIGvzQLAHEokibXtxsidumQ=";
|
||||
};
|
||||
});
|
||||
|
||||
conf.default_server_config."m.homeserver" = {
|
||||
base_url = "https://matrix.ny4.dev";
|
||||
server_name = "ny4.dev";
|
||||
|
|
@ -93,8 +81,6 @@
|
|||
homeserverList = ["ny4.dev"];
|
||||
};
|
||||
};
|
||||
|
||||
"mastodon" = pkgs.mastodon;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ sops:
|
|||
- recipient: age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3c05VWWV6RHVJckQ4R0VS
|
||||
aWVCbHhjYTdwK0ZSMHc3am9MMTVoeTZ5SFdnCmtrWGc1QjBGWVJneVBqbi8rSzZj
|
||||
RlBpY3dLVzFDbnFvNlZUS1B6ejdZQTgKLS0tIFpvRnR0K1FMcytpZTZ5UFhnNmR3
|
||||
eEhvYmk2SytiS1JVdlZZTFdPZEUrS1kKFbh4IBm6yekqsQgivyQVFgOcsmGdlV5H
|
||||
fCbsVtNwTS5xvd9FXykSbiy5d6KElQTrUTAYOp+3p8A09dziJc1u2g==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhb284WUdZYVgyc1M4b29n
|
||||
NDRyWmxGNUZ5VUwxSDFDZWxlTEwvbklKd1JvClR5SjVFMEdxQUlYbWl5ZEZ4M096
|
||||
VVJpUGVHVTBFMXpwN1ppVXhpVlIvdmMKLS0tIEdKb2ZMUnlYUkZLdDlLUklPdldq
|
||||
T2VnOGE3b1dpRlVNKzRtSkUvUnlnUEEKBunxj5CWfXr6Ph6YCBRm3CPabCjOPpHa
|
||||
Az5lbHWvQYSqbKVVXM0ViB4CThoAHdfOXm6QlblMgN1a2r9ntmOR/w==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVcU9JbVlTR2dUUEtaeXVp
|
||||
NXJRVGJjdUtBaVdzNFNIa1h4Vk9adGRJSDFvClV1QTdCSUpETmxucmlwL0U2S3Yy
|
||||
OU4zRjY2YkZXSDhHZjZ5bEJuU3Rsck0KLS0tIGVFZDVCdG1pdFFWUVhjSEpGUjE5
|
||||
R1ZMMG1jWnljNWl5Nk5MU3RCMlFPYjgKL1ScxzF0D1R18H+oe6dlxUGlL9myHEr3
|
||||
3HBPoapKCSQ/cT7Xma4bsWD1AVJIf1Ak+MeCs9ItGwKAcnd9JYZ9KA==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlUmEybE5XUTJnWFZDc1VW
|
||||
OVpteFpjQkJ3a1ltaWtNZWlPdG5CN2ZUTEZrClU0OVN6dytsc3AydW1LT3U5all4
|
||||
UWRGQjFZYmhGU29hd09ha2NWV3hKM1EKLS0tIGtWdUc2U1ZlS3ZtVHRWOXc5SVJE
|
||||
UkYrb3JpZDBzOUgzWXFQbUZnWjNUUjAKKuJmaJ6kV5ITsCMXEOzv9ym3L9VQKoB4
|
||||
n/SE4eCXeaoE/1UCdw4VlpyuUuouHh2pgLWJF49dHhY/zhv84sURtA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-08-12T12:55:54Z"
|
||||
mac: ENC[AES256_GCM,data:H1zm+Rk9F9SkRbANU4GYjhZpys3e5qQNBBsdIbgXD3AZTAKZVyemT6Vb8k0ufkfzQ98L0Xrm/S1JQFvcyaZqRHv+C2GW3F34FlSS4IOtaJz9IgVIdvaM4WvaOTtpC5B+5CKnA/oBPOmhEBCdi2LIjzrUltEzKpemWHkIIT2eHQA=,iv:1RCjLEz0W+tHQep4EguweYKSfePXa1VE3+gzlcFsAug=,tag:Oonqihfe83l5SNOmLjOPYg==,type:str]
|
||||
|
|
|
|||
|
|
@ -37,18 +37,7 @@
|
|||
"clash/proxy-providers/spcloud" = {};
|
||||
};
|
||||
|
||||
# why not substituteAll? see https://github.com/NixOS/nixpkgs/issues/237216
|
||||
sops.templates."clash.yaml".file = let
|
||||
substituteAll' = {src, ...} @ args: let
|
||||
args' = lib.removeAttrs args ["src"];
|
||||
in
|
||||
pkgs.substitute {
|
||||
inherit src;
|
||||
substitutions = lib.flatten (lib.mapAttrsToList (n: v: ["--subst-var-by" n v]) args');
|
||||
};
|
||||
in
|
||||
substituteAll' {
|
||||
src = ./config.yaml;
|
||||
sops.templates."clash.yaml".file = pkgs.replaceVars ./config.yaml {
|
||||
inherit
|
||||
(config.sops.placeholder)
|
||||
"clash/secret"
|
||||
|
|
|
|||
|
|
@ -14,38 +14,29 @@ sops:
|
|||
- recipient: age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAra2xDaFE5VW9McnhtOXlT
|
||||
Vmg2VnB1YThVSVNnbllRTzJPc25tRmtlMDNjCjU2M0VBSW5FNGhNbmg5V2k2b1ox
|
||||
VW0zblJNUGhlTUs3Ukx1YkZWMDI4OVEKLS0tIDg1QzhwamdvU092UUxURWxRcDdx
|
||||
cmFBcXJ0dTNwZVpoSGViOEp3RzN4ZkUKslf1N5CDAEhsQPeFlLay0rSbgd+4lhM+
|
||||
Em9RFBbLadCCEDR+lNiqJjOH7VUdzhjxR/Bca2rp6XR1Rxl9828Rng==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1hm6pkvt4d640wmjhxg5wxfwkp9zhcqre9klr4zg5kx2qx7vyhuuqlytmnp
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaeXJyTDRNTU94c2FjS284
|
||||
eEZkSDRrZWo3MGRCOFJBM1F6TmgweFFud1VBCjIyNDdBRk51ZEpoR2tOSFFYMlVv
|
||||
Nm8vV1k4TDRiYXJ5ejlGaUZuYVhRMDQKLS0tIElyaDZPNmRsWDlFSjdyNVFqWERR
|
||||
VVFFL2d6Y0ZzUTJuR2lnVHBEUWZKQ28K5WJFk6prLRNjGC/MeMOCihFPcnZhTKcv
|
||||
JCOhFi/gOoADhHvDSjbbWdUevYgRyy46IrUorBGskgGjyzhADxWWpA==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRZkVpWm43Y3NOVHpBWHdm
|
||||
bDhyeHA5RkhQZDNCZzQwL2l4cDFuZFlzUHg0CjhkWkJTWVEyRDRiUnFUVHcrd0Zh
|
||||
NUt2aG5jTjZ6dFBxRkFLZkdEWm5FcWsKLS0tIFY3VURVUWpRQ1A3WGxUWmdPaG1w
|
||||
bnNtenl4MUpTME9CYmZIL1VNZzdxREUKyIJVIyXg5lDkUlwG8hbGdgJ4ii/K/cTV
|
||||
2u/B5KSCTQ0/ndyamjfYMDawL7xVoXTuPRufj/oW/j1lNd0UTbSphA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxQ2RoL0FVNGNJc0JqNTFD
|
||||
U3YzbDQyV1d6V29MQ0V5aTlZdTkram1zM3c0CjA4QWdNV3lVTGx1NWZIZ2JWSnZP
|
||||
NExOWVdkdDJLMjk3bWd2N3Qxc1ZTSVEKLS0tIFFXMWJhRVNoOCtFUm5IZktxOWJT
|
||||
dVpNRFhtaWcwWTc5K2FIdkJIUlc4c2MKjhodQTFM68pEvIrpTOrr47UmtxW6bHGl
|
||||
4df8a+KsHbTyf9JWdVQOeUyNO+LvxWTIbKC2S9PBXLVsGgDp0GM8jQ==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlSlpRSjZHS29SMERKQ0tN
|
||||
bkJ2YlZVNVhEUHhNc3Z0bmc0TTZHR3Q1Y3hZCmx3cHZoL2lvWFVBTzNXa3hVa0Zk
|
||||
SG1zbDI0dnlicEV0RktnSmVvWEdaN3MKLS0tIHlJaExjRE15Q1JCTDFOUlBLUkFY
|
||||
US9haXAyakN5QXJpNFVFZnoybE5va1UK5b4Mr3sVReaT3KoiDPbSIMwNMjyp2Ob0
|
||||
iTdjOx3LklF4rslHxEb3nwHSTzQjsFUPVfygyMKC4oPoUk9jN1hy/A==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMdnVPV0pNWDBQUFJDSVRZ
|
||||
WXBlK3dpdmFZUmNDTkVWcmZ2Q0ZHUUc1VUJFCkszdFBWckltcTZRTVorTlljOGts
|
||||
UjRrS3lvMmlpaStzTEUreUxUYWV2a2MKLS0tIC9EOUdhZWdJaWg4K1gvYXpnSDVt
|
||||
UG9TTEV5R0R2bm5lUTAwSWlaelJFcW8KfBuQEVhkYJ74wYUjEcFYXFf9oWSSdkGR
|
||||
Yu5lpV9UsjaiJxaD1Qp4xtNgMzzLW7q6surQGEReTDBbN1ZCx+S3Aw==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWXB5L1VESXBhRkdBSTJk
|
||||
VVpJRGtyVTAvdXA1WUNwVW0xd3JZclBLeW5ZCllCS1dBTWxuRlpSbWFLbG1HdFR0
|
||||
TjFGVW1zUGE5dG9rZmF1NGQ1NEJnWkEKLS0tIDdzenRaWVRoVTZ5eGNVQk8zZmlp
|
||||
R3JVUlNmd0t2WWlvK3U3K2gyYmQycUEKoDQ7wLxvHbyLUKCvt2cV3xUDyiPXLTq8
|
||||
1KyVQ/5FHQCRPsqjYmXioqKNecZxYnVESPi8UZslTn8edtl3iiQTLQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-08-10T15:24:00Z"
|
||||
mac: ENC[AES256_GCM,data:BGF/DAfOhdw0YZ6PGipXu0sL9+8E1s509bg89dMnAtf1WfreFCQMuHe7uqfkC3Be99proNgJ1O5fWTENaynXyMKto1YF+7z9ZZ3CCOceFLNqbBucaxRFAO+tkMlVixLoqIvEHdyoZD+iM45wOO6mn+/o6wR/z3Ze36wmZCJ1+4c=,iv:s9N2lNx1SwPm0qNyqgGm2Qp5zS4xIhxwp2kj7sQmcQc=,tag:o1/WS7b7FR//IZK1iNQkCg==,type:str]
|
||||
|
|
|
|||
|
|
@ -10,38 +10,20 @@ sops:
|
|||
- recipient: age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDcjYwbmRlU1R2aFplS1JR
|
||||
THp6NkZlY1k2YndoNTVZMW11elZYVWdjQkdzCjg0a2kxKzlXeVFWaXBKOHEwNGlU
|
||||
RHZVSy9FdjZMNUZJNExnMGhHS0ozR3cKLS0tIDlXY25BSEcyeW1Bd01oSEVqN21s
|
||||
S3hTeDBzZm1ydyt0aDRjSDRUYkYvd00KLjKQwdG2+DqxG9HgyK0pseXlBbT9HgBT
|
||||
tonVZuTIsY4vIbo2sRS9IHBru0LvGPP/Lu9YGmw8I39EOG1b0IMNSg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1hm6pkvt4d640wmjhxg5wxfwkp9zhcqre9klr4zg5kx2qx7vyhuuqlytmnp
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2d2FPN0ZiMDZIZ0VkVExR
|
||||
RERNcE5GN1Z4ZktPZDBXekhYSVM1cWRkbWxZCndOMnhsdHlWcVFMeUtIYkcvbk5W
|
||||
bHpFQ1RocVR5NWp3VGhmKzRWWDdtMm8KLS0tIDgxZlY3VjVBSmgyaGRXVmozRnM0
|
||||
dDBqdnFJUURhdFJVdm5MNDBZL3h0MkkKEQv9tegnMhokwLbFj7NR7iJ2aXjGjuN4
|
||||
VIsC/5VMikoVEo/xLeBp8E6qII99WRO+PpK4o4M5Soi+Mc7zpmKjRQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMS1REa294Z3NJQTB3U0RB
|
||||
d241M1Z4TWNGdkJCbzJhRkxiSitEaGlzUWdrCjNHSWZqWHBRRTJ1OG9aTWM5ek40
|
||||
Y3IyWUFON3diYzJZSVNSNlNrZUN1ckkKLS0tIFliNm9iTUhnMTNsdy8rbks0ZWpx
|
||||
Q0xpTGtKTERPc3NvRUxHMDlwcjlkQ2sKK/ZFGqI4r68NL48wK4BR0Ho8MGQoeBQQ
|
||||
yfYZvlzt5iGRswKWB9F6vgGlIdRkOrnOJVq83Wvp2tJWUxzIWbGsQg==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyMDlEUldrMDUzMFFTY0sw
|
||||
Uld1WTRrUERPbWxnUWlTVTJKQzM0cFR4U3pJCmR1SWV2VWJxaUN6K2RLcDNwQWxZ
|
||||
S01sVjZHUktveDF4RDZIZjJ3UWhVQkEKLS0tIGdqeHpLQWUxd3V6WVd2ak80MXYv
|
||||
dW9BS0FSS1ljM2RwTFlsaWl3Zmh5OHMKSpz9jbEMYVvV6QuBP8a9UeHKRhbrewoh
|
||||
vu3Da65hAcdYFI9sg+p3YRuwaWAD/jQcz39f+s/tCEcR8hyOfxeU1A==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMmx0ODNBT3BLRU9Yck1w
|
||||
Sk8yOTRnSUd6ejJDZmhuNncxcTdtditSd0c0CjFOcll2azdOWjhMRnAyaXdvcVE0
|
||||
S0dndHFqRXcrbHRaSC9YWkNuNkt0TkkKLS0tIDdMQUFjRmlndWFKMUJZTzI5Wk1M
|
||||
bnpNdWVlTyt4SWUybUE4YWJNWE9Pd1kKpqBrRvQ82HFT68OuDFzpxPaUSevNgtLs
|
||||
5K/Q94ySySwvC01PJmyiynWS4fqm8Ve7uXiVLJYbgaJzVL5nExTYpA==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJQno2eDJsZlREcW44bDl0
|
||||
RXh5djJzbTlHRk8zK05XeXBWKzlRQlQySmpJCmV4amxKcG1WTytNNTgvNVRIeFZF
|
||||
L2VUTmc4UitVYVpycFFtaTExM2tpM00KLS0tIGZGcHNVRVJiSkhUYjZHa1A3a1A2
|
||||
anlOQ09Eb2lFc05kY3dGNUNwRWVIYzQKVDQK6DwJHr0ujog+LC/usF4jQIN0WxIj
|
||||
Eqm+ooHFDbOtNmzt4s7iVq0Ml8moUlmWM/VNSCKuaIY+kse4H3Xp+w==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-07-10T08:37:51Z"
|
||||
mac: ENC[AES256_GCM,data:M892yzbmOSiDdifD1kRreBR/+JwMneIZjvCXC90osBogFEmUtf9W6M3xeYmbTobgE/chy9O9yn6CVDt9OucU+sT7o2oUpbOHVulJnwstBuUJGQAEwhyolQP5YRiGRxQzdPG6dqLUkKlsi44pm4dNtDLHFPE0j1wA0PD1fhrH4Y0=,iv:P+ne5UD5F62NW0xYndCDEzR0e7qo0COwDY0iNb2bKUo=,tag:uZfOsrZuSMYdY2zqFhqiyw==,type:str]
|
||||
|
|
|
|||
|
|
@ -21,11 +21,29 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
qt6Packages = prev.qt6Packages.overrideScope (_final': prev': {
|
||||
# HACK: no more qt5
|
||||
qt6Packages = prev.qt6Packages.overrideScope (_qt6final: qt6prev: {
|
||||
fcitx5-with-addons = qt6prev.fcitx5-with-addons.override {
|
||||
fcitx5-with-addons = prev'.fcitx5-with-addons.override {
|
||||
libsForQt5.fcitx5-qt = prev.emptyDirectory;
|
||||
};
|
||||
|
||||
# HACK: no more qtwebengine, opencc
|
||||
fcitx5-chinese-addons =
|
||||
(prev'.fcitx5-chinese-addons.override {
|
||||
curl = prev.emptyDirectory;
|
||||
opencc = prev.emptyDirectory;
|
||||
qtwebengine = prev.emptyDirectory;
|
||||
})
|
||||
.overrideAttrs (oldAttrs: {
|
||||
buildInputs = oldAttrs.buildInputs ++ [prev.gettext prev'.qtbase];
|
||||
cmakeFlags =
|
||||
oldAttrs.cmakeFlags
|
||||
++ [
|
||||
(prev.lib.cmakeBool "ENABLE_BROWSER" false)
|
||||
(prev.lib.cmakeBool "ENABLE_CLOUDPINYIN" false)
|
||||
(prev.lib.cmakeBool "ENABLE_OPENCC" false)
|
||||
];
|
||||
});
|
||||
});
|
||||
|
||||
# HACK: no more gtk2
|
||||
|
|
|
|||
49
secrets.yaml
49
secrets.yaml
|
|
@ -9,47 +9,38 @@ sops:
|
|||
- recipient: age129yyxyz686qj88ce5v77ahelqqwt6zz94mzzls0ny4hq76psrd9qhc79kq
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXckNJVXZjSWgvRWZhejBD
|
||||
S0dIRHVoN1ZOL2Y1Y3JpYTE5UmIxeWxIVkFZCkZJTy9TTWJ1eXYzSXZUcDBhTWho
|
||||
TkZMZlkyVzQ3QysyRlVIRW1TdS9ISG8KLS0tIHRDdVRJSVhJNmFYS09IWENzdThO
|
||||
WUpvU0RlVWoyeUFxZ1N6YkNBQk5lRUEKnQwSMuIeeYY39HH0+zrU/tU4EMQsTZro
|
||||
wZpkYCyJ5+OgIN/WocqGIf8A52ctz19/Car3SNr8mTTpQfJj9H/6og==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1hm6pkvt4d640wmjhxg5wxfwkp9zhcqre9klr4zg5kx2qx7vyhuuqlytmnp
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZSk90NGNVaXQyVFF6SE9X
|
||||
SHkweE4rVlQ0QWNUODBjYWkvcE1qV1lQcFRZClMyc0FWV0FYUnIyL214VFFETDJ3
|
||||
MUF0R0ZkSTJOekl0V1g3Y2dRSUx0QXcKLS0tIGlRVklJKzFPM0J1OUthbHFGV0xZ
|
||||
V2pSTEE3WjU0NjJSNkF3R2dtZ2hLUGcKOSSpHoST4SomzYPEeFA7rZ87lCniNQqW
|
||||
dNoFFUIsH90p4qAdw8BTE8+z75p46aSoBzNqZOxoLlGzH4UPzTFD6Q==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvcFVFTDVuYlQxV1k1Yzl5
|
||||
OW1EWXFwM1lrNEtUZGdNNVR4YzZRTVlKd3hvCnJ3V0pnME9DVFNnbzF6aWdrUDdB
|
||||
OXV6ei9vOUxuNTZLS3A5RkFUTEpXRTQKLS0tIEljcml5cFlDME41TTFsaW5NZm1M
|
||||
aEF4N3ZSenVaUllHejd6OHNuOHhLZlkKHOAb/KwhXyY+nHuLtiqJyscdxlbI54yf
|
||||
MqhSx62mDd7PVSnOF0a/BQF8HV5vOfjFJrQKYcy8sUDXhw5c7oZAfw==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age174knn6hjtukp32ymcdvjwj6x0j54g7yw02dqfjmua3fkyltwcqrsxccjdk
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYS0dneitmaU96cU5oS09J
|
||||
YXkvb1hKQXJxcEdPSkU4cStHSnFQYWFudjAwCkdHTzlFN2lEbnRWTjhqZUkyT0FP
|
||||
Y0JXR2pnY0lmbHFDM3N5cW41RmdaV2cKLS0tIEJ2dVcvQi9GUDA4SnFVdGxGUHgy
|
||||
T1ViRnM4YXFSOHlsT25SS1U1cFBoZk0KIyUvPy+jmlojgm0yhiRUfWECDRM1E8zP
|
||||
b8JThM2kJ5NjmvEmol8FnIBq/eyR6GyaBs5GTkuuDAvVHpxLqLh+fw==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpeUlJVDBhVXNCUW9RYUJ0
|
||||
TFozZ3FZenVYcUVyMC9tbVpzTHErYzRsSGpRCnVJY1h6NkZDeWdZVVRSM25TOTk2
|
||||
Y2xaK3NlNThpRkFkc0Jza0lGNllwOE0KLS0tIDZZbjRNckR6akNoSVZNRGVxK3FE
|
||||
aHhrK3FlQVR2VnNwS1FDSlR4NnZyM1EK9nA+UMSD8pzhUJQvsmA0Tg3MBj0FkSrV
|
||||
kpT171pjoi8UFYaiaGB8ZucVfVTrcQ8YA6s+5B5PJ/0VaDcku54bTA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age193x79xx8snu82w3t3hax6nruuw57g7pduwnkpvzkzmd7fs5jvfrquqa3sl
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCNktUSEY4TzVVYjFNRDV0
|
||||
bzBCSzNad1BoRUNRbnJwRitVWU52aVBHK1UwCjlmWHRTSWRYZVBMeE5NYVpBVTdK
|
||||
OXRJTlZSTGFISjRwL2xScGI3N2tocFUKLS0tIHAvVnZkdldUNkVNMFZOZVN6aFJ0
|
||||
RlpXZkFkUWpDemJ0Wm04N0QrL0dVY0UKq6KGit+GvUC3Wl7/fT9cZa+DVvNSzLxu
|
||||
/E1EXLoDEKx9ubai3wPv1Ebt3nCM3PHNSU1l239QJiLk3NfCDc2nwg==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxMElHNVVCQ3I3bWdYL3k2
|
||||
NzNkUWczVEV4STl2RHVwbEZ0RFRZWTIrcEdNCmQ4Y3JFenYzTkh3MTlRdkVlNlhR
|
||||
Q211YXlmcGF4aGJHUjVIRGlMTDBycjAKLS0tIGMvU2dNMHBkVzlyN2J6UGErQmdH
|
||||
N1c4M2dOQUdOWkxFdG5aMzdyTDRwREEKaHFRZTdoiDKdL4Y+81L3EM7WNC5gCSe0
|
||||
73ZIY5+L5AqfEXSsg1LPPFIkx7gnVE9xpam22MXsaDkoRlBjgZBo3Q==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1vw4kf5v8cfnhfhvl0eyvqzpvy9hpfv9enffvzyt95tx5mu7s5dxqjqw0fa
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSQVZQRnlNZm5JZVhFZ2Vr
|
||||
NDl5VHBYcVNERW5lMTY5NS9ad0dkZVlqR2lzCkJadHFDeFdtRlprSTNCQ2s3bkRt
|
||||
SCtuQ0VneFMrTVptSTRJMXRvbk5iak0KLS0tIC9QMTkwa2ZrTERiQTdxV2xRdnNx
|
||||
NGNZVXlxMllGMUhNbXA1ZVBTcENxSm8K1BJtltsPjecKcQVDeLTDSY0GbFo1xa2P
|
||||
TYH7HmgLurykqOOhS2WnOSQZG36e2xaRutDsmdOWkSD2UI2YRBYlMQ==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmcWh4cUtwN0hXWEw5TEFY
|
||||
UEpOQ3ZLWkY3N1NIQ2xIeTZyYVdkemQweVdVCmQ1MlFFcDJaRUJTUytibHF2ck5H
|
||||
ZWYvR2FLSXNVOVB2MzhtVnVObGg1clUKLS0tIHZKNVVsbVpXdmI3SXpQL1MzVk1r
|
||||
aEtqL3RBYzFWeDZlZThQY2thd3A5VWsKLZUHV3nBuDGSHjx+4ju3457aL1Oh/3EI
|
||||
E7iHIC/Wd2w4UkYtb9u5arRDgwP7avZDfPxio3HCEgzyBcZ2bLJ6kQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-07-09T22:04:25Z"
|
||||
mac: ENC[AES256_GCM,data:d8ml8uokaSlD/nJQVM732OoEXZB0a7dpq5Koq1/Nz8iW9xDmwvrWONRmI6EPHMHJ+vFXKS09iLBtaWRo83H1KPIEfN6slVY8wrVYychz38A/jXx3TWd1oh00otJpkmjzWfEbhYYB6K0D2lTP/rfu009b29OzBNbqcIfVrJRz4vQ=,iv:/PBfFIf+SZ4zmRdOba8NKV29JRWHzCGwK5Oo2EGq/90=,tag:5eHt2FPi+5uSNEd3GlFkcQ==,type:str]
|
||||
|
|
|
|||
Loading…
Reference in a new issue