felix/nixos
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/nixos.git synced 2025-05-24 01:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'nixos-23.11'

Browse source
This commit is contained in:
Felix Buehler 2023-11-29 22:38:57 +01:00
commit ad523b3a88
15 changed files with 128 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
machines/core/users.nix
View file

@ -19,7 +19,7 @@
"video" # screen control
"wheel" # `sudo` for the user.
];
passwordFile = config.sops.secrets."users/felix/password".path;
hashedPasswordFile = config.sops.secrets."users/felix/password".path;
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@thinkman" ];
};

2
machines/newton/configuration.nix
View file

@ -18,7 +18,7 @@
};
system = {
stateVersion = "23.05";
stateVersion = "23.11";
autoUpgrade.enable = true;
};
}

8
machines/newton/secrets.yaml
View file

@ -1,6 +1,6 @@
users:
felix:
password: ENC[AES256_GCM,data:ma+FSUcvVjrtMKS9,iv:3AHwBXdbuSG6ZZnBVL+/Mf8H/GjiXIhmXbuZEnRYIGA=,tag:hlnKF0pLznMl1sbnGENXXQ==,type:str]
password: ENC[AES256_GCM,data:3c0MIwAJsWO3NdZPyByN9YYvR25BDaTFmeVX0gSgBjEsRbE2Qzy+sw/0UJ1UIm8wMszVOiK3eTwGnx7gzVZH6oTbprP4nHJnmQ==,iv:eOW99ZmSDrwZUHeF7PlM6+bV/LcHctw1QWcKBU1Bhz0=,tag:hDwITip+mRIroHUeqmUinQ==,type:str]
borgbackup:
password: ENC[AES256_GCM,data:MCzHfmd5uSIO6NqOLljVEce6O2btQoc=,iv:CGGvivLFcsUSQKT1EkY72uDVM9+No25WlXjL/WryuEU=,tag:wZOV8Clot5Df+mMf71thZA==,type:str]
ssh_key: ENC[AES256_GCM,data:Tznd7jifHBRcJY1kISOVGnmXYuHM8GBEaz4XdPfjf/uNFdloNy8TkBSwKoAmtHn26z0UI+bjtZLvRkSqdyZSD37uILLNxQg3pLO68i1CPduOD2enDWri0pIL3bLM7YA6Mh36cW1jnz1v+7oz6sQLZesX4RmtMgBsomBjWH3OAXdERHRKCSKtCIdvLwORJY1K2C+WcizjYdQIEqDP3V4h+nPkj0Ifc3c3TWCCk7jAHH7mjcOyGsdfls3SGErMTFTCyOumi9TPcABfcXTgy6VGr5NQSjO7NOAMshgZsOs6ePSDQCicPRsYYxuHhPID83AXnx/T414xLrdXAa2ms+9LSYxe+2TUpNMEUbTm+j7fpgv24KN/qbAEKT51Jk5MBVyGu+T95l5F+c2063wyqhHt0bOc3OvZw7TNI55JmrFteqDQ791+KByRXK6U4D1tmnCV5mtEAGM74GNg28RRJPxWWia2oB9q1XuCFrROdHHrsmek0IDzHJoUFzyzFefFlqF7Mkz8XRG21GWXGUxZWxqg,iv:W/J5jkwuOqS5TO4E3O5FXjG4zzJ9v1ulv5WLsfOPyek=,tag:nohAtERvEMxhzQs7NNcLTg==,type:str]
@ -52,8 +52,8 @@ sops:
NmNwT3N5UEVabFdLTDhseFRjeVZaWFkKL3HGFqfttU1tXY4OhnIr1ABFsHB0R0CX
s6wxb0ilut32ijjtnGXMIIa9y6XsMTpYskTb9FdRP9VnQQGVrMfdew==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-04-30T22:49:27Z"
mac: ENC[AES256_GCM,data:Ni820Zyct7EN9R1pkEyEoVP63uQlqpMuM8TY3lqAOtr3uiot8R6xgrlgMTXaXHyjNY/7WdHzaX2VoCxO2UoDpttqwBcGz+cNKQgeBvGU+52bO8QeqX6SImYZ1aAuYaXznEnTr9XP8sZGEDpQ/b6H4HIHpNhITNyx9qG5zVRJhnc=,iv:XJHFtAXvlIHvZmgz0KLH99Lanbk0yyeKi4P+W06Kvb8=,tag:8UjGPxn6ZeyvAV7SNAOa7Q==,type:str]
lastmodified: "2023-11-13T22:35:33Z"
mac: ENC[AES256_GCM,data:xeI7hSFT/DwZmwuh0as0y6A2vEdf8nXWg+QxEiCR73g0o4TXmOa5+VJG+b1H677WijU3fDTgt+SUU2ZjyaqP+qMzC7hz86gMGdU5Zr9DGp0A+aYTZr5l+bNDB6MHCkLq0hEmdij7qrKZh++PJwtAEFo7/z96PH+t1bi9D2MnhJ8=,iv:6EbbzvOCn50MoHjwRexJj/yJdSXccCJE4b1e12A1KjY=,tag:JJ1o2K8a492uvfV9xnfHTg==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
version: 3.8.1

98
machines/newton/syncthing.nix
View file

@ -17,60 +17,60 @@
openDefaultPorts = true;
key = config.sops.secrets."syncthing/key".path;
cert = config.sops.secrets."syncthing/cert".path;
extraOptions = {
settings = {
options = {
localAnnounceEnabled = false;
urAccepted = 3;
};
};
devices = {
"thinkman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
devices = {
"thinkman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
};
"birdman" = {
id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
};
"serverle" = {
id = "PVPEIN7-PI226LR-ULSBYKT-JGRQ3PS-WSPLGBP-TKYRJVP-OTWE7IV-NLKTBA3";
};
};
"birdman" = {
id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
};
"serverle" = {
id = "PVPEIN7-PI226LR-ULSBYKT-JGRQ3PS-WSPLGBP-TKYRJVP-OTWE7IV-NLKTBA3";
};
};
folders = {
"Computer" = {
id = "djdxo-1akub";
path = "/data/computer";
devices = [
"thinkman"
"birdman"
"serverle"
];
};
"Phone" = {
id = "4hds7-gpypp";
path = "/data/phone";
devices = [
"thinkman"
"birdman"
"serverle"
];
};
"Music" = {
id = "mphdq-n6q7y";
path = "/data/music";
watch = false;
devices = [
"thinkman"
"birdman"
"serverle"
];
};
"Pictures" = {
id = "cujyo-yiabu";
path = "/data/photos";
watch = false;
devices = [
"thinkman"
"serverle"
];
folders = {
"Computer" = {
id = "djdxo-1akub";
path = "/data/computer";
devices = [
"thinkman"
"birdman"
"serverle"
];
};
"Phone" = {
id = "4hds7-gpypp";
path = "/data/phone";
devices = [
"thinkman"
"birdman"
"serverle"
];
};
"Music" = {
id = "mphdq-n6q7y";
path = "/data/music";
fsWatcherEnabled = false;
devices = [
"thinkman"
"birdman"
"serverle"
];
};
"Pictures" = {
id = "cujyo-yiabu";
path = "/data/photos";
fsWatcherEnabled = false;
devices = [
"thinkman"
"serverle"
];
};
};
};
};

2
machines/serverle/configuration.nix
View file

@ -19,7 +19,7 @@
};
system = {
stateVersion = "23.05";
stateVersion = "23.11";
autoUpgrade.enable = true;
};
}

