diff --git a/.github/pull.yml b/.github/pull.yml
new file mode 100644
index 0000000..08de30a
--- /dev/null
+++ b/.github/pull.yml
@@ -0,0 +1,6 @@
+version: '1'
+rules:
+  - base: master
+    upstream: dmitmel:master
+    mergeMethod: merge
+    mergeUnstable: true
diff --git a/nvim/coc-languages/lua.vim b/nvim/coc-languages/lua.vim
new file mode 100644
index 0000000..e68ab5d
--- /dev/null
+++ b/nvim/coc-languages/lua.vim
@@ -0,0 +1,3 @@
+let g:coc_global_extensions += ['coc-lua']
+let s:filetypes = ['lua']
+let g:coc_filetypes += s:filetypes
diff --git a/nvim/dotfiles/plugins-list.vim b/nvim/dotfiles/plugins-list.vim
index ff2ce70..ccd39a0 100644
--- a/nvim/dotfiles/plugins-list.vim
+++ b/nvim/dotfiles/plugins-list.vim
@@ -2,7 +2,9 @@
   Plug 'tpope/vim-eunuch'
   if g:vim_ide
     Plug 'francoiscabrol/ranger.vim'
+    Plug 'rbgrouleff/bclose.vim'
   endif
+  Plug 'weirongxu/coc-explorer'
 " }}}
 
 " Editing {{{
@@ -71,3 +73,7 @@
     endif
   endif
 " }}}
+
+" Misc {{{
+  Plug 'wakatime/vim-wakatime'
+" }}}
diff --git a/scripts/copy-crosscode-emoji-url b/scripts/copy-crosscode-emoji-url
index 2192be2..1fcbdc4 100755
--- a/scripts/copy-crosscode-emoji-url
+++ b/scripts/copy-crosscode-emoji-url
@@ -57,7 +57,9 @@ def emote_downloader_and_iterator() -> Generator[str, None, None]:
 
     assert emote_registry_data["version"] == 1
 
-    emotes = [emote for emote in emote_registry_data["list"] if emote["safe"]]
+    emotes = [emote for emote in emote_registry_data["list"]
+              # if emote["safe"]
+              ]
 
     for emote in emotes:
         yield "{emote[ref]} [{emote[guild_name]}]".format(emote=emote)
diff --git a/scripts/copy-env-var b/scripts/copy-env-var
new file mode 100755
index 0000000..9a4d88d
--- /dev/null
+++ b/scripts/copy-env-var
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if variable="$(set -euo pipefail; {
+  awk 'BEGIN{for(v in ENVIRON) print v}'
+} | rofi -dmenu)" && [[ -n $variable ]]; then
+
+  variable="${variable%% *}"
+
+  echo ${!variable} | xclip -sel clip
+fi
diff --git a/scripts/discord-stream-desktop-audio b/scripts/discord-stream-desktop-audio
index e80d176..0161def 100755
--- a/scripts/discord-stream-desktop-audio
+++ b/scripts/discord-stream-desktop-audio
@@ -8,7 +8,7 @@ guild_id = int(sys.argv[1])
 voice_channel_id = int(sys.argv[2])
 pulseaudio_device = sys.argv[3]
 
-with open(os.path.expanduser("~/.config/dotfiles/discord-tools-bot-token.txt")) as f:
+with open(os.path.expanduser("~/.config/dotfiles/discord-tools-user-token.txt")) as f:
     bot_token = f.read().strip()
 
 
@@ -35,4 +35,4 @@ async def on_ready():
     )
 
 
