Compare commits

...

2 Commits

Author SHA1 Message Date
419d2e8cd7
flake update 2024-10-20 11:05:34 +02:00
5c4e09f773
backup: fix timers after boot, prepare steamdeck 2024-10-20 11:00:40 +02:00
6 changed files with 62 additions and 25 deletions

24
flake.lock generated
View File

@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729260213, "lastModified": 1729414726,
"narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "rev": "fe56302339bb28e3471632379d733547caec8103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +322,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728729581, "lastModified": 1729333370,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -338,11 +338,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729044727, "lastModified": 1729181673,
"narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +370,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1728888510, "lastModified": 1729256560,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -87,9 +87,9 @@
}; };
}; };
systemd.services = { systemd.timers = {
btrbk-bak = { btrbk-bak = {
after = [ "network.target" ]; requires = [ "network-online.target" ];
}; };
}; };

View File

@ -82,7 +82,7 @@
userServices = true; userServices = true;
}; };
}; };
tailscale.enable = true; #tailscale.enable = true;
}; };

View File

@ -32,7 +32,7 @@
}; };
kernelModules = [ "kvm-intel" ]; 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 = '' extraModprobeConfig = ''
options i915 enable_guc=3 options i915 enable_guc=3
''; '';
@ -42,10 +42,10 @@
zramSwap.enable = true; zramSwap.enable = true;
powerManagement = { # powerManagement = {
powerDownCommands = "${pkgs.kmod}/bin/rmmod intel_lpss_pci"; # powerDownCommands = "${pkgs.kmod}/bin/rmmod intel_lpss_pci";
resumeCommands = "${pkgs.kmod}/bin/modprobe intel_lpss_pci"; # resumeCommands = "${pkgs.kmod}/bin/modprobe intel_lpss_pci";
}; # };
services = { services = {
@ -96,7 +96,7 @@
snapshot_preserve_min = "all"; snapshot_preserve_min = "all";
target_preserve_min = "no"; target_preserve_min = "no";
target_preserve = "2m 4w"; target_preserve = "2m 4w 3d";
ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas"; ssh_identity = "/etc/btrbk/ssh/id_ed25519_btrbk_nas";
ssh_user = "btrbk"; ssh_user = "btrbk";
@ -115,9 +115,9 @@
}; };
}; };
systemd.services = { systemd.timers = {
btrbk-bak = { btrbk-bak = {
after = [ "network.target" ]; requires = [ "network-online.target" ];
}; };
}; };
@ -214,7 +214,7 @@
#defaultGateway = "192.168.0.1"; #defaultGateway = "192.168.0.1";
#nameservers = [ "192.168.0.4" ]; #nameservers = [ "192.168.0.4" ];
firewall = { firewall = {
checkReversePath = false; #checkReversePath = false;
enable = true; enable = true;
allowedUDPPorts = [ 24727 51820 ]; allowedUDPPorts = [ 24727 51820 ];
allowedTCPPorts = [ 24727 ]; allowedTCPPorts = [ 24727 ];

View File

@ -108,6 +108,10 @@
target = "/mnt/nas/Backups/Lifebook"; target = "/mnt/nas/Backups/Lifebook";
snapshot_dir = "@snapshots/@lifebook"; snapshot_dir = "@snapshots/@lifebook";
}; };
# "@steamdeck/@home" = {
# target = "/mnt/nas/Backups/Steamdeck";
# snapshot_dir = "@snapshots/@steamdeck";
# };
}; };
}; };
}; };
@ -130,7 +134,7 @@
systemd.services = { systemd.services = {
btrbk-bak = { btrbk-bak = {
after = [ "network.target" ]; requires = [ "network-online.target" ];
}; };
}; };

View File

@ -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."/" = fileSystems."/" =
{ device = "/dev/mapper/crypted"; { device = "/dev/mapper/crypted";