From d1b6266b28b8c57b4971b17694dd2f4d84cbfc22 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 12 Jun 2021 17:14:40 -0400
Subject: [PATCH] server2desk

---
 flake.lock    |  8 ++++----
 flake.nix     |  6 +++---
 hosts/p71.nix | 17 +++++++++--------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 072637b..dd008d2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -467,17 +467,17 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1622966049,
-        "narHash": "sha256-6g+28v94ISkVk9TBSsITVOnB2slK8plieWPIF2jo/l0=",
+        "lastModified": 1623324058,
+        "narHash": "sha256-Jm9GUTXdjXz56gWDKy++EpFfjrBaxqXlLvTLfgEi8lo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94",
+        "rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94",
+        "rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 5da0c5e..e7080a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     # https://status.nixos.org/
     # 
     # This ensures that we always use the official # cache.
-    nixpkgs.url = "github:nixos/nixpkgs/fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94";
+    nixpkgs.url = "github:nixos/nixpkgs/432fc2d9a67f92e05438dff5fdc2b39d33f77997";
 
     nixos-hardware.url = github:NixOS/nixos-hardware/master;
     home-manager.url = "github:nix-community/home-manager";
@@ -57,8 +57,8 @@
         ./hosts/p71.nix
         [
           inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
-          #./features/desktopish
-          ./features/server-mode.nix
+          ./features/desktopish/fonts.nix
+          # ./features/server-mode.nix
           ./features/postgrest.nix
         ];
       nixosConfigurations.x1c7 = mkHomeMachine
diff --git a/hosts/p71.nix b/hosts/p71.nix
index 2173488..0a2f6cc 100644
--- a/hosts/p71.nix
+++ b/hosts/p71.nix
@@ -9,8 +9,9 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
   boot.supportedFilesystems = [ "ntfs" ];
+  # https://notes.srid.ca/rtl8821cu
+  boot.extraModulePackages = [ config.boot.kernelPackages.rtl8821cu ];
 
   fileSystems."/" =
     {
@@ -33,7 +34,7 @@
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
 
   nixpkgs.config.allowUnfree = true;
   nix = {
@@ -58,12 +59,12 @@
   programs.mosh.enable = true;
 
   # Enable the X11 windowing system.
-  #services.xserver = {
-  #  enable = true;
-  #  videoDrivers = [ "nvidia" "intel" ];
-  #};
-  #services.xserver.displayManager.gdm.enable = true;
-  #services.xserver.desktopManager.gnome.enable = true;
+  services.xserver = {
+    enable = true;
+    videoDrivers = [ "nvidia" "intel" ];
+  };
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
   services.openssh.enable = true;
   services.ipfs = {