From 8b5dbd9d92a99e055344e2856e41796322ee05fd Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Fri, 26 Apr 2024 11:37:53 +0200
Subject: [PATCH 1/2] clean up devices

---
 systems/raspberry4/default.nix     | 13 +------------
 systems/sukuna-biko-na/default.nix | 14 --------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/systems/raspberry4/default.nix b/systems/raspberry4/default.nix
index 8cdbf6a..6efac2c 100644
--- a/systems/raspberry4/default.nix
+++ b/systems/raspberry4/default.nix
@@ -33,22 +33,11 @@
 
   #hardware.raspberry-pi."4".fkms-3d.enable = true;
 
-  jopejoe1 = {
-    bluetooth.enable = true;
-    local.enable = true;
-    nix.enable = true;
-    user = {
-      jopejoe1.enable = true;
-      root.enable = true;
-    };
-    ssh.enable = true;
-  };
-
   networking = {
     useDHCP = lib.mkDefault true;
   };
 
-  services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
+  #services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
 
   powerManagement.cpuFreqGovernor = "ondemand";
 }
diff --git a/systems/sukuna-biko-na/default.nix b/systems/sukuna-biko-na/default.nix
index 9b5b360..f62b7ef 100644
--- a/systems/sukuna-biko-na/default.nix
+++ b/systems/sukuna-biko-na/default.nix
@@ -27,20 +27,6 @@
 
   hardware.raspberry-pi."4".fkms-3d.enable = true;
 
-  jopejoe1 = {
-    audio.enable = true;
-    bluetooth.enable = true;
-    local.enable = true;
-    nix.enable = true;
-    kodi.enable = true;
-    plasma.enable = true;
-    user = {
-      jopejoe1.enable = true;
-      root.enable = true;
-    };
-    ssh.enable = true;
-  };
-
   networking = {
     useDHCP = lib.mkDefault true;
   };

From 59ddf06cd6f58f1523ff5f4189fc4b39ba61763c Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Fri, 26 Apr 2024 11:39:56 +0200
Subject: [PATCH 2/2] use system type as host

---
 systems.nix                                   | 4 ++--
 systems/{raspberry4 => pi4}/default.nix       | 0
 systems/{sukuna-biko-na => pi400}/default.nix | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename systems/{raspberry4 => pi4}/default.nix (100%)
 rename systems/{sukuna-biko-na => pi400}/default.nix (100%)

diff --git a/systems.nix b/systems.nix
index f3bdcdb..7d466dd 100644
--- a/systems.nix
+++ b/systems.nix
@@ -111,6 +111,6 @@ let
     };
 in
 {
-  sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na";
-  raspberry4 = mkSystem "aarch64-unknown-linux-gnu" "raspberry4";
+  pi400 = mkSystem "aarch64-unknown-linux-gnu" "pi400";
+  pi4 = mkSystem "aarch64-unknown-linux-gnu" "pi4";
 }
diff --git a/systems/raspberry4/default.nix b/systems/pi4/default.nix
similarity index 100%
rename from systems/raspberry4/default.nix
rename to systems/pi4/default.nix
diff --git a/systems/sukuna-biko-na/default.nix b/systems/pi400/default.nix
similarity index 100%
rename from systems/sukuna-biko-na/default.nix
rename to systems/pi400/default.nix