From 2b456f2eb9cf6c58869fb23a343beb9a43ba27f0 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 9 Apr 2021 16:02:38 -0400
Subject: [PATCH] continue using gnome on x1c7

---
 flake.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index e7f3416..953bb87 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,18 +12,16 @@
     let
       system = "x86_64-linux";
       # Make configuration for any computer I use in my home office.
-      mkHomeMachine = configurationNix: thinkpadModule: nixpkgs.lib.nixosSystem {
+      mkHomeMachine = configurationNix: extraModules: nixpkgs.lib.nixosSystem {
         inherit system;
-        modules = [
+        modules = ([
           # System configuration
           configurationNix
-          thinkpadModule
+          # ./features/virtualization.nix
           ./features/passwordstore.nix
           ./features/syncthing.nix
-          # ./features/virtualization.nix
           ./features/email
           ./features/monitor-brightness.nix
-          ./features/desktopish
 
           # HACK: This should really go under ./features/email
           ({
@@ -37,15 +35,20 @@
             home-manager.useUserPackages = true;
             home-manager.users.srid = import ./home.nix;
           }
-        ];
+        ] ++ extraModules);
       };
     in
     {
       nixosConfigurations.p71 = mkHomeMachine
         ./hosts/p71.nix
-        inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53;
+        [
+          inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
+          ./features/desktopish
+        ];
       nixosConfigurations.x1c7 = mkHomeMachine
         ./hosts/x1c7.nix
-        inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen;
+        [
+          inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
+        ];
     };
 }