Clean up

systems/yokai/default.nix

@@ -1,16 +1,10 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      # Include the results of the hardware scan.
-      ./hardware.nix
-    ];
+  imports = [ ./hardware.nix ];
 
   jopejoe1 = {
-    audio = {
-      enable = true;
-    };
+    audio = { enable = true; };
     bluetooth.enable = true;
     local.enable = true;
     nix.enable = true;
@@ -20,75 +14,22 @@
     root.enable = true;
   };
 
-  networking.hostName = "yokai";
-  networking.hostId = "af13bbec";
-
-  boot.supportedFilesystems = [ "ntfs" "btrfs" "zfs" ];
-
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-
-  hardware.opengl.enable = true;
-
-  networking.networkmanager.enable = true;
-
-  networking.networkmanager.ensureProfiles.profiles = {
-    "37C3" = {
-      connection = {
-        id = "37C3";
-        type = "wifi";
-        interface-name = "wlan0";
-      };
-      wifi = {
-        mode = "infrastructure";
-        ssid = "37C3";
-      };
-      wifi-security = {
-        auth-alg = "open";
-        key-mgmt = "wpa-eap";
-      };
-      "802-1x" = {
-        anonymous-identity = "37C3";
-        eap = "ttls;";
-        identity = "37C3";
-        password = "37C3";
-        phase2-auth = "mschapv2";
-      };
-      ipv4 = {
-        method = "auto";
-      };
-      ipv6 = {
-        addr-gen-mode = "default";
-        method = "auto";
-      };
-    };
+  networking = {
+    hostName = "yokai";
+    hostId = "af13bbec";
   };
 
+  hardware.opengl.enable = true;
 
   time.timeZone = "Europe/Berlin";
 
   environment.systemPackages = with pkgs; [
-    git
-
-    # Theming
     catppuccin-kvantum
     catppuccin-kde
     catppuccin-gtk
     tela-icon-theme
-
-    # Fonts
-    #google-fonts
-    noto-fonts
-    noto-fonts-emoji
-    noto-fonts-cjk-sans
-    noto-fonts-cjk-serif
-    noto-fonts-emoji-blob-bin
-    #nerdfonts
-    #league-of-moveable-type
-    twitter-color-emoji
   ];
 
-  services.flatpak.enable = true;
-
   programs = {
     droidcam.enable = true;
     dconf.enable = true;
@@ -99,15 +40,16 @@
     enable = true;
     keyMap = "us";
   };
-  services.xserver = {
-    layout = "us";
-  };
+  services.xserver = { layout = "us"; };
 
-  boot.loader = {
-    grub.enable = false;
-    generic-extlinux-compatible.enable = true;
-    systemd-boot.configurationLimit = 10;
-    systemd-boot.editor = false;
+  boot = {
+    supportedFilesystems = [ "ntfs" "btrfs" "zfs" ];
+    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    loader = {
+      generic-extlinux-compatible.enable = true;
+      systemd-boot.configurationLimit = 10;
+      systemd-boot.editor = false;
+    };
   };
 }
 

systems/yokai/hardware.nix

@@ -4,26 +4,25 @@
 { lib, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ "usbhid" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/NIXBOOT";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/NIXBOOT";
+    fsType = "vfat";
+  };
 
-  swapDevices = [ {
+  swapDevices = [{
     device = "/var/lib/swapfile";
-    size = (4*1024)+(2*1024);
-  } ];
+    size = (4 * 1024) + (2 * 1024);
+  }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's