diff options
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/default.nix b/default.nix index 86d584f..0463bc0 100644 --- a/default.nix +++ b/default.nix @@ -4,7 +4,7 @@ let bizpkgs = import "${nixpkgs-tar}" { overlays = [ overlay ]; }; nixos = import "${nixpkgs-tar}/nixos"; biz = import ./biz.nix { nixpkgs = bizpkgs; }; - buildOS = import ./Com/Simatime/buildOS.nix nixos; + buildOS = import ./Biz/buildOS.nix nixos; nixos-mailserver = let ver = "v2.3.0"; in builtins.fetchTarball { url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${ver}/nixos-mailserver-${ver}.tar.gz"; sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; @@ -13,20 +13,20 @@ in rec { # Cloud infrastructure, always online. Mostly for messaging-related # stuff. # - Com.Simatime.Cloud = buildOS { + Biz.Cloud = buildOS { enableVpn = true; ipAddress = "159.89.128.69"; configuration = { imports = [ - ./Com/Simatime/packages.nix - ./Com/Simatime/users.nix - ./Com/Simatime/Cloud/chat.nix - ./Com/Simatime/Cloud/git.nix - ./Com/Simatime/Cloud/hardware.nix - ./Com/Simatime/Cloud/mail.nix - ./Com/Simatime/Cloud/networking.nix - ./Com/Simatime/Cloud/web.nix - ./Com/Simatime/Cloud/znc.nix + ./Biz/packages.nix + ./Biz/users.nix + ./Biz/Cloud/chat.nix + ./Biz/Cloud/git.nix + ./Biz/Cloud/hardware.nix + ./Biz/Cloud/mail.nix + ./Biz/Cloud/networking.nix + ./Biz/Cloud/web.nix + ./Biz/Cloud/znc.nix nixos-mailserver ]; networking.hostName = "simatime"; @@ -35,7 +35,7 @@ in rec { }; # Dev machine for work and building stuff. # - Com.Simatime.Dev = buildOS { + Biz.Dev = buildOS { enableVpn = true; ipAddress = "73.222.221.63"; deps = { @@ -43,10 +43,10 @@ in rec { }; configuration = { imports = [ - ./Com/Simatime/packages.nix - ./Com/Simatime/users.nix - ./Com/Simatime/Dev/configuration.nix - ./Com/Simatime/Dev/hardware.nix + ./Biz/packages.nix + ./Biz/users.nix + ./Biz/Dev/configuration.nix + ./Biz/Dev/hardware.nix ]; networking.hostName = "lithium"; networking.domain = "dev.simatime.com"; @@ -54,35 +54,35 @@ in rec { }; # The production server for que.run # - Run.Que.Prod = buildOS { + Que.Prod = buildOS { deps = { - que-server = Run.Que.Server; - que-website = Run.Que.Website; + que-server = Que.Server; + que-website = Que.Website; }; configuration = { imports = [ - ./Com/Simatime/packages.nix - ./Com/Simatime/users.nix - ./Run/Que/Server.nix - ./Run/Que/Website.nix - ./Run/Que/Prod.nix + ./Biz/packages.nix + ./Biz/users.nix + ./Que/Server.nix + ./Que/Website.nix + ./Que/Prod.nix ]; networking.hostName = "prod.que.run"; networking.domain = "que.run"; }; }; # Production server for musicmeetscomics.com - Com.MusicMeetsComics.Prod = buildOS { + Hero.Prod = buildOS { deps = { - herocomics-server = Com.MusicMeetsComics.Server; - herocomics-client = Com.MusicMeetsComics.Client; + herocomics-server = Hero.Server; + herocomics-client = Hero.Client; }; configuration = { imports = [ - ./Com/Simatime/packages.nix - ./Com/Simatime/users.nix - ./Com/MusicMeetsComics/Service.nix - ./Com/MusicMeetsComics/Prod.nix + ./Biz/packages.nix + ./Biz/users.nix + ./Hero/Service.nix + ./Hero/Prod.nix ]; networking.hostName = "prod.herocomics.app"; networking.domain = "herocomcis.app"; @@ -90,12 +90,12 @@ in rec { }; # Haskell targets # - Com.InfluencedByBooks.Server = biz.buildGhc Com/InfluencedByBooks/Server.hs; - Com.InfluencedByBooks.Client = biz.buildGhcjs Com/InfluencedByBooks/Client.hs; - Com.MusicMeetsComics.Server = biz.buildGhc Com/MusicMeetsComics/Server.hs; - Com.MusicMeetsComics.Client = biz.buildGhcjs Com/MusicMeetsComics/Client.hs; - Run.Que.Server = biz.buildGhc ./Run/Que/Server.hs; - Run.Que.Website = biz.buildGhc ./Run/Que/Website.hs; + Biz.Ibb.Server = biz.buildGhc Biz/Ibb/Server.hs; + Biz.Ibb.Client = biz.buildGhcjs Biz/Ibb/Client.hs; + Hero.Server = biz.buildGhc Hero/Server.hs; + Hero.Client = biz.buildGhcjs Hero/Client.hs; + Que.Server = biz.buildGhc ./Que/Server.hs; + Que.Website = biz.buildGhc ./Que/Website.hs; # Development environment repl = biz.globalGhc; # Fall through to any of our overlay packages |