diff --git a/config/hosts/seras/configuration.nix b/config/hosts/seras/configuration.nix index 9da6d2c..74cf223 100644 --- a/config/hosts/seras/configuration.nix +++ b/config/hosts/seras/configuration.nix @@ -7,6 +7,8 @@ ]; boot.binfmt.emulatedSystems = ["aarch64-linux"]; + deployment.targetUser = lib.mkForce "emily"; + networking = { hostName = "seras"; nftables.enable = lib.mkForce false; diff --git a/config/services/nyastodon.nix b/config/services/nyastodon.nix index effc4e3..d998e44 100644 --- a/config/services/nyastodon.nix +++ b/config/services/nyastodon.nix @@ -1,12 +1,6 @@ { config, lib, pkgs, ... }: { - nixpkgs.overlays = [ - (final: prev: { - nyastodon = final.callPackage ../../pkgs/nyastodon/default.nix { }; - }) - ]; services.mastodon = { enable = true; - enableUnixSocket = false; package = pkgs.nyastodon; localDomain = config.networking.fqdn; configureNginx = true; diff --git a/flake.nix b/flake.nix index 1b61b9e..44dbd0f 100644 --- a/flake.nix +++ b/flake.nix @@ -50,9 +50,16 @@ outputs = { self, nixpkgs, flake-utils, ... }@inputs: { colmena = let - hosts = builtins.attrNames (nixpkgs.lib.filterAttrs (name: type: type == "directory") (builtins.readDir ./config/hosts)); + hosts = builtins.filter (name: name != "base") ( + builtins.attrNames (nixpkgs.lib.filterAttrs (name: type: type == "directory") ( + builtins.readDir ./config/hosts))); hostCfg = hostname: { - imports = [ (./config/hosts/${hostname}/configuration.nix) ]; + imports = [ + (./config/hosts/${hostname}/configuration.nix) + ({ ... }: { + nixpkgs.overlays = [ self.overlays.kyouma ]; + }) + ]; }; in { meta = { @@ -84,6 +91,10 @@ }; }; images.lain = self.nixosConfigurations.lain.config.system.build.sdImage; + overlays = { + kyouma = import ./pkgs/overlay.nix; + default = self.overlays.kyouma; + }; } // flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in { diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix new file mode 100644 index 0000000..64b9470 --- /dev/null +++ b/pkgs/overlay.nix @@ -0,0 +1,3 @@ +final: prev: { + nyastodon = final.callPackage ./nyastodon/default.nix { }; +}