Refactor structure

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/elara/default.nix

@@ -2,14 +2,15 @@
 {
   imports = [
     ../../lib
+
     inputs.disko.nixosModules.disko
     (import ./format.nix {
       device = "/dev/disk/by-id/ata-Samsung_SSD_990_EVO_1TB_S7GCNL0XA04998F";
     })
-    ./hardware.nix
+    ./hardware
     # elara runs on an external drive on eirene
-    ../eirene/hardware.nix
-    ../eirene/display.nix
+    ../eirene/hardware
+
     ../common/configs/system/bluetooth
     ../common/configs/system/boot
     ../common/configs/system/brightnessctl
@@ -47,36 +48,17 @@
     ../common/configs/system/users
     ../common/configs/system/wget
     ../common/configs/system/zsh
-    ./configs/system/globalprotect-remote-connect
+
+    ./configs/git
+    ./configs/globalprotect-remote-connect
+
     ./users/nikara
   ];
 
   networking.hostName = "elara";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  sops = {
-    defaultSopsFile = ./secrets/secrets.yaml;
-
-    # Required for building private SAS packages
-    secrets."ssh/sas/git/key" = {
-      sopsFile = ../../secrets/sas/secrets.yaml;
-      path = "/root/.ssh/ssh_git_sas_ed25519_key";
-    };
-  };
-
-  programs.ssh.extraConfig = ''
-    Host github.com
-      User git
-      HostName github.com
-      IdentityFile /root/.ssh/ssh_git_sas_ed25519_key
-      StrictHostKeyChecking no
-
-    Host gitlab.sas.com
-      User git
-      HostName gitlab.sas.com
-      IdentityFile /root/.ssh/ssh_git_sas_ed25519_key
-      StrictHostKeyChecking no
-  '';
+  sops.defaultSopsFile = ./secrets/secrets.yaml;
 
   environment.impermanence.device =
     config.disko.devices.disk.usb.content.partitions.root.content.name;