diff --git a/configuration.nix b/configuration.nix
index ceea16d..6871d4c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,24 +9,12 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
 			./secrets.nix
+      <home-manager/nixos>
     ];
 
   # Enable Flakes and the new command-line tool
   # nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  boot.loader.efi.canTouchEfiVariables = true;
-	boot.loader.efi.efiSysMountPoint = "/boot/efi";
-	boot.loader.grub.efiSupport = true;
-	boot.loader.grub.device = "nodev";
-  boot.loader.grub.extraEntriesBeforeNixOS = true;
-  boot.loader.grub.extraEntries = ''
-    menuentry "Void" {
-      search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
-      configfile "($void)/boot/grub/grub.cfg"
-    }
-  '';
-
-  networking.hostName = "Voyager"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
@@ -53,21 +41,28 @@
     home = "/home/tacocat";
     description = "Aria Nolan";
     extraGroups = [ "wheel" "networkmanager" "audio" "video" "bluetooth" "kvm" ];
+		# shell = "/bin/bash";
+		packages = with pkgs; [
+			firefox
+			thunderbird
+			vim
+			neovim
+			kitty
+			wget
+			tmux
+			helix
+			river
+			git
+      gcc
+		];
   };
 	nix.settings.trusted-users = [ "tacocat" ];
 
 
   environment = {
     systemPackages = with pkgs; [
-      vim
-			# neovim.packages."${pkgs.system}".neovim
-			neovim
-      git
-      wget
-      tmux
-      river
-      kitty
-			firefox
+			fish
+			bash
     ];
     defaultPackages = with pkgs; [
       perl
@@ -76,14 +71,7 @@
     ];
   };
 
-  programs.zsh.enable = true;
-  programs.zsh.ohMyZsh = {
-    enable = true;
-    plugins = [ "git" "python" "man" ];
-    theme = "agnoster";
-  };
-
-  environment.variables.EDITOR = "nvim";
+  environment.variables.EDITOR = "helix";
 
   # programs.firefox.package = pkgs.latest.firefox-wayland;
   # programs.firefox.enable = true;
diff --git a/flake.nix b/flake.nix.bk
similarity index 100%
rename from flake.nix
rename to flake.nix.bk
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index dc4ac17..b876696 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -13,6 +13,20 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" "nvme" ];
   boot.extraModulePackages = [ ];
+  boot.loader.efi.canTouchEfiVariables = true;
+	boot.loader.efi.efiSysMountPoint = "/boot/efi";
+	boot.loader.grub.efiSupport = true;
+	boot.loader.grub.device = "nodev";
+  boot.loader.grub.extraEntriesBeforeNixOS = true;
+  boot.loader.grub.extraEntries = ''
+    menuentry "Void" {
+      search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
+      configfile "($void)/boot/grub/grub.cfg"
+    }
+  '';
+
+
+  networking.hostName = "JWST"; # Define your hostname.
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/488c7ef3-5ea1-4a16-a5f9-e241901c24ce";
diff --git a/home.nix b/home.nix.bk
similarity index 100%
rename from home.nix
rename to home.nix.bk