From 8d9c36d0e579d22899ca4712b24716eede28b227 Mon Sep 17 00:00:00 2001
From: Victor <victor@xirion.net>
Date: Thu, 1 Jun 2023 09:14:53 +0200
Subject: [PATCH] changes

---
 flake.nix                                     | 20 -------------------
 nixos/common/desktop/default.nix              |  2 ++
 nixos/common/desktop/home.nix                 |  2 ++
 nixos/hosts/olympus/eevee/hardware.nix        |  1 -
 .../olympus/mailserver/configuration.nix      |  2 +-
 nixos/hosts/thalassa/null/configuration.nix   |  1 -
 nixos/templates/iso-graphical.nix             | 13 ------------
 nixos/templates/iso.nix                       | 12 -----------
 nixos/templates/proxmox-vm.nix                |  2 +-
 9 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 nixos/templates/iso-graphical.nix
 delete mode 100644 nixos/templates/iso.nix

diff --git a/flake.nix b/flake.nix
index 98f81d5..9edbb12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -100,32 +100,12 @@
 
         default = colmena.packages.${system}.colmena;
 
-        iso = nixos-generators.nixosGenerate {
-          inherit system pkgs;
-          format = "install-iso";
-          modules = [ (import ./nixos/templates/iso.nix) ];
-        };
-
-        iso-graphical = nixos-generators.nixosGenerate {
-          inherit system pkgs;
-          format = "install-iso";
-          modules = [ (import ./nixos/templates/iso-graphical.nix) ];
-        };
-
         proxmox-lxc = nixos-generators.nixosGenerate {
           inherit pkgs;
           format = "proxmox-lxc";
           modules = util.base_imports
             ++ [ (import ./nixos/templates/proxmox-lxc.nix) ];
         };
-
-        # Broken
-        # proxmox-vm = nixos-generators.nixosGenerate {
-        #   inherit system pkgs;
-        #   format = "proxmox";
-        #   modules = util.base_imports
-        #     ++ [ (import ./nixos/templates/proxmox-vm.nix) ];
-        # };
       };
 
       # Use by running `nix develop`
diff --git a/nixos/common/desktop/default.nix b/nixos/common/desktop/default.nix
index 9a93dbe..49a2d90 100644
--- a/nixos/common/desktop/default.nix
+++ b/nixos/common/desktop/default.nix
@@ -14,6 +14,8 @@
     };
   };
 
+  hardware.keyboard.qmk.enable = true;
+
   # Enable my config for the gnome desktop environment
   services.v.gnome.enable = true;
 
diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix
index c575b57..b36249d 100644
--- a/nixos/common/desktop/home.nix
+++ b/nixos/common/desktop/home.nix
@@ -10,6 +10,7 @@ in {
     btop
     calibre
     celluloid
+    chromium
     element-desktop
     fusee-launcher
     gcc
@@ -29,6 +30,7 @@ in {
     tex
     unzip
     yt-dlp
+    qmk
   ];
 
   # Enable my own hm modules
diff --git a/nixos/hosts/olympus/eevee/hardware.nix b/nixos/hosts/olympus/eevee/hardware.nix
index 561c570..14ca765 100644
--- a/nixos/hosts/olympus/eevee/hardware.nix
+++ b/nixos/hosts/olympus/eevee/hardware.nix
@@ -26,7 +26,6 @@
   services.udev.packages = with pkgs; [
     android-udev-rules
     logitech-udev-rules
-    qmk-udev-rules
     wooting-udev-rules
   ];
 
diff --git a/nixos/hosts/olympus/mailserver/configuration.nix b/nixos/hosts/olympus/mailserver/configuration.nix
index 0872c14..edce9cb 100644
--- a/nixos/hosts/olympus/mailserver/configuration.nix
+++ b/nixos/hosts/olympus/mailserver/configuration.nix
@@ -28,7 +28,7 @@ in {
     enable = true;
     fqdn = "mail.0x76.dev";
     domains = [ "0x76.dev" "meowy.tech" ];
-    certificateScheme = 3;
+    certificateScheme = "acme-nginx";
 
     loginAccounts = {
       # People
diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix
index 4b40a89..0353209 100644
--- a/nixos/hosts/thalassa/null/configuration.nix
+++ b/nixos/hosts/thalassa/null/configuration.nix
@@ -237,7 +237,6 @@ in {
   services.udev.packages = with pkgs; [
     android-udev-rules
     logitech-udev-rules
-    qmk-udev-rules
     wooting-udev-rules
   ];
 
diff --git a/nixos/templates/iso-graphical.nix b/nixos/templates/iso-graphical.nix
deleted file mode 100644
index 4d92727..0000000
--- a/nixos/templates/iso-graphical.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, modulesPath, lib, ... }: {
-  imports = [
-    "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix"
-  ];
-
-  # use the latest Linux kernel
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  environment.systemPackages = with pkgs; [ git ];
-
-  # Needed for https://github.com/NixOS/nixpkgs/issues/58959
-  boot.supportedFilesystems = lib.mkForce [ "btrfs" "ext4" ];
-}
diff --git a/nixos/templates/iso.nix b/nixos/templates/iso.nix
deleted file mode 100644
index 48d7dc9..0000000
--- a/nixos/templates/iso.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, modulesPath, lib, ... }: {
-  imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
-
-  # use the latest Linux kernel
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  environment.systemPackages = with pkgs; [ git ];
-
-  # Needed for https://github.com/NixOS/nixpkgs/issues/58959
-  boot.supportedFilesystems =
-    lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
-}
diff --git a/nixos/templates/proxmox-vm.nix b/nixos/templates/proxmox-vm.nix
index 268bcc7..567090f 100644
--- a/nixos/templates/proxmox-vm.nix
+++ b/nixos/templates/proxmox-vm.nix
@@ -2,7 +2,7 @@
   imports = [ ../common/common.nix ../common/generic-vm.nix ];
 
   proxmox.qemuConf = {
-    virtio0 = "local-zsfs:vm-9999-disk-0";
+    virtio0 = "local-zfs:vm-9999-disk-0";
     cores = 1;
     memory = 1024;
     bios = "ovmf";