darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Purify the config

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-01-30 13:50:23 +01:00
parent 0f64eb2c43
commit 16bed46a9a
Signed by: darkkirb
GPG key ID: 015E3768A70AFBC5
7 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/nix.nix
View file

@ -28,7 +28,6 @@
flags = [
"--no-write-lock-file"
"-L" # print build logs
"--impure" # unfortunately...
];
dates = "daily";
randomizedDelaySec = "86400";

1
config/nutty-noon.nix
View file

@ -155,7 +155,6 @@
hardware.opengl.driSupport32Bit = true;
sops.secrets."services/gitea.nix" = { owner = "darkkirb"; }; # for dev testiing
nix.binaryCaches = lib.mkForce [
"http://192.168.2.1:9000/cache.int.chir.rs/"
];

11
config/services/gitea.nix
View file

@ -1,7 +1,4 @@
{ config, ... }: {
imports = [
/run/secrets/services/gitea.nix
];
services.gitea = {
enable = true;
appName = "Lotte's Git";
@ -17,14 +14,13 @@
httpAddress = "127.0.0.1";
lfs.enable = true;
rootUrl = "https://git.chir.rs/";
storageSecretFile = "/var/secrets/services/gitea";
settings = rec {
lfs = {
STORAGE_TYPE = "default";
};
storage = {
STORAGE_TYPE = "minio";
MINIO_ENDPOINT = "minio.int.chir.rs:443";
MINIO_ACCESS_KEY_ID = "gitea";
MINIO_SECRET_ACCESS_KEY = "#storageSecret#";
MINIO_BUCKET = "gitea";
MINIO_USE_SSL = "true";
};
@ -50,7 +46,6 @@
TYPE = "redis";
CONN_STRING = "redis://${config.services.redis.servers.gitea.bind}:${toString config.services.redis.servers.gitea.port}/2";
};
"storage.default" = storage;
};
};
@ -78,5 +73,5 @@
databases = 3;
port = 6379;
};
sops.secrets."services/gitea.nix" = { };
sops.secrets."services/gitea" = { };
}

26
flake.lock
View file

