From 7b35953772a7aea9fda7bc897674f03acb31dd45 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 31 Mar 2023 13:14:35 +0100
Subject: [PATCH] Add laptop nix config, move H0615 home setup to common ukaea
 home setup to be shared across both devices

---
 nixos/H0615-elitherl.nix                      |  2 +-
 nixos/J0162-elitherl.nix                      | 26 +++++++++++++++++++
 ...{H0615-elitherl.nix => ukaea-elitherl.nix} |  0
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 nixos/J0162-elitherl.nix
 rename nixos/home-manager/{H0615-elitherl.nix => ukaea-elitherl.nix} (100%)

diff --git a/nixos/H0615-elitherl.nix b/nixos/H0615-elitherl.nix
index cbd9611f..515b71bf 100644
--- a/nixos/H0615-elitherl.nix
+++ b/nixos/H0615-elitherl.nix
@@ -22,7 +22,7 @@
   services.xserver.displayManager.autoLogin.user = "elitherl";
 
   # Set up home manager for user
-  home-manager.users.elitherl = import ./home-manager/H0615-elitherl.nix;
+  home-manager.users.elitherl = import ./home-manager/ukaea-elitherl.nix;
 
   #services.jupyter = {
   #  enable = true;
diff --git a/nixos/J0162-elitherl.nix b/nixos/J0162-elitherl.nix
new file mode 100644
index 00000000..aae252b6
--- /dev/null
+++ b/nixos/J0162-elitherl.nix
@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./common.nix
+    ./locales/en_GB.nix
+    ./desktop/plasma.nix
+  ];
+
+  networking.hostName = "J0162"; # Define your hostname.
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.elitherl = {
+    isNormalUser = true;
+    description = "Evie Litherland-Smith";
+    extraGroups = [ "networkmanager" "wheel" ];
+    shell = pkgs.fish;
+  };
+
+  # Enable automatic login for the user.
+  services.xserver.displayManager.autoLogin.enable = true;
+  services.xserver.displayManager.autoLogin.user = "elitherl";
+
+  # Set up home manager for user
+  home-manager.users.elitherl = import ./home-manager/ukaea-elitherl.nix;
+}
diff --git a/nixos/home-manager/H0615-elitherl.nix b/nixos/home-manager/ukaea-elitherl.nix
similarity index 100%
rename from nixos/home-manager/H0615-elitherl.nix
rename to nixos/home-manager/ukaea-elitherl.nix