Commit 20123d584810

@@ -5,13 +5,12 @@
 		[ # Include the results of the hardware scan.
 			../hardware-configuration.nix
 			../configuration/custom-packages.nix
-			../configuration/common.nix
-			../profiles/ssh.nix
-			../profiles/laptop.nix
-			../profiles/virtualization.nix
+			../configuration/users.nix
+			../profiles/server.nix
+			../profiles/gitconfig.nix
 			../profiles/dockerization.nix
+			../profiles/avahi.nix
 			../location/docker.nix
-			../hardware/thinkpad-x220.nix
 			../service/ssh-tunnel.nix
 		];
 
@@ -19,7 +18,6 @@
 	boot.loader.systemd-boot.enable = true;
 
 	services.openssh.enable = true;
-	services.openssh.forwardX11 = true;
 
 	services.ssh-tunnel = {
 		enable = true;
@@ -29,32 +27,4 @@
 		remoteUser = "vincent";
 		bindPort = 2223;
 	};
-	services.xserver = {
-		enable = true;
-		videoDrivers = [ "intel" ];
-		#xrandrHeads = [ "LVDS1" "DP1" ];
-		monitorSection = ''
-EndSection
-Section "Monitor"
-	Identifier "DP1"
-	Option "PreferredMode" "2560x1080"
-	Option "DPMS" "true"
-	Option "RightOf" "LVDS1"
-EndSection
-Section "Monitor"
-	Identifier "LVDS1"
-	Option "Primary" "true"
-	Option "DPMS" "true"
-				'';
-		deviceSection = ''
-Option "Monitor-HDMI1" "HDMI1"
-Option "Monitor-eDP1" "eDP1"
-'';
-		exportConfiguration = true;
-		displayManager.slim.theme = pkgs.fetchurl {
-			url = "https://github.com/vdemeester/slim-themes/raw/master/docker-nuage-theme-0.1.tar.xz";
-
-			sha256 = "1ds7p3d8dn21bankgs68i53hqrj4d2abpk437h6dbjz36q1ys839";
-		};
-	};
 }

@@ -9,6 +9,7 @@
 			../profiles/server.nix
 			../profiles/dockerization.nix
 			../profiles/avahi.nix
+			../profiles/gitconfig.nix
 			../location/docker.nix
 			../service/ssh-tunnel.nix
 		];

@@ -3,6 +3,10 @@
 { configs, pkgs, ...}:
 
 {
+	imports = 
+		[
+			./gitconfig.nix
+		];
 	environment.systemPackages = with pkgs; [
 		jq
 		grc
@@ -12,57 +16,4 @@
 		runc
 		containerd
 	];
-	environment.etc."gitconfig" = rec { text = ''
-[alias]
-    co = checkout
-    st = status
-    ci = commit --signoff
-    cia = commit --amend
-    ciad = commit --amend --date=\"$(date -R)\"
-    ciads = commit --amend --date=\"$(date -R)\" -S
-    civ = commit -v
-    cis = commit --signoff -S
-    cids = commit --signoff --date=\"$(date -R)\"
-    wdiff = diff --color-words
-    br = branch
-    unstage = reset HEAD
-    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
-    lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative --branches --remotes
-    lol = log --pretty=oneline --abbrev-commit --graph --decorate
-    conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
-    resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add
-[color]
-	branch = auto
-	diff = auto
-	status = auto
-[color "branch"]
-	current = cyan reverse
-	local = cyan
-	remote = green
-[color "diff"]
-	meta = white reverse
-	frag = magenta reverse
-	old = red 
-	new = green 
-[color "status"]
-	added = green
-	changed = yellow
-	untracked = red
-[core]
-	excludesfile = ~/.gitignore.global
-[push]
-	default = matching
-[merge]
-    tool = vimdiff
-
-[user]
-    name = Vincent Demeester
-    email = vincent@sbr.pm
-
-[http]
-        cookiefile = /home/vincent/.gitcookies
-	
-[url "git@github.com:"]
-    pushInsteadOf = git://github.com/
-	''; };
 }

@@ -0,0 +1,57 @@
+{ configs, pkgs, ...}:
+
+{
+	environment.etc."gitconfig" = rec { text = ''
+[alias]
+    co = checkout
+    st = status
+    ci = commit --signoff
+    cia = commit --amend
+    ciad = commit --amend --date=\"$(date -R)\"
+    ciads = commit --amend --date=\"$(date -R)\" -S
+    civ = commit -v
+    cis = commit --signoff -S
+    cids = commit --signoff --date=\"$(date -R)\"
+    wdiff = diff --color-words
+    br = branch
+    unstage = reset HEAD
+    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+    lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative --branches --remotes
+    lol = log --pretty=oneline --abbrev-commit --graph --decorate
+    conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
+    resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add
+[color]
+	branch = auto
+	diff = auto
+	status = auto
+[color "branch"]
+	current = cyan reverse
+	local = cyan
+	remote = green
+[color "diff"]
+	meta = white reverse
+	frag = magenta reverse
+	old = red 
+	new = green 
+[color "status"]
+	added = green
+	changed = yellow
+	untracked = red
+[core]
+	excludesfile = ~/.gitignore.global
+[push]
+	default = matching
+[merge]
+    tool = vimdiff
+
+[user]
+    name = Vincent Demeester
+    email = vincent@sbr.pm
+
+[http]
+        cookiefile = /home/vincent/.gitcookies
+	
+[url "git@github.com:"]
+    pushInsteadOf = git://github.com/
+	''; };
+}

@@ -8,5 +8,4 @@
 	];
 	boot.loader.systemd-boot.enable = true;
 	boot.loader.efi.canTouchEfiVariables = true;
-	boot.kernelPackages = pkgs.linuxPackages_4_12;
 }