Use intel drivers on x220

3 files changed, 95 insertions, 65 deletions

diff --git a/machines/base.nix b/machines/base.nix
index 52a32b5..d71292e 100755
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -26,6 +26,10 @@
     ga = "git add";
     gl = "git log";
     gd = "git diff";
+    ls = "ls --color=auto -hN --group-directories-first";
+    rm = "rm -vI";
+    cp = "cp -iv";
+    mv = "mv -iv";
   };
 
   ## === XDG ===
diff --git a/machines/x220/configuration.nix b/machines/x220/configuration.nix
index 9cea847..12c1bba 100644
--- a/machines/x220/configuration.nix
+++ b/machines/x220/configuration.nix
@@ -11,32 +11,32 @@ let
     '';
   };
 in
-{
-  imports = [
-    ../base.nix
-    ../pl.nix
-    ../../modules/larbs.nix
-    ../../modules/internet.nix
-    ../../modules/dockd.nix
-    ../../modules/trackpad.nix
-    ../../modules/agetty.nix
-  ];
-
-  boot.plymouth.enable = true;
-
-  networking = {
-    hostName = "x220";
-
-    networkmanager = {
-     enable = true;
-     wifi.backend = "iwd";
+  {
+    imports = [
+      ../base.nix
+      ../pl.nix
+      ../../modules/larbs.nix
+      ../../modules/internet.nix
+      ../../modules/dockd.nix
+      ../../modules/trackpad.nix
+      ../../modules/agetty.nix
+    ];
+
+    boot.plymouth.enable = true;
+
+    networking = {
+      hostName = "x220";
+
+      networkmanager = {
+        enable = true;
+        wifi.backend = "iwd";
+      };
     };
-  };
 
-  nixpkgs.config.allowUnfree = true;
+    nixpkgs.config.allowUnfree = true;
 
 
-  environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [
     # Basic tools
     groff file ssh-ident busybox_utils
 
@@ -107,6 +107,14 @@ in
   # Battery
   services.tlp.enable = true;
 
+  services.xserver = {
+    videoDrivers = [ "intel" ];
+    deviceSection = ''
+      Option "DIR" "2"
+      Option "TearFree" "true"
+    '';
+  };
+
   services.xserver.wacom = {
     enable = true;
   };
diff --git a/modules/dockd.nix b/modules/dockd.nix
index 3677f6e..d8a1582 100644
--- a/modules/dockd.nix
+++ b/modules/dockd.nix
@@ -20,54 +20,72 @@ in
   config = lib.mkIf (cfg.enable) {
     environment.etc = {
       "dockd/docked.conf".text = ''
-        [Screen]
-        height=1225
-        width=3840
-        mm_height=323
-        mm_width=1015
+[Screen]
+height=1180
+width=3940
+mm_height=311
+mm_width=1041
 
-        [CRTC]
-        crtc=63
-        x=0
-        y=145
-        rotation=1
-        mode=1920x1080
-        outputs_len=1
-        outputs_0=HDMI-3
+[CRTC]
+crtc=63
+x=0
+y=100
+rotation=1
+mode=1920x1080
+outputs_len=1
+outputs_0=HDMI3
 
-        [CRTC]
-        crtc=64
-        x=1920
-        y=0
-        rotation=1
-        mode=1920x1080
-        outputs_len=1
-        outputs_0=DP-2
-      '';
+[CRTC]
+crtc=64
+x=2020
+y=0
+rotation=1
+mode=1920x1080
+outputs_len=1
+outputs_0=DP2
+
+[CRTC]
+crtc=65
+x=0
+y=0
+rotation=1
+mode=None
+outputs_len=0
+     '';
       "dockd/undocked.conf".text = ''
-        [Screen]
-        height=768
-        width=1366
-        mm_height=202
-        mm_width=359
+[Screen]
+height=768
+width=1366
+mm_height=201
+mm_width=359
+
+[CRTC]
+crtc=63
+x=0
+y=0
+rotation=1
+mode=1366x768
+outputs_len=1
+outputs_0=LVDS1
+
+[CRTC]
+crtc=64
+x=1920
+y=0
+rotation=1
+mode=None
+outputs_len=0
+
+[CRTC]
+crtc=65
+x=0
+y=0
+rotation=1
+mode=None
+outputs_len=0
 
-        [CRTC]
-        crtc=63
-        x=0
-        y=0
-        rotation=1
-        mode=1366x768
-        outputs_len=1
-        outputs_0=LVDS-1
 
-        [CRTC]
-        crtc=64
-        x=1920
-        y=0
-        rotation=2
-        mode=None
-        outputs_len=0
-      '';
+     '';
     };
   };
 }