From 6094867053604fd911d2f71f4ce03c173dc5256a Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Sat, 2 Nov 2019 08:43:57 -0700 Subject: unify nix entrypoints to default.nix --- com/simatime.nix | 50 -------------------------------------------------- com/simatime/dev.nix | 20 -------------------- 2 files changed, 70 deletions(-) delete mode 100644 com/simatime.nix delete mode 100644 com/simatime/dev.nix (limited to 'com') diff --git a/com/simatime.nix b/com/simatime.nix deleted file mode 100644 index d67c756..0000000 --- a/com/simatime.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ buildNixOS }: - -/* - -com.simatime - cloud infrastructure server. - -This serves the git repo, mailserver, znc bouncer, user sites, and so on. - -Currently also used as a catch-all production/staging server, until I get real -stuff deployed. - -*/ - -let - nixos-mailserver = builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz"; - sha256 = "03d49v8qnid9g9rha0wg2z6vic06mhp0b049s3whccn1axvs2zzx"; - }; -in buildNixOS { - system = "x86_64-linux"; - configuration = { - imports = [ - ./simatime/hardware.nix - ./simatime/networking.nix - # common infra - ./simatime/users.nix - ./simatime/packages.nix - # configured modules - ./simatime/git.nix - ./simatime/mail.nix - ./simatime/web.nix - ./simatime/znc.nix - # third party - nixos-mailserver - ]; - nixpkgs.config.allowUnfree = true; - programs.mosh = { - enable = true; - withUtempter = true; - }; - services.openssh = { - enable = true; - passwordAuthentication = false; - }; - security.sudo.wheelNeedsPassword = true; - boot.cleanTmpDir = true; - }; -} // { - dev = import ./simatime/dev.nix { inherit buildNixOS; }; -} diff --git a/com/simatime/dev.nix b/com/simatime/dev.nix deleted file mode 100644 index b2ed3b0..0000000 --- a/com/simatime/dev.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ buildNixOS }: - -/* - -com.simatime.dev - main development/build server. Lives in ben's apartment in -Mountain View. - -*/ - -buildNixOS { - system = "x86_64-linux"; - configuration = { - imports = [ - ./users.nix - ./packages.nix - ./dev/hardware.nix - ./dev/configuration.nix - ]; - }; -} -- cgit v1.2.3