BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated the local machines

Browse Source
This commit is contained in:
Alexander Szczepanski
2021-10-16 16:18:00 +02:00
parent d0bac72407
commit 95dd547326
3 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
configs/secrets.nix.secret
View File

Binary file not shown.

38
machine/desktop.nix
View File

@ -2,6 +2,8 @@
let let
secrets = import ../configs/secrets.nix; secrets = import ../configs/secrets.nix;
secrets-wireguard = import ../configs/secrets-wireguard-publickeys.nix;
secrets-desktop = import ../configs/secrets-desktop.nix;
in in
{ {
imports = imports =
@ -50,12 +52,12 @@ in
wireguard.interfaces = { wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.2/24" ]; ips = [ "10.100.0.2/24" ];
privateKey = secrets.wireguard-desktop-private; privateKey = secrets-desktop.wireguard-desktop-private;
peers = [ peers = [
{ {
publicKey = secrets.wireguard-vps-public; publicKey = secrets-wireguard.wireguard-vps-public;
presharedKey = secrets.wireguard-preshared; presharedKey = secrets-wireguard.wireguard-preshared;
allowedIPs = [ "10.100.0.0/24" ]; allowedIPs = [ "10.100.0.0/24" ];
endpoint = "szczepan.ski:51820"; endpoint = "szczepan.ski:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
@ -81,11 +83,11 @@ in
extraPackages = with pkgs; [ extraPackages = with pkgs; [
rocm-opencl-icd rocm-opencl-icd
rocm-opencl-runtime rocm-opencl-runtime
amdvlk # amdvlk
];
extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
]; ];
# extraPackages32 = with pkgs; [
# driversi686Linux.amdvlk
# ];
}; };
fancontrol = { fancontrol = {
@ -111,14 +113,6 @@ in
}; };
}; };
environment.systemPackages = with pkgs; [
cpu-x
hwinfo
hardinfo
phoronix-test-suite
fswatch
];
sound.enable = true; sound.enable = true;
services = { services = {
@ -129,12 +123,12 @@ in
compression = "auto,zstd"; compression = "auto,zstd";
encryption = { encryption = {
mode = "repokey-blake2" ; mode = "repokey-blake2" ;
passphrase = secrets.borg-desktop-key; passphrase = secrets-desktop.borg-desktop-key;
}; };
extraCreateArgs = "--list --stats --verbose --checkpoint-interval 600 --exclude-caches"; extraCreateArgs = "--checkpoint-interval 600 --exclude-caches";
environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa"; environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa";
paths = "/home/alex"; paths = "/home/alex";
repo = "ssh://szczepan.ski/~/borg-backup/desktop"; repo = "ssh://u278697-sub2@u278697.your-storagebox.de:23/./borg";
startAt = "daily"; startAt = "daily";
user = "alex"; user = "alex";
prune.keep = { prune.keep = {
@ -144,14 +138,18 @@ in
}; };
extraPruneArgs = "--save-space --list --stats"; extraPruneArgs = "--save-space --list --stats";
exclude = map (x: paths + "/" + x) [ exclude = map (x: paths + "/" + x) [
".config/chromium/Default/Service Worker/CacheStorage"
".cache" ".cache"
".config/chromium/Default/Service Worker/CacheStorage"
".config/discord/Cache"
".local/share/libvirt/images" ".local/share/libvirt/images"
".local/share/Steam/config/htmlcache/Cache"
".local/share/Steam/steamapps" ".local/share/Steam/steamapps"
"Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" ".local/share/Trash"
"Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat" "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat"
"Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
"Kamera" "Kamera"
"Nextcloud" "Nextcloud"
"shared"
"Sync" "Sync"
"Workspace" "Workspace"
]; ];

12
machine/thinkpad.nix
View File

@ -12,6 +12,7 @@ let
exec -a "$0" "$@" exec -a "$0" "$@"
''; '';
secrets = import ../configs/secrets.nix; secrets = import ../configs/secrets.nix;
secrets-thinkpad = import ../configs/secrets-thinkpad.nix;
in in
{ {
imports = imports =
@ -160,12 +161,12 @@ in
compression = "auto,zstd"; compression = "auto,zstd";
encryption = { encryption = {
mode = "repokey-blake2" ; mode = "repokey-blake2" ;
passphrase = secrets.borg-desktop-key; passphrase = secrets-thinkpad.borg-thinkpad-key;
}; };
extraCreateArgs = "--list --stats --verbose --checkpoint-interval 600 --exclude-caches"; extraCreateArgs = "--list --stats --verbose --checkpoint-interval 600 --exclude-caches";
environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa"; environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa";
paths = "/home/alex"; paths = "/home/alex";
repo = "ssh://szczepan.ski/~/borg-backup/thinkpad"; repo = "ssh://u278697-sub1@u278697.your-storagebox.de:23/./borg";
startAt = "daily"; startAt = "daily";
user = "alex"; user = "alex";
prune.keep = { prune.keep = {
@ -175,14 +176,17 @@ in
}; };
extraPruneArgs = "--save-space --list --stats"; extraPruneArgs = "--save-space --list --stats";
exclude = map (x: paths + "/" + x) [ exclude = map (x: paths + "/" + x) [
".config/chromium/Default/Service Worker/CacheStorage"
".cache" ".cache"
".config/chromium/Default/Service Worker/CacheStorage"
".config/discord/Cache"
".local/share/libvirt/images" ".local/share/libvirt/images"
".local/share/Steam/steamapps" ".local/share/Steam/steamapps"
"Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" ".local/share/Trash"
"Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat" "Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat"
"Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
"Kamera" "Kamera"
"Nextcloud" "Nextcloud"
"shared"
"Sync" "Sync"
"Workspace" "Workspace"
]; ];