From 092fb00879d9593e41acf085141ebe2574421da4 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 13 Feb 2018 13:35:25 +0100
Subject: Move some startup programs to sessionCommands

---
 modules/hardware/colemak.nix        | 4 ++++
 modules/hardware/laptop.nix         | 3 +++
 modules/programs/window-manager.nix | 1 +
 3 files changed, 8 insertions(+)

(limited to 'modules')

diff --git a/modules/hardware/colemak.nix b/modules/hardware/colemak.nix
index 3b1c0582..29a03c87 100644
--- a/modules/hardware/colemak.nix
+++ b/modules/hardware/colemak.nix
@@ -13,5 +13,9 @@
     layout = "us,us";
     xkbVariant = "colemak,";
     xkbOptions = "grp:shifts_toggle,altwin:prtsc_rwin";
+    displayManager.sessionCommands = ''
+      # Needed for pass/rofi-pass autotype
+      ${pkgs.xlibs.setxkbmap}/bin/setxkbmap us -variant colemak
+    '';
   };
 }
diff --git a/modules/hardware/laptop.nix b/modules/hardware/laptop.nix
index c08f6b96..1c5d5e39 100644
--- a/modules/hardware/laptop.nix
+++ b/modules/hardware/laptop.nix
@@ -42,6 +42,9 @@
       naturalScrolling = true;
       disableWhileTyping = true;
     };
+    displayManager.sessionCommands = ''
+      ${pkgs.autorandr}/bin/autorandr --change --force
+    '';
   };
 
   systemd.services.nixos-upgrade.unitConfig.ConditionACPower = true;
diff --git a/modules/programs/window-manager.nix b/modules/programs/window-manager.nix
index ff3fc3ed..9c92f47d 100644
--- a/modules/programs/window-manager.nix
+++ b/modules/programs/window-manager.nix
@@ -8,6 +8,7 @@
      sessionCommands = ''
        ${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr -solid '#4d4d4c' &
        ${pkgs.hsetroot}/bin/hsetroot -solid '#4d4d4c'
+       ${pkgs.networkmanagerapplet}/bin/nm-applet &
      '';
    };
     xautolock = {
-- 
cgit 1.4.1