diff --git a/machines/loki/README.md b/machines/loki/README.md
new file mode 100644
index 0000000..e5ee321
--- /dev/null
+++ b/machines/loki/README.md
@@ -0,0 +1,3 @@
+# Loki
+
+Loki is my main laptop.
diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
new file mode 100644
index 0000000..c7b91bb
--- /dev/null
+++ b/machines/loki/configuration.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+{
+	imports = [
+    	./hardware-configuration.nix
+		../../modules
+	];
+
+	riley = {
+		gui = true;
+		ide = true;
+	};
+
+	networking = {
+		hostName = "loki";
+		interfaces.wlp6s0.useDHCP = true;
+	};
+
+	devices = {
+		audio = {
+
+			speakers = "";
+            external = "";
+            headset  = "";
+
+			# Inputs
+            main-mic = "";
+            
+        };
+
+        video.displays = {
+
+			# Internal display
+            "eDP-1" = {
+                primary = true;
+                position = [ 0 0 ];
+            };
+            
+        };
+
+		
+	};
+}
diff --git a/machines/loki/hardware-configuration.nix b/machines/loki/hardware-configuration.nix
new file mode 100644
index 0000000..0d256d6
--- /dev/null
+++ b/machines/loki/hardware-configuration.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+	imports = [
+		(modulesPath + "/installer/scan/not-detected.nix")
+	];
+	
+	boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+	boot.initrd.kernelModules = [];
+	boot.kernelModules = [ "kvm-intel" ];
+	boot.extraModulePackages = [];
+
+	fileSystems."/" = {
+		device = "/dev/disk/by-uuid/d5da56b4-936b-419b-b596-fb255dfb1337";
+		fsType = "ext4";
+	};
+
+	fileSystems."/boot" = {
+		device = "/dev/disk/by-uuid/9AAC-99AC";
+		fsType = "vfat";
+	};
+
+	swapDevices = [];
+
+	powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+	hardware.video.hidpi.enable = lib.mkDefault true;
+}
diff --git a/machines/thor/README.md b/machines/thor/README.md
new file mode 100644
index 0000000..a090b16
--- /dev/null
+++ b/machines/thor/README.md
@@ -0,0 +1,3 @@
+# Thor
+
+Thor is my main desktop machine.
diff --git a/modules/default.nix b/modules/default.nix
index e48996b..30551d3 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -177,6 +177,7 @@ let named = submodule {
     	};
 
     	nixpkgs.config.allowUnfree = true;
+    	security.rtkit.enable = true;
 
         users.users."riley" = {
             isNormalUser = true;
diff --git a/modules/net/README.md b/modules/net/README.md
new file mode 100644
index 0000000..11109aa
--- /dev/null
+++ b/modules/net/README.md
@@ -0,0 +1,5 @@
+# `net` module
+
+The `net` module defines an extended configuration interface for
+networking: wifi (`net/wifi`), ethernet (`net/wire`) and bluetooth
+(`net/blue`).
diff --git a/modules/net/default.nix b/modules/net/default.nix
new file mode 100644
index 0000000..eee7496
--- /dev/null
+++ b/modules/net/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+
+{
+	imports = [
+		./blue	# Bluetooth
+		./wifi	# Wireless
+		./wire	# Ethernet
+	];
+}