diff --git a/home-manager/fish.nix b/home-manager/fish.nix
new file mode 100644
index 0000000..e0efd61
--- /dev/null
+++ b/home-manager/fish.nix
@@ -0,0 +1,125 @@
+{ config, lib, pkgs, ... }:
+{
+  programs.fish = {
+    enable = true;
+
+    functions = {
+      setpath = "test -e $argv[1]; and fish_add_path $argv[1]";
+    };
+
+    interactiveShellInit = ''
+      if test -z "$XDG_RUNTIME_DIR"
+        set -x XDG_RUNTIME_DIR "/tmp/$USER-runtime-dir"
+        if test ! -e "$XDG_RUNTIME_DIR"
+          mkdir "$XDG_RUNTIME_DIR"
+          chmod 0700 "$XDG_RUNTIME_DIR"
+        end
+      end
+
+      setpath /opt/local/bin
+      setpath /opt/homebrew/bin
+      setpath ~/.cargo/bin
+      setpath ~/.ghcup/bin
+      setpath ~/.cabal/bin
+      setpath ~/.local/bin
+      setpath ~/.bun/bin
+
+      set -x EDITOR nvim
+      set -x USER lu
+      set -x SHELL (which fish)
+      set -x TERM xterm-256color
+      set -x LANG en_US.UTF-8
+      set -x LC_ALL en_US.UTF-8
+      set -x LC_CTYPE en_US.UTF-8
+      set -x LANGUAGE en_US.UTF-8
+    '';
+
+    shellAbbrs = {
+      # General aliases
+      c = "clear";
+      ll = "ls -lahF --color=always";
+      e = "$EDITOR";
+      se = "sudoedit";
+      "cd.." = "cd ../";
+      rmrf = "rm -rf";
+
+      # overrides of defaults
+      mkdir = "mkdir -p";
+      cp = "cp -r";
+      scp = "scp -r";
+      apt = "sudo apt";
+      doc = "sudo docker";
+      docker = "sudo docker";
+      systemctl = "sudo systemctl";
+      doco = "sudo docker-compose";
+
+      # z is a weird key to hit frequently, j is much better
+      j = "z";
+
+      # cargoes and rust-s
+      cg = "cargo";
+      cr = "cargo run";
+      cb = "cargo build";
+      ct = "cargo test";
+      cwr = "cargo watch -x run";
+
+      # rubies
+      be = "bundle exec";
+
+      # cd into a temp directory, very useful!
+      mkt = "cd (mktemp -d)";
+
+      # tmux aliases
+      tx = "tmux";
+      txls = "tmux list-sessions";
+      txa = "tmux attach";
+
+      # git aliases
+      lg = "lazygit";
+      g = "git";
+      ga = "git add";
+      gs = "git status --short";
+      gl = "git log --color --graph --abbrev-commit --oneline";
+      gqp = "git add --all; and git commit; and git push";
+      gqc = "git add --all; and git commit";
+      gpl = "git pull";
+      gps = "git push";
+      gc = "git commit";
+      gb = "git branch";
+      gaa = "git add --all";
+      gco = "git checkout";
+      editorigin = "git remote set-url origin";
+    };
+
+    plugins = [
+      {
+        name = "done";
+        src = pkgs.fishPlugins.done.src;
+      }
+      {
+        name = "pisces";
+        src = pkgs.fishPlugins.pisces.src;
+      }
+      {
+        name = "plugin-foreign-env";
+        src = pkgs.fetchFromGitHub
+          {
+            owner = "oh-my-fish";
+            repo = "plugin-foreign-env";
+            rev = "7f0cf099ae1e1e4ab38f46350ed6757d54471de7";
+            sha256 = "0d16mdgjdwln41zk44qa5vcilmlia4w15r8z2rc3p49i5ankksg3";
+          };
+      }
+    ];
+  };
+
+  programs.starship = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+}
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 34d287f..cde8aa0 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -10,12 +10,7 @@
 }: {
   # You can import other home-manager modules here
   imports = [
-    # If you want to use modules your own flake exports (from modules/home-manager):
-    # outputs.homeManagerModules.example
-
-    # Or modules exported from other flakes (such as nix-colors):
-    # inputs.nix-colors.homeManagerModules.default
-
+    ./fish.nix
     ./neovim.nix
   ];
 
diff --git a/home-manager/neovim.nix b/home-manager/neovim.nix
index c4b0057..ab39258 100644
--- a/home-manager/neovim.nix
+++ b/home-manager/neovim.nix
@@ -2,6 +2,7 @@
 
 {
   programs.neovim = {
+    enable = true;
     extraPackages = with pkgs; [
       # LazyVim
       lua-language-server
@@ -15,7 +16,6 @@
     ];
   };
 
-  # Normal LazyVim config here, see https://github.com/LazyVim/starter/tree/main/lua
   xdg.configFile."nvim/init.lua".source = ../dotfiles/nvim/init.lua;
   xdg.configFile."nvim/stylua.toml".source = ../dotfiles/nvim/stylua.toml;
   xdg.configFile."nvim/.neoconf.json".source = ../dotfiles/nvim/.neoconf.json;