summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-04-17 13:11:32 +0200
committerlassulus <lass@lassul.us>2017-04-18 21:14:56 +0200
commit6436eac7b9081c3a2f06aff5c27c40a2f54a4eff (patch)
tree60c3ef3346fff623fb87e8f79b58f5e93a1fcf3c /makefu
parentd53824e7b551759854c6e0ae77411c179a168754 (diff)
m 2 urxvtd: init
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/x.nix3
-rw-r--r--makefu/2configs/base-gui.nix5
-rw-r--r--makefu/2configs/urxvtd.nix21
-rw-r--r--makefu/5pkgs/awesomecfg/full.cfg2
4 files changed, 28 insertions, 3 deletions
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"