diff --git a/.chezmoiignore b/.chezmoiignore
index db94874..d5af6bd 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -1,3 +1,6 @@
 LICENSE
 misc/
 .gitignore
+dot_config/doom/init.el
+dot_config/doom/config.el
+dot_config/doom/packages.el
diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/executable_config.fish
index 669fb4b..7eed1e6 100644
--- a/dot_config/fish/executable_config.fish
+++ b/dot_config/fish/executable_config.fish
@@ -36,6 +36,7 @@ setpath ~/.fly/bin
 setpath ~/.nimble/bin
 setpath ~/Projects/go/bin
 setpath ~/.bun/bin
+setpath ~/go/bin
 
 # zoxide setup
 zoxide init fish | source
@@ -70,6 +71,7 @@ alias c "cargo"
 alias cr "cargo run"
 alias cb "cargo build"
 alias cwr "cargo watch -x run"
+alias rp "rustup"
 alias be "bundle exec"
 alias mkt "cd (mktemp -d)"
 alias czm "chezmoi"
@@ -83,6 +85,7 @@ alias gqc "g add --all; and g commit"
 alias gpl "g pull"
 alias gps "g push"
 alias gc "g commit"
+alias gb "g branch"
 alias gaa "g add --all"
 alias gco "g checkout"
 alias gse "g send-email"
@@ -90,3 +93,13 @@ alias wip "g add --all; and g commit -m WIP"
 alias squish "gs; and g commit -a --amend -C HEAD"
 alias editorigin "git remote set-url origin"
 
+# Alias vim to helix if it exists because vim is way easier to type
+if command --search hx > /dev/null
+  alias vim "hx"
+end
+
+# Load nix profile if nix is installed
+if test -e /nix
+  . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
+  set -x NIX_PATH "$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels"
+end
diff --git a/dot_config/helix/config.toml b/dot_config/helix/config.toml
new file mode 100644
index 0000000..3629b66
--- /dev/null
+++ b/dot_config/helix/config.toml
@@ -0,0 +1,14 @@
+theme = "gruvbox_light"
+
+[editor]
+shell = ["fish", "-c"]
+
+[editor.cursor-shape]
+insert = "bar"
+select = "underline"
+
+[editor.file-picker]
+hidden = false
+
+[editor.indent-guides]
+render = true
diff --git a/dot_config/nix/nix.conf b/dot_config/nix/nix.conf
new file mode 100644
index 0000000..c7d7291
--- /dev/null
+++ b/dot_config/nix/nix.conf
@@ -0,0 +1 @@
+experimental-features = nix-command flakes
diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el
index 295d1d9..5b8a494 100644
--- a/dot_doom.d/config.el
+++ b/dot_doom.d/config.el
@@ -17,7 +17,7 @@
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-opera)
+(setq doom-theme 'doom-solarized-light)
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
diff --git a/dot_doom.d/init.el b/dot_doom.d/init.el
index c5e004b..148a1a9 100644
--- a/dot_doom.d/init.el
+++ b/dot_doom.d/init.el
@@ -15,7 +15,6 @@
 ;;      directory (for easy access to its source code).
 
 (doom! :input
-       ;;bidi              ; (tfel ot) thgir etirw uoy gnipleh
        ;;chinese
        ;;japanese
        ;;layout            ; auie,ctsrnm is the superior home row