diff --git a/flake.nix b/flake.nix
index 10b2b59..080e486 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,8 +15,7 @@
         ./hosts/fenix
         ./variables.nix
 	{ config.var.username = "maya"; 
-	  config.var.timezone = "Etc/GMT-8"; 
-	  config.var.hostname = "fenix"; }
+	  config.var.timezone = "Etc/GMT-8"; };
 	home-manager.nixosModules.home-manager {
 	  home-manager.extraSpecialArgs = {
 	    inherit inputs;
diff --git a/home/default.nix b/home/default.nix
index f83d162..9986c9f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -9,15 +9,15 @@
     stateVersion = "26.05";
     shell.enableBashIntegration = true;
     file = {
-      ".config/waybar/config".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern");
-      ".config/waybar/style.css".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern.css");
+      ".config/waybar/config".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/cyberhack" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/modern");
+      ".config/waybar/style.css".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/cyberhack.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/modern.css");
     };
   };
     
     programs.home-manager.enable = true;
     programs.foot = {
       enable = true;
-      settings.main.font = (if vars.user == "alyx" then "monospace:size=20" else "monospace:size=12");
+      settings.main.font = "monospace:size=20";
       settings.colors.alpha = "0.9";
     };
 
@@ -49,7 +49,7 @@
       enable = true;
       settings = {
         user.name = vars.user;
-	user.email = (if vars.user == "alyx" then "alyxwren@proton.me" else "beanigit@protonmail.com");
+	user.email = "blankfornow";
 	commit.gpgsign = true;
 	gpg.format = "ssh";
 	user.signingKey = "~/.ssh/id_ed25519.pub";
@@ -62,13 +62,10 @@
     wayland.windowManager.sway.package = pkgs.swayfx;
     wayland.windowManager.sway.config = null;
     wayland.windowManager.sway.extraConfig = ''
-      include ~/.config/nixos/home/wms/sway
+      include ${config.home.homeDirectory}/newflake/home/wms/sway
     '';
     wayland.windowManager.sway.checkConfig = false;
 
     programs.obs-studio.enable = true;
-    home.packages = with pkgs; [
-      fzf
-    ];
   }
 
diff --git a/home/waybar/modern.css b/home/waybar/modern.css
index 6e21022..9063802 100644
--- a/home/waybar/modern.css
+++ b/home/waybar/modern.css
@@ -26,7 +26,6 @@
 @define-color crust #11111b;
 /* forgive me, above is the contents of catppuccin mocha's waybar css file */
 * {
-	color: #ffffff;
 	font-family: Iosevka NF;
 }
 window#waybar {
diff --git a/hosts/generic.nix b/hosts/generic.nix
index 42fcb3a..b4f667b 100644
--- a/hosts/generic.nix
+++ b/hosts/generic.nix
@@ -113,13 +113,5 @@
 
   ];
 
-  fonts.packages = with pkgs; [
-    jetbrains-mono
-    nerd-fonts.iosevka
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-color-emoji
-  ];
-
   system.stateVersion = "26.05";
 }