diff options
| author | jeschli <jeschli@gmail.com> | 2018-12-28 14:48:30 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-12-28 14:48:30 +0100 |
| commit | 06b6454af78e8236a67d69cab94f62c32054be47 (patch) | |
| tree | 749fd6025d2e799314cf46d51027dc23fb19c7b8 /makefu/2configs | |
| parent | 8605ac91ae3a3859ab906a5fa2e9b0e3dfcd6e1e (diff) | |
| parent | fb254e60949f029cc7cb48764093b49932d0acde (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/bgt/backup.nix | 20 | ||||
| -rw-r--r-- | makefu/2configs/hw/ssd.nix | 4 | ||||
| -rw-r--r-- | makefu/2configs/hw/tp-x2x0.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/support-nixos.nix | 1 |
4 files changed, 27 insertions, 0 deletions
diff --git a/makefu/2configs/bgt/backup.nix b/makefu/2configs/bgt/backup.nix new file mode 100644 index 000000000..3b9baadef --- /dev/null +++ b/makefu/2configs/bgt/backup.nix @@ -0,0 +1,20 @@ +{ + # Manual steps: + # 1. ssh-copy-id root ssh-key to the remotes you want to back up + # 2. run `rsnapshot hourly` manually as root to check if everything works + services.rsnapshot = { + enable = true; + cronIntervals = { + daily = "50 21 * * *"; + hourly = "0 */4 * * *"; + }; + extraConfig = '' +retain hourly 5 +retain daily 365 +snapshot_root /var/backup +backup root@binaergewitter.jit.computer:/opt/isso jit +backup root@binaergewitter.jit.computer:/etc/systemd/system/isso.service jit +backup root@binaergewitter.jit.computer:/etc/nginx/conf.d/isso.conf jit + ''; + }; +} diff --git a/makefu/2configs/hw/ssd.nix b/makefu/2configs/hw/ssd.nix new file mode 100644 index 000000000..9615b34d8 --- /dev/null +++ b/makefu/2configs/hw/ssd.nix @@ -0,0 +1,4 @@ +{ + # ssd trimming + services.fstrim.enable = true; +} diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix index 98fe30daf..42ae309d0 100644 --- a/makefu/2configs/hw/tp-x2x0.nix +++ b/makefu/2configs/hw/tp-x2x0.nix @@ -4,6 +4,7 @@ with import <stockholm/lib>; { imports = [ ./tpm.nix + ./ssd.nix ]; boot.kernelModules = [ @@ -50,6 +51,7 @@ with import <stockholm/lib>; CPU_MAX_PERF_ON_BAT=30 ''; + powerManagement.resumeCommands = '' ${pkgs.rfkill}/bin/rfkill unblock all ''; diff --git a/makefu/2configs/support-nixos.nix b/makefu/2configs/support-nixos.nix new file mode 100644 index 000000000..d4e5556ff --- /dev/null +++ b/makefu/2configs/support-nixos.nix @@ -0,0 +1 @@ +{ makefu.distrobump.enable = true; } |