flake.nix

@@ -63,8 +63,6 @@
     hyprpaper.url = "github:hyprwm/hyprpaper";
     xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
     hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo";
-    hyprsunset.url = "github:hyprwm/hyprsunset";
-    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
     hyprland-plugins = {
       url = "github:hyprwm/hyprland-plugins";
       inputs.hyprland.follows = "hyprland";
@@ -72,6 +70,7 @@
 
     ### other stuff
     nix-gaming.url = "github:fufexan/nix-gaming";
+    attic.url = "github:zhaofengli/attic";
     nur.url = "github:nix-community/NUR";
     yazi.url = "github:sxyazi/yazi";
     helix.url = "github:helix-editor/helix";
@@ -82,6 +81,8 @@
     stylix.url = "github:danth/stylix";
     eww.url = "github:elkowar/eww";
     anyrun.url = "github:Kirottu/anyrun";
+    #  wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay";
+
     botoh.url = "git+https://git.flake.sh/notohh/botoh";
     zen-browser.url = "github:fufexan/zen-browser-flake";
     deploy-rs = {
@@ -96,9 +97,5 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 }

hosts/common.nix

@@ -3,6 +3,6 @@
     inputs.sops-nix.nixosModules.sops
     inputs.home-manager.nixosModules.home-manager
     inputs.nur.nixosModules.nur
-    # inputs.attic.nixosModules.atticd
+    inputs.attic.nixosModules.atticd
   ];
 }

hosts/sora/services/attic.nix

@@ -1,15 +1,18 @@
 {
+  inputs,
   config,
   pkgs,
   ...
 }: {
+  imports = [inputs.attic.nixosModules.atticd];
+
   sops.secrets.attic = {};
 
-  environment.systemPackages = [pkgs.attic-client];
+  environment.systemPackages = [pkgs.attic];
 
   services.atticd = {
     enable = true;
-    environmentFile = config.sops.secrets.attic.path;
+    credentialsFile = config.sops.secrets.attic.path;
     settings = {
       listen = "[::]:8200";
       allowed-hosts = ["cache.flake.sh"];

hosts/tsuki/services/atticd.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  environment.systemPackages = [pkgs.attic-client];
+  environment.systemPackages = [pkgs.attic];
 
   systemd.services.atticd = {
     enable = true;
@@ -8,7 +8,7 @@
 
     serviceConfig = {
       User = "notoh";
-      ExecStart = "${pkgs.attic-client}/bin/attic watch-store kyasshu";
+      ExecStart = "${pkgs.attic}/bin/attic watch-store kyasshu";
       Restart = "always";
       RestartSec = 30;
     };