From d1f883e4f306e6a0415ef4cb33e8cbf3c072b84d Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Mon, 3 Jan 2022 14:47:46 -0500
Subject: [PATCH] thick: +desktop, +xanmod

---
 Makefile                        | 2 +-
 features/desktopish/guiapps.nix | 2 +-
 flake.lock                      | 8 ++++----
 flake.nix                       | 9 +++++----
 hosts/thick.nix                 | 5 ++++-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 3e8b2b8..24d2b87 100644
--- a/Makefile
+++ b/Makefile
@@ -22,5 +22,5 @@ h:
 	
 freeupboot:
 	# Delete all but the last few generations
-	sudo nix-env -p /nix/var/nix/profiles/system --delete-generations +5
+	sudo nix-env -p /nix/var/nix/profiles/system --delete-generations +2
 	sudo nixos-rebuild boot
diff --git a/features/desktopish/guiapps.nix b/features/desktopish/guiapps.nix
index 553ae9c..0a86251 100644
--- a/features/desktopish/guiapps.nix
+++ b/features/desktopish/guiapps.nix
@@ -6,7 +6,7 @@
   # Apps I use on desktops and laptops
   environment.systemPackages = with pkgs; [
     brave
-    onlyoffice-bin
+    # onlyoffice-bin
     obsidian
 
     simplescreenrecorder
diff --git a/flake.lock b/flake.lock
index 38a4b36..bc1ae4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -932,17 +932,17 @@
     },
     "nixpkgs_12": {
       "locked": {
-        "lastModified": 1640319671,
-        "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
+        "lastModified": 1640959792,
+        "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
+        "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
+        "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index ed85649..9940eaa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     # https://status.nixos.org/
     # 
     # This ensures that we always use the official nix cache.
-    nixpkgs.url = "github:nixos/nixpkgs/eac07edbd20ed4908b98790ba299250b5527ecdf";
+    nixpkgs.url = "github:nixos/nixpkgs/59bfda72480496f32787cec8c557182738b1bd3f";
     darwin.url = "github:lnl7/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -75,10 +75,11 @@
           [
             inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
             ./features/server/harden.nix
-            ./features/server/unlaptop.nix
+            #./features/server/unlaptop.nix
             ./features/server/wakeonlan.nix
-            #./features/kde.nix
-            #./features/desktopish/guiapps.nix
+            #./features/server/devserver.nix
+            ./features/gnome.nix
+            ./features/desktopish/guiapps.nix
             #./features/desktopish/fonts.nix
             #./features/protonvpn.nix
             ./features/lxd.nix
diff --git a/hosts/thick.nix b/hosts/thick.nix
index 58e9873..5c43308 100644
--- a/hosts/thick.nix
+++ b/hosts/thick.nix
@@ -10,7 +10,9 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
+  # Kernel w/ clear linux like patches: https://github.com/NixOS/nixpkgs/issues/63708#issuecomment-1003875463
+  boot.kernelPackages = pkgs.linuxPackages_xanmod;
   boot.supportedFilesystems = [ "ntfs" ];
   # https://notes.srid.ca/rtl8821cu
   # boot.extraModulePackages = [ config.boot.kernelPackages.rtl8821cu ];
@@ -40,6 +42,7 @@
   hardware.pulseaudio.support32Bit = true; ## If compatibility with 32-bit applications is desired.
 
   services.xserver.videoDrivers = [ "nvidia" "intel" ];
+  hardware.nvidia.modesetting.enable = true; # Required for Wayland+GDM, apparently.
   # On KDE+nvidia, display scaling can only be set here.
   services.xserver.dpi = 170;
   # Not sure how to merge two screens in KDE