diff --git a/hosts/alyssum/default.nix b/hosts/alyssum/default.nix index 870915a..06c415f 100644 --- a/hosts/alyssum/default.nix +++ b/hosts/alyssum/default.nix @@ -33,11 +33,9 @@ ./filesystem.nix ./kernel.nix - ./home.syncthing.nix ./networking.nix - ./restic.nix + ./home.syncthing.nix ./samba.nix - ./snapper.nix ../../users/hana ]; diff --git a/hosts/alyssum/restic.nix b/hosts/alyssum/restic.nix deleted file mode 100644 index eec0979..0000000 --- a/hosts/alyssum/restic.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, ... }: { - age.secrets.restic_env.file = ../../secrets/restic_env.age; - age.secrets.restic_pass.file = ../../secrets/restic_pass.age; - age.secrets.restic_url.file = ../../secrets/restic_url.age; - - services.restic.backups."flower" = { - initialize = true; - createWrapper = true; - progressFps = 0.016666; - - environmentFile = config.age.secrets.restic_env.path; - passwordFile = config.age.secrets.restic_pass.path; - repositoryFile = config.age.secrets.restic_url.path; - - paths = ["/flower"]; - exclude = ["/flower/.snapshots"] - ++ builtins.filter (x: lib.strings.hasPrefix "/flower" x) (builtins.attrNames config.me.binds); - timerConfig = { - # every 6 hours - OnCalendar = "*-*-* 00,06,12,18:00:00"; - Persistent = true; - }; - pruneOpts = [ - "--keep-last 8" - "--keep-daily 7" - "--keep-weekly 5" - "--keep-monthly 12" - "--keep-yearly 75" - ]; - }; -} diff --git a/hosts/alyssum/snapper.nix b/hosts/alyssum/snapper.nix deleted file mode 100644 index 0196fe6..0000000 --- a/hosts/alyssum/snapper.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ ... }: { - services.snapper = { - cleanupInterval = "1h"; - persistentTimer = true; - snapshotInterval = "*-*-* *:00,30:00"; - configs.home = { - FSTYPE = "btrfs"; - SUBVOLUME = "/flower"; - TIMELINE_CLEANUP = true; - TIMELINE_CREATE = true; - TIMELINE_MIN_AGE = "86400"; - TIMELINE_LIMIT_HOURLY = "24"; - TIMELINE_LIMIT_DAILY = "7"; - TIMELINE_LIMIT_WEEKLY = "5"; - TIMELINE_LIMIT_MONTHLY = "3"; - TIMELINE_LIMIT_YEARLY = "0"; - }; - }; -} diff --git a/modules/system/tailscale.nix b/modules/system/tailscale.nix index 16205f9..5e3e044 100644 --- a/modules/system/tailscale.nix +++ b/modules/system/tailscale.nix @@ -10,7 +10,4 @@ openFirewall = true; useRoutingFeatures = if config.me.environment == "headless" then "both" else "client"; }; - systemd.services.tailscaled.serviceConfig.LogFilterPatterns = [ - "~magicsock.*does not know about peer.*removing route" - ]; } diff --git a/modules/user/git.nix b/modules/user/git.nix index 77f6b72..ca2762e 100644 --- a/modules/user/git.nix +++ b/modules/user/git.nix @@ -11,7 +11,6 @@ core.abbrev = 11; safe.directory = "/home/rin/Projects/flakes"; init.defaultBranch = "master"; - push.autoSetupRemote = true; }; }; } diff --git a/secrets.nix b/secrets.nix index d7ac2cc..b1f55e5 100644 --- a/secrets.nix +++ b/secrets.nix @@ -12,10 +12,6 @@ in { "secrets/passwd_smbkujira.age".publicKeys = [ alyssum rin ]; "secrets/wpa_conf.age".publicKeys = [ alyssum blossom rin ]; - "secrets/restic_env.age".publicKeys = [ alyssum dandelion rin ]; - "secrets/restic_pass.age".publicKeys = [ alyssum dandelion rin ]; - "secrets/restic_url.age".publicKeys = [ alyssum dandelion rin ]; - "secrets/acme_dns.age".publicKeys = [ alyssum dandelion hazel rin ]; "secrets/navidrome_env.age".publicKeys = [ alyssum dandelion rin ]; "secrets/slskd_env.age".publicKeys = [ anemone dandelion rin ]; diff --git a/secrets/restic_env.age b/secrets/restic_env.age deleted file mode 100644 index 1917eef..0000000 --- a/secrets/restic_env.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 kOMSPw CYNG6K56RVMY5KP3vTczaCG9DVL3Ryv7QtqRzrdONh4 -VKH43RjHzP2TcyK8bEO8pZzZZeXqNXEDNq4JCkhMXlQ --> ssh-ed25519 bRFqeQ AmuEljYrO5qqhaJQONYxQZTlaid2qNt+kktiMRDSKl4 -u+KzYFuEx+UCBfdcpup0fbEp1vGMP24nE3MwvcjhTSc --> ssh-ed25519 U9FXlg IKN6gdqtD0FDOBk5vXuLD7AYuRtCGsIe5CYMJwyvcG4 -f5lkALvyjz1X94JmnG4u9kZ0S1TgZeBv+uxumFPChzQ ---- 3LBfI6E7NfSK1F42/cQkUzrpry6OWCeW/67YOpZe00k -8ĝg9(<9OT.L_C2XT 1L=3WCoze?4sU.<zIy,bP?(b?7dՃU*-<줯aD֐^,?3 Ebb -vH \ No newline at end of file diff --git a/secrets/restic_pass.age b/secrets/restic_pass.age deleted file mode 100644 index d9a6889..0000000 Binary files a/secrets/restic_pass.age and /dev/null differ diff --git a/secrets/restic_url.age b/secrets/restic_url.age deleted file mode 100644 index 0d3a2d1..0000000 --- a/secrets/restic_url.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 kOMSPw l9/BY4rhuzGl/MRKjJ6Hyz2AGpsIZlDojQhSzJ8IxzY -tEGqxZOEWHZvTazrDoC4uTOyuT7fgRKXxumxpjdE89o --> ssh-ed25519 bRFqeQ XQ1wRRwOP1bIiEX/Dh4tkHB3vF1OdZcLNTtVVM1oWgU -S6qXQsPNY0bGaUz+iLoJ0GBL26FtM4h/sgxqvIwOS3g --> ssh-ed25519 U9FXlg pmY+R/M38tLi1dq2ll9FDv6uaGv8XlkE99NoAemtlGY -FGZodar5ESxmOZYDZ0F8P1FXNzkEpqT6jyJgzY5wLc0 ---- ig7eZey8XraBclyUEJRv1lJUyiOjqsfGc8Q+jjbAuvQ -eĶ@zYtV4%s29>閇(y8% j|PѨ::-YI)C̹I%yٸ:LCfq_ \ No newline at end of file