summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/gum.nix3
-rw-r--r--makefu/1systems/omo.nix13
-rw-r--r--makefu/1systems/wry.nix39
-rw-r--r--makefu/1systems/x.nix3
-rw-r--r--makefu/2configs/backup.nix2
-rw-r--r--makefu/2configs/base-gui.nix7
-rw-r--r--makefu/2configs/bepasty-dual.nix6
-rw-r--r--makefu/2configs/default.nix2
-rw-r--r--makefu/2configs/deployment/graphs.nix37
-rw-r--r--makefu/2configs/extra-fonts.nix14
-rw-r--r--makefu/2configs/printer.nix2
-rw-r--r--makefu/2configs/urlwatch.nix3
-rw-r--r--makefu/5pkgs/awesomecfg/default.nix1
-rw-r--r--makefu/5pkgs/dymo-cups-drivers/default.nix17
-rw-r--r--makefu/5pkgs/taskserver/default.nix43
15 files changed, 81 insertions, 111 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 91049302..c39997eb 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -29,9 +29,12 @@ in {
../2configs/deployment/owncloud.nix
../2configs/nginx/share-download.nix
../2configs/nginx/euer.test.nix
+ ../2configs/nginx/euer.wiki.nix
+ ../2configs/nginx/euer.blog.nix
../2configs/nginx/public_html.nix
../2configs/nginx/update.connector.one.nix
../2configs/deployment/mycube.connector.one.nix
+ ../2configs/deployment/graphs.nix
# ../2configs/opentracker.nix
../2configs/logging/central-stats-client.nix
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index a6a336fe..99303b60 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -43,7 +43,6 @@ in {
# TODO: unlock home partition via ssh
../2configs/fs/sda-crypto-root.nix
../2configs/zsh-user.nix
- ../2configs/urlwatch.nix
../2configs/backup.nix
../2configs/exim-retiolum.nix
../2configs/smart-monitor.nix
@@ -182,5 +181,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;
}
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 2457ab92..a5c4d3cc 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -19,8 +19,6 @@ in {
../2configs/backup.nix
# other nginx
- ../2configs/nginx/euer.wiki.nix
- ../2configs/nginx/euer.blog.nix
# ../2configs/nginx/euer.test.nix
# collectd
@@ -33,46 +31,9 @@ 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;
- krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
- if ( $server_addr = "${external-ip}" ) {
- return 403;
- }
- '';
- krebs.tinc_graphs = {
- enable = true;
- nginx = {
- enable = true;
- # TODO: remove hard-coded hostname
- complete = {
- extraConfig = ''
- if ( $server_addr = "${external-ip}" ) {
- return 403;
- }
- '';
- serverAliases = [ "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
- };
- anonymous = {
- enableSSL = true;
- forceSSL = true;
- enableACME = true;
- };
- };
- };
networking = {
firewall = {
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 9666f50f..9cedc04a 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -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
diff --git a/makefu/2configs/backup.nix b/makefu/2configs/backup.nix
index 280dc1df..9ed89032 100644
--- a/makefu/2configs/backup.nix
+++ b/makefu/2configs/backup.nix
@@ -29,7 +29,7 @@ let
};
in {
krebs.backup.plans = {
- wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
+ # wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
gum-to-omo_root = defaultPull config.krebs.hosts.gum "/";
};
}
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 43b37cd8..ba4c551b 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -41,7 +41,7 @@ in
fonts = {
enableCoreFonts = true;
enableFontDir = true;
- enableGhostscriptFonts = false;
+ enableGhostscriptFonts = true;
fonts = [ pkgs.terminus_font ];
};
@@ -62,7 +62,7 @@ in
cat |derp <<EOF
XTerm*background: black
XTerm*foreground: white
- XTerm*FaceName : Terminus:pixelsize=14
+ XTerm*FaceName : xft:xos4 Terminus:pixelsize=14
URxvt*termName: rxvt
URxvt*saveLines: 10000
@@ -74,7 +74,8 @@ in
URxvt.background: black
URxvt.urgentOnBell: true
URxvt.visualBell: false
- URxvt.font : xft:Terminus
+ URxvt.font : xft:xos4 Terminus:size=12
+
! blue
URxvt*color4: #268bd2
diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix
index 936aaf00..ecf5f8a3 100644
--- a/makefu/2configs/bepasty-dual.nix
+++ b/makefu/2configs/bepasty-dual.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
let
sec = toString <secrets>;
# secKey is nothing worth protecting on a local machine
- secKey = import <secrets/bepasty-secret.nix>;
+ secKey = "${secrets}/bepasty-secret";
acmepath = "/var/lib/acme/";
acmechall = acmepath + "/challenges/";
ext-dom = "paste.krebsco.de" ;
@@ -31,7 +31,7 @@ in {
serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
};
defaultPermissions = "admin,list,create,read,delete";
- secretKey = secKey;
+ secretKeyFile = secKey;
};
"${ext-dom}" = {
@@ -41,7 +41,7 @@ in {
enableACME = true;
};
defaultPermissions = "read";
- secretKey = secKey;
+ secretKeyFile = secKey;
};
};
};
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 1ad7f071..7b2e6b61 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -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 = "2982661"; # unstable @ 2017-03-31 + cups-dymo + snapraid-11.1
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{
diff --git a/makefu/2configs/deployment/graphs.nix b/makefu/2configs/deployment/graphs.nix
new file mode 100644
index 00000000..35a724f6
--- /dev/null
+++ b/makefu/2configs/deployment/graphs.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+let
+ external-ip = config.krebs.build.host.nets.internet.ip4.addr;
+ internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
+ hn = config.krebs.build.host.name;
+in {
+ krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
+ if ( $server_addr = "${external-ip}" ) {
+ return 403;
+ }
+ '';
+ krebs.tinc_graphs = {
+ enable = true;
+ nginx = {
+ enable = true;
+ # TODO: remove hard-coded hostname
+ complete = {
+ extraConfig = ''
+ if ( $server_addr = "${external-ip}" ) {
+ return 403;
+ }
+ '';
+ serverAliases = [
+ "graphs.r" "graphs.retiolum"
+ "graphs.${hn}" "graphs.${hn}.retiolum"
+ ];
+ };
+ anonymous = {
+ enableSSL = true;
+ forceSSL = true;
+ enableACME = true;
+ };
+ };
+ };
+}
diff --git a/makefu/2configs/extra-fonts.nix b/makefu/2configs/extra-fonts.nix
new file mode 100644
index 00000000..7b3a5f19
--- /dev/null
+++ b/makefu/2configs/extra-fonts.nix
@@ -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
+ ];
+ };
+ }
diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index 7c7b00ab..509ed512 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -5,7 +5,7 @@
enable = true;
drivers = [
pkgs.samsungUnifiedLinuxDriver
- pkgs.dymo-cups-drivers
+ pkgs.cups-dymo
];
};
diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index 20eb031a..d1dcec65 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -9,7 +9,7 @@
## nixpkgs maintenance
https://api.github.com/repos/ovh/python-ovh/tags
https://api.github.com/repos/embray/d2to1/tags
- http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
+ https://api.github.com/repos/Mic92/vicious/tags
https://pypi.python.org/simple/bepasty/
https://pypi.python.org/simple/xstatic/
http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
@@ -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
];
};
}
diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index c2276887..b94b6fa5 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -1,6 +1,7 @@
_:
{
+ # TODO: requires in path: amixer, xlock, xbacklight
full = ./full.cfg;
kiosk = ./kiosk.lua;
}
diff --git a/makefu/5pkgs/dymo-cups-drivers/default.nix b/makefu/5pkgs/dymo-cups-drivers/default.nix
deleted file mode 100644
index d47bae6d..00000000
--- a/makefu/5pkgs/dymo-cups-drivers/default.nix
+++ /dev/null
@@ -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";
- };
-}
diff --git a/makefu/5pkgs/taskserver/default.nix b/makefu/5pkgs/taskserver/default.nix
deleted file mode 100644
index a1502b4d..00000000
--- a/makefu/5pkgs/taskserver/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
-
-stdenv.mkDerivation rec {
- name = "taskserver-${version}";
- version = "1.1.0";
-
- enableParallelBuilding = true;
-
- src = fetchurl {
- url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz";
- sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v";
- };
-
- patchPhase = ''
- pkipath=$out/share/taskd/pki
- mkdir -p $pkipath
- cp -r pki/* $pkipath
- echo "patching paths in pki/generate"
- sed -i "s#^\.#$pkipath#" $pkipath/generate
- for f in $pkipath/generate* ;do
- i=$(basename $f)
- echo patching $i
- sed -i \
- -e 's/which/type -p/g' \
- -e 's#^\. ./vars#if test -e ./vars;then . ./vars; else echo "cannot find ./vars - copy the template from '$pkipath'/vars into the working directory";exit 1; fi#' $f
-
- echo wrapping $i
- makeWrapper $pkipath/$i $out/bin/taskd-pki-$i \
- --prefix PATH : ${gnutls}/bin/
- done
- '';
-
- buildInputs = [ makeWrapper ];
- nativeBuildInputs = [ cmake libuuid gnutls ];
-
- meta = {
- description = "Server for synchronising Taskwarrior clients";
- homepage = http://taskwarrior.org;
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
- };
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 02:29:12 +0000