1 files changed, 55 insertions, 62 deletions
diff --git a/nixos/machine/ridcully.nix b/nixos/machine/ridcully.nix
index d16cdb2..f4af643 100644
--- a/nixos/machine/ridcully.nix
+++ b/nixos/machine/ridcully.nix
@@ -1,79 +1,72 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
+{lib, ...}: let
   inherit (lib) mkDefault;
 in {
-  config = {
-    deploy.enable = true;
+  deploy.enable = true;
 
-    cynerd = {
-      desktop.enable = true;
-      develop = true;
-      gaming = true;
-      openvpn = {
-        elektroline = true;
-      };
+  cynerd = {
+    desktop.enable = true;
+    develop = true;
+    gaming = true;
+    openvpn = {
+      elektroline = true;
     };
+  };
 
-    boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage"];
-    boot.kernelModules = ["kvm-amd"];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage"];
+  boot.kernelModules = ["kvm-amd"];
 
-    hardware.cpu.amd.updateMicrocode = true;
-    services.hardware.openrgb.motherboard = "amd";
+  hardware.cpu.amd.updateMicrocode = true;
+  services.hardware.openrgb.motherboard = "amd";
 
-    cynerd.autounlock = {
-      "encroot" = "/dev/disk/by-uuid/bc7d2ba4-6e04-4c49-b40c-3aecd1a86c71";
-      "enchdd" = "/dev/disk/by-uuid/7fee3cda-efa0-47cd-8832-fdead9a7e6db";
+  cynerd.autounlock = {
+    "encroot" = "/dev/disk/by-uuid/bc7d2ba4-6e04-4c49-b40c-3aecd1a86c71";
+    "enchdd" = "/dev/disk/by-uuid/7fee3cda-efa0-47cd-8832-fdead9a7e6db";
+  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/mapper/encroot";
+      fsType = "btrfs";
+      options = ["compress=lzo" "subvol=@nix"];
     };
-    fileSystems = {
-      "/" = {
-        device = "/dev/mapper/encroot";
-        fsType = "btrfs";
-        options = ["compress=lzo" "subvol=@nix"];
-      };
-      "/home" = {
-        device = "/dev/mapper/encroot";
-        fsType = "btrfs";
-        options = ["compress=lzo" "subvol=@home"];
-      };
-      "/boot" = {
-        device = "/dev/disk/by-uuid/6DAD-3819";
-        fsType = "vfat";
-      };
-
-      "/home2" = {
-        device = "/dev/mapper/enchdd";
-        fsType = "btrfs";
-        options = ["compress=lzo" "subvol=@home"];
-      };
+    "/home" = {
+      device = "/dev/mapper/encroot";
+      fsType = "btrfs";
+      options = ["compress=lzo" "subvol=@home"];
     };
-    services.btrfs.autoScrub = {
-      enable = true;
-      fileSystems = ["/" "/home2"];
+    "/boot" = {
+      device = "/dev/disk/by-uuid/6DAD-3819";
+      fsType = "vfat";
     };
 
-    #networking.vlans."enp6s0.adm" = {
-    #id = 2;
-    #interface = "enp6s0";
-    #};
+    "/home2" = {
+      device = "/dev/mapper/enchdd";
+      fsType = "btrfs";
+      options = ["compress=lzo" "subvol=@home"];
+    };
+  };
+  services.btrfs.autoScrub = {
+    enable = true;
+    fileSystems = ["/" "/home2"];
+  };
 
-    services.syncthing = {
-      enable = true;
-      user = mkDefault "cynerd";
-      group = mkDefault "cynerd";
-      openDefaultPorts = true;
+  #networking.vlans."enp6s0.adm" = {
+  #id = 2;
+  #interface = "enp6s0";
+  #};
 
-      overrideDevices = false;
-      overrideFolders = false;
+  services.syncthing = {
+    enable = true;
+    user = mkDefault "cynerd";
+    group = mkDefault "cynerd";
+    openDefaultPorts = true;
 
-      dataDir = "/home/cynerd";
-      configDir = "/home/cynerd/.config/syncthing";
-    };
+    overrideDevices = false;
+    overrideFolders = false;
 
-    # Force nix to use less jobs
-    nix.settings.max-jobs = 8;
+    dataDir = "/home/cynerd";
+    configDir = "/home/cynerd/.config/syncthing";
   };
+
+  # Force nix to use less jobs
+  nix.settings.max-jobs = 8;
 }