diff --git a/home-manager/linux/default.nix b/home-manager/linux/default.nix
index 0ecb59c..b55111e 100644
--- a/home-manager/linux/default.nix
+++ b/home-manager/linux/default.nix
@@ -54,13 +54,13 @@ with nLib; {
         };
         # Install games
         games = { launcher = mkEnableOption "Game launcher"; };
-        # Swaywm and supoorting application configuration
-        swaywm = {
-          enable = mkDefaultOption "swaywm" config.nathan.config.isDesktop;
+        # Hyprland and supporting application configuration
+        hyprland = {
+          enable = mkDefaultOption "hyprland" config.nathan.config.isDesktop;
         };
         # Alacritty, follows sway
         alacritty =
-          mkDefaultOption "alacritty" config.nathan.programs.swaywm.enable;
+          mkDefaultOption "alacritty" config.nathan.programs.hyprland.enable;
         # Communications applications
         communications = {
           # Enable by default if we are on a linux desktop
diff --git a/home-manager/linux/programs/hyprland.nix b/home-manager/linux/programs/hyprland.nix
index 6b0bdfc..cb0fe80 100644
--- a/home-manager/linux/programs/hyprland.nix
+++ b/home-manager/linux/programs/hyprland.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, inputs, ... }:
 let nathan = config.nathan;
 in with lib; {
-  config = mkIf nathan.programs.swaywm.enable (let
+  config = mkIf nathan.programs.hyprland.enable (let
     swaylock-package =
       inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.swaylock-effects;
     swaylock-command = ''
diff --git a/machines/productivity-vm/home.nix b/machines/productivity-vm/home.nix
index 2e97183..4e8fa13 100644
--- a/machines/productivity-vm/home.nix
+++ b/machines/productivity-vm/home.nix
@@ -2,7 +2,6 @@
 
 {
   nathan = {
-    # services = { email = { enable = true; }; };
     config = { isDesktop = true; };
     programs = {
       media.enable = false;
@@ -13,14 +12,12 @@
           sshSign = true;
         };
       };
-      # games = { launcher = true; };
-      # media.nicotineService = true;
     };
   };
 
   home.packages = with pkgs; [ gammastep ];
 
-  # Sway outputs
+  # Hyprland outputs + tweaks
   home.sessionVariables = {
     "WLR_NO_HARDWARE_CURSORS" = "1";
     "WLR_RENDERER" = "pixman";
diff --git a/modules/linux/default.nix b/modules/linux/default.nix
index c651be8..338e4af 100644
--- a/modules/linux/default.nix
+++ b/modules/linux/default.nix
@@ -173,13 +173,13 @@ in {
             # On by default
             autoUpdate = mkEnableOptionT "Nix autoupdating";
           };
-          # Swaywm configuration
+          # hyprland configuration
           # On by default if the system is a desktop
-          swaywm = {
+          hyprland = {
             enable = mkOption {
               default = config.nathan.config.isDesktop;
               example = true;
-              description = "Whether to setup swaywm";
+              description = "Whether to setup hyprland";
               type = lib.types.bool;
             };
           };
diff --git a/modules/linux/hyprland.nix b/modules/linux/hyprland.nix
index 956e1ca..05c14ca 100644
--- a/modules/linux/hyprland.nix
+++ b/modules/linux/hyprland.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, inputs, ... }:
 let nc = config.nathan.config;
 in with lib; {
-  config = mkIf nc.swaywm.enable {
+  config = mkIf nc.hyprland.enable {
     # Turn on GDM for login
     services.xserver = {
       enable = true;