diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix
index ff5d199..33bbbea 100644
--- a/dot_config/flake/machines/wash/configuration.nix
+++ b/dot_config/flake/machines/wash/configuration.nix
@@ -1,5 +1,4 @@
 {
-  inputs,
   outputs,
   pkgs,
   ...
@@ -7,6 +6,11 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
+
+    ../../modules/nixos/boot.nix
+
+    ../../modules/nixos/gnome.nix
+    ../../modules/nixos/android-studio.nix
   ];
 
   nixpkgs = {
@@ -23,25 +27,6 @@
     };
   };
 
-  # Bootloader
-  boot = {
-    loader = {
-      timeout = 0;
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 5;
-      };
-
-      efi.canTouchEfiVariables = true;
-    };
-
-    plymouth = {
-      enable = true;
-      themePackages = [pkgs.catppuccin-plymouth];
-      theme = "catppuccin-macchiato";
-    };
-  };
-
   # Nix options
   nix.optimise.automatic = true;
   nix.settings.experimental-features = ["nix-command" "flakes"];
@@ -75,18 +60,6 @@
     LC_ALL = "en_CA.UTF-8";
   };
 
-  # services.desktopManager.cosmic.enable = true;
-  # services.displayManager.sddm.enable = true;
-  # services.desktopManager.plasma6.enable = true;
-
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # services.xserver = {
-  #   desktopManager.gnome.enable = true;
-  #   displayManager.gdm.enable = true;
-  # };
-
   environment.plasma6.excludePackages = with pkgs.kdePackages; [
     # plasma-browser-integration
     konsole
@@ -115,16 +88,8 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
   };
 
-  services.gnome.gnome-keyring.enable = true;
-
   services.avahi = {
     enable = true;
     nssmdns4 = true;
@@ -150,7 +115,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-
     bitwarden-desktop
     sqlite
     vscode.fhs
@@ -166,27 +130,18 @@
   ];
 
   fonts.packages = with pkgs; [
-    # nerdfonts
+    nerd-fonts.jetbrains-mono
   ];
 
   programs.nix-ld.enable = true;
 
   # Install firefox.
   programs.firefox.enable = true;
+
   programs.fish.enable = true;
 
   programs.steam.enable = true;
 
-  # Sway
-  # programs.sway = {
-  #   enable = true;
-  #   # package = null;
-  #   wrapperFeatures.gtk = true;
-  # };
-
-  security.pam.services.swaylock = {};
-  security.pam.services.swaylock.fprintAuth = true;
-
   programs.appimage = {
     enable = true;
     binfmt = true;
diff --git a/dot_config/flake/modules/nixos/android-studio.nix b/dot_config/flake/modules/nixos/android-studio.nix
new file mode 100644
index 0000000..3e1ab9e
--- /dev/null
+++ b/dot_config/flake/modules/nixos/android-studio.nix
@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    android-studio
+    android-tools
+  ];
+
+  programs.adb.enable = true;
+  services.udev.packages = [
+    pkgs.android-udev-rules
+  ];
+}
diff --git a/dot_config/flake/modules/nixos/boot.nix b/dot_config/flake/modules/nixos/boot.nix
new file mode 100644
index 0000000..d9fd8b5
--- /dev/null
+++ b/dot_config/flake/modules/nixos/boot.nix
@@ -0,0 +1,20 @@
+{pkgs, ...}: {
+  # Bootloader
+  boot = {
+    loader = {
+      timeout = 0;
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 5;
+      };
+
+      efi.canTouchEfiVariables = true;
+    };
+
+    plymouth = {
+      enable = true;
+      themePackages = [pkgs.catppuccin-plymouth];
+      theme = "catppuccin-macchiato";
+    };
+  };
+}
diff --git a/dot_config/flake/modules/nixos/gnome.nix b/dot_config/flake/modules/nixos/gnome.nix
new file mode 100644
index 0000000..9c4d665
--- /dev/null
+++ b/dot_config/flake/modules/nixos/gnome.nix
@@ -0,0 +1,5 @@
+{...}: {
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+}