macos: add attic & skopeo

elohmeier · Oct 31, 2024 · 10555c0 · 10555c0
1 parent 55db050
commit 10555c0
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 5,262 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,6 +2,13 @@
   description = "ptsd";
 
   inputs = {
+    attic = {
+      url = "github:zhaofengli/attic";
+      inputs.flake-compat.follows = "flake-compat";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     colmena = {
       url = "github:zhaofengli/colmena";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix
@@ -41,7 +41,6 @@
         ];
       } ../../scripts/syncthing-device-id.py;
       win10fonts = final.callPackage ../../packages/win10fonts { };
-      attic-client = final.callPackage ../../packages/attic { clientOnly = true; };
       edge-tts = final.callPackage ../../packages/edge-tts { };
       #   wkhtmltopdf-qt4 = final.callPackage ./wkhtmltopdf-qt4 { };
       #   xorgxrdp = final.callPackage ./xrdp/xorgxrdp.nix { };
@@ -97,6 +96,7 @@
           allowUnfree = true;
         };
         overlays = [
+          inputs.attic.overlays.default
           inputs.colmena.overlays.default
           inputs.nix95.overlays.default
           inputs.nixcfg.overlays.default

diff --git a/modules/home/macos-enno.nix b/modules/home/macos-enno.nix
@@ -28,6 +28,7 @@ in
       docker-shell-completions
     ]
     ++ (with pkgs; [
+      attic-client
       deno
       dive
       entr
@@ -54,6 +55,7 @@ in
       rustup
       shellcheck
       shfmt
+      skopeo
       sops
       sq
       ssh-to-age