deploy-rs: add as overlay again

system/flakes/adsb-antenna.nix

@@ -4,11 +4,13 @@ let
   default-system = "aarch64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -36,9 +38,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
+
-        home-manager.useUserPackages = true;
+        home-manager = {
-        home-manager.users.daniel = import ../../home/hosts/adsb-antenna.nix;
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/adsb-antenna.nix;
+        };
       }
     ];
   };

system/flakes/argon.nix

@@ -4,11 +4,13 @@ let
   default-system = "aarch64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -38,9 +40,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
+
-        home-manager.useUserPackages = true;
+        home-manager = {
-        home-manager.users.daniel = import ../../home/hosts/argon.nix;
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/argon.nix;
+        };
       }
     ];
   };

system/flakes/mediaserver.nix

@@ -4,11 +4,13 @@ let
   default-system = "x86_64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -36,9 +38,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
+
-        home-manager.useUserPackages = true;
+        home-manager = {
-        home-manager.users.daniel = import ../../home/hosts/mediaserver.nix;
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/mediaserver.nix;
+        };
       }
     ];
   };

system/flakes/tanker.nix

@@ -4,11 +4,13 @@ let
   default-system = "x86_64-linux";
 
   # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       # overlay-master
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -40,9 +42,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
+
-        home-manager.useUserPackages = true;
+        home-manager = {
-        home-manager.users.daniel = import ../../home/hosts/tanker.nix;
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/tanker.nix;
+        };
       }
     ];
   };

system/flakes/weather-sdr.nix

@@ -4,11 +4,13 @@ let
   default-system = "aarch64-linux";
 
   overlay-attic = inputs.attic.overlays.default;
+  overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
   overlay-nifoc = inputs.nifoc-overlay.overlay;
 
   nixpkgsConfig = {
     overlays = [
       overlay-attic
+      overlay-deploy-rs
       overlay-nifoc
     ];
 
@@ -36,9 +38,12 @@ rec {
         nixpkgs = nixpkgsConfig;
         nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
         nix.registry.nixpkgs.flake = nixpkgs;
-        home-manager.useGlobalPkgs = true;
+
-        home-manager.useUserPackages = true;
+        home-manager = {
-        home-manager.users.daniel = import ../../home/hosts/weather-sdr.nix;
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.daniel = import ../../home/hosts/weather-sdr.nix;
+        };
       }
     ];
   };

system/hosts/weather-sdr.nix

@@ -30,12 +30,14 @@ in
 
       substituters = [
         "https://attic.cache.daniel.sx/nifoc-systems"
+        "https://attic.cache.daniel.sx/nifoc-ci"
         "https://nifoc.cachix.org"
         "https://nix-community.cachix.org"
       ];
 
       trusted-public-keys = [
         "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
+        "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk="
         "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];

system/nixos/forgejo.nix

@@ -58,9 +58,13 @@ in
       quic = true;
       http3 = true;
 
-      onlySSL = true;
+      forceSSL = true;
       useACMEHost = "kempkens.io";
 
+      extraConfig = ''
+        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
+      '';
+
       locations."/" = {
         recommendedProxySettings = true;
         proxyPass = "http://unix:/run/gitea/gitea.sock";