summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-10-19 18:42:09 +0200
committerlassulus <lassulus@lassul.us>2017-10-19 23:34:19 +0200
commit9064b8e5ce92c3380b8765d55e5ba722361286aa (patch)
tree3b947f316cb6b2b1f7ea835f6a99692d94d6b72d /lass
parentcef1c830b1baeda34cd16d5da4aa09ca79a9b4b2 (diff)
l: make screenlock configureable
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/helios/config.nix2
-rw-r--r--lass/2configs/baseX.nix2
-rw-r--r--lass/2configs/screenlock.nix17
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/3modules/screenlock.nix37
-rw-r--r--lass/5pkgs/xmonad-lass.nix2
6 files changed, 42 insertions, 19 deletions
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index 6db6f8fd1..70aa3832d 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -115,4 +115,6 @@ with import <stockholm/lib>;
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC2G1.pem"; sha256 = "1z2qkyhgjvri13bvi06ynkb7mjmpcznmc9yw8chx1lnwc3cxa7kf"; })
(pkgs.fetchurl { url = "http://pki.dcso.de/ca/PEM/DCSOCAIDENC3G1.pem"; sha256 = "0smdjjvz95n652cb45yhzdb2lr83zg52najgbzf6lm3w71f8mv7f"; })
];
+
+ lass.screenlock.command = "${pkgs.i3lock}/bin/i3lock -i /home/lass/lock.png -t -f";
}
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 5669eb77d..a8bb8693f 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -6,7 +6,6 @@ in {
imports = [
./mpv.nix
./power-action.nix
- ./screenlock.nix
./copyq.nix
./xresources.nix
./livestream.nix
@@ -136,4 +135,5 @@ in {
};
services.urxvtd.enable = true;
+ lass.screenlock.enable = true;
}
diff --git a/lass/2configs/screenlock.nix b/lass/2configs/screenlock.nix
deleted file mode 100644
index b5bc4ee2a..000000000
--- a/lass/2configs/screenlock.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, config, ... }:
-
-{
- systemd.services.screenlock = {
- before = [ "sleep.target" ];
- wantedBy = [ "sleep.target" ];
- environment = {
- DISPLAY = ":0";
- };
- serviceConfig = {
- SyslogIdentifier = "screenlock";
- ExecStart = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f";
- Type = "forking";
- User = "lass";
- };
- };
-}
diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index e7744395d..e14e39bc2 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -8,6 +8,7 @@ _:
./mysql-backup.nix
./news.nix
./pyload.nix
+ ./screenlock.nix
./umts.nix
./usershadow.nix
./xresources.nix
diff --git a/lass/3modules/screenlock.nix b/lass/3modules/screenlock.nix
new file mode 100644
index 000000000..cf38f8357
--- /dev/null
+++ b/lass/3modules/screenlock.nix
@@ -0,0 +1,37 @@
+{ pkgs, config, ... }:
+
+with import <stockholm/lib>;
+
+let
+ cfg = config.lass.screenlock;
+
+ out = {
+ options.lass.screenlock = api;
+ config = mkIf cfg.enable imp;
+ };
+
+ api = {
+ enable = mkEnableOption "news";
+ command = mkOption {
+ type = types.str;
+ default = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f";
+ };
+ };
+
+ imp = {
+ systemd.services.screenlock = {
+ before = [ "sleep.target" ];
+ wantedBy = [ "sleep.target" ];
+ environment = {
+ DISPLAY = ":0";
+ };
+ serviceConfig = {
+ SyslogIdentifier = "screenlock";
+ ExecStart = cfg.command;
+ Type = "forking";
+ User = "lass";
+ };
+ };
+ };
+
+in out
diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index fe391fef9..12c078940 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -97,7 +97,7 @@ displaySomeException = displayException
myKeyMap :: [([Char], X ())]
myKeyMap =
- [ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f")
+ [ ("M4-<F11>", spawn "${config.lass.screenlock.command}")
, ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png")
, ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
, ("M4-o", spawn "${pkgs.brain}/bin/brainmenu --type")