diff --git a/ops/nixos/all-systems.nix b/ops/nixos/all-systems.nix
index ba63de2f2..d1bf39746 100644
--- a/ops/nixos/all-systems.nix
+++ b/ops/nixos/all-systems.nix
@@ -11,4 +11,5 @@
 
 (with depot.users.glittershark.system.system; [
   chupacabra
+  yeren
 ])
diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix
index d19397192..1d6d8795a 100644
--- a/users/glittershark/system/home/default.nix
+++ b/users/glittershark/system/home/default.nix
@@ -25,5 +25,12 @@ rec {
 
   dobharchuHome = dobharchu.activation-script;
 
-  meta.targets = [ "chupacabraHome" ];
+  yeren = home ./machines/yeren.nix;
+
+  yerenHome = yeren.activation-script;
+
+  meta.targets = [
+    "chupacabraHome"
+    "yerenHome"
+  ];
 }
diff --git a/users/glittershark/system/home/machines/yeren.nix b/users/glittershark/system/home/machines/yeren.nix
new file mode 100644
index 000000000..43f59d375
--- /dev/null
+++ b/users/glittershark/system/home/machines/yeren.nix
@@ -0,0 +1,17 @@
+{ pkgs, lib, config, ... }:
+
+{
+  imports = [
+    ../platforms/linux.nix
+    ../modules/common.nix
+  ];
+
+  # for when hacking
+  programs.home-manager.enable = true;
+  home.stateVersion = "20.03";
+
+  system.machine = {
+    wirelessInterface = "wlp0s20f3";
+    i3FontSize = 9;
+  };
+}
diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix
index 2223f33ce..a9eb4a130 100644
--- a/users/glittershark/system/system/default.nix
+++ b/users/glittershark/system/system/default.nix
@@ -13,12 +13,19 @@ rec {
     configuration = mugwump;
   }).system;
 
+  yeren = import ./machines/yeren.nix;
+
+  yerenSystem = (pkgs.nixos {
+    configuration = yeren;
+  }).system;
+
   iso = import ./iso.nix args;
 
   # Build chupacabra in CI
   meta.targets = [
     "chupacabraSystem"
     "mugwumpSystem"
+    "yerenSystem"
 
     "iso"
   ];
diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/glittershark/system/system/machines/yeren.nix
new file mode 100644
index 000000000..541da0969
--- /dev/null
+++ b/users/glittershark/system/system/machines/yeren.nix
@@ -0,0 +1,46 @@
+{ modulesPath, config, lib, pkgs, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    ../modules/common.nix
+    ../modules/reusable/battery.nix
+    ../modules/xserver.nix
+    ../modules/fonts.nix
+    ../modules/sound.nix
+  ];
+
+  networking.hostName = "yeren";
+
+  system.stateVersion = "21.03";
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      kernelModules = [ ];
+
+      luks.devices = {
+        "cryptroot".device = "/dev/disk/by-uuid/dcfbc22d-e0d2-411b-8dd3-96704d3aae2e";
+        "cryptswap".device = "/dev/disk/by-uuid/48b8a8fd-559c-4759-a617-56f221cfaaec";
+      };
+    };
+
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/53A9-248B";
+      fsType = "vfat";
+    };
+  };
+
+  swapDevices = [{ device = "/dev/mapper/cryptswap"; }];
+}
diff --git a/users/glittershark/system/system/modules/common.nix b/users/glittershark/system/system/modules/common.nix
index 711f686d8..0eab59066 100644
--- a/users/glittershark/system/system/modules/common.nix
+++ b/users/glittershark/system/system/modules/common.nix
@@ -56,14 +56,6 @@ with lib;
     shell = pkgs.zsh;
   };
 
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.03"; # Did you read the comment?
-
   nixpkgs.config.allowUnfree = true;
 
   nix = {
diff --git a/users/glittershark/system/system/modules/desktop.nix b/users/glittershark/system/system/modules/desktop.nix
index dc2847a77..3adbd9d9b 100644
--- a/users/glittershark/system/system/modules/desktop.nix
+++ b/users/glittershark/system/system/modules/desktop.nix
@@ -16,10 +16,4 @@
   ];
 
   services.geoclue2.enable = true;
-
-  powerManagement = {
-    enable = true;
-    cpuFreqGovernor = lib.mkDefault "powersave";
-    powertop.enable = true;
-  };
 }
diff --git a/users/glittershark/system/system/modules/xserver.nix b/users/glittershark/system/system/modules/xserver.nix
index 07e9a4fdf..35ee44112 100644
--- a/users/glittershark/system/system/modules/xserver.nix
+++ b/users/glittershark/system/system/modules/xserver.nix
@@ -9,19 +9,8 @@
 
     displayManager = {
       defaultSession = "none+i3";
-
-      autoLogin = {
-        enable = true;
-        user = "grfn";
-      };
     };
 
     windowManager.i3.enable = true;
-#       enable = true;
-#       extraPackages = with pkgs; [
-#         i3status
-#         i3lock
-#       ];
-#     };
   };
 }