chore: cleanup old code

hosts/hazel/default.nix

@@ -8,7 +8,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    # ./disko.nix
+    ./disko.nix
     ./../../modules/core/default.server.nix
     # ./../../modules/services/hazel.nix
   ];

hosts/hazel/disko.nix

@@ -9,17 +9,12 @@
         device = "/dev/sda";
         type = "disk";
         content = {
-          type = "mbr";
+          type = "gpt";
           partitions = {
-            ESP = {
+            boot = {
-              type = "EF00";
+              size = "1M";
-              size = "500M";
+              type = "EF02";
-              content = {
+              priority = 1;
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
             };
             root = {
               size = "100%";

hosts/hazel/hardware-configuration.nix

@@ -24,21 +24,21 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  # fileSystems."/" = {
-    device = "/dev/disk/by-uuid/864dfbec-81f0-460f-b970-27693a0ad0e6";
+  #   device = "/dev/disk/by-uuid/864dfbec-81f0-460f-b970-27693a0ad0e6";
-    fsType = "ext4";
+  #   fsType = "ext4";
-  };
+  # };
 
-  fileSystems."/boot" = {
+  # fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/E141-F5CE";
+  #   device = "/dev/disk/by-uuid/E141-F5CE";
-    fsType = "vfat";
+  #   fsType = "vfat";
-    options = [
+  #   options = [
-      "fmask=0077"
+  #     "fmask=0077"
-      "dmask=0077"
+  #     "dmask=0077"
-    ];
+  #   ];
-  };
+  # };
 
-  swapDevices = [ ];
+  # swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

modules/home/packages.nix

@@ -5,44 +5,8 @@
   config,
   ...
 }:
-with lib;
-let
-  guiPkgs =
-    if (config.liv.gui == true) then
-      [
-        element-desktop
-        gajim
-        signal-desktop
-        anki-bin
-        obs-studio
-        wdisplays
-        librewolf # main
-        ungoogled-chromium # for things that don't work with librewolf
-        nsxiv
-        imv
-        libreoffice
-        xfce.thunar
-        spotify
-        spotify-player
-        thunderbird
-        lxqt.pavucontrol-qt
-        mpv
-        plasma5Packages.kdeconnect-kde
-        winbox
-        # onthespot-overlay
-
-        # Gaming
-        lunar-client
-      ]
-    else
-      [
-        killall
-      ];
-in
 {
-  home.packages =
+  home.packages = with pkgs; [
-    with pkgs;
-    [
     # Environment shit
     tesseract
     yubikey-touch-detector
@@ -123,6 +87,5 @@ in
     khard
     khal
     vdirsyncer
-    ]
+  ];
-    ++ guiPkgs;
 }

modules/services/nginx.nix

@@ -37,24 +37,6 @@
     recommendedProxySettings = true;
     clientMaxBodySize = lib.mkDefault "10G";
 
-    #defaultListen =
-    #  let
-    #    listen = [
-    #      {
-    #        addr = "[::]";
-    #        port = 80;
-    #        extraParameters = [ "proxy_protocol" ];
-    #      }
-    #      {
-    #        addr = "[::]";
-    #        port = 443;
-    #        ssl = true;
-    #        extraParameters = [ "proxy_protocol" ];
-    #      }
-    #    ];
-    #  in
-    #  map (x: (x // { addr = "0.0.0.0"; })) listen ++ listen;
-
     # Hardened TLS and HSTS preloading
     appendHttpConfig = ''
       # Proxying

roles/gui.nix

@@ -21,5 +21,31 @@ in
       gnome.gnome-keyring.enable = true;
       dbus.enable = true;
     };
+
+    home-manager.users.${username}.home.packages = with pkgs; [
+      element-desktop
+      gajim
+      signal-desktop
+      anki-bin
+      obs-studio
+      wdisplays
+      librewolf # main
+      ungoogled-chromium # for things that don't work with librewolf
+      nsxiv
+      imv
+      libreoffice
+      xfce.thunar
+      spotify
+      spotify-player
+      thunderbird
+      lxqt.pavucontrol-qt
+      mpv
+      plasma5Packages.kdeconnect-kde
+      winbox
+      # onthespot-overlay
+
+      # Gaming
+      lunar-client
+    ];
   };
 }