Commit 277b56bb8eaa

Vincent Demeester <vincent@sbr.pm>
2016-11-18 15:32:39
Update nixos-configuration layout
- `configuration` holds common/app configuration - `hardware` holds hardware-specific configuration (module options and stuff) - `machine` holds configuration "merged" for known computer (in case of re-install) Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent f8c2ac1
Changed files (6)
hardware
dell-latitude-e6540.nix
thinkpad-t460s-configuration.nix
machine
honshu.nix
wakasu.nix
.gitignore
README.md
hardware/dell-latitude-e6540.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, ... }:
+
+{
+	services.xserver = {
+			synaptics.enable = false;
+
+			 config = ''
+      			 Section "InputClass"
+			         Identifier     "Enable libinput for TrackPoint"
+				 MatchIsPointer "on"
+				 Driver         "libinput"
+				 Option         "ScrollMethod" "button"
+				 Option         "ScrollButton" "8"
+			 EndSection
+    			 '';
+			inputClassSections = [
+					''
+					Identifier "evdev touchpad off"
+					MatchIsTouchpad "on"
+					MatchDevicePath "/dev/input/event*"
+					Driver "evdev"
+					Option "Ignore" "true"
+					''
+			];
+	};
+}
thinkpad-t460s-configuration.nix → hardware/thinkpad-t460s-configuration.nix
File renamed without changes
wakasu.nix → machine/honshu.nix
@@ -3,11 +3,10 @@
 {
 	imports =
 		[ # Include the results of the hardware scan.
-			./hardware-configuration.nix
-			./configuration/common.nix
-			./thinkpad-t460s-configuration.nix
+			../hardware-configuration.nix
+			../configuration/common.nix
+			../hardware/dell-latitude-e6540.nix
 		];
 
 	networking.hostName = "wakasu";
-
 }
machine/wakasu.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+	imports =
+		[ # Include the results of the hardware scan.
+			../hardware-configuration.nix
+			../configuration/common.nix
+			../hardware/thinkpad-t460s-configuration.nix
+		];
+
+	networking.hostName = "wakasu";
+
+}
.gitignore
@@ -1,5 +1,5 @@
-local-configuration.nix
 hardware-configuration.nix
+configuration.nix
 result
 .tramp*
 *~
README.md
@@ -10,7 +10,7 @@ Thanks to @FaustXVI 👼
 When installing nixos:
 
 - clone this repository in `/etc/nixos`
+- create a `configuration.nix` either by linking it from a known
+  machine (in `machine/`) or by doing your own.
 - run `nixos-generate-configuration` to have the
   `hardware-configuration.nix` generated.
-- create a `local-configuration.nix` with completely local
-  configuration. I mainly use this for `networking.hostname` key.