From 5896c51c542f6b1b27a235b716c81e31d2e823d8 Mon Sep 17 00:00:00 2001 From: coolneng Date: Sun, 10 May 2020 03:15:42 +0200 Subject: [PATCH] Add panacea to VPN and Syncthing --- modules/datasync.nix | 13 ++++++------- modules/hardware-configuration.nix | 19 ++++++++++--------- modules/networking.nix | 5 +++++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/modules/datasync.nix b/modules/datasync.nix index 127e7a5..4e32803 100644 --- a/modules/datasync.nix +++ b/modules/datasync.nix @@ -17,43 +17,42 @@ devices = { monolith = { id = "64P2YDH-S5V7PKM-XXBOSXC-WEXUSC7-B553ELI-6IJ3CPJ-ZFB3YA5-MTKAFAH"; }; roamer = { id = "7CDUG25-KGBOIA7-Y73TZGA-NEHYLZP-OEOEWVN-DMS5U7K-QNNMPKY-YNGEWQL"; }; - unit = { id = "VYHHL4A-KJ6WUYQ-4SNWNA3-YRCFTHE-52ZTRLP-4LV6ZDV-4VAJLHC-RJXYYQY"; }; + panacea = { id = "UNZIABR-GEQ4AWT-XKFADLW-HW3SQ3Y-BEYZ56A-W530DLS-DXGQWKK-2QQ4RQ6"; }; }; folders = { Documents = { id = "wusdj-bfjkr"; type = "receiveonly"; path = "/vault/syncthing/Documents"; - devices = [ "monolith" "roamer" "unit" ]; + devices = [ "monolith" "roamer" "panacea" ]; }; Notes = { id = "kafhz-bfmzm"; type = "receiveonly"; path = "/vault/syncthing/Notes"; - devices = [ "monolith" "roamer" "unit" ]; + devices = [ "monolith" "roamer" "panacea" ]; }; Music = { id = "2aqt7-vpprc"; type = "receiveonly"; path = "/vault/syncthing/Music"; - devices = [ "monolith" "roamer" "unit" ]; + devices = [ "monolith" "roamer" "panacea" ]; }; Photos = { id = "mjibc-ustcg"; type = "receiveonly"; path = "/vault/syncthing/Photos"; - devices = [ "monolith" "roamer" "unit" ]; + devices = [ "monolith" "roamer" "panacea" ]; }; Projects = { - devices = [ "monolith" "unit" ]; id = "cjhmu-avy9v"; type = "receiveonly"; path = "/vault/syncthing/Projects"; - watch = false; + devices = [ "monolith" "panacea" ]; }; }; }; diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index 7acbc4e..2495198 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -23,6 +23,11 @@ fsType = "zfs"; }; + fileSystems."/vault/backups" = + { device = "vault/backups"; + fsType = "zfs"; + }; + fileSystems."/vault/git" = { device = "vault/git"; fsType = "zfs"; @@ -33,23 +38,18 @@ fsType = "zfs"; }; - fileSystems."/vault/backups" = - { device = "vault/backups"; - fsType = "zfs"; - }; - fileSystems."/vault/nextcloud" = { device = "vault/nextcloud"; fsType = "zfs"; }; - fileSystems."/vault/backups/monolith" = - { device = "vault/backups/monolith"; + fileSystems."/vault/backups/zion" = + { device = "vault/backups/zion"; fsType = "zfs"; }; - fileSystems."/vault/backups/zion" = - { device = "vault/backups/zion"; + fileSystems."/vault/backups/monolith" = + { device = "vault/backups/monolith"; fsType = "zfs"; }; @@ -61,4 +61,5 @@ swapDevices = [ ]; nix.maxJobs = lib.mkDefault 4; + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; } diff --git a/modules/networking.nix b/modules/networking.nix index 86c5d54..ac28d8d 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -77,6 +77,11 @@ publicKey = "gS5VIUFL74kTs3zxVNT/ijWyOjeAFLEqWynD0Pefh1o="; allowedIPs = [ "10.8.0.3/32" ]; } + # Panacea + { + publicKey = "XMkTztU2Y8hw6Fu/2o4Gszij+EmNacvFMXuZyHS1n38="; + allowedIPs = [ "10.8.0.4/32" ]; + } ]; }; };