Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 2 main-laptop: remove obsolete display

Browse Source
This commit is contained in:
makefu 2016-08-02 15:40:41 +02:00
parent 127b8c0989
commit 4719eb8d58
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefu/2configs/base-gui.nix
View File

@ -55,7 +55,7 @@ in
hardware.pulseaudio = { hardware.pulseaudio = {
enable = true; enable = true;
# systemWide = true; systemWide = true;
}; };
services.xserver.displayManager.sessionCommands = let services.xserver.displayManager.sessionCommands = let
xdefaultsfile = pkgs.writeText "Xdefaults" '' xdefaultsfile = pkgs.writeText "Xdefaults" ''

27
makefu/2configs/main-laptop.nix
View File

@ -6,7 +6,10 @@
# TODO split generic desktop stuff and laptop-specifics like lidswitching # TODO split generic desktop stuff and laptop-specifics like lidswitching
with config.krebs.lib; with config.krebs.lib;
{ let
window-manager = "awesome";
user = config.krebs.build.user.name;
in {
imports = [ imports = [
./base-gui.nix ./base-gui.nix
./fetchWallpaper.nix ./fetchWallpaper.nix
@ -17,23 +20,32 @@ with config.krebs.lib;
users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ]; users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
krebs.power-action = let krebs.power-action = let
speak = "${pkgs.espeak}/bin/espeak"; #speak = "XDG_RUNTIME_DIR=/run/user/$(id -u) ${pkgs.espeak}/bin/espeak"; # when run as user
whisper = text: ''${pkgs.espeak}/bin/espeak -v +whisper -s 110 "${text}"''; speak = "${pkgs.espeak}/bin/espeak"; # systemwide pulse
note = "${pkgs.libnotify}/bin/notify-send"; whisper = text: ''${speak} -v +whisper -s 110 "${text}"'';
note = pkgs.writeDash "note-as-user" ''
eval "export $(egrep -z DBUS_SESSION_BUS_ADDRESS /proc/$(${pkgs.procps}/bin/pgrep -u ${user} ${window-manager})/environ)"
${pkgs.libnotify}/bin/notify-send "$@";
'';
in { in {
enable = true; enable = true;
inherit user;
plans.low-battery = { plans.low-battery = {
upperLimit = 25; upperLimit = 25;
lowerLimit = 15; lowerLimit = 15;
charging = false; charging = false;
action = whisper "power level low, please plug me in"; action = pkgs.writeDash "low-speak" ''
${whisper "power level low, please plug me in"}
'';
}; };
plans.nag-harder = { plans.nag-harder = {
upperLimit = 15; upperLimit = 15;
lowerLimit = 5; lowerLimit = 5;
charging = false;
action = pkgs.writeDash "crit-speak" '' action = pkgs.writeDash "crit-speak" ''
${note} Battery -u critical -t 60000 "Power level critical, do something!"
${whisper "Power level critical, do something"} ${whisper "Power level critical, do something"}
${note} Battery -u critical -t 600000 "Power level critical, do something!"
''; '';
}; };
plans.last-chance = { plans.last-chance = {
@ -52,8 +64,7 @@ with config.krebs.lib;
''; '';
}; };
}; };
users.users.power-action.extraGroups = [ "audio" ]; security.sudo.extraConfig = "${config.krebs.power-action.user} ALL= (root) NOPASSWD: ${pkgs.systemd}/bin/systemctl suspend";
security.sudo.extraConfig = "${config.krebs.power-action.user.name} ALL= (root) NOPASSWD: ${pkgs.systemd}/bin/systemctl suspend";
services.redshift = { services.redshift = {
enable = true; enable = true;