Group into blocks where applicable

Signed-off-by: Tristan Druyen <tristan@vault81.de>

configuration.nix

@@ -7,7 +7,7 @@
   ...
 }: {
   imports = [
-    ./hardware-configuration.nix
+    ./hardware.nix
   ];
 
   nix = {
@@ -62,14 +62,13 @@
     LC_TIME = "de_DE.UTF-8";
   };
 
-  services.xserver.enable = true;
-
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
   services.xserver = {
+    enable = true;
     layout = "us";
     xkbVariant = "";
+
+    displayManager.sddm.enable = true;
+    desktopManager.plasma5.enable = true;
   };
 
   services.printing.enable = true;
@@ -109,13 +108,12 @@
 
   environment.systemPackages = with pkgs; [
     curl
-    emacs
     fish
     git
     neovim
-    ripgrep
     vim
     virt-manager
+    wl-clipboard
     wget
   ];
 

flake.nix

@@ -28,7 +28,7 @@
     nixpkgs,
     tuxedo-nixos,
     nix-doom-emacs,
-    emacs-overlay
+    emacs-overlay,
   }: {
     nixosConfigurations = {
       nixos-pulse = nixpkgs.lib.nixosSystem {

hardware-configuration.nix

@@ -1,58 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = ["xhci_pci" "uas" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd" "amdgpu"];
-  boot.extraModulePackages = [];
-  services.xserver.videoDrivers = ["amdgpu"];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0";
-    fsType = "ext4";
-  };
-
-  boot.initrd.luks.devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B471-B193";
-    fsType = "vfat";
-  };
-
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";}
-  ];
-
-  # 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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
-  networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  hardware.opengl.driSupport = true;
-  hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd
-    rocm-opencl-runtime
-  ];
-
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  systemd.tmpfiles.rules = [
-    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.hip}"
-  ];
-}

hardware.nix

@@ -0,0 +1,68 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = ["xhci_pci" "uas" "sd_mod"];
+      kernelModules = [];
+
+      luks.devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102";
+    };
+
+    kernelModules = ["kvm-amd" "amdgpu"];
+    extraModulePackages = [];
+  };
+
+  services.xserver.videoDrivers = ["amdgpu"];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/B471-B193";
+      fsType = "vfat";
+    };
+  };
+
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";}
+  ];
+
+  networking = {
+    useDHCP = lib.mkDefault true;
+    interfaces.enp1s0.useDHCP = lib.mkDefault true;
+    interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+  };
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  hardware = {
+    opengl = {
+      driSupport = true;
+      driSupport32Bit = true;
+      extraPackages = with pkgs; [
+        rocm-opencl-icd
+        rocm-opencl-runtime
+      ];
+    };
+
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
+
+  systemd.tmpfiles.rules = [
+    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.hip}"
+  ];
+}