diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index a09399e..fcfdbc7 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: bash
+  program: fish
 #  args:
 #    - --login
 
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 1334601..1114f9f 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,14 +1,12 @@
-#!/usr/bin/env fish
-
-set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/bin $HOME/.doom-emacs/bin $HOME/.emacs.d/bin $HOME/.cargo/bin $HOME/dev/kde/src/kdesrc-build
-set TERM "xterm-256color"
-set EDITOR "emacsclient -c -a"
-set VISUAL "emacsclient -c -a emacs"
-# set QT_QPA_PLATFORMTHEME "qt5ct"
-set KWIN_DRM_USE_EGL_STREAMS 1
-set -Ux ANDROID_SDK_ROOT /opt/android-sdk
-set -Ux JAVA_HOME /usr/lib/jvm/default
-set -Ux CHROME_EXECUTABLE /usr/bin/qutebrowser
+# set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/bin $HOME/.doom-emacs/bin $HOME/.emacs.d/bin $HOME/.cargo/bin $HOME/dev/kde/src/kdesrc-build
+# set TERM "xterm-256color"
+# set EDITOR "emacsclient -c -a"
+# set VISUAL "emacsclient -c -a emacs"
+# # set QT_QPA_PLATFORMTHEME "qt5ct"
+# set KWIN_DRM_USE_EGL_STREAMS 1
+# set -Ux ANDROID_SDK_ROOT /opt/android-sdk
+# set -Ux JAVA_HOME /usr/lib/jvm/default
+# set -Ux CHROME_EXECUTABLE /usr/bin/qutebrowser
 
 function fish_greeting -d "what's up, fish?"
     # set_color $fish_color_autosuggestion[1]
@@ -203,30 +201,30 @@ end
 # starship init fish | source
 
 ### ALIASES
-alias yay "paru"
-alias yeet "paru -Rns"
-alias ls "exa -l"
-alias la "exa -la"
-alias mpf "mpv --profile=fast"
-alias mps "mpv --profile=slow"
-alias suspend "systemctl suspend"
-alias sysuse "systemctl --user"
-alias sys "systemctl"
-alias ec "emacsclient -t"
-alias ecc "emacsclient -c"
-alias mkdir "mkdir -pv"
-alias nupd "update-nix"
-alias nupg "upgrade-nix"
-alias nixs "nix search nixpkgs"
-alias myip "curl icanhazip.com"
-alias ytd "yt-dlp -o \"~/Videos/%(title)s.%(ext)s\" $1"
+# alias yay "paru"
+# alias yeet "paru -Rns"
+# alias ls "exa -l"
+# alias la "exa -la"
+# alias mpf "mpv --profile=fast"
+# alias mps "mpv --profile=slow"
+# alias suspend "systemctl suspend"
+# alias sysuse "systemctl --user"
+# alias sys "systemctl"
+# alias ec "emacsclient -t"
+# alias ecc "emacsclient -c"
+# alias mkdir "mkdir -pv"
+# alias nupd "update-nix"
+# alias nupg "upgrade-nix"
+# alias nixs "nix search nixpkgs"
+# alias myip "curl icanhazip.com"
+# alias ytd "yt-dlp -o \"~/Videos/%(title)s.%(ext)s\" $1"
 
 ### Start X at login
-if status is-login
-    if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
-        exec dbus-run-session startx
-    end
-end
+# if status is-login
+#     if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
+#         exec dbus-run-session startx
+#     end
+# end
 
 # macchina
 # pfetch
@@ -238,6 +236,6 @@ end
 # end
 
 # fm6000 -r -c blue
-any-nix-shell fish --info-right | source
+# any-nix-shell fish --info-right | source
 
 direnv hook fish | source
diff --git a/guix/home.scm b/guix/home.scm
index 880ce5c..21b3852 100644
--- a/guix/home.scm
+++ b/guix/home.scm
@@ -61,6 +61,7 @@
         "bat"
         "dutree"
         "alacritty"
+        "fish-foreign-env"
         "libnotify"
         "nextcloud-client"
         "rofi-wayland"
@@ -85,13 +86,14 @@
         "breeze"
         "breeze-icons"
         "kdeconnect"
-        "plasma"
+        ;; "plasma"
         "dolphin"
         "ark"
         "kdenlive"
         "mediainfo"
         ;; "tridactyl-native"
         "qtwayland@5.15.8"
+        "qtdeclarative@5.15.8"
         ;; "qtwayland"
         "egl-wayland"
         "pinentry"
@@ -268,7 +270,15 @@
                   (home-fish-configuration
                    (aliases '(("ls" . "exa -l")
                               ("gh" . "guix home -L ~/dotfiles/guix reconfigure ~/dotfiles/guix/home.scm")
-                              ("gs" . "sudo guix system -L /home/chris/dotfiles/guix reconfigure /home/chris/dotfiles/guix/$(hostname).scm")))))
+                              ("gs" . "sudo guix system -L /home/chris/dotfiles/guix reconfigure /home/chris/dotfiles/guix/$(hostname).scm")
+                              ("ec" . "emacsclient -t")
+                              ("ecc" . "emacsclient -c")
+                              ("mkdir" . "mkdir -p")
+                              ("ytd" . "yt-dlp -o \\\"~/Videos/%(title)s.%(ext)s\\\" $1")))
+                   (config (list
+                            ;; (plain-file "home-manager" "fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh")
+                                 (plain-file "direnv" "direnv hook fish | source")
+                                 (local-file "../.config/fish/config.fish")))))
          (simple-service 'config
                          home-xdg-configuration-files-service-type
                          `(("hypr" ,(local-file "../.config/hypr" #:recursive? #t))
@@ -284,6 +294,7 @@
                            ("starship.toml" ,(local-file "../.config/starship.toml"))
                            ("guix/channels.scm" ,(local-file "channels.scm"))
                            ("home-manager/home.nix" ,(local-file "home.nix"))
+                           ("fish/functions" ,(local-file "../.config/fish/functions" #:recursive? #t))
                            ("qt5ct/colors/snazzy.conf" ,(local-file "../.config/qt5ct/snazzy.conf"))
                            ("alacritty/alacritty.yml" ,(local-file "../.config/alacritty/alacritty.yml"))
                            ("direnv/direnvrc" ,(plain-file "direnvrc" "\
diff --git a/guix/pkgs/zola.scm b/guix/pkgs/zola.scm.bak
similarity index 98%
rename from guix/pkgs/zola.scm
rename to guix/pkgs/zola.scm.bak
index 4753429..9c462ae 100644
--- a/guix/pkgs/zola.scm
+++ b/guix/pkgs/zola.scm.bak
@@ -1,4 +1,4 @@
-(define-module (zola)
+(define-module (pkgs zola)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages crates-io)