[services] Moved most service config into it's own file, from packages.nix

3 files changed, 53 insertions, 46 deletions

diff --git a/configuration.nix b/configuration.nix
index 66241a5..7e1902e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,6 +10,7 @@ in {
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./packages.nix
+      ./services.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/packages.nix b/packages.nix
index b833713..602cb6d 100644
--- a/packages.nix
+++ b/packages.nix
@@ -102,51 +102,5 @@ in {
   services = {
     dbus.packages = with pkgs; [ gnome2.GConf ];
     udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
-
-    upower.enable = true;
-    tlp.enable = true;
-    udisks2.enable = true; # gnome-disks disk access
-    gnome.gnome-keyring.enable = true;
-    gvfs.enable = true; # MTP (for nemo)
-
-    logind.extraConfig = ''
-      InhibitDelayMaxSec=2
-      HoldoffTimeoutSec=1s
-      HandlePowerKey=poweroff'';
-
-    thinkfan = {
-      enable = true;
-      levels = [
-        [0  0 35]
-        [1 35 38]
-        [3 38 53]
-        ["level auto" 53 32767]
-      ];
-    };
-
-    httpd = {
-      enable = true;
-
-      virtualHosts = {
-        syndamiadotcom-local = {
-          hostName = "synd.local";
-          listen = [ { port = 80; } ];
-          documentRoot = "/home/kamen/Programming/GitLab-repos/syndamiadotcom/website";
-        };
-      };
-    };
-
-    xserver = {
-      enable = true;
-      # xkbmap
-      layout = "us,bg"; # TODO us,bg-custom
-      xkbVariant = ",phonetic";
-      xkbOptions = "grp:alt_shift_toggle,lv3:switch,caps:escape";
-      # Window manager
-      windowManager.openbox.enable = true;
-      # touchpad support
-      libinput.enable = true;
-      libinput.touchpad.naturalScrolling = true;
-    };
   };
 }
diff --git a/services.nix b/services.nix
new file mode 100644
index 0000000..aa99f57
--- /dev/null
+++ b/services.nix
@@ -0,0 +1,52 @@
+
+{ config, ... }:
+
+{
+  services = {
+    upower.enable = true;
+    tlp.enable = true;
+    udisks2.enable = true; # gnome-disks disk access
+    gnome.gnome-keyring.enable = true;
+    gvfs.enable = true; # MTP (for nemo)
+
+    logind.extraConfig = ''
+      InhibitDelayMaxSec=2
+      HoldoffTimeoutSec=1s
+      HandlePowerKey=poweroff'';
+
+    thinkfan = {
+      enable = true;
+      levels = [
+        [0  0 35]
+        [1 35 38]
+        [3 38 53]
+        ["level auto" 53 32767]
+      ];
+    };
+
+    httpd = {
+      enable = true;
+
+      virtualHosts = {
+        syndamiadotcom-local = {
+          hostName = "synd.local";
+          listen = [ { port = 80; } ];
+          documentRoot = "/home/kamen/Programming/GitLab-repos/syndamiadotcom/website";
+        };
+      };
+    };
+
+    xserver = {
+      enable = true;
+      # xkbmap
+      layout = "us,bg"; # TODO us,bg-custom
+      xkbVariant = ",phonetic";
+      xkbOptions = "grp:alt_shift_toggle,lv3:switch,caps:escape";
+      # Window manager
+      windowManager.openbox.enable = true;
+      # touchpad support
+      libinput.enable = true;
+      libinput.touchpad.naturalScrolling = true;
+    };
+  };
+}