diff --git a/flake.nix b/flake.nix
index b85d13f..6f2f6cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,7 @@
         system = "x86_64-linux";
         modules = [
           ./modules/nixos
+
           home-manager.nixosModules.home-manager
           {
             home-manager = {
@@ -42,6 +43,7 @@
               useUserPackages = true;
               users.${user}.imports = [
                 ./modules/home-manager
+                ./modules/home-manager/nixos.nix
                 ./modules/nixos/dconf.nix
               ];
               extraSpecialArgs = { inherit genebean-omp-themes; };
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 7e0e7cf..cf94d29 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -13,6 +13,7 @@
     meld
     mtr
     nix-zsh-completions
+    nurl
     rename
     slack
     subversion
@@ -30,7 +31,15 @@
     bat = {
       enable = true;
       config = {
-        theme = "Dracula";
+        theme = "Catppuccin-frappe";
+      };
+      themes = {
+        Catppuccin-frappe = builtins.readFile (pkgs.fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "bat";
+          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+          hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+        } + "/Catppuccin-frappe.tmTheme");
       };
     };
     eza.enable = true;
diff --git a/modules/home-manager/nixos.nix b/modules/home-manager/nixos.nix
new file mode 100644
index 0000000..ee7d36d
--- /dev/null
+++ b/modules/home-manager/nixos.nix
@@ -0,0 +1,33 @@
+{ pkgs, ... }: {
+  programs = {
+    waybar = {
+      enable = true;
+    };
+  };
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        frame_color = "#8CAAEE";
+        separator_color= "frame";
+      };
+
+      urgency_low = {
+        background = "#303446";
+        foreground = "#C6D0F5";
+      };
+
+      urgency_normal = {
+        background = "#303446";
+        foreground = "#C6D0F5";
+      };
+
+      urgency_critical = {
+        background = "#303446";
+        foreground = "#C6D0F5";
+        frame_color = "#EF9F76";
+      };
+    };
+  };
+}
+
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 8755bdb..c4b8901 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -42,15 +42,17 @@ in {
     # Configure keymap in X11
     layout = "us";
     xkbVariant = "";
+
+    displayManager = {
+      gdm = {
+        enable = true;
+        wayland = true;
+      };
+    };
   };
 
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
+  programs.hyprland.enable = true;
 
-  services.udev.packages = with pkgs; [
-    gnome.gnome-settings-daemon
-  ];
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
@@ -64,6 +66,7 @@ in {
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
+    wireplumber.enable = true;
   };
 
   # Enable touchpad support (enabled default in most desktopManager).
@@ -73,7 +76,7 @@ in {
   users.users.${user} = {
     isNormalUser = true;
     description = "Gene Liverman";
-    extraGroups = [ "networkmanager" "wheel" "dialout" ];
+    extraGroups = [ "networkmanager" "wheel" "dialout" "input" ];
     packages = with pkgs; [
      tailscale-systray
     ];
@@ -91,27 +94,37 @@ in {
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    brightnessctl
     dconf2nix
+    file
     firefox
-    gnomeExtensions.appindicator
-    gnomeExtensions.caffeine
-    gnomeExtensions.dash-to-panel
-    gnomeExtensions.user-themes
+    gnome.nautilus
     libreoffice
     neofetch
+    pavucontrol
+    polkit-kde-agent
+    python3
     tailscale
     tilix
+    ulauncher
     vivaldi
+    xfce.xfce4-terminal
+    wmctrl
   ];
 
-  programs._1password.enable = true;
-  programs._1password-gui = {
-    enable = true;
-    # Certain features, including CLI integration and system authentication support,
-    # require enabling PolKit integration on some desktop environments (e.g. Plasma).
-    polkitPolicyOwners = [ "${user}" ];
+  programs = {
+    _1password.enable = true;
+    _1password-gui = {
+      enable = true;
+      # Certain features, including CLI integration and system authentication support,
+      # require enabling PolKit integration on some desktop environments (e.g. Plasma).
+      polkitPolicyOwners = [ "${user}" ];
+    };
   };
 
+  # Used by Nautilus
+  services.gvfs.enable = true;
+
   nix.settings = {
     allowed-users = [ "${user}" ];
     experimental-features = [
@@ -121,8 +134,13 @@ in {
   };
 
   fonts.fontDir.enable = false;
-  fonts.packages = [ (pkgs.nerdfonts.override { fonts = [
-    "Hack"
-    "SourceCodePro"
-  ]; }) ];
+  fonts.packages = with pkgs; [
+    font-awesome
+    (nerdfonts.override {
+      fonts = [
+        "Hack"
+        "SourceCodePro"
+      ];
+    })
+  ];
 }