chanegs over time...
This commit is contained in:
parent
5e4aa0d7dd
commit
df7761b11b
@ -89,6 +89,12 @@ in {
|
|||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "Upgrade";
|
proxy_set_header Connection "Upgrade";
|
||||||
|
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-By $server_addr:$server_port;
|
||||||
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let local-domain = "sea.fudo.org";
|
||||||
local-domain = "sea.fudo.org";
|
|
||||||
in {
|
in {
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/mnt/documents" = {
|
"/mnt/documents" = {
|
||||||
@ -37,14 +36,14 @@ in {
|
|||||||
services.printing = {
|
services.printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
drivers = [
|
drivers = [
|
||||||
pkgs.brlaser
|
# pkgs.brlaser
|
||||||
pkgs.brgenml1lpr
|
# pkgs.brgenml1lpr
|
||||||
pkgs.brgenml1cupswrapper
|
# pkgs.brgenml1cupswrapper
|
||||||
pkgs.hll2380dw-cups
|
# pkgs.hll2380dw-cups
|
||||||
|
|
||||||
|
# pkgs.hll2380dw-lpr
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [ hll2380dw-cups ];
|
||||||
hll2380dw-cups
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
@ -30,6 +30,7 @@ let
|
|||||||
byobu
|
byobu
|
||||||
cdrtools
|
cdrtools
|
||||||
cargo
|
cargo
|
||||||
|
clojure
|
||||||
curl
|
curl
|
||||||
doomEmacsInit
|
doomEmacsInit
|
||||||
enca
|
enca
|
||||||
@ -55,6 +56,7 @@ let
|
|||||||
nix-index
|
nix-index
|
||||||
nixops
|
nixops
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
|
nyxt
|
||||||
nmap
|
nmap
|
||||||
openldap
|
openldap
|
||||||
openssl
|
openssl
|
||||||
@ -119,6 +121,21 @@ in {
|
|||||||
|
|
||||||
".local/share/openttd/baseset" =
|
".local/share/openttd/baseset" =
|
||||||
mkIf enable-gui { source = "${pkgs.openttd-data}/data"; };
|
mkIf enable-gui { source = "${pkgs.openttd-data}/data"; };
|
||||||
|
|
||||||
|
# ".xsessions" = {
|
||||||
|
# mode = "0554";
|
||||||
|
# text = ''
|
||||||
|
# # -*-bash-*-
|
||||||
|
# gdmauth=$XAUTHORITY
|
||||||
|
# unset XAUTHORITY
|
||||||
|
# export XAUTHORITY
|
||||||
|
# xauth merge "$gdmauth"
|
||||||
|
|
||||||
|
# if [ -f $HOME/.xinitrc ]; then
|
||||||
|
# bash --login -i $HOME/.xinitrc
|
||||||
|
# fi
|
||||||
|
# '';
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
let
|
let
|
||||||
nixos-version = "20.09";
|
nixos-version = "21.05";
|
||||||
|
|
||||||
hosts = import ./lib/hosts.nix { inherit nixos-version; };
|
hosts = import ./lib/hosts.nix { inherit nixos-version; };
|
||||||
|
|
||||||
|
@ -72,6 +72,12 @@ in {
|
|||||||
coreutils file perl which;
|
coreutils file perl which;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hll2380dw-lpr = import ./hll2380dw-lp.nix {
|
||||||
|
inherit (pkgs)
|
||||||
|
stdenv fetchurl makeWrapper cups dpkg a2ps ghostscript gnugrep gnused
|
||||||
|
coreutils file perl which lib;
|
||||||
|
};
|
||||||
|
|
||||||
backplane-dns-client = import ./backplane-dns-client.nix {
|
backplane-dns-client = import ./backplane-dns-client.nix {
|
||||||
pkgs = pkgs;
|
pkgs = pkgs;
|
||||||
stdenv = pkgs.stdenv;
|
stdenv = pkgs.stdenv;
|
||||||
|
44
packages/hll2380dw-lp.nix
Normal file
44
packages/hll2380dw-lp.nix
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
{ lib, stdenv, fetchurl, makeWrapper, cups, dpkg, a2ps, ghostscript, gnugrep
|
||||||
|
, gnused, coreutils, file, perl, which }:
|
||||||
|
|
||||||
|
let
|
||||||
|
model = "hll2380dw";
|
||||||
|
version = "3.2.0-1";
|
||||||
|
src = fetchurl {
|
||||||
|
url =
|
||||||
|
"https://download.brother.com/welcome/dlf101771/hll2380dwlpr-${version}.i386.deb";
|
||||||
|
sha256 = "08g3kx5lgwzb3f9ypj8knmpkkj0h3kv1i4gd20rzjxrx6vx1wbpx";
|
||||||
|
};
|
||||||
|
reldir = "opt/brother/Printers/${model}/";
|
||||||
|
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
|
inherit src version;
|
||||||
|
pname = "${model}-lpr";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||||
|
|
||||||
|
unpackPhase = "dpkg-deb -x $src $out";
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
DIR="$out/${reldir}"
|
||||||
|
substituteInPlace $dir/lpd/filter_${model} \
|
||||||
|
--replace /usr/bin/perl ${perl}/bin/perl \
|
||||||
|
--replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
|
||||||
|
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
|
||||||
|
wrapProgram $dir/lpd/filter_${model} \
|
||||||
|
--prefix PATH : ${
|
||||||
|
stdenv.lib.makeBinPath [ coreutils ghostscript gnugrep gnused which ]
|
||||||
|
}
|
||||||
|
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||||
|
$dir/lpd/${model}filter
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "http://www.brother.com/";
|
||||||
|
description = "Brother ${lib.toUpper model} LPR print driver";
|
||||||
|
license = stdenv.lib.licenses.unfree;
|
||||||
|
platforms = [ "i386" "x86_64-linux" ];
|
||||||
|
downloadPage =
|
||||||
|
"http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2380dw_us&os=128";
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user