diff --git a/home-common.nix b/home-cli.nix
similarity index 76%
rename from home-common.nix
rename to home-cli.nix
index ea32b76..892015c 100644
--- a/home-common.nix
+++ b/home-cli.nix
@@ -2,7 +2,7 @@
 
 {
   home.packages = with pkgs; [
-    ripgrep fd wget silver-searcher tree ranger nodejs-13_x yarn mosh w3m urlview nmap tuir gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert catimg tldr ffsend du-dust duplicati python3
+    ripgrep fd wget silver-searcher tree ranger nodejs yarn mosh w3m urlview nmap tuir gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert catimg tldr ffsend du-dust duplicati python3 bitwarden-cli
   ];
 
   home.sessionVariables = {
@@ -19,66 +19,6 @@
 
   programs.home-manager.enable = true;
 
-  # programs.alacritty = {
-  #   enable = true;
-  #   settings = {
-  #     window = {
-  #       padding = {
-  #         x = 12;
-  #         y = 12;
-  #       };
-  #       dimentions = {
-  #         columns = 0;
-  #         lines = 0;
-  #       };
-  #     };
-  #     font = {
-  #       normal.family = "Iosevka Nerd Font";
-  #       bold.family = "Iosevka Nerd Font";
-  #       italic.family = "Iosevka Nerd Font";
-  #       size = 16.0;
-  #     };
-  #     key_bindings = [
-  #       {
-  #         key = "N";
-  #         mods = "Control|Shift";
-  #         action = "SpawnNewInstance";
-  #       }
-  #     ];
-  #     background_opacity = 0.95;
-  #     colors = { # Nord
-  #       primary = {
-  #         background = "0x2E3440";
-  #         foreground = "0xD8DEE9";
-  #       };
-  #       cursor = {
-  #         text = "0x2E3440";
-  #         cursor = "0xD8DEE9";
-  #       };
-  #       normal = {
-  #         black = "0x3B4252";
-  #         red = "0xBF616A";
-  #         green = "0xA3BE8C";
-  #         yellow = "0xEBCB8B";
-  #         blue = "0x81A1C1";
-  #         magenta = "0xB48EAD";
-  #         cyan = "0x88C0D0";
-  #         white = "0xE5E9F0";
-  #       };
-  #       bright = {
-  #         black = "0x4C566A";
-  #         red = "0xBF616A";
-  #         green = "0xA3BE8C";
-  #         yellow = "0xEBCB8B";
-  #         blue = "0x81A1C1";
-  #         magenta = "0xB48EAD";
-  #         cyan = "0x8FBCBB";
-  #         white = "0xECEFF4";
-  #       };
-  #     };
-  #   };
-  # };
-
   programs.tmux = {
     enable = true;
     shortcut = "a";
@@ -110,7 +50,6 @@
   };
 
   programs.zsh = {
-  # programs.fish = { # fish and home-manager don't work yet
     enable = true;
     enableAutosuggestions = true;
     oh-my-zsh = {
@@ -139,7 +78,6 @@
   programs.starship = {
     enable = true;
     enableZshIntegration = true;
-    # enableFishIntegration = true;
   };
 
   programs.fzf = {
@@ -149,13 +87,11 @@
     defaultOptions = [ "--height 40%" "--border" "--ansi" ];
     fileWidgetCommand = "fd --type file --color=always";
     fileWidgetOptions = [ "--min-height 30 --preview-window noborder --preview '(bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}) 2> /dev/null'" ];
-    # enableFishIntegration = true;
   };
 
   programs.broot = {
     enable = true;
     enableZshIntegration = true;
-    # enableFishIntegration = true;
   };
 
   programs.ssh = {
@@ -189,6 +125,7 @@
   };
 
   programs.emacs.enable = true;
+
   programs.neovim = {
     enable = true;
     viAlias = true;
@@ -268,10 +205,10 @@
   programs.htop.enable = true;
   programs.mpv.enable = true;
   programs.jq.enable = true;
+
   programs.keychain = {
     enable = true;
     enableZshIntegration = true;
-    # enableFishIntegration = true; # uhoh, this doesn't exist yet either
     inheritType = "any";
     agents = ["gpg" "ssh"];
     keys = ["id_rsa" "2B3A6377"];
@@ -286,8 +223,4 @@
   #     ttrss-passwordeval "gpg -dq ~/.dustinswan@tt-rss.dustinswan.com.gpg"
   #   '';
   # };
-
-  # programs.qutebrowser = {
-  #   enable = true;
-  # };
 }
diff --git a/home-gui.nix b/home-gui.nix
new file mode 100644
index 0000000..f363b27
--- /dev/null
+++ b/home-gui.nix
@@ -0,0 +1,61 @@
+{
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      window = {
+        padding = {
+          x = 12;
+          y = 12;
+        };
+        dimentions = {
+          columns = 0;
+          lines = 0;
+        };
+      };
+      font = {
+        normal.family = "Iosevka Nerd Font";
+        bold.family = "Iosevka Nerd Font";
+        italic.family = "Iosevka Nerd Font";
+        size = 16.0;
+      };
+      key_bindings = [
+        {
+          key = "N";
+          mods = "Control|Shift";
+          action = "SpawnNewInstance";
+        }
+      ];
+      background_opacity = 0.95;
+      colors = { # Nord
+        primary = {
+          background = "0x2E3440";
+          foreground = "0xD8DEE9";
+        };
+        cursor = {
+          text = "0x2E3440";
+          cursor = "0xD8DEE9";
+        };
+        normal = {
+          black = "0x3B4252";
+          red = "0xBF616A";
+          green = "0xA3BE8C";
+          yellow = "0xEBCB8B";
+          blue = "0x81A1C1";
+          magenta = "0xB48EAD";
+          cyan = "0x88C0D0";
+          white = "0xE5E9F0";
+        };
+        bright = {
+          black = "0x4C566A";
+          red = "0xBF616A";
+          green = "0xA3BE8C";
+          yellow = "0xEBCB8B";
+          blue = "0x81A1C1";
+          magenta = "0xB48EAD";
+          cyan = "0x8FBCBB";
+          white = "0xECEFF4";
+        };
+      };
+    };
+  };
+}
diff --git a/home-linux.nix b/home-linux.nix
index 741e4c2..48a8f30 100644
--- a/home-linux.nix
+++ b/home-linux.nix
@@ -207,7 +207,7 @@ xsetroot -solid black -cursor_name left_ptr
     };
   };
 
-  imports = [ ./home-common.nix ./home-mail.nix ];
+  imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ];
 
   programs.alacritty.settings.font.size = 10.0;
 }
diff --git a/home-mac.nix b/home-mac.nix
index effe2e1..8958ee0 100644
--- a/home-mac.nix
+++ b/home-mac.nix
@@ -15,5 +15,5 @@
   programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh";
   # programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh";
 
-  imports = [ ./home-common.nix ./home-mail.nix ];
+  imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ];
 }