milieu: refactor

machines/hackens-milieu/_configuration.nix

@@ -9,24 +9,26 @@
     [
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./shared-hackens
+      ./aarch64.nix
+      ./audio.nix
+      ./dns
+      ./gnome.nix
+      ./i18n.nix
+      ./no-sleep.nix
+      ./programs.nix
+      ./system.nix
+      ./users.nix
+      ./vim.nix
     ];
 
-  # Use the GRUB 2 boot loader.
+  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub.enable = true;
+  boot.loader.systemd-boot = {
-  boot.loader.grub.version = 2;
+    enable = true;
-  boot.loader.grub.efiSupport = true;
+  };
-  boot.loader.grub.efiInstallAsRemovable = true;
   boot.loader.efi.efiSysMountPoint = "/boot";
-  boot.loader.grub.device = "nodev"; # or "nodev" for efi only
-  boot.loader.grub.configurationLimit = 2;
 
   networking.hostName = "hackens-milieu"; # Define your hostname.
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = [
-  ];
-
   # 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.

machines/hackens-milieu/default.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }: {
+  imports = [
+  ];
+}

machines/hackens-milieu/shared-hackens/default.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  imports = [
-    ./aarch64.nix
-    ./audio.nix
-    ./dns
-    ./gnome.nix
-    ./i18n.nix
-    ./no-sleep.nix
-    ./programs.nix
-    ./system.nix
-    ./users.nix
-    ./vim.nix
-  ];
-}

machines/hackens-milieu/users.nix

@@ -5,6 +5,7 @@ let
     ../../../pubkeys/gdd.keys
     ../../../pubkeys/BiBi.keys
     ../../../pubkeys/sinavir.keys
+    ../../../pubkeys/soyouzpanda.keys
   ];
 in
 {