From 99b8bfeaec5f3d70148354f128568e15be249b9d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Apr 2016 15:25:04 +0200 Subject: l: use i3lock instead of slock --- lass/2configs/xserver/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 30afd787e..fbae9741f 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -40,10 +40,6 @@ let }; }; - security.setuidPrograms = [ - "slock" - ]; - systemd.services.display-manager.enable = false; services.xserver.enable = true; @@ -96,6 +92,7 @@ let set -efu export PATH; PATH=${makeSearchPath "bin" ([ pkgs.rxvt_unicode + pkgs.i3lock ] ++ config.environment.systemPackages)}:/var/setuid-wrappers settle() {( # Use PATH for a clean journal -- cgit v1.2.3 From c53e97a0240c566aa73b257d9e59c0dffa224a68 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 Apr 2016 15:25:47 +0200 Subject: l: clean up xmonad config --- lass/2configs/xserver/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index fbae9741f..5b89da093 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -78,12 +78,7 @@ let # XXX JSON is close enough :) XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [ - "cr" - "gm" - "ff" - "IM" - "mail" - "stockholm" + "dashboard" ]); }; -- cgit v1.2.3 From 468be84c69e0b0fcdfd9388ef67f3f352b0c2e0d Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 27 Apr 2016 12:51:07 +0200 Subject: l 2 xserver: add pulseaudioLight to pkgs --- lass/2configs/xserver/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 5b89da093..2252e3e4e 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -88,6 +88,7 @@ let export PATH; PATH=${makeSearchPath "bin" ([ pkgs.rxvt_unicode pkgs.i3lock + pkgs.pulseaudioLight ] ++ config.environment.systemPackages)}:/var/setuid-wrappers settle() {( # Use PATH for a clean journal -- cgit v1.2.3 From 1cc4fb02187f51dd0bec89bf53b8d88e6bae8ebe Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 27 Apr 2016 12:51:47 +0200 Subject: l: add brightness controls to xmonad --- lass/2configs/xserver/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 2252e3e4e..e775a575d 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -89,6 +89,7 @@ let pkgs.rxvt_unicode pkgs.i3lock pkgs.pulseaudioLight + pkgs.xorg.xbacklight ] ++ config.environment.systemPackages)}:/var/setuid-wrappers settle() {( # Use PATH for a clean journal -- cgit v1.2.3 From 9feebcc90271ef765e4d381026038187a0edd3b7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 28 Apr 2016 21:33:24 +0200 Subject: l 2 xserver: sleep in xmonad-stop --- lass/2configs/xserver/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index e775a575d..474181c0f 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -108,7 +108,8 @@ let xmonad-stop = pkgs.writeScriptBin "xmonad-stop" '' #! /bin/sh - exec ${pkgs.xmonad-lass}/bin/xmonad --shutdown + ${pkgs.xmonad-lass}/bin/xmonad --shutdown + ${pkgs.coreutils}/bin/sleep 2s ''; xserver-environment = { -- cgit v1.2.3 From d22a4a59641e26895711ff1795e6c1a7495ed6ff Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 28 Apr 2016 21:39:56 +0200 Subject: l 2 xserver: restart xmonad on change again --- lass/2configs/xserver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 474181c0f..980c922fd 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -48,7 +48,7 @@ let wantedBy = [ "multi-user.target" ]; requires = [ "xserver.service" ]; environment = xmonad-environment; - restartIfChanged = false; + restartIfChanged = true; serviceConfig = { ExecStart = "${xmonad-start}/bin/xmonad"; ExecStop = "${xmonad-stop}/bin/xmonad-stop"; -- cgit v1.2.3 From 7fdef91d42eecafd57d2f2bc207e6519cc77f941 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 19 May 2016 21:19:17 +0200 Subject: l 2 xserver: add urxvt to lass' pkgs --- lass/2configs/xserver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 980c922fd..ee7440c95 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -40,6 +40,10 @@ let }; }; + krebs.per-user.lass.packages = [ + pkgs.rxvt_unicode_with-plugins + ]; + systemd.services.display-manager.enable = false; services.xserver.enable = true; -- cgit v1.2.3 From b047ba85232ca330834bc43dd91f33abb7c6ef4e Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 19 May 2016 21:20:31 +0200 Subject: l 2 xserver: use pkgs.xorg.xorgserver.out --- lass/2configs/xserver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/xserver/default.nix') diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index ee7440c95..80c947a7b 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -127,7 +127,7 @@ let xserver = pkgs.writeScriptBin "xserver" '' #! /bin/sh set -efu - exec ${pkgs.xorg.xorgserver}/bin/X \ + exec ${pkgs.xorg.xorgserver.out}/bin/X \ :${toString config.services.xserver.display} \ vt${toString config.services.xserver.tty} \ -config ${import ./xserver.conf.nix args} \ -- cgit v1.2.3