@ -277,27 +277,27 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1643388593,
"narHash": "sha256-ARKH3ICvFsQduFQ+nL4mIS88PQy0Oe/DvultqBo4ZoQ=",
"owner": "DarkKirb",
"repo": "nixpkgs",
"rev": "6c51e64b0137169142652cb692c4a365936d5fae",
"type": "github"
"lastModified": 1643538740,
"narHash": "sha256-Ji4CLeXulIwca0qKeoo5YNcPf6yVAB0ZGQXF5m4hbGk=",
"ref": "main",
"rev": "aabc76e849be29418a155f04b12ea9a05f988ccf",
"revCount": 350029,
"type": "git",
"url": "https://git.chir.rs/darkkirb/nixpkgs"
},
"original": {
"owner": "DarkKirb",
"ref": "soundtouch-2.3.1",
"repo": "nixpkgs",
"type": "github"
"ref": "main",
"type": "git",
"url": "https://git.chir.rs/darkkirb/nixpkgs"
}
},
"nur": {
"locked": {
"lastModified": 1643466833,
"narHash": "sha256-k+KHPjLvSc3xBnPDY3F/QhN4AEx3gm7s5CVdX57VzLE=",
"lastModified": 1643530893,
"narHash": "sha256-cGPuqpoMpBk0szsRmG3W6YylUWl1xNzD32S/DfFXEZM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "4a6dfe3cbf28f83114de8b7aa46ce4bf6722c99d",
"rev": "a10af0f53947336a4c06aae34a64b4c6a20b9584",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -2,7 +2,7 @@ rec {
description = "Lotte's NixOS installation";
# Use NixOS unstable
inputs.nixpkgs.url = "github:DarkKirb/nixpkgs?ref=soundtouch-2.3.1";
inputs.nixpkgs.url = "git+https://git.chir.rs/darkkirb/nixpkgs?ref=main";
inputs.home-manager.url = "github:nix-community/home-manager";
inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
inputs.sops-nix.url = github:Mic92/sops-nix;

6
secrets/nixos-8gb-fsn1-1/secrets.yaml
View file

@ -10,7 +10,7 @@ security:
password: ENC[AES256_GCM,data:8W1pEFt+1lW2/Y11OrJa+glMM1A=,iv:V0R7PlBMxl/oTJxE10MIDMtbqr98bE/po+/92MGMftY=,tag:juGYo8nQy7IJUX28f2ZznQ==,type:str]
services:
chir.rs: ENC[AES256_GCM,data:f8Jrf6ksi6nxTExzeos+U5KXQKreViD0iGoKAEbfA1872WfhgH3VSpx2WQVCW5lTKio4pQ9Mej17W451N6bIc1U2lbQszFn+4wjXrOS9VJnB8+JV+05UGzGXmHJD8u19GG3vyMllKJLwKSsceWux7AAm9duBXoRSgEElA7sTWhGBjXXW+/yCRDKQcNdNvPpH6zHzXcApFmI7ECQKMF/Cq8Txl6yQkWIX/n3v/U8JNSzNzwllVSgx2JU7FDorqS7lrkYaz6lXuPZeiiISIIRShwYoW20uqvQvUQ1bQmDbJPsV4FXu1SynUNbHA7WbsR/Qh2bBAZozgxCy3NvfYfPkb2XANOBemFU+uRbrYMmoaucZnYBJijlc9FGfFsq10vT3BynPjCRLcZWtLTx52k83SP4NiLxkNkPPYERxwcT74IuhkyMOQdZe+EASASRWY0VVCKkGLX/v2dO/jf6gumxQ0xn5ehqGhlqq5wR8cA==,iv:S+mUPpwg1C7FW6or+7Y3fG4UjtWePYdH9N9apJ9TvHw=,tag:EH9Dix+g5tguZFDe/bfmYg==,type:str]
gitea.nix: ENC[AES256_GCM,data:8Re9/GdZ7d/PV11nT0CLzqFj3SaJ6bu12VV14AAY+G446liX1w6nCB5L33w7SXLxnbIQV/x6LTAn+YZ5hNxLdHHxaPYF60L+HvmSNee6Jz6bGjMphGaAB1e+smNTqV5AU+FUqnL9wpr6y3wE+gm00I52HJQ44Mx2CVXPvB2NYpbJo7CrHQ9NdW67C+Ub5eoxwcl6FxLKst9dZ6+FwAmzkhrAuog9u7TnboX7Bx6sEn8Kl6XM/0mIG6L6,iv:sk2fZ+uOrSzXtuDO+n3ozNesEg1S8DC2bRqnqudufz0=,tag:H3cKnTLDqb4rHoYfCV+6eg==,type:str]
gitea: ENC[AES256_GCM,data:i+reN0mYGY2iMQ06atN/i6YzAg==,iv:HT1H9/UIBweErA5+YFq7aprPjPB2d0gNbt/3MKayuHI=,tag:vDGL31LBw+9sU7UHE9GYKw==,type:str]
minio_scrape: ENC[AES256_GCM,data:w+VescGVui8/70HsSP/WCQG/E9fU0X45BXF2qwPNE2vnYM9XyCreHezX218Vb5qDOU3vRl71CJGVH4nv28nBgWvtu017ITfh56CX9dZt7tFAUx198WqXxW1Xc+D9NggWHXUFyAD80+dkzoPH2mUrdhBYeXwlhwyp9+DLF0Up00kdLsjDtSHpDiKKoIvzk3m0K00GZkMtOOENpomAoqtUduUupYRmL1GaHBMJ+XcuLuyvfSI3uSK9BzFxIfNPcJdrP2F28g==,iv:xe7BrC5mLz48efufLup5v0x/aI0kaqXNQ07l4G6kUdg=,tag:yepSZfc3034JaYo2pp15CA==,type:str]
old-homepage: ENC[AES256_GCM,data:DgOLD0YCRXsRSvrjQ/pK4RpYdzcO/j2Ifg4eYXFivrEVVj5ooPKeeeJAMX+L+XOjjNmHo5r8o0AvBnvJ4TeGto3VOQynkxw5apvkedR5ecC654Sz5+bRGr2bgtVzujiLH7+IiB3ljH9KYflYASvfmumowmR8R6074GNGKZlH2F7UYDKDdbd48p4pOFWP3Lv5/1iDvJ7Ve3hVASZqiUlS4elMa+8T0HYKkJyxWb76AT+t0M54ps6xgqDYbjrmbO2+UK95Z8DanOk06tk1t30=,iv:2/KdwQ86SO/LFeHTGNDVY+d4ZQnujK7OGuBuGEwkCbU=,tag:7yOVg0V29aGMTT8O5422kw==,type:str]
postfixadmin:
@ -51,8 +51,8 @@ sops:
Ync4ejJHR0RXTkpqVzFRQXhEVlFVZjgKPo209jJf8Lwn1j3VmLC+j0633zdbt2yf
bPwO7dlKYGbGeGObprNtBXBS2cUXHeuQ45vRpTtg1cpxYK+TfNH8vQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2022-01-23T10:27:04Z"
mac: ENC[AES256_GCM,data:YCEW4MtYuAkoEfklmzaK8fBE/KUZe9ylUhYbqEJPKBEaIs385Wfxynd9q+//KTsfdcHtotIBzYxsXu7YBXX8xQVZqyqJixvS9ypmbaFq1nOPLv1bUiCy5BXbFE2EdccWOA2QnFH7PkuEDwLZrGccZLqtZ35pvY30/qgS7RMj8M8=,iv:LsKQ4I9yR9UIybl6rv/RFW885J3njI7+0ctrwNku8iE=,tag:kwQMq8AyascTHZzCGFu49A==,type:str]
lastmodified: "2022-01-30T10:28:55Z"
mac: ENC[AES256_GCM,data:itiQ9yoJWmfaghOnDQf+WftTXgI5xjscghju0WHYcxNPEyRg3MlIijJAcpcdOsUJmc28raDv+ZE3xTFOKd3iV0i+pV+l205igv/da0tyTCDdsgvUDhT5zr7eioy9GIT6m7Rcg2WEKrQI0of5w+UoVE/mIiqdHGJYRpiV0UF6oXg=,iv:YluA2PX9Er6FwUyYD1dduNyuoROo7lbnZ8EPUDXIj+s=,tag:9JuFuCM/9AqAMWnBpRvh/A==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.1

6
secrets/nutty-noon/secrets.yaml
View file

@ -8,8 +8,6 @@ email:
darkkirb@darkkirb.de: ENC[AES256_GCM,data:/7Bi/3ko7bzrXGcTkH1yMk7S2Eg=,iv:UFRF8CpYvFnnp7a+rgTUjX+GSCuJCOVnLtW5qXpcnRo=,tag:rpWf3sucE5cZXbUOd21F+A==,type:str]
lotte@chir.rs: ENC[AES256_GCM,data:7XsLQMZex88Pdh25FI3GwUmjHA==,iv:e/YhtFBnLZBVfngnR3n2WS1c1FNlSN8grLzEpcRFW38=,tag:TQNx+tgtMyUcJZ3/bQOXtw==,type:str]
mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:6+yoCDtAqlXX4fZLR73TyNKqXz6kKTwqK1JnKwTnoRJvjXjpCJ3zC8bHgIXfQFNPxaWQN85N21qSGp9ahbljKw==,iv:XtysXD6fL4XNVC7JNhH8eU3J8/x4uL8pSBQV5jQN4yE=,tag:VKZeLMnFNst69OWS97fjYg==,type:str]
services:
gitea.nix: ENC[AES256_GCM,data:t0qqgZd7PsltGN7R2w==,iv:rEtRmpXIgDylGTNjjHOAoR0IOp5au3/M45UdNQ8wF2M=,tag:lBbvkUQg9YG/NK8HSMov8Q==,type:str]
sops:
kms: []
gcp_kms: []
@ -34,8 +32,8 @@ sops:
VU03QjZNVkdQSDFNZVNZVzQxdEJ0RVEKOEYRYSX0GNYWKJFggMag9+1ExSZu0QLY
EKBY0NBVvcspzUSZ/LkcxjXn1kZ5iMqNzYt6A5lmVE3QpYtV2sDXNA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2022-01-21T15:19:22Z"
mac: ENC[AES256_GCM,data:38dIkGQNo3aIq93m5KEc/DrssssctWR/4bm80k+qj58+ukQxHnPdS2WHALBT11BwuJHK+2vCFIayBF29EcRboKW+TolYXR3EnIRKjLRzH7c0r5P+0anx8VjI4fM3n5aCZ204kH7nRxbg7W0P1gP6kJmnygzyGYB+3CfTdK5zSEc=,iv:doOJJHgYYo5bXFlWNBD/MlNB9xN7ltRuUPMkJ2SFp5s=,tag:QI7BITjAJR1XvKpmbo60OA==,type:str]
lastmodified: "2022-01-30T10:29:05Z"
mac: ENC[AES256_GCM,data:h/eVfsBDWwpPkec6X85qadybXJFRUwGUwhzuMQbtHgXLzZmU94QNjNbbSZa4CstmRr3ulT82Xj2uqpU34lLOl3fOZR916l/GBJxVM/N9egt8xQYoE7EbQ+Lnz3pn+7IDSdKEfgb5PzDvxWyXOl0dsBryIXguuzxcRsJ+0tRO/A8=,iv:GXIjrb3HMEN46gLkIrEZOCAHCI44dvgl3Vj9Cj/lVoQ=,tag:Je2OkCI6WBScgT9pZxZeLg==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.1