machines/hackens-milieu/_configuration.nix

@@ -9,26 +9,24 @@
     [
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./aarch64.nix
+      ./shared-hackens
-      ./audio.nix
-      ./dns
-      ./gnome.nix
-      ./i18n.nix
-      ./no-sleep.nix
-      ./programs.nix
-      ./system.nix
-      ./users.nix
-      ./vim.nix
     ];
 
-  boot.loader.efi.canTouchEfiVariables = true;
+  # Use the GRUB 2 boot loader.
-  boot.loader.systemd-boot = {
+  boot.loader.grub.enable = true;
-    enable = true;
+  boot.loader.grub.version = 2;
-  };
+  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

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

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

@@ -0,0 +1,14 @@
+{ 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/shared-hackens/users.nix

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

npins/sources.json

@@ -20,9 +20,9 @@
         "repo": "disko"
       },
       "branch": "master",
-      "revision": "502241afa3de2a24865ddcbe4c122f4546e32092",
+      "revision": "d07de570ba05cec2807d058daaa044f6955720c7",
-      "url": "https://github.com/nix-community/disko/archive/502241afa3de2a24865ddcbe4c122f4546e32092.tar.gz",
+      "url": "https://github.com/nix-community/disko/archive/d07de570ba05cec2807d058daaa044f6955720c7.tar.gz",
-      "hash": "0bm2x8zc81vnc4vcqwci0h9s21i8sw93mhsaznf0x70mhhg7j45w"
+      "hash": "18rli5h2xmzbbwambrcrg7r22vp0rmnjm55mcqc00n3fq5kscsqy"
     },
     "dns.nix": {
       "type": "GitRelease",
@@ -46,9 +46,9 @@
         "repo": "nixpkgs"
       },
       "branch": "nixos-unstable",
-      "revision": "2726f127c15a4cc9810843b96cad73c7eb39e443",
+      "revision": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
-      "url": "https://github.com/NixOS/nixpkgs/archive/2726f127c15a4cc9810843b96cad73c7eb39e443.tar.gz",
+      "url": "https://github.com/NixOS/nixpkgs/archive/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8.tar.gz",
-      "hash": "0109bpmax6nbfs2mpfw2axvk47lbvksgx3d0izrjjhw7fn41i9sh"
+      "hash": "08zzqp8aadgqr1sbdw46wlydmv2h8i068mlx37lr2r1qmx2schai"
     }
   },
   "version": 3