1
0
Fork 0

Compare commits

..

No commits in common. "18369af0aa5f682f414bbba16e63563fb95cdce5" and "666e345f43ec9b81a4ed46eb531919366f6e98f6" have entirely different histories.

7 changed files with 16 additions and 47 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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