From 8110cd8d4fb4106bb4796fa9adde1217f323807c Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Tue, 21 Dec 2021 00:00:21 +0100
Subject: [PATCH] Refactored lisa

---
 machines/lisa/default.nix     | 52 ++++-------------------------------
 machines/lisa/hardware.nix    | 26 ++++++++++++++++++
 machines/lisa/home-julien.nix |  7 +++++
 3 files changed, 38 insertions(+), 47 deletions(-)
 create mode 100644 machines/lisa/hardware.nix
 create mode 100644 machines/lisa/home-julien.nix

diff --git a/machines/lisa/default.nix b/machines/lisa/default.nix
index 6b1bc67..9f58aec 100644
--- a/machines/lisa/default.nix
+++ b/machines/lisa/default.nix
@@ -7,68 +7,26 @@
   imports =
     [
       (modulesPath + "/profiles/qemu-guest.nix")
+      ./hardware.nix
+      ./home-julien.nix
     ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
- 
-  luj.hmgr.julien = {
-    luj.programs.neovim.enable = true;
-    luj.programs.git.enable = true;
-
- };
-
-
-
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/eaec3978-f462-4634-95e6-06d59512deb8";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/EAD2-51DB";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/c19ec918-ba8c-4bab-9ee0-831465cb432e"; }];
-
-  nix.maxJobs = lib.mkDefault 8;
-
-  # Specific to lisa but not hardware
-
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
   luj.mediaserver.enable = true;
   luj.homepage.enable = true;
-  networking.hostName = "lisa"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+ 
+  nix.maxJobs = lib.mkDefault 8;
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = false;
+  networking.hostName = "lisa"; # Define your hostname.
   networking.interfaces.ens18.useDHCP = true;
   networking.interfaces.ens19.useDHCP = false;
   networking.interfaces.ens19.ipv6.addresses = [{
     address = "2a01:e0a:5f9:9681:5880:c9ff:fe9f:3dfb";
     prefixLength = 120;
   }];
-
   networking.firewall.allowedTCPPorts = [ 22 80 443 8096 8920 ];
   networking.firewall.allowedUDPPorts = [ 22 80 443 1900 7359 ];
   networking.firewall.allowedUDPPortRanges = [{ from = 60000; to = 61000; }];
 
-
   system.stateVersion = "20.09"; # Did you read the comment?
 
-
-
-
 }
diff --git a/machines/lisa/hardware.nix b/machines/lisa/hardware.nix
new file mode 100644
index 0000000..ca680f6
--- /dev/null
+++ b/machines/lisa/hardware.nix
@@ -0,0 +1,26 @@
+{ pkgs, config, lib, ... }:
+{
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+ fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/eaec3978-f462-4634-95e6-06d59512deb8";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/EAD2-51DB";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/c19ec918-ba8c-4bab-9ee0-831465cb432e"; }];
+
+
+
+}
diff --git a/machines/lisa/home-julien.nix b/machines/lisa/home-julien.nix
new file mode 100644
index 0000000..41a3e3b
--- /dev/null
+++ b/machines/lisa/home-julien.nix
@@ -0,0 +1,7 @@
+{ pkgs, lib, config, ... }:
+{
+ luj.hmgr.julien = {
+    luj.programs.neovim.enable = true;
+    luj.programs.git.enable = true;
+  };
+}