modularize x11 config

2 files changed, 52 insertions, 47 deletions

diff --git a/configuration.nix b/configuration.nix
index ba8ae49..e8270dd 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -3,6 +3,7 @@
   imports = [
     ./hardware-configuration.nix
 	./lockscreen.nix
+./x11.nix
   ];
 
   # Bootloader.
@@ -180,53 +181,6 @@ super + l
   # Services
   services.openssh.enable = true;
 
-  services.displayManager.ly = {
-    enable = true;
-    settings = {
-      animation = "gameoflife";
-      clock = "%c";
-      vi_mode = true;
-      vi_default_mode = "insert";
-      numlock = true;
-      bigclock = "en";
-      bigclock_seconds = true;
-    };
-
-  };
-  services.dunst = {
-    enable = true;
-  };
-
-  services.xserver = {
-    enable = true;
-    autorun = true;
-    enableTearFree = true;
-    windowManager.dwm.enable = true;
-    desktopManager.runXdgAutostartIfNone = false;
-    displayManager = {
-      setupCommands = '''';
-      sessionCommands = ''
-        		#!/bin/sh
-        		${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360
-        		${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg'
-        		${pkgs.sxhkd}/bin/sxhkd &
-      '';
-    };
-    xkb = {
-      layout = "us";
-      options = "caps:escape";
-    };
-    config = ''
-      Section "InputClass"
-        Identifier "Kinesis Advantage 360"
-        MatchIsKeyboard "on"
-        MatchVendor "Kinesis"
-        Option "XkbModel" "kinesis"
-        Option "XkbLayout" "us"
-      EndSection
-    '';
-  };
-
 
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
diff --git a/x11.nix b/x11.nix
new file mode 100644
index 0000000..dc9bf62
--- /dev/null
+++ b/x11.nix
@@ -0,0 +1,51 @@
+{ config, pkgs, ... }:
+{
+  services.displayManager.ly = {
+    enable = true;
+    settings = {
+      animation = "gameoflife";
+      clock = "%c";
+      vi_mode = true;
+      vi_default_mode = "insert";
+      numlock = true;
+      bigclock = "en";
+      bigclock_seconds = true;
+    };
+
+  };
+
+  services.dunst = {
+    enable = true;
+  };
+
+  services.xserver = {
+    enable = true;
+    autorun = true;
+    enableTearFree = true;
+    windowManager.dwm.enable = true;
+    desktopManager.runXdgAutostartIfNone = false;
+    displayManager = {
+      setupCommands = '''';
+      sessionCommands = ''
+        		#!/bin/sh
+        		${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360
+        		${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg'
+        		${pkgs.sxhkd}/bin/sxhkd &
+      '';
+    };
+    xkb = {
+      layout = "us";
+      options = "caps:escape";
+    };
+    config = ''
+      Section "InputClass"
+        Identifier "Kinesis Advantage 360"
+        MatchIsKeyboard "on"
+        MatchVendor "Kinesis"
+        Option "XkbModel" "kinesis"
+        Option "XkbLayout" "us"
+      EndSection
+    '';
+  };
+
+}