home

commit fb31c8de7dd59abec06ef1672c95974d2258c9b6
parent 3baf7912b7822e48adfe9ba97dab837f7ab67834
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri,  4 Dec 2020 14:48:35 +0100

users/vincent: update i3 module & boltd fixes

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/hardware/lenovo-p50.nix
 | 
1
+
M
systems/hardware/thinkpad-t480s.nix
 | 
10
++++++++--
M
systems/modules/profiles/i3.nix
 | 
17
++++++++++++++++-
M
users/vincent/desktop/i3.nix
 | 
4
++++

4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/systems/hardware/lenovo-p50.nix b/systems/hardware/lenovo-p50.nix
@@ -56,6 +56,7 @@ in
     udev.extraRules = ''
       # Rules for Lenovo Thinkpad WS Dock
       SUBSYSTEM=="usb", ACTION=="add|remove", ENV{ID_VENDOR}=="17ef", ENV{ID_MODEL}=="305a", RUN+="${pkgs.vde-thinkpad}/bin/dock"
+      ACTION=="add", SUBSYSTEM=="thunderbolt", ATTR{authorized}=="0", ATTR{authorized}="1"
     '';
   };
 }
diff --git a/systems/hardware/thinkpad-t480s.nix b/systems/hardware/thinkpad-t480s.nix
@@ -9,7 +9,7 @@ in
     ./thinkpad.nix
   ];
   boot = {
-    initrd.availableKernelModules = [ "nvme" "rtsx_pci_sdmmc" ];
+    initrd.availableKernelModules = [ "nvme" "rtsx_pci_sdmmc" "thunderbolt" ];
   };
   hardware = {
     enableAllFirmware = true;
@@ -49,8 +49,14 @@ in
         DISK_DEVICES="nvme0n1p3"
       '';
     };
+    udev.extraRules = ''
+      # Rules for Lenovo Thinkpad WS Dock
+      # SUBSYSTEM=="usb", ACTION=="add|remove", ENV{ID_VENDOR}=="17ef", ENV{ID_MODEL}=="305a", RUN+="${pkgs.vde-thinkpad}/bin/dock"
+      ACTION=="add", SUBSYSTEM=="thunderbolt", ATTR{authorized}=="0", ATTR{authorized}="1"
+    '';
     xserver = {
-      dpi = 128;
+      # dpi = 128;
+      dpi = 96;
     };
   };
 }
diff --git a/systems/modules/profiles/i3.nix b/systems/modules/profiles/i3.nix
@@ -17,7 +17,22 @@ in
       avahi.enable = true;
     };
     services = {
-      xserver.enable = true;
+      blueman.enable = true;
+      xserver = {
+        enable = true;
+        displayManager = {
+          defaultSession = "none+i3";
+          lightdm.enable = true;
+          lightdm.greeters.mini.enable = true;
+          lightdm.greeters.mini.user = "vincent";
+        };
+        windowManager.i3.enable = true;
+      };
+      dbus = {
+        enable = true;
+        # socketActivated = true;
+        packages = [ pkgs.gnome3.dconf ];
+      };
     };
   };
 }
diff --git a/users/vincent/desktop/i3.nix b/users/vincent/desktop/i3.nix
@@ -16,6 +16,10 @@ let
   lockCommand = "${pkgs.i3lock-color}/bin/i3lock-color -c 666666";
 in
 {
+  imports = [
+    ./dconf.nix
+    ./xsession.nix
+  ];
   home.sessionVariables = { WEBKIT_DISABLE_COMPOSITING_MODE = 1; };
   home.packages = with pkgs; [
     alacritty