From bc05f2e736a01f3231565a71129b1c746feeb28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 29 Jan 2019 23:12:30 +0100
Subject: [PATCH] Fix light-locker, google-drive; add power to lightdm

---
 config.nix           | 15 ++++++---------
 configs/graphics.nix |  4 ++--
 configs/packages.nix |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/config.nix b/config.nix
index be682c5..d315ecf 100644
--- a/config.nix
+++ b/config.nix
@@ -14,8 +14,6 @@ in {
     configs/retiolum.nix
   ];
 
-  nix.optimise.automatic = true;
-
   time.timeZone = "Europe/Berlin";
 
   sound.enable = true;
@@ -58,18 +56,17 @@ in {
     shell = pkgs.zsh;
   };
 
-  systemd.user.services.google-drive = {
+  systemd.services.google-drive = {
     description = "Google Drive synchronisation service";
     wants = [ "network-online.target" ];
     script = ''
       ${pkgs.grive2}/bin/grive -p ${config.users.users.kfm.home}/cloud/gdrive
     '';
-    serviceConfig.Restart = "on-failure";
-  };
-
-  systemd.user.timers.google-drive = {
-    wantedBy = [ "timers.target" ];
-    timerConfig.OnUnitActiveSec = "5minutes";
+    startAt = "*:0/5";
+    serviceConfig = {
+      Restart = "on-failure";
+      User = "kfm";
+    };
   };
 
   programs.tmux = {
diff --git a/configs/graphics.nix b/configs/graphics.nix
index 0daa0f2..7724326 100644
--- a/configs/graphics.nix
+++ b/configs/graphics.nix
@@ -19,14 +19,14 @@
       ${pkgs.dropbox-cli}/bin/dropbox start &
       ${pkgs.seafile-client}/bin/seafile-applet &
       ${pkgs.systemd}/bin/systemctl --user import-environment XDG_SESSION_PATH
-      ${pkgs.lightlocker}/bin/light-locker
+      ${pkgs.lightlocker}/bin/light-locker &
       ${pkgs.openssh}/bin/ssh-add
     '';
     displayManager.lightdm.greeters.gtk = {
       enable = true;
       theme = { name = config.constants.theme.gtk.name; package = config.constants.theme.gtk.package; };
       iconTheme = { name = config.constants.theme.icon.name; package = config.constants.theme.icon.package; };
-      indicators = [ "~spacer" "~host" "~spacer" "~session" ];
+      indicators = [ "~spacer" "~host" "~spacer" "~session" "~power" ];
     };
     desktopManager.xterm.enable = false;
     windowManager.default = "i3";
diff --git a/configs/packages.nix b/configs/packages.nix
index 3d4697e..b6d4e29 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -30,7 +30,7 @@ in with pkgs;
   ] ++ [ # office
     abiword
     gnumeric
-    typora
+    # typora
   ] ++ [ # theme
     config.constants.theme.gtk.package
     config.constants.theme.icon.package