add nginx to starlight, temporary package fixes

This commit is contained in:
Artemis Tosini 2020-11-13 00:56:07 +00:00
parent b956be6699
commit 5aada82172
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
4 changed files with 27 additions and 7 deletions

View file

@ -102,13 +102,7 @@
]; ];
printing = { printing = {
enable = true; enable = true;
drivers = [ (pkgs.brlaser.overrideAttrs (old: { drivers = [ pkgs.brlaser ];
patches = [ (pkgs.fetchpatch {
name = "l2300d-fix.patch";
url = "https://patch-diff.githubusercontent.com/raw/pdewacht/brlaser/pull/68.patch";
sha256 = "07iqv048q0iplghn0aamjslyixw1p5jbk004i20xnl1vs95nyqzy";
}) ];
})) ];
}; };
}; };
xdg.portal = { xdg.portal = {

View file

@ -3,6 +3,13 @@
let let
llvm = pkgs.llvmPackages_10; llvm = pkgs.llvmPackages_10;
go = pkgs.go_1_15; go = pkgs.go_1_15;
wofi = pkgs.wofi.overrideAttrs ( old: {
src = pkgs.fetchhg {
url = old.src.url;
rev = "e3db9b8075e71399bba14a568c59032f47981dab";
sha256 = "07fr1yfls94gxpwv3azgzxm7shjs4g5ribvqrh88flpf4cv5hq2d";
};
} );
in in
{ {
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [

View file

@ -4,6 +4,7 @@
imports = [ imports = [
./boot-config.nix ./boot-config.nix
./hardware-configuration.nix ./hardware-configuration.nix
./nginx.nix
../../services/ssh.nix ../../services/ssh.nix
../../sets/fpga.nix ../../sets/fpga.nix
../../private/starlight.nix ../../private/starlight.nix

View file

@ -0,0 +1,18 @@
{ pkgs, config, ... }:
{
security.acme = {
acceptTerms = true;
email = "me@artem.ist";
};
services.nginx = {
enable = true;
package = pkgs.nginxMainline;
virtualHosts."starlight.manehattan.artem.ist" = {
default = true;
forceSSL = true;
enableACME = true;
root = "/srv/nginx/starlight.manehattan.artem.ist";
};
};
}