diff --git a/configs/packages.nix b/configs/packages.nix
index e273c27..27c511e 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -5,6 +5,7 @@ let
   iolanguage = pkgs.callPackage ../packages/iolanguage.nix {};
   todoist = pkgs.callPackage ../packages/todoist {};
   unstable = import <nixos-unstable> {};
+  executables = pkgs.haskell.lib.justStaticExecutables;
 in with pkgs;
 {
   nixpkgs.config.allowUnfree = true;
@@ -66,9 +67,14 @@ in with pkgs;
   ] ++ [ # shell
     bat
     dos2unix
+    fd
     file
     git
+    gitAndTools.hub
+    gitstats
     manpages
+    patch
+    patchutils
     posix_man_pages
     most
     ranger
@@ -98,57 +104,40 @@ in with pkgs;
 
   users.users.kfm.packages = scripts ++ [
   ] ++ [ # typesetting
-    (texlive.combine { inherit (pkgs.texlive)
-      scheme-tetex
-      latexmk
-      biblatex
-      comment
-      csquotes
-      enumitem
-      fontaxes
-      ifnextok
-      tcolorbox
-      lipsum
-      environ
-      trimspaces
-      ucharclasses
-      wrapfig
-      imakeidx
-      hardwrap
-      titlesec
-      libertine
-      logreq
-      marginnote
-      mweights
-      realscripts
-      pbox
-      stdclsdv
-      fdsymbol
-      moderncv
-      xstring;
+    (texlive.combine {
+      inherit (pkgs.texlive) scheme-full texdoc latex2e-help-texinfo;
+      pkgFilter = pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "latex2e-help-texinfo";
     })
     pandoc
-    haskellPackages.pandoc-citeproc
+    (executables haskellPackages.pandoc-citeproc)
     asciidoctor
   ] ++ [ # programming
     cloc
     gnumake
     cabal2nix
+    chicken
     clojure
     gcc
     ghc
-    guile
-    haskellPackages.ghcid
-    haskellPackages.hakyll
-    haskellPackages.hasktags
-    haskellPackages.hindent
-    haskellPackages.hoogle
-    hlint
+    (executables haskellPackages.cabal-install)
+    (executables haskellPackages.ghcid)
+    (executables haskellPackages.hakyll)
+    (executables haskellPackages.hasktags)
+    (executables haskellPackages.hindent)
+    (executables haskellPackages.hoogle)
+    (executables haskellPackages.pointfree)
+    (executables haskellPackages.pointful)
+    (executables haskellPackages.hlint)
+    (executables haskellPackages.hpack)
+    htmlTidy
     iolanguage
     lua
     mypy
     nix-prefetch-git
     nodejs
+    nodePackages.eslint
+    nodePackages.csslint
+    nodePackages.prettier
     ocaml
     python3
     python36Packages.black
@@ -157,7 +146,6 @@ in with pkgs;
     rustup
     scala
     shellcheck
-    stack
   ] ++ [ # media
     audacity
     calibre
@@ -174,12 +162,19 @@ in with pkgs;
     graphviz
     maxima
   ] ++ [ # shell
-    daybook
     # todoist
-    unstable.hledger
+    aspell
+    aspellDicts.de
+    aspellDicts.en
+    aspellDicts.la
+    daybook
     jo
     jq
     memo
     par
+    qrencode
+    unstable.hledger
+    wordnet
+    xsv
   ];
 }
diff --git a/configs/shells.nix b/configs/shells.nix
index 91f1bf9..4f52a38 100644
--- a/configs/shells.nix
+++ b/configs/shells.nix
@@ -10,6 +10,7 @@
       ip = "${pkgs.iproute}/bin/ip -c";
       ocaml = rlwrap "${pkgs.ocaml}/bin/ocaml";
       tmux = "${pkgs.tmux}/bin/tmux -2";
+      inix = "nix repl '<nixpkgs>'";
     };
 
   environment.interactiveShellInit = "export PATH=$PATH:$HOME/.local/bin:$HOME/.cargo/bin";
diff --git a/dot/scripts.nix b/dot/scripts.nix
index 5aefe6b..a48967a 100644
--- a/dot/scripts.nix
+++ b/dot/scripts.nix
@@ -388,6 +388,9 @@ let
   scripts.wttr = unstable.writers.writeDashBin "wttr" ''
     ${pkgs.curl}/bin/curl -s -H "Accept-Language: ''${LANG%_*}" --compressed "wttr.in/''${1-$(${pkgs.curl}/bin/curl -s ipinfo.io | ${pkgs.jq}/bin/jq .loc)}?0"
   '';
+  scripts.nix-git = unstable.writers.writeDashBin "nix-git" ''
+    ${pkgs.nix-prefetch-git}/bin/nix-prefetch-git "$@" 2> /dev/null | ${pkgs.jq}/bin/jq -r '"rev = \"\(.rev)\";\nsha256 = \"\(.sha256)\";"'
+  '';
   scripts.q =
     let
       q-performance = ''
diff --git a/options.nix b/options.nix
index a171104..be1031d 100644
--- a/options.nix
+++ b/options.nix
@@ -33,8 +33,8 @@ in {
     };
 
     theme = mapAttrs (const themeOption) {
-      gtk = { name = "Breeze-Dark"; package = pkgs.breeze-gtk; };
-      icon = { name = "Adwaita"; package = pkgs.gnome3.adwaita-icon-theme; };
+      gtk = { name = "Arc"; package = pkgs.arc-theme; };
+      icon = { name = "Arc"; package = pkgs.arc-icon-theme; };
       cursor = { name = "capitaine-cursors"; package = pkgs.capitaine-cursors; };
     };
   };