Organize configuration better

nixos-configurations/laptop/default.nix

@@ -1,30 +1,26 @@
 { inputs, pkgs, ... }:
-
 {
   imports = [
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480s
     ./hardware-configuration.nix
-    ../shared-desktop.nix
-    ../shared.nix
+
+    ../../modules/core.nix
+    ../../modules/desktop.nix
+    ../../modules/development.nix
+    ../../modules/home.nix
+    ../../modules/media.nix
   ];
 
   networking.hostName = "laptop";
 
-  boot.initrd = {
-    luks.devices = {
-      cryptroot = {
-        device = "/dev/disk/by-uuid/f1b5a08f-e515-4fba-b3f4-2a1091063cdc";
-      };
-    };
+  boot.initrd.luks.devices.cryptroot = {
+    device = "/dev/disk/by-uuid/f1b5a08f-e515-4fba-b3f4-2a1091063cdc";
+  };
+
+  home-manager.users.thiloho = {
+    programs.git.signing.key = "3B62137A89493F7D";
+    home.stateVersion = "24.11";
   };
 
-  home-manager.users.thiloho =
-    { pkgs, ... }:
-    {
-      programs.git.signing.key = "3B62137A89493F7D";
-      home = {
-        stateVersion = "24.11";
-      };
-    };
   system.stateVersion = "24.11";
 }

nixos-configurations/laptop/hardware-configuration.nix

@@ -1,32 +1,47 @@
 # 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, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/8c24d51b-f02d-4c0c-9894-50b4209cf8c0";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/8c24d51b-f02d-4c0c-9894-50b4209cf8c0";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/222F-191E";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/c6a47a90-a892-43c0-82e2-74b489aabc17"; }
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/222F-191E";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/c6a47a90-a892-43c0-82e2-74b489aabc17"; }
+  ];
 
   # 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