diff --git a/hosts/familypc/config.nix b/hosts/familypc/config.nix
index 3ff6f8a..c87d9f7 100644
--- a/hosts/familypc/config.nix
+++ b/hosts/familypc/config.nix
@@ -102,7 +102,7 @@
 
   # Enable networking
   networking.networkmanager.enable = true;
-  networking.hostName = "${host}";
+  networking.hostName = host;
   networking.timeServers = options.networking.timeServers.default ++ [ "pool.ntp.org" ];
 
   # Set your time zone.
@@ -124,11 +124,6 @@
   };
 
   programs = {
-    hyprland = {
-      enable = true;
-      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-      xwayland.enable = true;
-    };
     firefox.enable = true;
     dconf.enable = true;
     seahorse.enable = true;
@@ -198,9 +193,6 @@
       hyprpicker
       gnumake
       ninja
-      symbola
-      noto-fonts-color-emoji
-      material-icons
       brightnessctl
       virt-viewer
       swappy
@@ -222,21 +214,28 @@
       distrobox
       mpv
       gimp
-      obs-studio
       rustup
       audacity
       pavucontrol
       tree
       protonup-qt
-      font-awesome
       spotify
       neovide
-      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
       sugar.sddm-sugar-dark # Name: sugar-dark
       tokyo-night # Name: tokyo-night-sddm
       pkgs.libsForQt5.qt5.qtgraphicaleffects
     ];
 
+  fonts = {
+    packages = with pkgs; [
+      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+      font-awesome
+      symbola
+      noto-fonts-color-emoji
+      material-icons
+    ];
+  };
+
   environment.variables = {
     ZANEYOS_VERSION = "2.1";
     ZANEYOS = "true";
@@ -245,6 +244,7 @@
   # Extra Portal Configuration
   xdg.portal = {
     enable = true;
+    wlr.enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
       pkgs.xdg-desktop-portal
@@ -259,17 +259,23 @@
   # Services to start
   services = {
     xserver = {
+      enable = false;
+    };
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
+    greetd = {
       enable = true;
-      displayManager.sddm = {
-        enable = true;
-        autoNumlock = true;
-        wayland.enable = true;
-        theme = "sugar-dark";
-      };
-      desktopManager.cinnamon.enable = false;
-      xkb = {
-        layout = "us";
-        variant = "";
+      settings = {
+        default_session = {
+          # Wayland Desktop Manager is installed only for user ryan via home-manager!
+          user = username;
+          # .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others).
+          # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here.
+          command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager
+          # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd $HOME/.wayland-session";  # start wayland session with a TUI login manager
+        };
       };
     };
     smartd = {
@@ -305,7 +311,6 @@
     nfs.server.enable = true;
   };
   systemd.services.flatpak-repo = {
-    wantedBy = [ "multi-user.target" ];
     path = [ pkgs.flatpak ];
     script = ''
       flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
diff --git a/hosts/familypc/variables.nix b/hosts/familypc/variables.nix
index e988375..bfa8021 100644
--- a/hosts/familypc/variables.nix
+++ b/hosts/familypc/variables.nix
@@ -3,9 +3,6 @@
   gitUsername = "Tyler Kelley";
   gitEmail = "tylerzanekelley@gmail.com";
 
-  # Base16 Theme
-  theme = "tokyo-night-storm";
-
   # Hyprland Settings
   borderAnim = true; # Enable / Disable Hyprland Border Animation
   extraMonitorSettings = "";
diff --git a/modules/amd-drivers.nix b/modules/amd-drivers.nix
index beec999..d3d3a7d 100644
--- a/modules/amd-drivers.nix
+++ b/modules/amd-drivers.nix
@@ -16,11 +16,5 @@ in
   config = mkIf cfg.enable {
     systemd.tmpfiles.rules = [ "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}" ];
     services.xserver.videoDrivers = [ "amdgpu" ];
-    # OpenGL
-    hardware.opengl = {
-      ## amdvlk: an open-source Vulkan driver from AMD
-      extraPackages = [ pkgs.amdvlk ];
-      extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
-    };
   };
 }