From f775d3a7e643d8432b867632c10e000d40b051c7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 Apr 2019 23:44:37 +0200
Subject: tv: add Xresources module

---
 tv/2configs/xserver/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 051e12ef0..e2160258c 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -9,6 +9,10 @@ let
   };
 in {
 
+  imports = [
+    ./Xresources.nix
+  ];
+
   environment.systemPackages = [
     pkgs.ff
     pkgs.font-size
@@ -73,7 +77,6 @@ in {
         ${pkgs.xorg.xhost}/bin/xhost -LOCAL:
       } &
       ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
-      ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
       ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
       wait
     '';
-- 
cgit v1.2.3


From 542d290543b9c9965f906548397ba0d8b761898e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 25 Apr 2019 00:17:25 +0200
Subject: tv: add urxvt config module

---
 tv/2configs/xserver/default.nix | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index e2160258c..95198ff9e 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -10,7 +10,7 @@ let
 in {
 
   imports = [
-    ./Xresources.nix
+    ./urxvt.nix
   ];
 
   environment.systemPackages = [
@@ -150,19 +150,6 @@ in {
     };
   };
 
-  systemd.services.urxvtd = {
-    wantedBy = [ "graphical.target" ];
-    restartIfChanged = false;
-    serviceConfig = {
-      SyslogIdentifier = "urxvtd";
-      ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
-      Restart = "always";
-      RestartSec = "2s";
-      StartLimitBurst = 0;
-      User = cfg.user.name;
-    };
-  };
-
   tv.slock = {
     enable = true;
     user = cfg.user;
-- 
cgit v1.2.3


From 73e89ece549bad03d97326cc94e9ba59a762d298 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 25 Apr 2019 00:23:39 +0200
Subject: tv: add sxiv config module

---
 tv/2configs/xserver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 95198ff9e..012caff73 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -10,6 +10,7 @@ let
 in {
 
   imports = [
+    ./sxiv.nix
     ./urxvt.nix
   ];
 
@@ -18,7 +19,6 @@ in {
     pkgs.font-size
     pkgs.gitAndTools.qgit
     pkgs.mpv
-    pkgs.sxiv
     pkgs.xdotool
     pkgs.xsel
     pkgs.zathura
-- 
cgit v1.2.3