Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2017-03-26 01:41:26 +01:00
commit 3d46b5b9e6
12 changed files with 74 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/5pkgs/apt-cacher-ng/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "apt-cacher-ng-${version}";
version = "0.9.3.2";
version = "2";
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
sha256 = "1bvng9mwrggvc93q2alj0x72i56wifnjs2dsycr17mapsv0f2gnc";
sha256 = "0bkc3012vinridl5ch46pwnxjalymx4wf6nxax64nm7bdkcj9azf";
};
NIX_LDFLAGS = "-lpthread";

12
makefu/1systems/omo.nix
View File

@ -182,5 +182,17 @@ in {
zramSwap.enable = true;
krebs.Reaktor.reaktor = {
nickname = "Reaktor|bot";
channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
plugins = with pkgs.ReaktorPlugins;[
titlebot
# stockholm-issue
nixos-version
shack-correct
sed-plugin
random-emoji ];
};
krebs.build.host = config.krebs.hosts.omo;
}

14
makefu/1systems/wry.nix
View File

@ -33,18 +33,6 @@ in {
krebs.build.host = config.krebs.hosts.wry;
krebs.Reaktor.reaktor = {
nickname = "Reaktor|bot";
channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
plugins = with pkgs.ReaktorPlugins;[
titlebot
# stockholm-issue
nixos-version
shack-correct
sed-plugin
random-emoji ];
};
# prepare graphs
services.nginx.enable = true;
krebs.retiolum-bootstrap.enable = true;
@ -64,7 +52,7 @@ in {
return 403;
}
'';
serverAliases = [ "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
serverAliases = [ "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
};
anonymous = {
enableSSL = true;

3
makefu/1systems/x.nix
View File

@ -8,6 +8,7 @@
[ # base
../.
../2configs/main-laptop.nix
../2configs/extra-fonts.nix
../2configs/tools/all.nix
../2configs/laptop-backup.nix
../2configs/dnscrypt.nix
@ -46,7 +47,7 @@
../2configs/mail-client.nix
../2configs/printer.nix
../2configs/virtualization.nix
# ../2configs/virtualization-virtualbox.nix
../2configs/virtualization-virtualbox.nix
../2configs/wwan.nix
../2configs/rad1o.nix

2
makefu/2configs/base-gui.nix
View File

@ -41,7 +41,7 @@ in
fonts = {
enableCoreFonts = true;
enableFontDir = true;
enableGhostscriptFonts = false;
enableGhostscriptFonts = true;
fonts = [ pkgs.terminus_font ];
};

2
makefu/2configs/default.nix
View File

@ -22,7 +22,7 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu;
source = let
inherit (config.krebs.build) host user;
ref = "53a2baa"; # unstable @ 2017-02-28
ref = "73a6832"; # unstable @ 2017-03-24
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{

14
makefu/2configs/extra-fonts.nix Normal file
View File

@ -0,0 +1,14 @@
{ pkgs, ... }:
{
fonts = {
enableFontDir = true;
enableGhostscriptFonts = true;
fonts = with pkgs; [
inconsolata # monospaced
ubuntu_font_family # Ubuntu fonts
unifont # some international languages
dejavu_fonts
terminus_font
];
};
}

2
makefu/2configs/printer.nix
View File

@ -5,7 +5,7 @@
enable = true;
drivers = [
pkgs.samsungUnifiedLinuxDriver
pkgs.dymo-cups-drivers
pkgs.cups-dymo
];
};

1
makefu/2configs/urlwatch.nix
View File

@ -19,6 +19,7 @@
https://api.github.com/repos/embray/d2to1/tags
https://api.github.com/repos/dorimanx/exfat-nofuse/commits
https://api.github.com/repos/dorimanx/exfat-nofuse/tags
https://api.github.com/repos/radare/radare2/tags
];
};
}

17
makefu/5pkgs/dymo-cups-drivers/default.nix
View File

@ -1,17 +0,0 @@
{ stdenv, lib, pkgs, fetchurl, cups, ... }:
stdenv.mkDerivation rec {
name = "dymo-cups-drivers-${version}";
version = "1.4.0";
src = fetchurl {
url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${name}.tar.gz";
sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6";
};
buildInputs = [ cups ];
makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ];
# acd_cli gets dumped in bin and gets overwritten by fixupPhase
meta = {
description = "Dymo printer drivers";
};
}

1
shared/1systems/wolf.nix
View File

@ -15,6 +15,7 @@ in
../2configs/cgit-mirror.nix
../2configs/repo-sync.nix
../2configs/graphite.nix
../2configs/share-shack.nix
];
# use your own binary cache, fallback use cache.nixos.org (which is used by
# apt-cacher-ng in first place)

38
shared/2configs/share-shack.nix Normal file
View File

@ -0,0 +1,38 @@
{config, ... }:{
users.users.smbguest = {
name = "smbguest";
uid = config.ids.uids.smbguest;
group = "share";
description = "smb guest user";
home = "/home/share";
createHome = true;
};
networking.firewall.allowedTCPPorts = [
139 445 # samba
];
networking.firewall.allowedUDPPorts = [
137 138
];
services.samba = {
enable = true;
shares = {
share-home = {
path = "/home/share/";
"read only" = "no";
browseable = "yes";
"guest ok" = "yes";
};
};
extraConfig = ''
guest account = smbguest
map to guest = bad user
# disable printing
load printers = no
printing = bsd
printcap name = /dev/null
disable spoolss = yes
'';
};
}