Organize directories

hosts/default/configuration.nix

@@ -6,14 +6,10 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [ # Hardware-related
       ./hardware-configuration.nix
-
+      ../../modules/nixos/hardware/swap.nix
-      # Swap
+      ../../modules/nixos/hardware/nvidia.nix
-      ../../modules/nixos/swap.nix
-
-      # NVIDIA setup
-      ../../modules/nixos/nvidia.nix
 
       # Gnome customization
       ../../modules/nixos/gnome.nix
@@ -131,6 +127,9 @@
     FLAKE = "/home/shoi/etc/nixos";
   };
 
+  # Enable Mullvad
+  services.mullvad-vpn.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [