From 16f931782e368a71057bbed344ca2f02265487c5 Mon Sep 17 00:00:00 2001
From: m3tam3re <m@m3tam3re.com>
Date: Tue, 18 Jul 2023 12:52:40 +0000
Subject: [PATCH] m3-r1

---
 hosts/m3-r1/default.nix                |  4 ++--
 hosts/m3-r1/hardware-configuration.nix | 22 ++++++++--------------
 hosts/m3-r1/services/traefik.nix       |  7 -------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/hosts/m3-r1/default.nix b/hosts/m3-r1/default.nix
index 6cd0b0a..6f6a71a 100644
--- a/hosts/m3-r1/default.nix
+++ b/hosts/m3-r1/default.nix
@@ -6,8 +6,8 @@
     ./services
   ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   services.openssh.enable = true;
   services.openssh.settings.PasswordAuthentication = false;
diff --git a/hosts/m3-r1/hardware-configuration.nix b/hosts/m3-r1/hardware-configuration.nix
index aa4baa7..6afcb4f 100644
--- a/hosts/m3-r1/hardware-configuration.nix
+++ b/hosts/m3-r1/hardware-configuration.nix
@@ -8,39 +8,34 @@
     [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6f25ddea-6022-4663-9f5d-58b383de7e52";
+    { device = "/dev/disk/by-uuid/5e3a0875-005c-49c4-9dbf-86e471e7e881";
       fsType = "btrfs";
-      options = [ "subvol=root" ];
+      options = [ "subvol=root" "compress=zstd" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/6f25ddea-6022-4663-9f5d-58b383de7e52";
+    { device = "/dev/disk/by-uuid/5e3a0875-005c-49c4-9dbf-86e471e7e881";
       fsType = "btrfs";
-      options = [ "subvol=home" ];
+      options = [ "subvol=home" "compress=zstd" ];
     };
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/6f25ddea-6022-4663-9f5d-58b383de7e52";
+    { device = "/dev/disk/by-uuid/5e3a0875-005c-49c4-9dbf-86e471e7e881";
       fsType = "btrfs";
-      options = [ "subvol=nix" ];
+      options = [ "subvol=nix" "compress=zstd" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2550-EF31";
+    { device = "/dev/disk/by-uuid/A79C-4B9F";
       fsType = "vfat";
     };
 
-  fileSystems."/var/backup" =
-    { device = "46.38.248.210:/voln527829a1";
-      fsType = "nfs";
-    };
-
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -51,5 +46,4 @@
   # networking.interfaces.ens3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/m3-r1/services/traefik.nix b/hosts/m3-r1/services/traefik.nix
index 2c5649b..7b6aa73 100644
--- a/hosts/m3-r1/services/traefik.nix
+++ b/hosts/m3-r1/services/traefik.nix
@@ -4,13 +4,6 @@
     staticConfigOptions = {
       log = { level = "WARN"; };
       certificatesResolvers = {
-        godaddy = {
-          acme = {
-            email = "dev@lanakk.com";
-            storage = "/var/lib/traefik/acme.json";
-            dnsChallenge = { provider = "godaddy"; };
-          };
-        };
         lets-encrypt = {
           acme = {
             email = "acc@m3tam3re.com";