update

hosts/thinkpad/configuration.nix

@@ -1,6 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
 {
   config,
   pkgs,
@@ -8,15 +5,13 @@
   ...
 }: {
   imports = [
-    # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    inputs.home-manager.nixosModules.default
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
+    ../../modules/common/common.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/user.nix
     ../../modules/nixos/ssh.nix
     ../../modules/nixos/bluetooth.nix
-    #../../modules/nixos/sway.nix
     ../../modules/nixos/i3.nix
     ../../modules/nixos/nm.nix
     ../../modules/nixos/sound.nix
@@ -27,27 +22,8 @@
 
   networking.hostName = "thinkpad";
 
-  nix.settings = {
-    trusted-users = ["mthomson"];
-
-    substituters = [
-      "https://cache.nixos.org"
-      "https://nix-community.cachix.org"
-    ];
-
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-
-  time.timeZone = "America/Toronto";
-
   i18n.defaultLocale = "en_CA.UTF-8";
 
-  nixpkgs.config.allowUnfree = true;
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
   environment.systemPackages = with pkgs; [
     wget
     git
@@ -55,14 +31,5 @@
     lsof
   ];
 
-  home-manager = {
-    extraSpecialArgs = {inherit inputs;};
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users = {
-      mthomson = import ./home.nix;
-    };
-  };
-
   system.stateVersion = "23.11";
 }