diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index fcfdbc7..f98459f 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -357,7 +357,7 @@ colors:
 #   - (Linux/BSD) user login shell
 #   - (Windows) powershell
 shell:
-  program: fish
+  program: nu
 #  args:
 #    - --login
 
diff --git a/README.org b/README.org
index ce6a3f5..5ba4f81 100644
--- a/README.org
+++ b/README.org
@@ -6,7 +6,7 @@ mailto:chris@tfcconnection.org
 This repository contains all of my dotfiles to the many programs I like to use on Linux. This is primarily built with NixOS. I have organized this with flakes and modules.
 
 * Guix
-I am in the process of moving all of my systems to Guix. I'll keep NixOS as a system for most servers probably but for desktop systems, I think I'll start using Guix since I enjoy lisps a lot.
+I want to be in the process of moving all of my systems to Guix. However, Guix is still missing quite a few things that I think I'll need. Like for example, hyprland works, but eww doesn't. Also, firefox doesn't seem to work with tridactyl's native messenger. I did build it myself and get it working, but that's it. Finally, I can't seem to figure out how to get my rust project working well there so I'll keep Nix for that.
 
 
 * NixOS
diff --git a/flake.lock b/flake.lock
index 10a7788..fdc59ae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -255,6 +255,26 @@
         "type": "github"
       }
     },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ]
+      },
+      "locked": {
+        "lastModified": 1701083314,
+        "narHash": "sha256-LVtzGyRan2XV/EpDYYqwPd5cKdSwTJmVuOYeCUD0He4=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "b225987d6c3b0b962f8bc67164966c6fdc9b3f74",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -519,6 +539,7 @@
         "eww": "eww",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
+        "hyprland-plugins": "hyprland-plugins",
         "libre-presenter": "libre-presenter",
         "nix-bitcoin": "nix-bitcoin",
         "nixos-hardware": "nixos-hardware",
diff --git a/home/home.nix b/home/home.nix
index d158a80..bc74a3f 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -152,33 +152,39 @@
     source = ../.config/mpv;
   };
 
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
-
-  services.syncthing.enable = true;
   # services.kdeconnect.enable = true;
-  services.easyeffects.enable = true;
 
-  # For matrix clients that don't have e2ee
-  services.pantalaimon = {
-    enable = true;
-    settings = {
-      Default = {
-        LogLevel = "Debug";
-        SSL = true;
-      };
-      local-matrix = {
-        Homeserver = "https://matrix.tfcconnection.org";
-        ListenAddress = "localhost";
-        ListenPort = 8008;
-        SSL = false;
-        IgnoreVerification = true;
+  services = {
+    syncthing.enable = true;
+    easyeffects.enable = true;
+    nextcloud-client = {
+      enable = true;
+      startInBackground = true;
+    };
+
+    mpd.enable = true;
+    pueue.enable = true;
+
+    # For matrix clients that don't have e2ee
+    pantalaimon = {
+      enable = true;
+      settings = {
+        Default = {
+          LogLevel = "Debug";
+          SSL = true;
+        };
+        local-matrix = {
+          Homeserver = "https://matrix.tfcconnection.org";
+          ListenAddress = "localhost";
+          ListenPort = 8008;
+          SSL = false;
+          IgnoreVerification = true;
+        };
       };
     };
   };
 
+
  #services.espanso = {
  #  enable = true;
  #  settings = {
@@ -593,7 +599,7 @@ window#waybar > box {
 
   programs.nushell = {
     enable = true;
-    package = pkgs.nushellFull;
+    # package = pkgs.nushellFull;
     shellAliases = {
       # ls = "eza -l";
       la = "ls -la";
@@ -610,13 +616,15 @@ window#waybar > box {
       nixs = "nix search nixpkgs";
       ytd = "yt-dlp -o '~/Videos/%(title)s.%(ext)s'";
     };
-    extraConfig = ''
+    configFile = {
+      text = ''
       $env.config = {
         show_banner: false
       }
-    '';
+      '';
+    };
     environmentVariables = {
-      EDITOR = "emacsclient -t";
+      EDITOR = "\"emacsclient -t\"";
     };
   };
 
@@ -624,7 +632,6 @@ window#waybar > box {
     source = ../.config/dunst;
   };
 
-  services.pueue.enable = true;
 
   programs.atuin.enable = true;
 
@@ -747,6 +754,10 @@ window#waybar > box {
       git_status = {
         format = "[\\[$all_status$ahead_behind\\]]($style) |(dimmed gray) ";
       };
+      character = {
+        success_symbol = "[󰄾](bold green)";
+        error_symbol = "[x](bold red)";
+      };
     };
   };
 
diff --git a/modules/emacs.nix b/modules/emacs.nix
index 23b2337..b22a428 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -25,6 +25,7 @@ with lib;
         doom-modeline
         doom-themes
         melpaPackages.mini-echo
+        llm
         rainbow-delimiters
         smartparens
         paredit
@@ -41,6 +42,7 @@ with lib;
         cider
         melpaPackages.evil
         melpaPackages.evil-collection
+        melpaPackages.ellama
         general
         evil-escape
         evil-surround
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index 8ad88ca..e459b2a 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -17,12 +17,14 @@ with lib;
     ifuse
     dash
     brightnessctl
+    mpc-cli
     dunst
     dvdbackup
     bottom
     ungoogled-chromium
     qutebrowser
     brave
+    ollama
     ttyper
     kget
     audacity