diff --git a/home-cli.nix b/home-cli.nix
index a9bc0a2..d225845 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -6,14 +6,13 @@ in
 {
   home.stateVersion = "18.09";
 
-  home.packages = with pkgs; [ # magic-wormhole
-    ripgrep fd mosh w3m nnn hexyl wget httpie timg sox du-dust restic bitwarden-cli gnupg gpg-tui rage sd libqalculate glow spotify-tui spotifyd amfora duf pandoc pastel jq jo fx jc miller sc-im cacert weechat ddgr # visidata
+  home.packages = with pkgs; [
+    ripgrep fd mosh w3m nnn hexyl wget httpie timg sox du-dust restic bitwarden-cli gnupg gpg-tui rage sd libqalculate glow spotify-tui spotifyd amfora duf pandoc pastel jq jo fx jc miller sc-im cacert weechat ddgr visidata magic-wormhole
     nixfmt shellcheck vale tectonic zathura # lilypond-with-fonts
     nodejs deno yarn nodePackages.typescript-language-server nodePackages.stylelint nodePackages.js-beautify nodePackages.expo-cli
     ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin
-    rustup go cmake
-    # racket-minimal
-    ghc haskell-language-server hlint haskellPackages.hoogle
+    rustup go cmake racket-minimal
+    # ghc haskell-language-server hlint haskellPackages.hoogle
     lua53Packages.luarocks
     ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es
   ];
@@ -21,13 +20,8 @@ in
   home.sessionVariables = {
     EDITOR = "vim";
     BROWSER = "open";
-    MANPAGER = "sh -c 'col -bx | bat -l man -p'";
-    PATH = "$PATH:${builtins.getEnv "HOME"}/.cargo/bin:${builtins.getEnv "HOME"}/.local/bin";
-    EXA_ICON_SPACING = 2;
   };
 
-  fonts.fontconfig.enable = true;
-
   programs.home-manager.enable = true;
 
   programs.tmux = {
@@ -70,6 +64,7 @@ in
   programs.zoxide = { # z doc -> cd ~/Documents; zi -> interactive
     enable = true;
     enableZshIntegration = true;
+    enableFishIntegration = true;
   };
 
   programs.zsh = {
@@ -94,20 +89,45 @@ in
     };
   };
 
+  programs.fish = {
+    enable = true;
+    # enableAutosuggestions = true;
+    # enableSyntaxHighlighting = true;
+    # oh-my-zsh = {
+    #   enable = true;
+    #   plugins = [ "git" "httpie" "aws" "fd" "fzf" "mosh" "npm" "ripgrep" "rsync" "sudo" "yarn" "vi-mode" ];
+    # };
+    shellAliases = {
+      v = "vim";
+      l = "exa -lah --icons --git";
+      n = "nnn";
+      h = "himalaya";
+      er = "rm -rf logs; unzip -o";
+      srsync = "rsync --rsync-path='sudo rsync'";
+      lg = "lazygit";
+      ambient1 = "play -n -c1 synth whitenoise lowpass -1 120 lowpass -1 120 lowpass -1 120 gain +16";
+      ambient2 = "play -c 2 -n synth brownnoise lowpass 200";
+      ambient3 = "play -c 2 -n synth brownnoise lowpass 150 loudness +10";
+    };
+  };
+
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;
+    # enableFishIntegration = true;
   };
 
   programs.starship = {
     enable = true;
     enableZshIntegration = true;
+    enableFishIntegration = true;
   };
 
   programs.fzf = {
     # ctrl-t, ctrl-r, ssh **<tab>
     enable = true;
     enableZshIntegration = true;
+    enableFishIntegration = true;
     defaultCommand = "fd --type file --color=always";
     defaultOptions = [
       "--height 40%"
@@ -126,6 +146,7 @@ in
     # ctrl-G
     enable = true;
     enableZshIntegration = true;
+    enableFishIntegration = true;
   };
 
   programs.ssh = {
@@ -216,7 +237,7 @@ in
   programs.helix = {
     enable = true;
     settings = {
-      theme = "catpuccin";
+      theme = "catppuccin_mocha";
       editor = {
         cursorline = true;
         lsp.display-messages = true;
@@ -238,8 +259,16 @@ in
 
   programs.bat = {
     enable = true;
+    themes = {
+      Catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub {
+        owner = "catppuccin";
+        repo = "bat";
+        rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+        sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+      } + "/Catppuccin-mocha.tmTheme");
+    };
     config = {
-      theme = "Nord";
+      theme = "Catppuccin-mocha";
     };
   };
 
@@ -252,6 +281,7 @@ in
   programs.keychain = {
     enable = true;
     enableZshIntegration = true;
+    enableFishIntegration = true;
     inheritType = "any";
     agents = [ "gpg" "ssh" ];
     keys = [ "id_rsa" "2B3A6377" ];
diff --git a/home-gui.nix b/home-gui.nix
index beded44..491c490 100644
--- a/home-gui.nix
+++ b/home-gui.nix
@@ -1,7 +1,8 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ iosevka-bin ];
+  # home.packages = with pkgs; [ iosevka-bin ];
+  fonts.fontconfig.enable = true;
 
   programs.alacritty = {
     enable = true;
diff --git a/home-mail.nix b/home-mail.nix
index a088a39..22a2899 100644
--- a/home-mail.nix
+++ b/home-mail.nix
@@ -4,7 +4,7 @@ let
   secrets = import ./secrets.nix;
 in
 {
-  home.packages = with pkgs; [ vdirsyncer khard imapnotify ]; # khal
+  home.packages = with pkgs; [ vdirsyncer khard khal imapnotify ];
 
   programs.mbsync.enable = true;
 
@@ -16,7 +16,7 @@ in
     sort = "reverse-threads";
   };
 
-  # programs.himalaya.enable = true;
+  programs.himalaya.enable = true;
 
   programs.aerc = {
     enable = true;
@@ -81,15 +81,6 @@ in
     };
   };
 
-#   home.file.aerc-accounts = {
-#     target = ".config/aerc/accounts.conf";
-#     text = ''[FastMail]
-# source = maildir://~/Mail/FastMail
-# from = "Dustin Swan <dustin@dustinswan.com>"
-# outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from
-# '';
-#   };
-
   home.file.vdirsyncer = {
     target = ".config/vdirsyncer/config";
     text = ''[general]
diff --git a/newsboat.catpuccin b/newsboat.catpuccin
new file mode 100644
index 0000000..ac57e94
--- /dev/null
+++ b/newsboat.catpuccin
@@ -0,0 +1,18 @@
+color listnormal         color15 default
+color listnormal_unread  color2  default
+color listfocus_unread   color2  color0
+color listfocus          default color0
+color background         default default
+color article            default default
+color end-of-text-marker color8  default
+color info               color4  color8
+color hint-separator     default color8
+color hint-description   default color8
+color title              color14 color8
+
+highlight article "^(Feed|Title|Author|Link|Date): .+" color4 default bold
+highlight article "^(Feed|Title|Author|Link|Date):" color14 default bold
+
+highlight article "\\((link|image|video)\\)" color8 default
+highlight article "https?://[^ ]+" color4 default
+highlight article "\[[0-9]+\]" color6 default bold