diff --git a/flake.nix b/flake.nix index 5cc6df182cb712c7f9b4712caf92f16c916ab762..dde5f48d2302bf2a255847c06ad9e7d66795b7a6 100644 --- a/flake.nix +++ b/flake.nix @@ -244,8 +244,6 @@ }; dragonwell = { imports = [ home-manager.follows = ""; - home-manager = { - home-manager.follows = ""; url = "github:nix-community/home-manager"; inputs.ugit.nixosModules.default ./machines/dragonwell diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 14d13f6e4b5d049514cd7421ee9c61d75999851a..1828604d5d816c62ab6206594259a7139535f060 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -2,7 +2,7 @@ let username = "jolheiser"; key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; in { - imports = [./caddy.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix]; + imports = [./caddy.nix ./golink.nix ./gotosocial.nix ./ugit.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/restic.nix b/machines/dragonwell/restic.nix deleted file mode 100644 index ffe0bf2bb9e65842c6106498f13006cc16aa5763..0000000000000000000000000000000000000000 --- a/machines/dragonwell/restic.nix +++ /dev/null @@ -1,19 +0,0 @@ -{config, ...}: { - age.secrets = { - restic-env.file = ../../secrets/personal/restic-env.age; - restic-pass.file = ../../secrets/personal/restic-pass.age; - restic-repo.file = ../../secrets/personal/restic-repo.age; - }; - services.restic.backups.dragonwell = { - initialize = true; - environmentFile = config.age.secrets.restic-env.path; - passwordFile = config.age.secrets.restic-pass.path; - repositoryFile = config.age.secrets.restic-repo.path; - paths = ["/var/lib/ugit/repos"]; - pruneOpts = ["--keep-daily 7" "--keep-weekly 2" "--keep-monthly 2"]; - timerConfig = { - OnCalendar = "daily"; - Persistent = true; - }; - }; -} diff --git a/secrets/personal/restic-env.age b/secrets/personal/restic-env.age deleted file mode 100644 index bd913d088e8cf03d4c02952d47084a78f6bc31ff..0000000000000000000000000000000000000000 --- a/secrets/personal/restic-env.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g 1HJtBNf8fXHgPxE/igj2b6z9o4Etlp+GHoLo8L6YnRs -v+Sh2QlLbfixF7YkHTHM1luL4/SGlFzhNqQASH1UGDk --> ssh-ed25519 f31uNA 7HHWKFc59n5Y2UJ+qaNoYDfLJZbry/pZRvIFR4DWBWc -DXcG+KGcE8JMPQt8cv4ted6vtkBf+u2uZsyPm4MMkwI --> psKyV-grease "MM~T(~g tK+-AO4 >-T !n090?K| -Dtc2xPmFxFcTTC48EGs6awFQszoIjNY ---- 7U9PGgjHxlCoYcyS5Mke4lhCcdqkQLjc9M5UycDSYWk -2 5͈vUC&v5Rܹq-˺Z[ U%krV֙, Q#jZynJd9~z^\ފByv/qIQ"U d+Ag lE- \ No newline at end of file diff --git a/secrets/personal/restic-pass.age b/secrets/personal/restic-pass.age deleted file mode 100644 index d130979306bba017676a6dc156c7878d57d9635a..0000000000000000000000000000000000000000 --- a/secrets/personal/restic-pass.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g IxilZcPJYM7QuBM+2/NTzzv4YNJVI41FvmTlkL+KoUw -P7RK+wlfEdBeGVIU52QG43sRDJ9KxF0/6TarT9W+wbc --> ssh-ed25519 f31uNA pQCg9BCiIk//YdV3AHr3w2Y84K6MwH/HK/k7w4EapQQ -9EySD+N5XEz/w4AyRBsLioYhr6PaPOkckMLhE7LONdk --> M-grease d_4>8< / 1V($ -yc2NhRg1u6HU1bAVVTqdi4qKyHdPINhhZt7HUPubLWR0KJyPb2Aaz6c66UmMu8La -49kh/q2eAcgQ+GVOHUSc6ZYEf+WD ---- YX4Fl76QjEubDmrpQcVx1ihZiVY2hQJhzrnIlxNlEHw -{tiHљxŦAt+epVJˬLpY -L \ No newline at end of file diff --git a/secrets/personal/restic-repo.age b/secrets/personal/restic-repo.age deleted file mode 100644 index 5a81ece3687b04d8e1751d2f62cc10670f26b8cc..0000000000000000000000000000000000000000 --- a/secrets/personal/restic-repo.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g /mv0fp9Xhz82GMijyXu4zKyNsW11q2fxJ6zD3MU6O2Q -6o/t8ahIXklhZ3ILUfOKiGns74qhny+80dcrFu/+tNY --> ssh-ed25519 f31uNA DuKL8kZ2xuwICNLHzoOirxfzbzh3zHR6qW4LPnMhgCk -GNsyRaJlIxJjL2Ccnn5hkRzLrDr/pvbNrVidf9646dQ --> Ztf-grease v -rvC+ciAnVae8fNwFllFCMyxjSXHx391gDjXnrf1TWl/UXaIpwvlcbPeSPedig52U -6bQM9Z3UW+zfAugHBb2q3BukVSkDFfFw8RAAxHbC1sleAbFAsgtCSjCjG0tn+irI -dxE ---- 7K9dTBILUGSBVi0dsn48ImjpAALL+8fR+eoPMo6Pbvw -5w)@+Fnjg _Ix NӤ"]/2VBO/ ҈gwd.@3tV^w`0нt \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a38e355a12892158e7b2730e1a9fce693358aab7..0cf619b5e1d7566ff587099241b2de24d504e501 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -19,8 +19,4 @@ "work/pip.conf.age".publicKeys = [jolheiser chai masala]; "work/pypirc.age".publicKeys = [jolheiser chai masala]; "work/cifs.age".publicKeys = [jolheiser chai masala]; jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; -let - "personal/restic-pass.age".publicKeys = [jolheiser dragonwell]; - "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am";