new machineHEADmaster

4 files changed, 7 insertions, 43 deletions

diff --git a/config/boot.nix b/config/boot.nix
index 0cbef3b..65bc035 100644
--- a/config/boot.nix
+++ b/config/boot.nix
@@ -1,6 +1,4 @@
-{...}: {
-  personal.boot = {
-    grub.enable = true;
-    efi.enable = true;
-  };
+{ ... }: {
+  personal.boot.grub.enable = true;
+  boot.loader.grub.device = "/dev/disk/by-id/nvme-SAMSUNG_MZVLB512HAJQ-00000_S3W8NX0M170652";
 }
diff --git a/config/hardware/default.nix b/config/hardware/default.nix
index 292d94c..cfcd1ab 100644
--- a/config/hardware/default.nix
+++ b/config/hardware/default.nix
@@ -1,13 +1,7 @@
 {
   nixos-hardware,
-  pkgs,
   ...
 }:
-let
-  # usage:
-  # blankscreen {force, poke}
-  blankscreen = "setterm -term linux -blank </dev/tty1";
-in
 {
   imports = [
     # Include the results of the hardware scan.
@@ -21,28 +15,9 @@ in
 
   personal.hardware = {
     usb.enable = false;
-    disks.crypted = "/dev/disk/by-uuid/29fa7cc7-e8ca-4f9f-bd3d-46475ede48e2";
+    disks.crypted = "/dev/disk/by-uuid/c02cc407-a55f-41d3-96f7-37c7013c51a7";
     firmwareNonFree.enable = true;
     keyboard.keyMap = "fr";
     sound.enable = false;
   };
-
-  environment.shellAliases = { inherit blankscreen; };
-  systemd = {
-    suppressedSystemUnits = [ "systemd-backlight@.service" ];
-    services.blankscreen = {
-      description = "Shut down screen";
-      path = [ pkgs.util-linux ];
-      script = ''
-        ${blankscreen} force
-      '';
-      wantedBy = [ "default.target" ];
-      after = [ "multi-user.target" ];
-    };
-  };
-
-  services.cron = {
-    enable = true;
-    systemCronJobs = [ "0 * * * * ping -c 1 192.168.1.1 && blankscreen force || blankscreen poke" ];
-  };
 }
diff --git a/config/hardware/hardware-configuration.nix b/config/hardware/hardware-configuration.nix
index e2287cf..bc205f0 100644
--- a/config/hardware/hardware-configuration.nix
+++ b/config/hardware/hardware-configuration.nix
@@ -13,10 +13,10 @@
   boot.initrd.availableKernelModules = [
     "xhci_pci"
     "ahci"
+    "nvme"
     "usbhid"
     "usb_storage"
     "sd_mod"
-    "rtsx_pci_sdmmc"
   ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
@@ -28,7 +28,7 @@
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/766A-3450";
+    device = "/dev/disk/by-uuid/CC58-3E09";
     fsType = "vfat";
     options = [
       "fmask=0022"
diff --git a/config/networking.nix b/config/networking.nix
index 0fcf448..9c449d0 100644
--- a/config/networking.nix
+++ b/config/networking.nix
@@ -8,16 +8,7 @@
 
   networking = {
     hostName = "hephaistos";
-    domain = "local";
-
-    wireless = {
-      enable = true;
-      secretsFile = "/etc/wpa_supplicant/secrets"; # -r-xr-x--- 1 root wpa_supplicant
-      networks.Quentintranet = {
-        authProtocols = [ "SAE" ];
-        pskRaw = "ext:psk";
-      };
-    };
+    domain = "aristote.fr";
   };
 
   services.resolved = {