diff --git a/config/surfraw/elvi/twitter b/config/surfraw/elvi/twitter
new file mode 100755
index 00000000..9f0bb3b4
--- /dev/null
+++ b/config/surfraw/elvi/twitter
@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+#
+# AUTHOR: Henrik Lissner
+#
+# DATE: Tue Nov 26 2019
+#
+# DESC: Elvi to search twitter
+# elvis: twitter           -- Search twitter
+. surfraw || exit 1
+
+w3_usage_hook () {
+    cat <<EOF
+Usage: $w3_argv0 [options] [search words]...
+Description:
+  Search twitter (twitter.com)
+EOF
+    w3_global_usage
+}
+
+w3_config
+w3_parse_args "$@"
+if [ -z "$w3_args" ]; then
+    w3_browse_url "https://twitter.com"
+else
+    args="$(w3_url_of_arg $we_args)"
+    w3_browse_url "https://twitter.com/search?q=${args}"
+fi
+
diff --git a/configuration.kuro.nix b/configuration.kuro.nix
index fd355aac..f0c31091 100644
--- a/configuration.kuro.nix
+++ b/configuration.kuro.nix
@@ -24,6 +24,7 @@
     ./modules/shell/gnupg.nix
     ./modules/shell/ncmpcpp.nix
     ./modules/shell/pass.nix
+    ./modules/shell/surfraw.nix
     ./modules/shell/zsh.nix
     # ./modules/video/kdenlive.nix
     # ./modules/video/obs.nix
diff --git a/configuration.shiro.nix b/configuration.shiro.nix
index d3659d8c..59a9d278 100644
--- a/configuration.shiro.nix
+++ b/configuration.shiro.nix
@@ -22,6 +22,7 @@ in {
     ./modules/shell/git.nix
     ./modules/shell/gnupg.nix
     ./modules/shell/pass.nix
+    ./modules/shell/surfraw.nix
     ./modules/shell/zsh.nix
     # ./modules/video/obs.nix
 
diff --git a/modules/shell/surfraw.nix b/modules/shell/surfraw.nix
new file mode 100644
index 00000000..91b18342
--- /dev/null
+++ b/modules/shell/surfraw.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    surfraw
+  ];
+
+  home-manager.users.hlissner.xdg.configFile = {
+    "surfraw".source = <config/surfraw>;
+  };
+}