diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index c9f4387..5781d71 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -87,9 +87,9 @@ }; }; - systemd.services = { + systemd.timers = { btrbk-bak = { - after = [ "network.target" ]; + requires = [ "network-online.target" ]; }; }; diff --git a/hosts/lifebook/default.nix b/hosts/lifebook/default.nix index ca3c411..1a2441e 100644 --- a/hosts/lifebook/default.nix +++ b/hosts/lifebook/default.nix @@ -82,7 +82,7 @@ userServices = true; }; }; - tailscale.enable = true; + #tailscale.enable = true; }; diff --git a/hosts/lifebook/hardware-configuration.nix b/hosts/lifebook/hardware-configuration.nix index 109ec44..780b3b6 100644 --- a/hosts/lifebook/hardware-configuration.nix +++ b/hosts/lifebook/hardware-configuration.nix @@ -32,7 +32,7 @@ }; kernelModules = [ "kvm-intel" ]; - kernelParams = [ "luks.options=fido2-device=auto" "sysrq_always_enabled=1" ]; + kernelParams = [ "luks.options=fido2-device=auto" "sysrq_always_enabled=1" "pcie_aspm=force" ]; extraModprobeConfig = '' options i915 enable_guc=3 ''; @@ -42,10 +42,10 @@ zramSwap.enable = true; - powerManagement = { - powerDownCommands = "${pkgs.kmod}/bin/rmmod intel_lpss_pci"; - resumeCommands = "${pkgs.kmod}/bin/modprobe intel_lpss_pci"; - }; +# powerManagement = { +# powerDownCommands = "${pkgs.kmod}/bin/rmmod intel_lpss_pci"; +# resumeCommands = "${pkgs.kmod}/bin/modprobe intel_lpss_pci"; +# }; services = { @@ -96,7 +96,7 @@ snapshot_preserve_min = "all"; target_preserve_min = "no"; - target_preserve = "2m 4w"; + target_preserve = "2m 4w 3d"; ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas"; ssh_user = "btrbk"; @@ -115,9 +115,9 @@ }; }; - systemd.services = { + systemd.timers = { btrbk-bak = { - after = [ "network.target" ]; + requires = [ "network-online.target" ]; }; }; @@ -214,7 +214,7 @@ #defaultGateway = "192.168.0.1"; #nameservers = [ "192.168.0.4" ]; firewall = { - checkReversePath = false; + #checkReversePath = false; enable = true; allowedUDPPorts = [ 24727 51820 ]; allowedTCPPorts = [ 24727 ]; diff --git a/hosts/nasbackup/hardware-configuration.nix b/hosts/nasbackup/hardware-configuration.nix index 50af416..ec696f4 100644 --- a/hosts/nasbackup/hardware-configuration.nix +++ b/hosts/nasbackup/hardware-configuration.nix @@ -108,6 +108,10 @@ target = "/mnt/nas/Backups/Lifebook"; snapshot_dir = "@snapshots/@lifebook"; }; +# "@steamdeck/@home" = { +# target = "/mnt/nas/Backups/Steamdeck"; +# snapshot_dir = "@snapshots/@steamdeck"; +# }; }; }; }; @@ -130,7 +134,7 @@ systemd.services = { btrbk-bak = { - after = [ "network.target" ]; + requires = [ "network-online.target" ]; }; }; diff --git a/hosts/steamdeck/hardware-configuration.nix b/hosts/steamdeck/hardware-configuration.nix index b1ce700..241556a 100644 --- a/hosts/steamdeck/hardware-configuration.nix +++ b/hosts/steamdeck/hardware-configuration.nix @@ -74,9 +74,42 @@ }; }; }; +# bak = { +# onCalendar = "daily"; +# settings = { +# stream_buffer = "256m"; +# stream_compress = "lz4"; +# incremental = "yes"; +# snapshot_create = "no"; +# snapshot_dir = "@snapshots"; +# timestamp_format = "long"; +# +# snapshot_preserve_min = "all"; +# target_preserve_min = "no"; +# target_preserve = "2m 4w 3d"; +# +# ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas"; +# ssh_user = "btrbk"; +# +# volume = { +# "/mnt/snapshots/root" = { +# subvolume = { +# "@home" = {}; +# }; +# target = "ssh://jupiter.home.opel-online.de:2220/mnt/snapshots/Mars/@snapshots/@steamdeck"; +# }; +# }; +# }; +# }; }; }; }; +# +# systemd.timers = { +# btrbk-bak = { +# requires = [ "network-online.target" ]; +# }; +# }; fileSystems."/" = { device = "/dev/mapper/crypted";