From d5025c552911b29bb8f2250c5b4aa1f9917a68e4 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 3 Apr 2020 21:12:54 -0700 Subject: Add wemux to the dev machine I also had to refactor the overlays stuff a bit, but it is much nicer now. --- Com/Simatime/Dev/configuration.nix | 2 ++ Com/Simatime/Prod/configuration.nix | 2 +- Com/Simatime/buildOS.nix | 8 +++----- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Com') diff --git a/Com/Simatime/Dev/configuration.nix b/Com/Simatime/Dev/configuration.nix index d6b3f4b..96a5b89 100644 --- a/Com/Simatime/Dev/configuration.nix +++ b/Com/Simatime/Dev/configuration.nix @@ -51,6 +51,8 @@ in { fira fira-code fira-code-symbols ]; + environment.systemPackages = [ pkgs.wemux ]; + nixpkgs = { config = { allowUnfree = true; diff --git a/Com/Simatime/Prod/configuration.nix b/Com/Simatime/Prod/configuration.nix index d5ad02f..0a1d4fc 100644 --- a/Com/Simatime/Prod/configuration.nix +++ b/Com/Simatime/Prod/configuration.nix @@ -5,7 +5,7 @@ enable = true; domain = "que.run"; port = 3000; - package = pkgs.biz.que-server; + package = pkgs.que-server; }; services.nginx.enable = true; } diff --git a/Com/Simatime/buildOS.nix b/Com/Simatime/buildOS.nix index eb20d88..636377e 100644 --- a/Com/Simatime/buildOS.nix +++ b/Com/Simatime/buildOS.nix @@ -4,7 +4,7 @@ nixos: , vpnConnectTo ? "" , vpnRsaPrivateKeyFile ? null , vpnEd25519PrivateKeyFile ? null -, deps ? {} # added under pkgs.biz +, deps ? {} # an attrset overlayed to pkgs , configuration # see: configuration.nix(5) }: # assert enableVpn -> builtins.isString ipAddress; @@ -16,9 +16,7 @@ let Ed25519PrivateKeyFile = "${vpnEd25519PrivateKeyFile}" PrivateKeyFile = "${vpnRsaPrivateKeyFile}" '' else ""; - bizpkgs = self: super: { - biz = deps; - }; + overlay = self: super: deps; defaults = { boot.cleanTmpDir = true; #networking.interfaces.simatime-vpn = [{ ipv4.address = ipAddress; }]; @@ -28,7 +26,7 @@ let nix.maxJobs = 1; # "auto"; nix.optimise.automatic = true; nix.optimise.dates = [ "Sunday 02:30" ]; - nixpkgs.overlays = [ bizpkgs ]; + nixpkgs.overlays = [ overlay ]; programs.mosh.enable = true; programs.mosh.withUtempter = true; security.acme.email = "ben@bsima.me"; -- cgit v1.2.3