From 94a09258ad3202cfba1bcba8cdbf99b51f5aae86 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Nov 2018 09:03:52 +0100
Subject: tv xmonad: move to haskell packages

---
 tv/2configs/xserver/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index a44ece8b1..9cb487254 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -57,7 +57,9 @@ in {
 
   systemd.services.display-manager.enable = false;
 
-  systemd.services.xmonad = {
+  systemd.services.xmonad = let
+    xmonad = "${pkgs.haskellPackages.xmonad-tv}/bin/xmonad";
+  in {
     wantedBy = [ "graphical.target" ];
     requires = [ "xserver.service" ];
     environment = {
@@ -93,6 +95,11 @@ in {
         "za" "zh" "zj" "zs"
       ]);
     };
+    path = [
+      pkgs.alsaUtils
+      pkgs.fzmenu
+      pkgs.rxvt_unicode
+    ];
     serviceConfig = {
       SyslogIdentifier = "xmonad";
       ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${toString [
@@ -100,8 +107,8 @@ in {
         "\${XMONAD_CONFIG_DIR}"
         "\${XMONAD_DATA_DIR}"
       ]}";
-      ExecStart = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem}";
-      ExecStop = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem} --shutdown";
+      ExecStart = "@${xmonad} xmonad-${currentSystem} ";
+      ExecStop = "@${xmonad} xmonad-${currentSystem} --shutdown";
       User = cfg.user.name;
       WorkingDirectory = cfg.user.home;
     };
-- 
cgit v1.2.3


From 08849bbb4e731a4b655fa2456bad6925e7a70e8d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Nov 2018 16:17:32 +0100
Subject: tv xmonad: amixer -> pactl

---
 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 9cb487254..22c94f7b1 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -96,8 +96,8 @@ in {
       ]);
     };
     path = [
-      pkgs.alsaUtils
       pkgs.fzmenu
+      pkgs.pulseaudioLight.out
       pkgs.rxvt_unicode
     ];
     serviceConfig = {
-- 
cgit v1.2.3


From b9bd7a08b8aab6c0a7b4df5bad2ac7d40474633a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 2 Dec 2018 14:52:25 +0100
Subject: tv xmonad: find all paths

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

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

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 22c94f7b1..480295565 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -99,6 +99,7 @@ in {
       pkgs.fzmenu
       pkgs.pulseaudioLight.out
       pkgs.rxvt_unicode
+      "/run/wrappers" # for slock, and su
     ];
     serviceConfig = {
       SyslogIdentifier = "xmonad";
-- 
cgit v1.2.3


From 46dc547bbe9edbb2a314145482e220287ab4c70a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 2 Dec 2018 15:36:55 +0100
Subject: tv xmonad: use slock service

---
 tv/2configs/xserver/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

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

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 480295565..b513dabbe 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -24,17 +24,6 @@ in {
     pkgs.xlibs.fontschumachermisc
   ];
 
-  # TODO dedicated group, i.e. with a single user [per-user-setuid]
-  # TODO krebs.setuid.slock.path vs /run/wrappers/bin
-  krebs.setuid.slock = {
-    filename = "${pkgs.slock}/bin/slock";
-    group = "wheel";
-    envp = {
-      DISPLAY = ":${toString config.services.xserver.display}";
-      USER = cfg.user.name;
-    };
-  };
-
   services.xserver = {
 
     # Don't install feh into systemPackages
@@ -96,10 +85,11 @@ in {
       ]);
     };
     path = [
+      config.tv.slock.package
       pkgs.fzmenu
       pkgs.pulseaudioLight.out
       pkgs.rxvt_unicode
-      "/run/wrappers" # for slock, and su
+      "/run/wrappers" # for su
     ];
     serviceConfig = {
       SyslogIdentifier = "xmonad";
@@ -155,4 +145,9 @@ in {
       User = cfg.user.name;
     };
   };
+
+  tv.slock = {
+    enable = true;
+    user = cfg.user;
+  };
 }
-- 
cgit v1.2.3


From a58628d1c3c8fb4d730ee77ce3fae6130271962f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 2 Dec 2018 15:43:49 +0100
Subject: tv xmonad: add xcalib

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

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

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index b513dabbe..8d4b13fad 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -89,6 +89,7 @@ in {
       pkgs.fzmenu
       pkgs.pulseaudioLight.out
       pkgs.rxvt_unicode
+      pkgs.xcalib
       "/run/wrappers" # for su
     ];
     serviceConfig = {
-- 
cgit v1.2.3