From ff038698d1dd68b5d4c512c2214198b5d975594c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 17 Apr 2017 13:11:32 +0200
Subject: m 2 urxvtd: init

---
 makefu/1systems/x.nix            |  3 ++-
 makefu/2configs/base-gui.nix     |  5 ++++-
 makefu/2configs/urxvtd.nix       | 21 +++++++++++++++++++++
 makefu/5pkgs/awesomecfg/full.cfg |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 makefu/2configs/urxvtd.nix

(limited to 'makefu')

diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix
index 9cedc04a8..51c9543ef 100644
--- a/makefu/1systems/x.nix
+++ b/makefu/1systems/x.nix
@@ -2,6 +2,7 @@
 #
 #
 { config, pkgs, ... }:
+with import <stockholm/lib>;
 
 {
   imports =
@@ -78,7 +79,7 @@
   };
 
   boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
-  environment.systemPackages = [ pkgs.passwdqc-utils pkgs.bintray-upload ];
+  environment.systemPackages = [ pkgs.passwdqc-utils ];
 
   virtualisation.docker.enable = true;
 
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index ba4c551b3..1a19ab36b 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -16,7 +16,10 @@ let
   mainUser = config.krebs.build.user.name;
 in
 {
-  imports = [ ];
+  imports = [
+    ./urxvtd.nix
+  ];
+
   services.xserver = {
     enable = true;
     layout = "us";
diff --git a/makefu/2configs/urxvtd.nix b/makefu/2configs/urxvtd.nix
new file mode 100644
index 000000000..286b87ab3
--- /dev/null
+++ b/makefu/2configs/urxvtd.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+let
+	mainUser = config.krebs.build.user.name;
+in {
+  systemd.services.urxvtd = {
+    wantedBy = [ "multi-user.target" ];
+    before = [ "graphical.target" ];
+    reloadIfChanged = true;
+    serviceConfig = {
+      SyslogIdentifier = "urxvtd";
+      ExecReload = "${pkgs.coreutils}/bin/echo NOP";
+      ExecStart = "${pkgs.rxvt_unicode_with-plugins}/bin/urxvtd";
+      Restart = "always";
+      RestartSec = "2s";
+      StartLimitBurst = 0;
+      User = mainUser;
+    };
+  };
+	# TODO: sessionCommands from base-gui related to urxvt in this file
+}
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index e43341d25..73ff42e9f 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -90,7 +90,7 @@ client.connect_signal("focus", function(c) c.border_color = beautiful.border_foc
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
 -- This is used later as the default terminal and editor to run.
-terminal = "urxvt"
+terminal = "urxvtc"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 browser = "firefox"
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/11100000.lock: No such file or directory (2)