diff --git a/configurations/nixos/vixen/configuration.nix b/configurations/nixos/vixen/configuration.nix
index 3253166..59e74c3 100644
--- a/configurations/nixos/vixen/configuration.nix
+++ b/configurations/nixos/vixen/configuration.nix
@@ -17,9 +17,6 @@
   # Enable networking
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
-  time.timeZone = "America/New_York";
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
@@ -35,13 +32,6 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
   # Configure keymap in X11
   services.xserver.xkb = {
     layout = "us";
@@ -64,26 +54,12 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.srid = {
-    isNormalUser = true;
-    description = "Sridhar Ratnakumar";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
-  # Install firefox.
-  programs.firefox.enable = true;
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     #  wget
     brave
-    gnome-tweaks
     vscode
   ];
 
diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix
index b378f91..912fcc9 100644
--- a/configurations/nixos/vixen/default.nix
+++ b/configurations/nixos/vixen/default.nix
@@ -10,6 +10,7 @@ in
     self.nixosModules.default
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen4
     ./configuration.nix
+    (self + /modules/nixos/linux/gui/gnome.nix)
   ];
 
   services.openssh.enable = true;
diff --git a/modules/nixos/linux/gui/gnome.nix b/modules/nixos/linux/gui/gnome.nix
index d2c4b7c..ea48b8d 100644
--- a/modules/nixos/linux/gui/gnome.nix
+++ b/modules/nixos/linux/gui/gnome.nix
@@ -6,6 +6,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    gnome.gnome-tweaks
+    # This is necessary to set CAPS to CTRL
+    gnome-tweaks
   ];
 }
diff --git a/modules/nixos/shared/primary-as-admin.nix b/modules/nixos/shared/primary-as-admin.nix
index 50082a6..27d0945 100644
--- a/modules/nixos/shared/primary-as-admin.nix
+++ b/modules/nixos/shared/primary-as-admin.nix
@@ -14,7 +14,7 @@
         openssh.authorizedKeys.keys = myKeys;
       } // lib.optionalAttrs pkgs.stdenv.isLinux {
         isNormalUser = true;
-        extraGroups = [ "wheel" ];
+        extraGroups = [ "networkmanager" "wheel" ];
       };
     };