From c11ac8374832d5a01e0f8e8d25a723476944c9c2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 12:19:25 +0200 Subject: lass 2 desktop-base: add much --- lass/2configs/desktop-base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix index ed84edef..4e693997 100644 --- a/lass/2configs/desktop-base.nix +++ b/lass/2configs/desktop-base.nix @@ -28,14 +28,14 @@ in { environment.systemPackages = with pkgs; [ powertop + sxiv + much #window manager stuff haskellPackages.xmobar haskellPackages.yeganesh dmenu2 xlibs.fontschumachermisc - - sxiv ]; fonts.fonts = [ -- cgit v1.2.3 From 7c8ea4a87b50c2ffe982a1ba0c70579bea7cb4dd Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:48:42 +0200 Subject: move realwallpaper to krebs 5 --- krebs/5pkgs/default.nix | 1 + krebs/5pkgs/realwallpaper.nix | 28 ++++++++++++++++++++++++++++ lass/5pkgs/default.nix | 1 - lass/5pkgs/realwallpaper.nix | 28 ---------------------------- 4 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 krebs/5pkgs/realwallpaper.nix delete mode 100644 lass/5pkgs/realwallpaper.nix diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 7e136d96..25ba83d8 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -23,6 +23,7 @@ rec { posix-array = callPackage ./posix-array {}; pssh = callPackage ./pssh {}; Reaktor = callPackage ./Reaktor {}; + realwallpaper = callPackage ./realwallpaper.nix {}; youtube-tools = callPackage ./youtube-tools {}; execve = name: { filename, argv, envp ? {}, destination ? "" }: diff --git a/krebs/5pkgs/realwallpaper.nix b/krebs/5pkgs/realwallpaper.nix new file mode 100644 index 00000000..4fea977e --- /dev/null +++ b/krebs/5pkgs/realwallpaper.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, xplanet, imagemagick, curl, file }: + +stdenv.mkDerivation { + name = "realwallpaper"; + + src = fetchgit { + url = https://github.com/Lassulus/realwallpaper; + rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5"; + sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + buildInputs = [ + xplanet + imagemagick + curl + file + ]; + + installPhase = '' + mkdir -p $out + cp realwallpaper.sh $out/realwallpaper.sh + ''; +} diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 6954c6a2..7427cb62 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -13,5 +13,4 @@ rec { ublock = callPackage ./firefoxPlugins/ublock.nix {}; vimperator = callPackage ./firefoxPlugins/vimperator.nix {}; }; - realwallpaper = callPackage ./realwallpaper.nix {}; } diff --git a/lass/5pkgs/realwallpaper.nix b/lass/5pkgs/realwallpaper.nix deleted file mode 100644 index 4fea977e..00000000 --- a/lass/5pkgs/realwallpaper.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, xplanet, imagemagick, curl, file }: - -stdenv.mkDerivation { - name = "realwallpaper"; - - src = fetchgit { - url = https://github.com/Lassulus/realwallpaper; - rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5"; - sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs"; - }; - - phases = [ - "unpackPhase" - "installPhase" - ]; - - buildInputs = [ - xplanet - imagemagick - curl - file - ]; - - installPhase = '' - mkdir -p $out - cp realwallpaper.sh $out/realwallpaper.sh - ''; -} -- cgit v1.2.3 From cf28831057d95a73bbc2326f43b9d29a79fca12b Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:49:36 +0200 Subject: move realwallpaper to krebs 3 --- krebs/3modules/default.nix | 1 + krebs/3modules/realwallpaper.nix | 100 ++++++++++++++++++++++++++++++++++++++ lass/3modules/default.nix | 1 - lass/3modules/realwallpaper.nix | 102 --------------------------------------- 4 files changed, 101 insertions(+), 103 deletions(-) create mode 100644 krebs/3modules/realwallpaper.nix delete mode 100644 lass/3modules/realwallpaper.nix diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 43019440..edfbde9b 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -14,6 +14,7 @@ let ./iptables.nix ./nginx.nix ./Reaktor.nix + ./realwallpaper.nix ./retiolum.nix ./urlwatch.nix ]; diff --git a/krebs/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix new file mode 100644 index 00000000..d5c1aeab --- /dev/null +++ b/krebs/3modules/realwallpaper.nix @@ -0,0 +1,100 @@ +arg@{ config, lib, pkgs, ... }: + +let + inherit (lib) + mkEnableOption + mkOption + types + mkIf + ; + + cfg = config.krebs.realwallpaper; + + out = { + options.krebs.realwallpaper = api; + config = mkIf cfg.enable imp; + }; + + api = { + enable = mkEnableOption "realwallpaper"; + + workingDir = mkOption { + type = types.str; + default = "/var/realwallpaper/"; + }; + + nightmap = mkOption { + type = types.str; + default = "http://eoimages.gsfc.nasa.gov/images/imagerecords/55000/55167/earth_lights_lrg.jpg"; + }; + + daymap = mkOption { + type = types.str; + default = "http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png"; + }; + + cloudmap = mkOption { + type = types.str; + default = "http://xplanetclouds.com/free/local/clouds_2048.jpg"; + }; + + outFile = mkOption { + type = types.str; + default = "/tmp/wallpaper.png"; + }; + + timerConfig = mkOption { + type = types.unspecified; + default = { + OnCalendar = "*:0/15"; + }; + }; + + }; + + imp = { + systemd.timers.realwallpaper = { + description = "real wallpaper generator timer"; + + timerConfig = cfg.timerConfig; + }; + + systemd.services.realwallpaper = { + description = "real wallpaper generator"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + path = with pkgs; [ + xplanet + imagemagick + curl + file + ]; + + environment = { + working_dir = cfg.workingDir; + nightmap_url = cfg.nightmap; + daymap_url = cfg.daymap; + cloudmap_url = cfg.cloudmap; + out_file = cfg.outFile; + }; + + restartIfChanged = true; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.realwallpaper}/realwallpaper.sh"; + User = "realwallpaper"; + }; + }; + + users.extraUsers.realwallpaper = { + uid = 2009435407; #genid realwallpaper + home = cfg.workingDir; + createHome = true; + }; + }; + +in +out + diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix index 9b621127..9de987bf 100644 --- a/lass/3modules/default.nix +++ b/lass/3modules/default.nix @@ -3,6 +3,5 @@ _: { imports = [ ./xresources.nix - ./realwallpaper.nix ]; } diff --git a/lass/3modules/realwallpaper.nix b/lass/3modules/realwallpaper.nix deleted file mode 100644 index 85dd3523..00000000 --- a/lass/3modules/realwallpaper.nix +++ /dev/null @@ -1,102 +0,0 @@ -arg@{ config, lib, pkgs, ... }: - -let - inherit (lib) - mkEnableOption - mkOption - types - mkIf - ; - - lpkgs = import ../5pkgs { inherit pkgs; }; - - cfg = config.lass.realwallpaper; - - out = { - options.lass.realwallpaper = api; - config = mkIf cfg.enable imp; - }; - - api = { - enable = mkEnableOption "realwallpaper"; - - workingDir = mkOption { - type = types.str; - default = "/var/realwallpaper/"; - }; - - nightmap = mkOption { - type = types.str; - default = "http://eoimages.gsfc.nasa.gov/images/imagerecords/55000/55167/earth_lights_lrg.jpg"; - }; - - daymap = mkOption { - type = types.str; - default = "http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png"; - }; - - cloudmap = mkOption { - type = types.str; - default = "http://xplanetclouds.com/free/local/clouds_2048.jpg"; - }; - - outFile = mkOption { - type = types.str; - default = "/tmp/wallpaper.png"; - }; - - timerConfig = mkOption { - type = types.unspecified; - default = { - OnCalendar = "*:0/15"; - }; - }; - - }; - - imp = { - systemd.timers.realwallpaper = { - description = "real wallpaper generator timer"; - - timerConfig = cfg.timerConfig; - }; - - systemd.services.realwallpaper = { - description = "real wallpaper generator"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = with pkgs; [ - xplanet - imagemagick - curl - file - ]; - - environment = { - working_dir = cfg.workingDir; - nightmap_url = cfg.nightmap; - daymap_url = cfg.daymap; - cloudmap_url = cfg.cloudmap; - out_file = cfg.outFile; - }; - - restartIfChanged = true; - - serviceConfig = { - Type = "simple"; - ExecStart = "${lpkgs.realwallpaper}/realwallpaper.sh"; - User = "realwallpaper"; - }; - }; - - users.extraUsers.realwallpaper = { - uid = 2009435407; #genid realwallpaper - home = cfg.workingDir; - createHome = true; - }; - }; - -in -out - -- cgit v1.2.3 From 7820eae9b6f9a91927caf646074d5d2b79093489 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:50:07 +0200 Subject: lass 2 realwallpaper: update due to file move --- lass/2configs/realwallpaper.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index f1c8861e..c69cb166 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -1,9 +1,5 @@ { config, ... }: { - imports = [ - ../3modules/realwallpaper.nix - ]; - - lass.realwallpaper.enable = true; + krebs.realwallpaper.enable = true; } -- cgit v1.2.3 From b4d2814e31b860199de1fd927c5f53609ef162c9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:51:37 +0200 Subject: lass 1 echelon: activate git --- lass/1systems/echelon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index 45f7ebd7..b301b504 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -13,6 +13,7 @@ in { ../2configs/retiolum.nix ../2configs/realwallpaper-server.nix ../2configs/privoxy-retiolum.nix + ../2configs/git.nix { networking.interfaces.enp2s1.ip4 = [ { -- cgit v1.2.3 From f4f5633b0e0ec711202d2d56735b6b55c8c69138 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:52:24 +0200 Subject: lass 2 git: make echelon main git host --- lass/2configs/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 78e6f0ba..595936da 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -51,7 +51,7 @@ let nick = config.krebs.build.host.name; channel = "#retiolum"; server = "cd.retiolum"; - verbose = config.krebs.build.host.name == "cloudkrebs"; + verbose = config.krebs.build.host.name == "echelon"; }; }; }; -- cgit v1.2.3 From eabf194460f695044d32713900419583986a9bd5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 16:33:16 +0200 Subject: krebs 3 lass: add ssh pubkeys --- krebs/3modules/lass/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index aa071270..9dbc597e 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -34,9 +34,11 @@ with import ../../4lib { inherit lib; }; ''; }; }; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL21QDOEFdODFh6WAfNp6odrXo15pEsDQuGJfMu/cKzK"; }; fastpoke = { - dc = "lass"; #dc = "cac"; + dc = "lass"; nets = rec { internet = { addrs4 = ["193.22.164.36"]; @@ -95,6 +97,8 @@ with import ../../4lib { inherit lib; }; ''; }; }; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7oYx7Lbkc0wPYNp92LQF93DCtxsGzOkVD91FJQzVZl"; }; uriel = { cores = 1; @@ -119,6 +123,8 @@ with import ../../4lib { inherit lib; }; ''; }; }; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBryIo/Waw8SWvlQ0+5I+Bd/dJgcMd6iPXtELS6gQXoc"; secure = true; }; mors = { @@ -145,6 +151,8 @@ with import ../../4lib { inherit lib; }; }; }; secure = true; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINAMPlIG+6u75GJ3kvsPF6OoIZsU+u8ZQ+rdviv5fNMD"; }; }; -- cgit v1.2.3 From 2460a6c226ab3a1b462ca04ca0cb52f12e6a0be3 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 7 Oct 2015 15:20:12 +0200 Subject: krebs 3 realwallpaper: actually start realwallpaper as timer --- krebs/3modules/realwallpaper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix index d5c1aeab..7e02538f 100644 --- a/krebs/3modules/realwallpaper.nix +++ b/krebs/3modules/realwallpaper.nix @@ -55,13 +55,13 @@ let imp = { systemd.timers.realwallpaper = { description = "real wallpaper generator timer"; + wantedBy = [ "timers.target" ]; timerConfig = cfg.timerConfig; }; systemd.services.realwallpaper = { description = "real wallpaper generator"; - wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = with pkgs; [ -- cgit v1.2.3 From 36d43bf73f498228ff540e86e6dd6596a353a0da Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 7 Oct 2015 15:21:24 +0200 Subject: makefu 3 tinc_graphs: actually start the timer --- makefu/3modules/tinc_graphs.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/makefu/3modules/tinc_graphs.nix b/makefu/3modules/tinc_graphs.nix index 06b3f626..62d60752 100644 --- a/makefu/3modules/tinc_graphs.nix +++ b/makefu/3modules/tinc_graphs.nix @@ -64,13 +64,11 @@ let environment.systemPackages = [ pkgs.tinc_graphs]; systemd.timers.tinc_graphs = { description = "Build Tinc Graphs via via timer"; - + wantedBy = [ "timers.target"]; timerConfig = cfg.timerConfig; }; systemd.services.tinc_graphs = { description = "Build Tinc Graphs"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; environment = { EXTERNAL_FOLDER = external_dir; INTERNAL_FOLDER = internal_dir; -- cgit v1.2.3 From 5f5c1f5f661a2c4236fb62bc4c0ec7d43ae7a5b1 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 8 Oct 2015 16:51:57 +0200 Subject: m 2 Reaktor: add shack-correct, update pnp Reaktor Channels --- makefu/1systems/pnp.nix | 3 ++- makefu/2configs/Reaktor/shack-correct.nix | 20 ++++++++++++++++++++ makefu/2configs/Reaktor/shack-correct.sh | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 makefu/2configs/Reaktor/shack-correct.nix create mode 100644 makefu/2configs/Reaktor/shack-correct.sh diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index fdc2f013..e7ceca60 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -25,6 +25,7 @@ ../2configs/Reaktor/simpleExtend.nix ../2configs/Reaktor/random-emoji.nix ../2configs/Reaktor/titlebot.nix + ../2configs/Reaktor/shack-correct.nix ../2configs/exim-retiolum.nix ../2configs/urlwatch.nix @@ -35,7 +36,7 @@ krebs.Reaktor.debug = true; krebs.Reaktor.nickname = "Reaktor|bot"; krebs.Reaktor.extraEnviron = { - REAKTOR_CHANNELS = "#krebs,#binaergewitter"; + REAKTOR_CHANNELS = "#krebs,#binaergewitter,#shackspace"; }; krebs.build.host = config.krebs.hosts.pnp; diff --git a/makefu/2configs/Reaktor/shack-correct.nix b/makefu/2configs/Reaktor/shack-correct.nix new file mode 100644 index 00000000..8f30807f --- /dev/null +++ b/makefu/2configs/Reaktor/shack-correct.nix @@ -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.*Shack.*)$$', + 'argv' : ["${script}"], + 'env' : { }}) + ''; +} + diff --git a/makefu/2configs/Reaktor/shack-correct.sh b/makefu/2configs/Reaktor/shack-correct.sh new file mode 100644 index 00000000..3b4d04f8 --- /dev/null +++ b/makefu/2configs/Reaktor/shack-correct.sh @@ -0,0 +1,6 @@ +#! /bin/sh +set -eu +printf "Sie meinten wohl \"" +echo -n $@ | sed 's/Shack/shack/g' +echo "\"" +echo "${_from}--" -- cgit v1.2.3 From 965eba6073f9de3726d9776ca18f6de9ad8ec867 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 9 Oct 2015 11:34:47 +0200 Subject: k 5 Reaktor: 0.4.3 -> 0.5.0 --- krebs/5pkgs/Reaktor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/Reaktor/default.nix index 52478208..c38aa642 100644 --- a/krebs/5pkgs/Reaktor/default.nix +++ b/krebs/5pkgs/Reaktor/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonPackage rec { name = "Reaktor-${version}"; - version = "0.4.3"; + version = "0.5.0"; propagatedBuildInputs = with pkgs;[ python3Packages.docopt python3Packages.requests2 ]; src = fetchurl { url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz"; - sha256 = "1rvfw9vg7i7z2ah7m5k3zik2b92d3xdaqa8am62qw6vgvmxcmfp4"; + sha256 = "1npag52xmnyqv56z0anyf6xf00q0smfzsippal0xdbxrfj7s8qim"; }; meta = { homepage = http://krebsco.de/; -- cgit v1.2.3