flake.lock

@@ -1,47 +1,5 @@
 {
   "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": "darwin",
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1701216516,
-        "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1673295039,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
@@ -59,27 +17,6 @@
       }
     },
     "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -101,22 +38,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1677676435,
-        "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1701389149,
         "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
@@ -133,10 +54,9 @@
     },
     "root": {
       "inputs": {
-        "agenix": "agenix",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "thunderbird-gnome-theme": "thunderbird-gnome-theme"
       }
     },

flake.nix

@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-23.11";
-    agenix.url = "github:ryantm/agenix";
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -18,7 +17,7 @@
     };
   };
 
-  outputs = inputs @ { self, nixpkgs, agenix, home-manager, ... }:
+  outputs = inputs @ { self, nixpkgs, home-manager, ... }:
     let
       inherit (lib) attrValues;
       inherit (lib.my) mapModules mapModulesRec;
@@ -45,7 +44,7 @@
       nixosConfigurations = {
         atlas = nixpkgs.lib.nixosSystem {
           modules = [
-            home-manager.nixosModules.home-manager
+            inputs.home-manager.nixosModules.home-manager
             { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
             (import ./modules)
             ./hosts/atlas
@@ -54,7 +53,7 @@
         };
         eos = nixpkgs.lib.nixosSystem {
           modules = [
-            home-manager.nixosModules.home-manager
+            inputs.home-manager.nixosModules.home-manager
             { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
             (import ./modules)
             ./hosts/eos
@@ -63,7 +62,7 @@
         };
         helios = nixpkgs.lib.nixosSystem {
           modules = [
-            home-manager.nixosModules.home-manager
+            inputs.home-manager.nixosModules.home-manager
             { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
             (import ./modules)
             ./hosts/helios
@@ -72,8 +71,7 @@
         };
         odyssey = nixpkgs.lib.nixosSystem {
           modules = [
-            home-manager.nixosModules.home-manager
+            inputs.home-manager.nixosModules.home-manager
-            agenix.nixosModules.default
             { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
             (import ./modules)
             ./hosts/odyssey

hosts/odyssey/default.nix

@@ -69,29 +69,6 @@ with lib.my;
     };
   };
 
-  services.borgmatic = {
-    enable = true;
-    settings = {
-      location = {
-        source_directories = [
-          "/home/jordan/Documents"
-        ];
-        repositories = [
-          "ssh://s6ac8m61@s6ac8m61.repo.borgbase.com/./repo"
-        ];
-      };
-      storage = {
-        encryption_passcommand = "cat /run/agenix/odyssey_borg_passphrase";
-        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
-      };
-      retention = {
-        keep_daily = 7;
-        keep_weekly = 4;
-        keep_monthly = 6;
-      };
-    };
-  };
-
   modules = {
     desktop = {
       apps.qbittorrent.enable = true;

secrets.nix

@@ -1,10 +0,0 @@
-let
-  jordan = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS";
-  users = [ jordan ];
-
-  odyssey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJre8/cjdoUnbTu0x4ClTITcq4lq+FjpEyJBbLbOlox7";
-  systems = [ odyssey ];
-in
-{
-  "secrets/odyssey_borg_passphrase.age".publicKeys = [ jordan odyssey ];
-}