Merge branch 'master' of pnp:stockholm

This commit is contained in:
makefu 2015-10-09 12:06:27 +02:00
commit 42c2a52eaa
16 changed files with 51 additions and 23 deletions

View File

@ -14,6 +14,7 @@ let
./iptables.nix ./iptables.nix
./nginx.nix ./nginx.nix
./Reaktor.nix ./Reaktor.nix
./realwallpaper.nix
./retiolum.nix ./retiolum.nix
./urlwatch.nix ./urlwatch.nix
]; ];

View File

@ -34,9 +34,11 @@ with import ../../4lib { inherit lib; };
''; '';
}; };
}; };
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL21QDOEFdODFh6WAfNp6odrXo15pEsDQuGJfMu/cKzK";
}; };
fastpoke = { fastpoke = {
dc = "lass"; #dc = "cac"; dc = "lass";
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["193.22.164.36"]; addrs4 = ["193.22.164.36"];
@ -95,6 +97,8 @@ with import ../../4lib { inherit lib; };
''; '';
}; };
}; };
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7oYx7Lbkc0wPYNp92LQF93DCtxsGzOkVD91FJQzVZl";
}; };
uriel = { uriel = {
cores = 1; cores = 1;
@ -119,6 +123,8 @@ with import ../../4lib { inherit lib; };
''; '';
}; };
}; };
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBryIo/Waw8SWvlQ0+5I+Bd/dJgcMd6iPXtELS6gQXoc";
secure = true; secure = true;
}; };
mors = { mors = {
@ -145,6 +151,8 @@ with import ../../4lib { inherit lib; };
}; };
}; };
secure = true; secure = true;
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINAMPlIG+6u75GJ3kvsPF6OoIZsU+u8ZQ+rdviv5fNMD";
}; };
}; };

View File

