Move necessary env variable to laptop only

nixos-configurations/laptop/default.nix

@@ -1,38 +1,41 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../shared.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ../shared.nix
+  ];
 
-    networking.hostName = "laptop";
+  environment.variables = {
+    TERMINAL = "alacritty";
+  };
 
-    services.xserver = {
+  networking.hostName = "laptop";
+
+  services.xserver = {
+    enable = true;
+    windowManager.i3 = {
       enable = true;
-      windowManager.i3 = {
-        enable = true;
+    };
+    libinput.enable = true;
+    videoDrivers = [ "modesetting" "nvidia" ];
+  };
+
+  hardware = {
+    bluetooth.enable = true;
+    firmware = [ pkgs.broadcom-bt-firmware ];
+  };
+
+  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+
+  home-manager.users.thiloho = { pkgs, ... }: {
+    programs.git = {
+      signing = {
+        key = "86C465C22C8A4D56";
       };
-      libinput.enable = true;
-      videoDrivers = [ "modesetting" "nvidia" ];
-    };
-
-    hardware = {
-      bluetooth.enable = true;
-      firmware = [ pkgs.broadcom-bt-firmware ];
-    };
-
-    boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-
-    home-manager.users.thiloho = { pkgs, ... }: {
-      programs.git = {
-        signing = {
-          key = "86C465C22C8A4D56";
-        };
-      };
-      home.packages = with pkgs; [
-        arduino
-      ];
     };
+    home.packages = with pkgs; [
+      arduino
+    ];
+  };
 }

nixos-configurations/pc/default.nix

@@ -1,34 +1,33 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../shared.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ../shared.nix
+  ];
 
-    networking.hostName = "pc";
+  networking.hostName = "pc";
 
-    services.xserver = {
+  services.xserver = {
+    enable = true;
+    displayManager.gdm.enable = true;
+  };
+
+  programs.sway.enable = true;
+
+  home-manager.users.thiloho = { pkgs, ... }: {
+    wayland.windowManager.sway = {
       enable = true;
-      displayManager.gdm.enable = true;
-    };
-
-    programs.sway.enable = true;
-
-    home-manager.users.thiloho = { pkgs, ... }: {
-      wayland.windowManager.sway = {
-        enable = true;
-        config = {
-          modifier = "Mod1";
-          terminal = "alacritty";
-        };
-      };
-      programs.git = {
-        signing = {
-          key = "29791D54E85BEE9E";
-        };
+      config = {
+        modifier = "Mod1";
+        terminal = "alacritty";
       };
     };
+    programs.git = {
+      signing = {
+        key = "29791D54E85BEE9E";
+      };
+    };
+  };
 }
 

nixos-configurations/shared.nix

@@ -34,10 +34,6 @@
   sound.enable = true;
   security.rtkit.enable = true;
 
-  environment.variables = {
-    TERMINAL = "alacritty";
-  };
-
   fonts.fonts = with pkgs; [
     noto-fonts-cjk-sans
   ];