update

hosts/desktop/configuration.nix

@@ -6,7 +6,7 @@
 }: {
   imports = [
     ./hardware-configuration.nix
-    inputs.home-manager.nixosModules.default
+    ../../modules/common/common.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/user.nix
     ../../modules/nixos/ssh.nix
@@ -19,18 +19,8 @@
     ../../modules/nixos/docker.nix
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   networking.hostName = "desktop";
 
-  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
@@ -38,14 +28,5 @@
     lsof
   ];
 
-  home-manager = {
-    extraSpecialArgs = {inherit inputs;};
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users = {
-      mthomson = import ./home.nix;
-    };
-  };
-
   system.stateVersion = "23.11";
 }

hosts/macbook/configuration.nix

@@ -5,56 +5,26 @@
   ...
 }: {
   imports = [
-    inputs.home-manager.darwinModules.default
+    ../../modules/common/common.nix
     ../../modules/nix-darwin/system.nix
     ../../modules/nix-darwin/aerospace.nix
-    ../../modules/nixos/neovim.nix
   ];
 
   nixpkgs.hostPlatform = "aarch64-darwin";
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.allowBroken = true;
-
-  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
 
   networking.hostName = "macbook";
 
   system.primaryUser = "mthomson";
 
-  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="
-    ];
-  };
-
   users.users.mthomson = {
     home = "/Users/mthomson";
   };
 
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
   environment.systemPackages = with pkgs; [
     man-pages
     man-pages-posix
   ];
 
-  home-manager = {
-    extraSpecialArgs = {inherit inputs;};
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    backupFileExtension = "backup";
-    users = {
-      mthomson = import ./home.nix;
-    };
-  };
-
   system.stateVersion = 5;
 
   # fix for this: https://github.com/LnL7/nix-darwin/issues/1346

hosts/macbook/home.nix

@@ -30,13 +30,6 @@
 
   home.packages = with pkgs; [
     hidden-bar
-    presenterm
-    (azure-cli.withExtensions [
-      azure-cli.extensions.containerapp
-    ])
-    nh
-    todo-txt-cli
-    age
   ];
 
   programs.home-manager.enable = true;

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";
 }

hosts/wsl/configuration.nix

@@ -11,7 +11,7 @@
   ...
 }: {
   imports = [
-    inputs.home-manager.nixosModules.default
+    ../../modules/common/common.nix
     ../../modules/nixos/user.nix
     ../../modules/nixos/postgres.nix
     ../../modules/nixos/podman.nix
@@ -37,20 +37,7 @@
     dconf
   ];
 
-  nixpkgs.config.allowUnfree = true;
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
   programs.nix-ld.enable = true;
 
-  home-manager = {
-    extraSpecialArgs = {inherit inputs;};
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users = {
-      mthomson = import ./home.nix;
-    };
-  };
-
   system.stateVersion = "24.11";
 }