diff --git a/nalai/etc/nixos/configuration.nix b/nalai/etc/nixos/configuration.nix
index 078ad65..064c4b7 100644
--- a/nalai/etc/nixos/configuration.nix
+++ b/nalai/etc/nixos/configuration.nix
@@ -54,6 +54,17 @@
     home.stateVersion = "24.05";
     home.username = "eliribble";
     home.file.".config/nvim/after/ftplugin/html.vim".source = ./home/eliribble/config/nvim/after/ftplugin/html.vim;
+    home.file.".config/nvim/after/ftplugin/go.vim".source = ./home/eliribble/config/nvim/after/ftplugin/go.vim;
+    home.file.".config/tmux/tmux.conf".source = ./home/eliribble/config/tmux/tmux.conf;
+    programs.fish = {
+      enable = true;
+      interactiveShellInit = ''
+        set fish_greeting # Disable greeting
+      '';
+      #plugins = [
+      	#{ name = "grc"; src = pkgs.fishPlugins.grc.src; }
+      #];
+    };
     programs.git = {
       enable = true;
       userName = "Eli Ribble";
diff --git a/nalai/etc/nixos/home/eliribble/config/nvim/after/ftplugin/go.vim b/nalai/etc/nixos/home/eliribble/config/nvim/after/ftplugin/go.vim
new file mode 100644
index 0000000..5ecb247
--- /dev/null
+++ b/nalai/etc/nixos/home/eliribble/config/nvim/after/ftplugin/go.vim
@@ -0,0 +1,10 @@
+set indentexpr=
+set noautoindent
+set nocindent
+set noexpandtab
+set nosmartindent
+set nosmarttab
+set nu
+set shiftwidth=4
+set tabstop=4
+filetype indent off
diff --git a/nalai/etc/nixos/home/eliribble/config/tmux/tmux.conf b/nalai/etc/nixos/home/eliribble/config/tmux/tmux.conf
new file mode 100644
index 0000000..678d927
--- /dev/null
+++ b/nalai/etc/nixos/home/eliribble/config/tmux/tmux.conf
@@ -0,0 +1,22 @@
+set-option -g default-command fish
+
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
+
+# nested tmux, obey me
+bind-key a send-prefix
+
+# Avoid the annoying bit of delay when using the control character
+set -g escape-time 0
+set -g renumber-windows on
+
+# Show a visual bell, even on other windows
+set-window-option -g visual-bell both
+set-window-option -g bell-action other
+
+# Set up the window visuals
+set -g window-status-style bg=yellow
+set -g window-status-current-style bg=red,fg=white
+