8
machines/serverle/secrets.yaml
View file

@ -1,6 +1,6 @@
users:
felix:
password: ENC[AES256_GCM,data:mrG5gb0wbjA2S0sd,iv:86PZWbVR2BkB6+c9KrtnFh1j/kJtiFJXlXEQMFqEmZA=,tag:WUXrp4+/KW+X+wUp0omqdg==,type:str]
password: ENC[AES256_GCM,data:nmGfgkhZrR+fUlsAJ55rxoRQbMbcGW31phFnCjvC5iI7bgkgH+ppo1ZFBsneCQoOp6TwScxDqyUIjUPY0bz5/iwIQy7+7Y/g+A==,iv:i7r7BVDV3MuIxndUrduRLZvSqvS50wdzSYLPWRZWRL0=,tag:nhWPG8TSvKntLdtrex1aZQ==,type:str]
wifi:
bismarck: ENC[AES256_GCM,data:6mcU+o6GiBelKq5Av2hJdHigf+yyQRO/qXV0DbGeri00CaO1cjjGka86C/t0NAoh8EaJeLPd6lZQspeUTIdqJMleQLhmq1zk1qGw65fvEphCsWkKUsUd6flWODdmll80mmYLpllX6hmZ8I/Of7EVZPn4WEiw4M2HB1UCw5+M0W2H0MJrjlskafbL9+uYtMeoUikXVMTYNAkX3+9+MZi3KzDMEc6JVt1fQZHjXkdeKx+2iVsaXEtXL72Dbj3ihlpA+WRhgZOmrrbablYde71mpzSuQ/yqeTZT+2NCMUmkYaj0dGz4FW0gJMPzjHjji8CopeOK7/CQM/MMWGFJXR2Xdea8X/YdDoVAz34WraGylYzK9e7a1C+s37mekt6c/bvuiQ==,iv:DH0LDw1pZ5m9RScJ3+IhjUb5JroLLOJ3jru7DwCKXv0=,tag:r57fz+W2nEybNqOc8eEDFA==,type:str]
borgbackup:
@ -48,8 +48,8 @@ sops:
a1BjcjVaM01UV0o5bTFTVTE5QUZKMmsKPAGYDf1FVtp4+Z/KUrI6z0aZYEwN1DYa
jKtA1IUXrmdaRllN0SfC+YjMXTk7IoJvrjagCv9Zo0zEKasfO8PL4g==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-07-25T19:49:06Z"
mac: ENC[AES256_GCM,data:YJDe8T2DljJZX80Q5dMgh5nn+oNO5f9lU8KxbjtfMdXsu5aFCB/IykSMXLO9Yji4QeUMdiTsmAhDl+xWonK7BjDorNF7Culq3zo/g36WkAekGFlgp4i0lnHf182noX46sApwFDj9gRx+Ozhn/BsoVADhNkOfP91XJH09UOLyHxM=,iv:qWnS2m9ifuLKdX2+7b053/OHNgIjb9GK7EIft00Qu7E=,tag:XAtQdRP5pEP3xYoGLqbnNA==,type:str]
lastmodified: "2023-11-13T22:36:19Z"
mac: ENC[AES256_GCM,data:jmclk98sHpnrO4Nj/ZiG+3gVmG6UvoClZR/FPYFgaBpJBk/W1zXXuH+wAb+dh3M5H3x030QFbNj/3006JZIlBCkarRggvJ1vQvC8XKlIFyTnGeY+1gXER/ssj22y/0RkF2HpOr68Sg51edcL5hiHtfAokxMuiouUkdRxV3KK3lY=,iv:FAdXDOw1r718fogIfFyzYplyFp/kmL9VHvO+RFyMPuM=,tag:HlZPTyZpmrvzT6pCgWLW9Q==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
version: 3.8.1

112
machines/serverle/syncthing.nix
View file

@ -18,66 +18,66 @@
openDefaultPorts = true;
key = config.sops.secrets."syncthing/key".path;
cert = config.sops.secrets."syncthing/cert".path;
extraOptions = {
settings = {
options = {
urAccepted = 3;
};
};
devices = {
"thinkman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
devices = {
"thinkman" = {
id = "KXSCPX3-JCCFZM4-S2LQZZL-3AM6WRL-IPNWVG2-IB5FEDJ-YYFUIRR-VMDO3AL";
};
"birdman" = {
id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
};
"newton" = {
id = "5RISLVO-U5A5A7N-5BRYF2X-FTPNAI6-LOQDIMP-MVSM663-6W6VYBL-L7626A6";
};
};
"birdman" = {
id = "34Z4J7W-MJIODUD-J6LDJY6-QILQLLB-CJ4GR7K-7TJM2K3-R7SIPRV-XQO5TAI";
};
"newton" = {
id = "5RISLVO-U5A5A7N-5BRYF2X-FTPNAI6-LOQDIMP-MVSM663-6W6VYBL-L7626A6";
};
};
folders = {
"Computer" = {
id = "djdxo-1akub";
path = "/data/computer";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Phone" = {
id = "4hds7-gpypp";
path = "/data/phone";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Music" = {
id = "mphdq-n6q7y";
path = "/data/music";
watch = false;
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Pictures" = {
id = "cujyo-yiabu";
path = "/data/photos";
watch = false;
devices = [
"thinkman"
"newton"
];
};
"Aria2" = {
id = "jjnzq-pgzua";
path = "/data/tmp/aria2";
devices = [
"thinkman"
];
folders = {
"Computer" = {
id = "djdxo-1akub";
path = "/data/computer";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Phone" = {
id = "4hds7-gpypp";
path = "/data/phone";
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Music" = {
id = "mphdq-n6q7y";
path = "/data/music";
fsWatcherEnabled = false;
devices = [
"thinkman"
"birdman"
"newton"
];
};
"Pictures" = {
id = "cujyo-yiabu";
path = "/data/photos";
fsWatcherEnabled = false;
devices = [
"thinkman"
"newton"
];
};
"Aria2" = {
id = "jjnzq-pgzua";
path = "/data/tmp/aria2";
devices = [
"thinkman"
];
};
};
};
};

2
machines/thinkman/configuration.nix
View file

@ -22,7 +22,7 @@
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
system = {
stateVersion = "22.11";
stateVersion = "23.11";
autoUpgrade.enable = true;
};
}

8
machines/thinkman/secrets.yaml
View file

@ -1,6 +1,6 @@
users:
felix:
password: ENC[AES256_GCM,data:Zlq+j/zqbiIBEvew,iv:k2/Jjwi/jfBnc2fYFZeJyWmr0QlvgeMl5IU7Zzl0LvY=,tag:fImYKHSfQ0bKV2E+P5El0Q==,type:str]
password: ENC[AES256_GCM,data:p6PEjIHC8uaKxzxskYB5dmaD9a+FPY0bRZg2Jal3z87IA7zyQtS52Y9apta0gYWjX6iP2X9u6uDTB2VxAnGWvm5pVZJq4SwUSQ==,iv:2m4GQpWqlnxT9o/58Gn1jaHa4txafEBcBxkl+fQMFg4=,tag:ej0opSh14ObE9ybG2WhISw==,type:str]
borgbackup:
password: ENC[AES256_GCM,data:RF385VVV1aUjZA5FcJGwizhiAlINW7HiFA==,iv:W1+khhHyKfDKD7vs0t442g28MJ+0zu5ZpKYMmrmvEyM=,tag:whQ4euwgukHaTTJIAwpYSg==,type:str]
ssh_key: ENC[AES256_GCM,data:oEh9OKq14UvCfUIasqMTOX9cfLUTbWK7CWLjdlAw3yxgqSZFM79kr6a7OfVZ7Uv1ycqdH/qYt3OVU+CCvy9KFzn/zQFHJnN6r5vSwOYU2/TnnlAwAp6XBWwN1SNUt5Xcf/MQEu3BJlvGewVC0ApkutcZdvQKTUDbKuThhZ5P7n8+y2CZZvGBc1lpd0DfMpmGbBES27TRclycj5YHmyOPQOI0Nvbieh3GByKIouvoQY6LKuBVOrxVptJYKY7Wjv+EjpQrSc/SX/OIv2fYxrhrZgT+LjOnIp+bMduhIvDH5kI47KZSauyJxQXPK+ZqJ9C2SlABsODvHkY518qOZNFN56X486AnWnP+2CCx5VQxT13msUWzmtZagc0gKqZgNw+NnLtsG6m2rUj5peKjuxjCBK+BVloKbGyfvj6VgZvQQlAS1TEgcnWYRfeoT8gX4FmvxX4yMILiyZrkDfzchOI4giOlX2y6hvXGr5Qr0gTzQruwnSYZ9M+wxg+sZdLl0q+07nwRqjlPQHah5vd5Qz7q,iv:9N1aRbHAcSPt3v/ZrKyJODNDn3gw8ttMC/gmamHgxwU=,tag:NhZSGu7139hsPSprdvItPg==,type:str]
@ -28,8 +28,8 @@ sops:
bzY2ZTY1QUtSRjlOZ1E0Vkw5Q1cxYmMKqwvWUv2XpRIenGwCpZuwKQc0ZsiX2AAx
pmIh4f10G7wr1rLeodRi2KxYIrrudPbxEWIuzmBRyHc7+3EPpzLetw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-02-05T17:51:52Z"
mac: ENC[AES256_GCM,data:E2urh1ipKHRCX2KXRH7kCv1x+1UH2ETVX6ppiQ5GlBidROKkoaaHHViQ85OUB5ADvbdRg1qJleL8QXDRayEizx6vIT/LD864IO+t/tDmhBPYYVi1k+s861UAuN7+ykCxUI3Ni3nyp3ySLb5rctZKO0C5bAO0ZhmW23PT3jCHheg=,iv:AGMmGSQvvdausHUZtxQM/QhEqpGTy1LymWzf3BZXZ8w=,tag:bp5L0L8I+92dv77L0BGePw==,type:str]
lastmodified: "2023-11-13T22:35:21Z"
mac: ENC[AES256_GCM,data:793v+gkbUDjSEPGR+i6DqkJZnLzQN6zl9skzNxYRgvu6SvzScdDh28EPRfCWont2PIRd9DZYBmfycrMCAojDqaeeDzjIPpKLR5HydsT8DAuAMs9bjmDygi6rQktUz1avLHbGq89HM7vO7x4TTw2Y9eA275H4OboIX0GbYd8yXZM=,iv:En9dRzxMvgHpYYlRSNKgB0czxRRJ1u//B+Gk8oNi4oc=,tag:5rFkNs0RZE+CHan3esJV7Q==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
version: 3.8.1

2
modules/hardware/bluetooth/default.nix
View file

@ -10,7 +10,7 @@ in
config = lib.mkIf cfg.enable {
hardware.bluetooth = {
enable = true;
package = pkgs.bluezFull;
package = pkgs.bluez;
settings = {
General = {
Enable = "Source,Sink,Media,Socket";

20
modules/services/nextcloud/default.nix
View file

@ -69,24 +69,10 @@ in
#dbhost = "/run/postgresql";
};
extraApps = {
calendar = let version = "4.5.2"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud-releases/calendar/releases/download/v${version}/calendar-v${version}.tar.gz";
sha256 = "sha256-n7GjgAyw2SLoZTEfakmI3IllWUk6o1MF89Zt3WGhR6A=";
};
contacts = let version = "5.4.2"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud-releases/contacts/releases/download/v${version}/contacts-v${version}.tar.gz";
sha256 = "sha256-IkKHJ3MY/UPZqa4H86WGOEOypffMIHyJ9WvMqkq/4t8=";
};
tasks = let version = "0.15.0"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud/tasks/releases/download/v${version}/tasks.tar.gz";
sha256 = "sha256-zMMqtEWiXmhB1C2IeWk8hgP7eacaXLkT7Tgi4NK6PCg=";
};
deck = let version = "1.11.0"; in pkgs.fetchNextcloudApp {
url = "https://github.com/nextcloud/deck/releases/download/v${version}/deck.tar.gz";
sha256 = "sha256-stb9057pP8WXIhztNl7H8ymLqSZzSulgKgB2cbib2pQ=";
};
extraApps = with pkgs.nextcloud27Packages.apps; {
inherit calendar contacts tasks deck;
};
extraAppsEnable = true;
};
#postgresql = {

2
modules/system/fonts/default.nix
View file

@ -21,7 +21,7 @@ in
monospace = [ "Ubuntu Mono" ];
};
fonts = with pkgs; [
packages = with pkgs; [
cantarell-fonts # gnome default
fira
fira-code # coding

2
modules/system/kvm/default.nix
View file

@ -19,7 +19,7 @@ in
virtualisation.libvirtd.enable = true;
environment.systemPackages = with pkgs; [
virtmanager
virt-manager
];
}

1
profiles/clean/default.nix
View file

@ -11,7 +11,6 @@ in
environment.systemPackages = with pkgs; [
baobab
dupeguru
findimagedupes
jdupes
kondo
];

2
profiles/desktop-dev/default.nix
View file

@ -17,7 +17,7 @@ in
fritzing
gnome.gnome-font-viewer
meld
unstable.bruno
bruno
qgis
sqlitebrowser
(vscode-with-extensions.override {