Change configuration structure for second device

flake.nix

@@ -9,10 +9,23 @@
 
   outputs = inputs@{ nixpkgs, home-manager, ... }: {
     nixosConfigurations = {
-      itachi = nixpkgs.lib.nixosSystem {
+      pc = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./configuration.nix
+          ./nixos-configurations/pc
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+            };
+          }
+        ];
+      };
+      laptop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./nixos-configurations/laptop
           home-manager.nixosModules.home-manager
           {
             home-manager = {

nixos-configurations/laptop/default.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../shared.nix
+    ];
+
+    networking.hostName = "laptop";
+}

nixos-configurations/pc/default.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [
+      ./hardware-configuration.nix
+      ../shared.nix
+    ];
+
+    services.xserver.windowManager.i3.extraSessionCommands = "xrandr --output DP-0 --left-of DP-4 --mode 1920x1080 --rate 144 --output DP-4 --mode 1920x1080 --rate 144";
+
+    networking.hostName = "pc";
+}
+

nixos-configurations/shared.nix

@@ -1,11 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-    ];
-
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
@@ -13,8 +8,6 @@
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  networking.hostName = "itachi";
-
   time.timeZone = "Europe/Amsterdam";
 
   services = {
@@ -23,7 +16,6 @@
       videoDrivers = [ "nvidia" ];
       windowManager.i3 = {
         enable = true;
-        extraSessionCommands = "xrandr --output DP-0 --left-of DP-4 --mode 1920x1080 --rate 144 --output DP-4 --mode 1920x1080 --rate 144";
       };
     };
     pipewire = {
@@ -86,6 +78,9 @@
     services.flameshot.enable = true;
     home = {
       stateVersion = "22.11";
+      packages = with pkgs; [
+        zoom-us
+      ];
     };
   };