diff --git a/apps/shell/fish/config.fish b/apps/shell/fish/config.fish
index 7cc7b60..db11722 100755
--- a/apps/shell/fish/config.fish
+++ b/apps/shell/fish/config.fish
@@ -18,15 +18,6 @@ set -Ux BROWSER firefox-developer-edition
 set -Ux ERL_AFLAGS "-kernel shell_history enabled -kernel shell_history_file_bytes 1024000" # iex history
 set -Ux LESS "-r"
 
-# set our EDITOR to neovim if we've got it
-set -Ux EDITOR vim
-if has_command nvim
-	set -Ux EDITOR nvim
-end
-alias ovim 'command vim' # always have an alias to normal vim just in case
-alias vim $EDITOR
-alias vi $EDITOR
-
 # more sane ls colors
 set -Ux LS_COLORS 'ow=01;36;40'
 
diff --git a/bin/lib/arch-linux/provisioning/0-adduser.bash b/env/arch-linux/provisioning/0-adduser.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/0-adduser.bash
rename to env/arch-linux/provisioning/0-adduser.bash
diff --git a/bin/lib/arch-linux/provisioning/1-pacaur.bash b/env/arch-linux/provisioning/1-pacaur.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/1-pacaur.bash
rename to env/arch-linux/provisioning/1-pacaur.bash
diff --git a/bin/lib/arch-linux/provisioning/2-essentials.bash b/env/arch-linux/provisioning/2-essentials.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/2-essentials.bash
rename to env/arch-linux/provisioning/2-essentials.bash
diff --git a/bin/lib/arch-linux/provisioning/3-extras.bash b/env/arch-linux/provisioning/3-extras.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/3-extras.bash
rename to env/arch-linux/provisioning/3-extras.bash
diff --git a/bin/lib/arch-linux/provisioning/4-comms.bash b/env/arch-linux/provisioning/4-comms.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/4-comms.bash
rename to env/arch-linux/provisioning/4-comms.bash
diff --git a/bin/lib/arch-linux/provisioning/amd.bash b/env/arch-linux/provisioning/amd.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/amd.bash
rename to env/arch-linux/provisioning/amd.bash
diff --git a/bin/lib/arch-linux/provisioning/irc.bash b/env/arch-linux/provisioning/irc.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/irc.bash
rename to env/arch-linux/provisioning/irc.bash
diff --git a/bin/lib/arch-linux/provisioning/nvidia.bash b/env/arch-linux/provisioning/nvidia.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/nvidia.bash
rename to env/arch-linux/provisioning/nvidia.bash
diff --git a/bin/lib/arch-linux/provisioning/tmux-plugins.bash b/env/arch-linux/provisioning/tmux-plugins.bash
similarity index 100%
rename from bin/lib/arch-linux/provisioning/tmux-plugins.bash
rename to env/arch-linux/provisioning/tmux-plugins.bash
diff --git a/bin/lib/debian/provisioning/create-my-user.bash b/env/debian/provisioning/create-my-user.bash
similarity index 100%
rename from bin/lib/debian/provisioning/create-my-user.bash
rename to env/debian/provisioning/create-my-user.bash
diff --git a/bin/lib/debian/provisioning/install-packages.bash b/env/debian/provisioning/install-packages.bash
similarity index 100%
rename from bin/lib/debian/provisioning/install-packages.bash
rename to env/debian/provisioning/install-packages.bash
diff --git a/bin/lib/debian/provisioning/install-tmux-plugins.bash b/env/debian/provisioning/install-tmux-plugins.bash
similarity index 100%
rename from bin/lib/debian/provisioning/install-tmux-plugins.bash
rename to env/debian/provisioning/install-tmux-plugins.bash
diff --git a/env/nix/modules/de/base.nix b/env/nix/modules/de/graphics.nix
similarity index 100%
rename from env/nix/modules/de/base.nix
rename to env/nix/modules/de/graphics.nix
diff --git a/env/nix/modules/de/sway.nix b/env/nix/modules/de/sway.nix
index 9c6eefd..65f973d 100644
--- a/env/nix/modules/de/sway.nix
+++ b/env/nix/modules/de/sway.nix
@@ -3,7 +3,7 @@
 let
   unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
 in {
-	imports = [ ./base.nix ];
+	imports = [ ./graphics.nix ];
 	programs = {
 		sway = {
 			enable = true;
diff --git a/env/nix/modules/neovim.nix b/env/nix/modules/neovim.nix
index 368b0dd..5ad8794 100644
--- a/env/nix/modules/neovim.nix
+++ b/env/nix/modules/neovim.nix
@@ -1,14 +1,20 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+let
+  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
+	aliases = { vim = "nvim"; vi = "nvim"; };
+in
+{
 	environment = {
-		systemPackages = [ pkgs.neovim ];
+		systemPackages = [ unstable.neovim ];
 		variables = {
 			EDITOR = "nvim";
+			PAGER = "nvim";
+			VISUAL = "nvim";
 			MANPAGER = "nvim +Man!";
 			MANWIDTH = "80";
 		};
-		shellAliases = {
-			vim = "nvim";
-			vi = "nvim";
-		};
+		shellAliases = aliases;
 	};
+	programs.bash.shellAliases = aliases;
+	programs.fish.shellAliases = aliases;
 }
diff --git a/bin/lib/arch-linux/scripts/.gitkeep b/env/nix/modules/ripcord.nix
similarity index 100%
rename from bin/lib/arch-linux/scripts/.gitkeep
rename to env/nix/modules/ripcord.nix
diff --git a/env/nix/modules/users/daniel.nix b/env/nix/modules/users/daniel.nix
index 771abdf..58b8db3 100644
--- a/env/nix/modules/users/daniel.nix
+++ b/env/nix/modules/users/daniel.nix
@@ -5,37 +5,43 @@
     shell = pkgs.fish;
 		home = "/home/daniel/.home";
 		packages = with pkgs; [
-			fortune
-			steam
-			pulsemixer
-			file
-			appimage-run
-			kitty
-			fzf
-			fortune
-			dmenu
-			ranger
-			pass
-			brightnessctl
-			vulkan-tools # TODO: vulkan?
+			fortune # fun sayings
+			steam # games
+			pulsemixer # audio
+			file # identify file types
+			kitty # terminal emulator
+			fzf # fuzzy finder
+			dmenu # TODO: currently only using this for dmenu_path in `bin/launch`
+			ranger # tui for file management
+			pass # the standard unix password manager
+			vulkan-tools # vkcube for making sure vulkan still works
 			rustup
 			clang
-			pavucontrol
-			pamixer
-			strongswan
+			pavucontrol # gui pulseaudio manager
+			pamixer # tui pulseaudio manager
+			strongswan # work vpn
 			gnumake
 			elixir
-			postgresql
-			htop
-			google-cloud-sdk
-			unzip
-			automake
-			autoconf
-			ncurses
-			weechat
-			python39Full
-			jq
-			xfce.thunar xfce.thunar-archive-plugin xfce.thunar-volman
+			postgresql # database
+			htop # almost as good as bottom (btm)
+			google-cloud-sdk # gcloud
+			kubectl # kubernetes cli
+			awscli # aws cli
+			unzip # needed by a handful of other utilities
+			autoconf automake # autotools
+			weechat # irc
+			python39Full # python 3.9
+			jq # awk for json
+			xfce.thunar xfce.thunar-archive-plugin xfce.thunar-volman # gui file manager
+
+			# TODO: move this one to just laptop?
+			brightnessctl # laptop screen brightness
+
+			# nix utils
+			nox # package querying and installation?
+			# yay is to pacman, nox is to nix-env
+			niv # dependency pinning?
+			lorri # project envrc - like asdf-vm?
 		];
   };
 }
diff --git a/env/nix/profiles/base.nix b/env/nix/profiles/base.nix
index 86f506a..6d3dfd8 100644
--- a/env/nix/profiles/base.nix
+++ b/env/nix/profiles/base.nix
@@ -23,10 +23,6 @@
 			unzip
 			killall
 		];
-		variables = {
-			PAGER = "less";
-			VISUAL = "less";
-		};
 	};
 
 	programs = {