@ -8,12 +8,10 @@ let
mkIf mkIf
; ;
lpkgs = import ../5pkgs { inherit pkgs; }; cfg = config.krebs.realwallpaper;
cfg = config.lass.realwallpaper;
out = { out = {
options.lass.realwallpaper = api; options.krebs.realwallpaper = api;
config = mkIf cfg.enable imp; config = mkIf cfg.enable imp;
}; };
@ -57,13 +55,13 @@ let
imp = { imp = {
systemd.timers.realwallpaper = { systemd.timers.realwallpaper = {
description = "real wallpaper generator timer"; description = "real wallpaper generator timer";
wantedBy = [ "timers.target" ];
timerConfig = cfg.timerConfig; timerConfig = cfg.timerConfig;
}; };
systemd.services.realwallpaper = { systemd.services.realwallpaper = {
description = "real wallpaper generator"; description = "real wallpaper generator";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
path = with pkgs; [ path = with pkgs; [
@ -85,7 +83,7 @@ let
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = "${lpkgs.realwallpaper}/realwallpaper.sh"; ExecStart = "${pkgs.realwallpaper}/realwallpaper.sh";
User = "realwallpaper"; User = "realwallpaper";
}; };
}; };

View File

@ -2,14 +2,14 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
name = "Reaktor-${version}"; name = "Reaktor-${version}";
version = "0.4.3"; version = "0.5.0";
propagatedBuildInputs = with pkgs;[ propagatedBuildInputs = with pkgs;[
python3Packages.docopt python3Packages.docopt
python3Packages.requests2 python3Packages.requests2
]; ];
src = fetchurl { src = fetchurl {
url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz"; url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz";
sha256 = "1rvfw9vg7i7z2ah7m5k3zik2b92d3xdaqa8am62qw6vgvmxcmfp4"; sha256 = "1npag52xmnyqv56z0anyf6xf00q0smfzsippal0xdbxrfj7s8qim";
}; };
meta = { meta = {
homepage = http://krebsco.de/; homepage = http://krebsco.de/;

View File

@ -24,6 +24,7 @@ rec {
pssh = callPackage ./pssh {}; pssh = callPackage ./pssh {};
passwdqc-utils = callPackage ./passwdqc-utils {}; passwdqc-utils = callPackage ./passwdqc-utils {};
Reaktor = callPackage ./Reaktor {}; Reaktor = callPackage ./Reaktor {};
realwallpaper = callPackage ./realwallpaper.nix {};
youtube-tools = callPackage ./youtube-tools {}; youtube-tools = callPackage ./youtube-tools {};
execve = name: { filename, argv, envp ? {}, destination ? "" }: execve = name: { filename, argv, envp ? {}, destination ? "" }:

View File

@ -13,6 +13,7 @@ in {
../2configs/retiolum.nix ../2configs/retiolum.nix
../2configs/realwallpaper-server.nix ../2configs/realwallpaper-server.nix
../2configs/privoxy-retiolum.nix ../2configs/privoxy-retiolum.nix
../2configs/git.nix
{ {
networking.interfaces.enp2s1.ip4 = [ networking.interfaces.enp2s1.ip4 = [
{ {

View File

@ -28,14 +28,14 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
powertop powertop
sxiv
much
#window manager stuff #window manager stuff
haskellPackages.xmobar haskellPackages.xmobar
haskellPackages.yeganesh haskellPackages.yeganesh
dmenu2 dmenu2
xlibs.fontschumachermisc xlibs.fontschumachermisc
sxiv
]; ];
fonts.fonts = [ fonts.fonts = [

View File

@ -51,7 +51,7 @@ let
nick = config.krebs.build.host.name; nick = config.krebs.build.host.name;
channel = "#retiolum"; channel = "#retiolum";
server = "cd.retiolum"; server = "cd.retiolum";
verbose = config.krebs.build.host.name == "cloudkrebs"; verbose = config.krebs.build.host.name == "echelon";
}; };
}; };
}; };

View File

@ -1,9 +1,5 @@
{ config, ... }: { config, ... }:
{ {
imports = [ krebs.realwallpaper.enable = true;
../3modules/realwallpaper.nix
];
lass.realwallpaper.enable = true;
} }

View File

@ -3,6 +3,5 @@ _:
{ {
imports = [ imports = [
./xresources.nix ./xresources.nix
./realwallpaper.nix
]; ];
} }

View File

@ -13,5 +13,4 @@ rec {
ublock = callPackage ./firefoxPlugins/ublock.nix {}; ublock = callPackage ./firefoxPlugins/ublock.nix {};
vimperator = callPackage ./firefoxPlugins/vimperator.nix {}; vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
}; };
realwallpaper = callPackage ./realwallpaper.nix {};
} }

View File

@ -25,6 +25,7 @@
../2configs/Reaktor/simpleExtend.nix ../2configs/Reaktor/simpleExtend.nix
../2configs/Reaktor/random-emoji.nix ../2configs/Reaktor/random-emoji.nix
../2configs/Reaktor/titlebot.nix ../2configs/Reaktor/titlebot.nix
../2configs/Reaktor/shack-correct.nix
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
../2configs/urlwatch.nix ../2configs/urlwatch.nix
@ -35,7 +36,7 @@
krebs.Reaktor.debug = true; krebs.Reaktor.debug = true;
krebs.Reaktor.nickname = "Reaktor|bot"; krebs.Reaktor.nickname = "Reaktor|bot";
krebs.Reaktor.extraEnviron = { krebs.Reaktor.extraEnviron = {
REAKTOR_CHANNELS = "#krebs,#binaergewitter"; REAKTOR_CHANNELS = "#krebs,#binaergewitter,#shackspace";
}; };
krebs.build.host = config.krebs.hosts.pnp; krebs.build.host = config.krebs.hosts.pnp;

View File

@ -0,0 +1,20 @@
{ config, lib, pkgs, ... }:
with pkgs;
let
script = pkgs.substituteAll ( {
name="shack-correct";
isExecutable=true;
dir = "";
src = ./shack-correct.sh;
});
in {
krebs.Reaktor.extraConfig = ''
public_commands.insert(0,{
'capname' : "shack-correct",
'pattern' : '^(?P<args>.*Shack.*)$$',
'argv' : ["${script}"],
'env' : { }})
'';
}

View File

@ -0,0 +1,6 @@
#! /bin/sh
set -eu
printf "Sie meinten wohl \""
echo -n $@ | sed 's/Shack/shack/g'
echo "\""
echo "${_from}--"

View File

@ -64,13 +64,11 @@ let
environment.systemPackages = [ pkgs.tinc_graphs]; environment.systemPackages = [ pkgs.tinc_graphs];
systemd.timers.tinc_graphs = { systemd.timers.tinc_graphs = {
description = "Build Tinc Graphs via via timer"; description = "Build Tinc Graphs via via timer";
wantedBy = [ "timers.target"];
timerConfig = cfg.timerConfig; timerConfig = cfg.timerConfig;
}; };
systemd.services.tinc_graphs = { systemd.services.tinc_graphs = {
description = "Build Tinc Graphs"; description = "Build Tinc Graphs";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment = { environment = {
EXTERNAL_FOLDER = external_dir; EXTERNAL_FOLDER = external_dir;
INTERNAL_FOLDER = internal_dir; INTERNAL_FOLDER = internal_dir;