Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
717c383a93 |
@ -12,8 +12,8 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
- uses: DeterminateSystems/nix-installer-action@da36cb69b1c3247ad7a1f931ebfd954a1105ef14 # v14
|
- uses: DeterminateSystems/nix-installer-action@v13
|
||||||
- uses: DeterminateSystems/magic-nix-cache-action@87b14cf437d03d37989d87f0fa5ce4f5dc1a330b # v8
|
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
||||||
- name: lint
|
- name: lint
|
||||||
run: |
|
run: |
|
||||||
nix fmt
|
nix fmt
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
config = {
|
|
||||||
system.stateVersion = 4;
|
|
||||||
|
|
||||||
networking.hostName = "jakehillion-mba-m2-15";
|
|
||||||
|
|
||||||
nix = {
|
|
||||||
useDaemon = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
|
|
||||||
security.pam.enableSudoTouchIdAuth = true;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
fd
|
|
||||||
htop
|
|
||||||
mosh
|
|
||||||
neovim
|
|
||||||
nix
|
|
||||||
ripgrep
|
|
||||||
sapling
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
49
flake.lock
49
flake.lock
@ -2,9 +2,7 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"agenix": {
|
"agenix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"darwin": [
|
"darwin": "darwin",
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"home-manager": [
|
"home-manager": [
|
||||||
"home-manager"
|
"home-manager"
|
||||||
],
|
],
|
||||||
@ -30,19 +28,21 @@
|
|||||||
"darwin": {
|
"darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
"agenix",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726188813,
|
"lastModified": 1700795494,
|
||||||
"narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
|
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
|
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
|
"ref": "master",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -72,11 +72,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725703823,
|
"lastModified": 1720042825,
|
||||||
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=",
|
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba",
|
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -93,11 +93,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726357542,
|
"lastModified": 1723399884,
|
||||||
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
|
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
|
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -108,11 +108,11 @@
|
|||||||
},
|
},
|
||||||
"impermanence": {
|
"impermanence": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725690722,
|
"lastModified": 1719091691,
|
||||||
"narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=",
|
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "impermanence",
|
"repo": "impermanence",
|
||||||
"rev": "63f4d0443e32b0dd7189001ee1894066765d18a5",
|
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -124,11 +124,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725885300,
|
"lastModified": 1723310128,
|
||||||
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
|
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
|
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -139,11 +139,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726320982,
|
"lastModified": 1723688146,
|
||||||
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
|
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
|
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -155,11 +155,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726243404,
|
"lastModified": 1723637854,
|
||||||
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -172,7 +172,6 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"darwin": "darwin",
|
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"home-manager-unstable": "home-manager-unstable",
|
"home-manager-unstable": "home-manager-unstable",
|
||||||
|
104
flake.nix
104
flake.nix
@ -7,12 +7,8 @@
|
|||||||
|
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
|
||||||
darwin.url = "github:lnl7/nix-darwin";
|
|
||||||
darwin.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
agenix.inputs.darwin.follows = "darwin";
|
|
||||||
agenix.inputs.home-manager.follows = "home-manager";
|
agenix.inputs.home-manager.follows = "home-manager";
|
||||||
|
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||||
@ -25,67 +21,47 @@
|
|||||||
|
|
||||||
description = "Hillion Nix flake";
|
description = "Hillion Nix flake";
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils, agenix, home-manager, home-manager-unstable, darwin, impermanence, ... }@inputs:
|
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils, agenix, home-manager, home-manager-unstable, impermanence, ... }@inputs: {
|
||||||
let
|
nixosConfigurations =
|
||||||
getSystemOverlays = system: nixpkgsConfig: [
|
let
|
||||||
(final: prev: {
|
fqdns = builtins.attrNames (builtins.readDir ./hosts);
|
||||||
unstable = nixpkgs-unstable.legacyPackages.${prev.system};
|
getSystemOverlays = system: nixpkgsConfig: [
|
||||||
"storj" = final.callPackage ./pkgs/storj.nix { };
|
(final: prev: {
|
||||||
})
|
"storj" = final.callPackage ./pkgs/storj.nix { };
|
||||||
];
|
})
|
||||||
in
|
];
|
||||||
{
|
mkHost = fqdn:
|
||||||
nixosConfigurations =
|
let
|
||||||
let
|
system = builtins.readFile ./hosts/${fqdn}/system;
|
||||||
fqdns = builtins.attrNames (builtins.readDir ./hosts);
|
func = if builtins.pathExists ./hosts/${fqdn}/unstable then nixpkgs-unstable.lib.nixosSystem else nixpkgs.lib.nixosSystem;
|
||||||
mkHost = fqdn:
|
home-manager-pick = if builtins.pathExists ./hosts/${fqdn}/unstable then home-manager-unstable else home-manager;
|
||||||
let
|
in
|
||||||
system = builtins.readFile ./hosts/${fqdn}/system;
|
func {
|
||||||
func = if builtins.pathExists ./hosts/${fqdn}/unstable then nixpkgs-unstable.lib.nixosSystem else nixpkgs.lib.nixosSystem;
|
inherit system;
|
||||||
home-manager-pick = if builtins.pathExists ./hosts/${fqdn}/unstable then home-manager-unstable else home-manager;
|
specialArgs = inputs;
|
||||||
in
|
modules = [
|
||||||
func {
|
./hosts/${fqdn}/default.nix
|
||||||
inherit system;
|
./modules/default.nix
|
||||||
specialArgs = inputs;
|
|
||||||
modules = [
|
|
||||||
./hosts/${fqdn}/default.nix
|
|
||||||
./modules/default.nix
|
|
||||||
|
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
impermanence.nixosModules.impermanence
|
impermanence.nixosModules.impermanence
|
||||||
|
|
||||||
home-manager-pick.nixosModules.default
|
home-manager-pick.nixosModules.default
|
||||||
{
|
{
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
impermanence.nixosModules.home-manager.impermanence
|
impermanence.nixosModules.home-manager.impermanence
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
({ config, ... }: {
|
({ config, ... }: {
|
||||||
system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
|
system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
|
||||||
nixpkgs.overlays = getSystemOverlays config.nixpkgs.hostPlatform.system config.nixpkgs.config;
|
nixpkgs.overlays = getSystemOverlays config.nixpkgs.hostPlatform.system config.nixpkgs.config;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
nixpkgs.lib.genAttrs fqdns mkHost;
|
nixpkgs.lib.genAttrs fqdns mkHost;
|
||||||
|
} // flake-utils.lib.eachDefaultSystem (system: {
|
||||||
darwinConfigurations = {
|
formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
|
||||||
jakehillion-mba-m2-15 = darwin.lib.darwinSystem {
|
});
|
||||||
system = "aarch64-darwin";
|
|
||||||
specialArgs = inputs;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
./darwin/jakehillion-mba-m2-15/configuration.nix
|
|
||||||
|
|
||||||
({ config, ... }: {
|
|
||||||
nixpkgs.overlays = getSystemOverlays "aarch64-darwin" config.nixpkgs.config;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // flake-utils.lib.eachDefaultSystem (system: {
|
|
||||||
formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
@ -101,18 +101,6 @@
|
|||||||
fileSystems = [ "/data" ];
|
fileSystems = [ "/data" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
## General usability
|
|
||||||
### Make podman available for dev tools such as act
|
|
||||||
virtualisation = {
|
|
||||||
containers.enable = true;
|
|
||||||
podman = {
|
|
||||||
enable = true;
|
|
||||||
dockerCompat = true;
|
|
||||||
dockerSocket.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
users.users.jake.extraGroups = [ "podman" ];
|
|
||||||
|
|
||||||
## Networking
|
## Networking
|
||||||
boot.kernel.sysctl = {
|
boot.kernel.sysctl = {
|
||||||
"net.ipv4.ip_forward" = true;
|
"net.ipv4.ip_forward" = true;
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
{
|
{
|
||||||
device = "tmpfs";
|
device = "tmpfs";
|
||||||
fsType = "tmpfs";
|
fsType = "tmpfs";
|
||||||
options = [ "mode=0755" "size=100%" ];
|
options = [ "mode=0755" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
|
@ -32,14 +32,6 @@
|
|||||||
nat.enable = lib.mkForce false;
|
nat.enable = lib.mkForce false;
|
||||||
|
|
||||||
useDHCP = false;
|
useDHCP = false;
|
||||||
|
|
||||||
vlans = {
|
|
||||||
cameras = {
|
|
||||||
id = 3;
|
|
||||||
interface = "eth2";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
interfaces = {
|
interfaces = {
|
||||||
enp1s0 = {
|
enp1s0 = {
|
||||||
name = "eth0";
|
name = "eth0";
|
||||||
@ -64,14 +56,6 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
cameras /* cameras@eth2 */ = {
|
|
||||||
ipv4.addresses = [
|
|
||||||
{
|
|
||||||
address = "10.133.145.1";
|
|
||||||
prefixLength = 24;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
enp4s0 = { name = "eth3"; };
|
enp4s0 = { name = "eth3"; };
|
||||||
enp5s0 = { name = "eth4"; };
|
enp5s0 = { name = "eth4"; };
|
||||||
enp6s0 = { name = "eth5"; };
|
enp6s0 = { name = "eth5"; };
|
||||||
@ -98,8 +82,8 @@
|
|||||||
|
|
||||||
ip protocol icmp counter accept comment "accept all ICMP types"
|
ip protocol icmp counter accept comment "accept all ICMP types"
|
||||||
|
|
||||||
iifname { "eth0", "cameras" } ct state { established, related } counter accept
|
iifname "eth0" ct state { established, related } counter accept
|
||||||
iifname { "eth0", "cameras" } drop
|
iifname "eth0" drop
|
||||||
}
|
}
|
||||||
|
|
||||||
chain forward {
|
chain forward {
|
||||||
@ -154,7 +138,7 @@
|
|||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
interfaces-config = {
|
interfaces-config = {
|
||||||
interfaces = [ "eth1" "eth2" "cameras" ];
|
interfaces = [ "eth1" "eth2" ];
|
||||||
};
|
};
|
||||||
lease-database = {
|
lease-database = {
|
||||||
type = "memfile";
|
type = "memfile";
|
||||||
@ -259,29 +243,6 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
|
||||||
subnet = "10.133.145.0/24";
|
|
||||||
interface = "cameras";
|
|
||||||
pools = [{
|
|
||||||
pool = "10.133.145.64 - 10.133.145.254";
|
|
||||||
}];
|
|
||||||
option-data = [
|
|
||||||
{
|
|
||||||
name = "routers";
|
|
||||||
data = "10.133.145.1";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "broadcast-address";
|
|
||||||
data = "10.133.145.255";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "domain-name-servers";
|
|
||||||
data = "1.1.1.1, 8.8.8.8";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
reservations = [
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, nixos-hardware, ... }:
|
{ config, pkgs, nixpkgs-unstable, lib, nixos-hardware, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -60,7 +60,6 @@ in
|
|||||||
(lib.lists.optional config.custom.services.unifi.enable "/var/lib/unifi") ++
|
(lib.lists.optional config.custom.services.unifi.enable "/var/lib/unifi") ++
|
||||||
(lib.lists.optional (config.virtualisation.oci-containers.containers != { }) "/var/lib/containers") ++
|
(lib.lists.optional (config.virtualisation.oci-containers.containers != { }) "/var/lib/containers") ++
|
||||||
(lib.lists.optional config.services.tang.enable "/var/lib/private/tang") ++
|
(lib.lists.optional config.services.tang.enable "/var/lib/private/tang") ++
|
||||||
(lib.lists.optional config.services.caddy.enable "/var/lib/caddy") ++
|
|
||||||
(lib.lists.optional config.services.step-ca.enable "/var/lib/step-ca/db");
|
(lib.lists.optional config.services.step-ca.enable "/var/lib/step-ca/db");
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, config, nixpkgs-unstable, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.custom.resilio;
|
cfg = config.custom.resilio;
|
||||||
@ -61,7 +61,5 @@ in
|
|||||||
in
|
in
|
||||||
builtins.map (folder: mkFolder folder.name folder.secret) cfg.folders;
|
builtins.map (folder: mkFolder folder.name folder.secret) cfg.folders;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.resilio.unitConfig.RequiresMountsFor = builtins.map (folder: "${config.services.resilio.directoryRoot}/${folder.name}") cfg.folders;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, nixpkgs-unstable, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.custom.services.gitea;
|
cfg = config.custom.services.gitea;
|
||||||
@ -55,7 +55,7 @@ in
|
|||||||
|
|
||||||
services.gitea = {
|
services.gitea = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.unstable.gitea;
|
package = nixpkgs-unstable.legacyPackages.x86_64-linux.gitea;
|
||||||
mailerPasswordFile = config.age.secrets."gitea/mailer_password".path;
|
mailerPasswordFile = config.age.secrets."gitea/mailer_password".path;
|
||||||
|
|
||||||
appName = "Hillion Gitea";
|
appName = "Hillion Gitea";
|
||||||
|
@ -102,6 +102,7 @@ in
|
|||||||
"light.cubby_light"
|
"light.cubby_light"
|
||||||
"light.desk_lamp"
|
"light.desk_lamp"
|
||||||
"light.hallway_light"
|
"light.hallway_light"
|
||||||
|
"light.living_room_hue_lamp"
|
||||||
"light.living_room_lamp"
|
"light.living_room_lamp"
|
||||||
"light.living_room_light"
|
"light.living_room_light"
|
||||||
"light.wardrobe_light"
|
"light.wardrobe_light"
|
||||||
|
@ -33,11 +33,6 @@ in
|
|||||||
|
|
||||||
services.caddy = {
|
services.caddy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.unstable.caddy;
|
|
||||||
|
|
||||||
globalConfig = ''
|
|
||||||
email acme@hillion.co.uk
|
|
||||||
'';
|
|
||||||
|
|
||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
"hillion.co.uk".extraConfig = ''
|
"hillion.co.uk".extraConfig = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user