From fd5dbd1fd2b89da05601236e93af76a70777c54c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon, 12 May 2025 18:49:52 +0100
Subject: [PATCH] Simplify T490 configuration

---
 hosts/t490/configuration.nix    | 21 ---------------------
 hosts/t490/secrets.nix          |  5 -----
 hosts/t490/services/default.nix |  6 +++++-
 hosts/t490/users.nix            | 15 ---------------
 secrets.nix                     |  1 -
 5 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 hosts/t490/secrets.nix
 delete mode 100644 hosts/t490/users.nix

diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index 8c737772..cdd65522 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -1,14 +1,10 @@
-{ pkgs, ... }:
-
 {
   imports = [
     ../common
 
     ./hardware-configuration.nix
     ./hardware.nix
-    ./secrets.nix
     ./services
-    ./users.nix
 
     ../../users/luke.nix
     ../../users/opdavies.nix
@@ -40,22 +36,5 @@
 
   networking.networkmanager.enable = true;
 
-  security = {
-    polkit.enable = true;
-    rtkit.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    gtypist
-    pam_gnupg
-    sxiv
-    ttyper
-    yt-dlp
-  ];
-
-  networking.hosts = {
-    "192.168.1.116" = [ "nixedo" ];
-  };
-
   system.autoUpgrade.enable = true;
 }
diff --git a/hosts/t490/secrets.nix b/hosts/t490/secrets.nix
deleted file mode 100644
index e2032222..00000000
--- a/hosts/t490/secrets.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  age.secrets = {
-    cloudflare.file = ../../secrets/cloudflare.age;
-  };
-}
diff --git a/hosts/t490/services/default.nix b/hosts/t490/services/default.nix
index ef7c3c7b..810ef869 100644
--- a/hosts/t490/services/default.nix
+++ b/hosts/t490/services/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./cron.nix
     ./interception-tools.nix
-    ./redshift.nix
     ./sound.nix
     ./udev.nix
     ./xserver.nix
@@ -27,5 +26,10 @@
     throttled.enable = true;
     thermald.enable = true;
     upower.enable = true;
+
+    xserver = {
+      desktopManager.cinnamon.enable = true;
+      displayManager.lightdm.enable = true;
+    };
   };
 }
diff --git a/hosts/t490/users.nix b/hosts/t490/users.nix
deleted file mode 100644
index f663ad5c..00000000
--- a/hosts/t490/users.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, username, ... }:
-
-{
-  users.users.${username} = {
-    extraGroups = [ "media" ];
-
-    packages = with pkgs; [
-      abook
-      android-tools
-      via
-    ];
-  };
-
-  users.groups.media = { };
-}
diff --git a/secrets.nix b/secrets.nix
index 2ca983a2..ad7e8bd6 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -3,7 +3,6 @@ let
     lemp11 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZ+ljJKd6uqdAk+fqxwtObI4Stab2N9Bjo4QFHY/v8n";
     nixedo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvtcGJnc94k6wCPfvK9oBvGey0WWVCR8IYSqg5vqage";
     t480 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvtcGJnc94k6wCPfvK9oBvGey0WWVCR8IYSqg5vqage";
-    t490 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvtcGJnc94k6wCPfvK9oBvGey0WWVCR8IYSqg5vqage";
   };
 
   users = {