-bot.run(bot_token)
+bot.run(bot_token, bot=False)
diff --git a/zsh/completions/_gh b/zsh/completions/_gh
new file mode 100644
index 0000000..b872834
--- /dev/null
+++ b/zsh/completions/_gh
@@ -0,0 +1,159 @@
+#compdef _gh gh
+
+# zsh completion for gh                                   -*- shell-script -*-
+
+__gh_debug()
+{
+    local file="$BASH_COMP_DEBUG_FILE"
+    if [[ -n ${file} ]]; then
+        echo "$*" >> "${file}"
+    fi
+}
+
+_gh()
+{
+    local shellCompDirectiveError=1
+    local shellCompDirectiveNoSpace=2
+    local shellCompDirectiveNoFileComp=4
+    local shellCompDirectiveFilterFileExt=8
+    local shellCompDirectiveFilterDirs=16
+
+    local lastParam lastChar flagPrefix requestComp out directive compCount comp lastComp
+    local -a completions
+
+    __gh_debug "\n========= starting completion logic =========="
+    __gh_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $CURRENT location, so we need
+    # to truncate the command-line ($words) up to the $CURRENT location.
+    # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+    words=("${=words[1,CURRENT]}")
+    __gh_debug "Truncated words[*]: ${words[*]},"
+
+    lastParam=${words[-1]}
+    lastChar=${lastParam[-1]}
+    __gh_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+    # For zsh, when completing a flag with an = (e.g., gh -n=<TAB>)
+    # completions must be prefixed with the flag
+    setopt local_options BASH_REMATCH
+    if [[ "${lastParam}" =~ '-.*=' ]]; then
+        # We are dealing with a flag with an =
+        flagPrefix="-P ${BASH_REMATCH}"
+    fi
+
+    # Prepare the command to obtain completions
+    requestComp="${words[1]} __complete ${words[2,-1]}"
+    if [ "${lastChar}" = "" ]; then
+        # If the last parameter is complete (there is a space following it)
+        # We add an extra empty parameter so we can indicate this to the go completion code.
+        __gh_debug "Adding extra empty parameter"
+        requestComp="${requestComp} \"\""
+    fi
+
+    __gh_debug "About to call: eval ${requestComp}"
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+    __gh_debug "completion output: ${out}"
+
+    # Extract the directive integer following a : from the last line
+    local lastLine
+    while IFS='\n' read -r line; do
+        lastLine=${line}
+    done < <(printf "%s\n" "${out[@]}")
+    __gh_debug "last line: ${lastLine}"
+
+    if [ "${lastLine[1]}" = : ]; then
+        directive=${lastLine[2,-1]}
+        # Remove the directive including the : and the newline
+        local suffix
+        (( suffix=${#lastLine}+2))
+        out=${out[1,-$suffix]}
+    else
+        # There is no directive specified.  Leave $out as is.
+        __gh_debug "No directive found.  Setting do default"
+        directive=0
+    fi
+
+    __gh_debug "directive: ${directive}"
+    __gh_debug "completions: ${out}"
+    __gh_debug "flagPrefix: ${flagPrefix}"
+
+    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+        __gh_debug "Completion received error. Ignoring completions."
+        return
+    fi
+
+    compCount=0
+    while IFS='\n' read -r comp; do
+        if [ -n "$comp" ]; then
+            # If requested, completions are returned with a description.
+            # The description is preceded by a TAB character.
+            # For zsh's _describe, we need to use a : instead of a TAB.
+            # We first need to escape any : as part of the completion itself.
+            comp=${comp//:/\\:}
+
+            local tab=$(printf '\t')
+            comp=${comp//$tab/:}
+
+            ((compCount++))
+            __gh_debug "Adding completion: ${comp}"
+            completions+=${comp}
+            lastComp=$comp
+        fi
+    done < <(printf "%s\n" "${out[@]}")
+
+    if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
+        # File extension filtering
+        local filteringCmd
+        filteringCmd='_files'
+        for filter in ${completions[@]}; do
+            if [ ${filter[1]} != '*' ]; then
+                # zsh requires a glob pattern to do file filtering
+                filter="\*.$filter"
+            fi
+            filteringCmd+=" -g $filter"
+        done
+        filteringCmd+=" ${flagPrefix}"
+
+        __gh_debug "File filtering command: $filteringCmd"
+        _arguments '*:filename:'"$filteringCmd"
+    elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
+        # File completion for directories only
+        local subDir
+        subdir="${completions[1]}"
+        if [ -n "$subdir" ]; then
+            __gh_debug "Listing directories in $subdir"
+            pushd "${subdir}" >/dev/null 2>&1
+        else
+            __gh_debug "Listing directories in ."
+        fi
+
+        _arguments '*:dirname:_files -/'" ${flagPrefix}"
+        if [ -n "$subdir" ]; then
+            popd >/dev/null 2>&1
+        fi
+    elif [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ] && [ ${compCount} -eq 1 ]; then
+        __gh_debug "Activating nospace."
+        # We can use compadd here as there is no description when
+        # there is only one completion.
+        compadd -S '' "${lastComp}"
+    elif [ ${compCount} -eq 0 ]; then
+        if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+            __gh_debug "deactivating file completion"
+        else
+            # Perform file completion
+            __gh_debug "activating file completion"
+            _arguments '*:filename:_files'" ${flagPrefix}"
+        fi
+    else
+        _describe "completions" completions $(echo $flagPrefix)
+    fi
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "$funcstack[1]" = "_gh" ]; then
+	_gh
+fi