Refactor deprecated borgmatic.settings.location

flake.lock

@@ -137,8 +137,7 @@
         "firefox-gnome-theme": "firefox-gnome-theme",
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_2",
-        "thunderbird-gnome-theme": "thunderbird-gnome-theme",
+        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
-        "wallpapers": "wallpapers"
       }
     },
     "thunderbird-gnome-theme": {
@@ -156,23 +155,6 @@
         "repo": "thunderbird-gnome-theme",
         "type": "github"
       }
-    },
-    "wallpapers": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1702336410,
-        "narHash": "sha256-DyC9Ro5tj3X0P2M24gZdpTkFGuZEy9JXrFLUav/b5H0=",
-        "ref": "refs/heads/master",
-        "rev": "dd78ed7242af54c33e8304feee322a71da575abd",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@git.vimium.com/jordan/wallpapers.git"
-      },
-      "original": {
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@git.vimium.com/jordan/wallpapers.git"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -16,10 +16,6 @@
       url = "github:rafaelmardojai/thunderbird-gnome-theme";
       flake = false;
     };
-    wallpapers = {
-      url = "git+ssh://git@git.vimium.com/jordan/wallpapers.git?shallow=1";
-      flake = false;
-    };
   };
 
   outputs = inputs @ { self, nixpkgs, agenix, home-manager, ... }:

hosts/odyssey/default.nix

@@ -57,14 +57,12 @@
   services.borgmatic = {
     enable = true;
     settings = {
-      location = {
+      source_directories = [
-        source_directories = [
+        "/home/jordan/Documents"
-          "/home/jordan/Documents"
+      ];
-        ];
+      repositories = [
-        repositories = [
+        { label = "borgbase"; path = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"; }
-          "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"
+      ];
-        ];
-      };
       storage = {
         encryption_passcommand = "cat ${config.age.secrets.odyssey_borg_passphrase.path}";
         ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";

modules/desktop/gnome.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 
 let cfg = config.modules.desktop.gnome;
 in {
@@ -99,8 +99,8 @@ in {
         window-gap = 8;
       };
       "org/gnome/desktop/background" = {
-        picture-uri = "file://${inputs.wallpapers}/Aqua.png";
+        picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
-        picture-uri-dark = "file://${inputs.wallpapers}/Aqua.png";
+        picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
       };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;