Compare commits

...

74 commits

Author SHA1 Message Date
pull[bot]
7cf73f8f1b
Merge pull request #243 from dmitmel/master
[pull] master from dmitmel:master
2021-04-25 22:05:46 +00:00
pull[bot]
dfb5750295
Merge pull request #242 from dmitmel/master
[pull] master from dmitmel:master
2021-04-24 16:29:46 +00:00
pull[bot]
c1e451b5ce
Merge pull request #241 from dmitmel/master
[pull] master from dmitmel:master
2021-04-23 22:29:43 +00:00
pull[bot]
0643bdf1bf
Merge pull request #240 from dmitmel/master
[pull] master from dmitmel:master
2021-04-22 22:30:01 +00:00
pull[bot]
fc5e5f1951
Merge pull request #239 from dmitmel/master
[pull] master from dmitmel:master
2021-04-22 16:29:44 +00:00
pull[bot]
1cc52196dd
Merge pull request #238 from dmitmel/master
[pull] master from dmitmel:master
2021-04-18 16:31:04 +00:00
pull[bot]
0d82ed488b
Merge pull request #237 from dmitmel/master
[pull] master from dmitmel:master
2021-04-11 22:29:26 +00:00
pull[bot]
e5d942e860
Merge pull request #236 from dmitmel/master
[pull] master from dmitmel:master
2021-04-10 16:29:36 +00:00
5e7350f793
Merge branch 'dmitmel-master' 2021-04-09 21:50:58 +02:00
7a2ac38de7
Fixed conflict. 2021-04-09 21:50:38 +02:00
pull[bot]
3236718daf
Merge pull request #234 from dmitmel/master
[pull] master from dmitmel:master
2021-04-05 03:36:06 +00:00
Dmytro Meleshko
9253cb6a08 [crosscode] add an icon for the Arch mod 2021-04-05 02:07:00 +03:00
pull[bot]
49b67aea8d
Merge pull request #233 from dmitmel/master
[pull] master from dmitmel:master
2021-04-02 21:27:52 +00:00
pull[bot]
23a741be94
Merge pull request #232 from dmitmel/master
[pull] master from dmitmel:master
2021-03-30 14:59:34 +00:00
pull[bot]
5e0633ead5
Merge pull request #231 from dmitmel/master
[pull] master from dmitmel:master
2021-03-30 09:29:53 +00:00
pull[bot]
7867a5ddd9
Merge pull request #230 from dmitmel/master
[pull] master from dmitmel:master
2021-03-27 16:34:30 +00:00
pull[bot]
a089d68776
Merge pull request #229 from dmitmel/master
[pull] master from dmitmel:master
2021-03-27 02:18:23 +00:00
pull[bot]
fc159ec552
Merge pull request #228 from dmitmel/master
[pull] master from dmitmel:master
2021-03-26 06:38:12 +00:00
pull[bot]
4e1c759bbc
Merge pull request #227 from dmitmel/master
[pull] master from dmitmel:master
2021-03-25 06:41:49 +00:00
pull[bot]
9164088ecc
Merge pull request #226 from dmitmel/master
[pull] master from dmitmel:master
2021-03-21 15:54:50 +00:00
pull[bot]
1a248036aa
Merge pull request #225 from dmitmel/master
[pull] master from dmitmel:master
2021-03-21 12:34:14 +00:00
pull[bot]
f4a842d59e
Merge pull request #224 from dmitmel/master
[pull] master from dmitmel:master
2021-03-20 21:48:49 +00:00
pull[bot]
3b97435825
Merge pull request #223 from dmitmel/master
[pull] master from dmitmel:master
2021-03-20 06:03:32 +00:00
pull[bot]
626811a49f
Merge pull request #222 from dmitmel/master
[pull] master from dmitmel:master
2021-03-19 02:42:33 +00:00
5ab08f0f0b
Merge branch 'dmitmel-master' 2021-03-18 19:20:39 +01:00
ce9c2d33ae
Merged dmitmel:master into master. 2021-03-18 19:20:25 +01:00
Dmytro Meleshko
6577755555
[nvim] switch from coc-python to coc-pyright 2021-03-14 12:19:19 +01:00
dependabot[bot]
81d185be53
Bump prismjs from 1.21.0 to 1.23.0 in /script-resources/markdown2htmldoc
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.21.0 to 1.23.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PrismJS/prism/compare/v1.21.0...v1.23.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-14 12:19:19 +01:00
pull[bot]
b31bea45ea
Merge pull request #218 from dmitmel/master
[pull] master from dmitmel:master
2021-02-27 14:13:28 +00:00
pull[bot]
86b542b4d0
Merge pull request #217 from dmitmel/master
[pull] master from dmitmel:master
2021-02-22 11:00:14 +00:00
pull[bot]
fc3afdf441
Merge pull request #216 from dmitmel/master
[pull] master from dmitmel:master
2021-02-20 13:47:09 +00:00
f9051aff76
Why was this on rebase again? 2021-02-19 21:47:22 +01:00
5517419413
Merge pull request #215 from dmitmel/master 2021-02-19 21:33:01 +01:00
Dmytro Meleshko
9555e5f706 [x11] add my xprofile 2021-02-12 15:13:05 +00:00
Dmytro Meleshko
6fc06191a5 [scripts/discord-stream-desktop-audio] allow specifying the audio device 2021-02-12 09:08:57 +00:00
Dmytro Meleshko
b0eef79602 [nvim] disable ESLint integration for Prettier, sync configs 2021-02-12 09:08:57 +00:00
Dmytro Meleshko
2a0ffb0cf5 [crosscode] add a mod for binding mouse buttons to actions 2021-02-12 09:08:57 +00:00
Dmytro Meleshko
6bd741c236 [nvim] disable matchpairs in all other JS-like filetypes 2021-02-09 12:29:26 +00:00
Dmytro Meleshko
851a494eb0 [nvim] properly display wavy underlines under spelling mistakes now that I have enabled all termcap features of kitty 2021-02-08 21:44:50 +00:00
Dmytro Meleshko
b15a03c3f9 [kitty] stop changing TERM to something non-default 2021-02-08 18:24:47 +00:00
Dmytro Meleshko
33ed3720c8 [ranger] add ranger config 2021-02-08 18:24:47 +00:00
Dmytro Meleshko
a59a693e98 [zsh] use Python 3 by default on macOS 2021-02-07 21:04:30 +00:00
Dmytro Meleshko
da7c44af35 [nvim] fix FixWhitespaceOnSave flooding the search history 2021-02-05 11:36:25 +00:00
Dmytro Meleshko
618995cc7f [nvim] add functions to workaround some interesting behaviors of vim 2021-02-05 11:36:25 +00:00
Dmytro Meleshko
a27c05856a [zsh] add a timestamp printing function 2021-02-05 11:36:25 +00:00
pull[bot]
0ec9d1ded1
Merge pull request #149 from dmitmel/master
[pull] master from dmitmel:master
2021-02-04 21:43:39 +00:00
Dmytro Meleshko
f288247671 [kitty] remove the sample config and keep only the changed bits 2021-02-04 18:30:58 +00:00
Dmytro Meleshko
bcf58ced93 [kitty] enable the only two layouts I actually use 2021-02-04 18:30:58 +00:00
Dmytro Meleshko
18700a8198 [scripts/welcome] add logo for Manjaro ARM 2021-02-04 14:54:46 +00:00
Dmytro Meleshko
60f8ca3788 [zsh] display the current pyenv version in the prompt 2021-02-02 22:52:58 +00:00
Dmytro Meleshko
ed93c816f9 [nvim] bring back a fix removed in 14e64127e4 2021-02-02 22:52:58 +00:00
Dmytro Meleshko
57f0e01b51 [nvim] disable rust-analyzer's diagnostics and autoimports 2021-02-01 11:18:52 +00:00
482828639e
Merge branch 'master' keanuplayz/dotfiles 2021-01-30 14:17:16 +01:00
a659106248
[scripts/copy-env-var] Script to copy envvars. 2021-01-30 14:17:07 +01:00
Dmytro Meleshko
b45d969f0c [git] add temporary files to the gitignore 2021-01-29 13:19:12 +00:00
Dmytro Meleshko
1e50762fcb [nvim+zsh] fix the need for resetting FZF_DEFAULT_OPTS on Ubuntu and derivatives 2021-01-29 01:19:21 +00:00
7f3dfb96be
[nvim] Added plugin coc-explorer. 2021-01-28 16:24:43 +01:00
Dmytro Meleshko
e277f19ed3 [zsh] fix the manpath-caused errors on shell startup once and for all 2021-01-25 19:28:31 +00:00
Dmytro Meleshko
4b6cf8c56a [nvim] fix the commentstring in po files 2021-01-25 12:40:11 +00:00
Dmytro Meleshko
06ff96bf30 [nvim] add a plugin for RON 2021-01-21 11:06:06 +00:00
Dmytro Meleshko
4cc4389455 [nvim] make the airline theme match my syntax theme even more 2021-01-21 01:20:43 +00:00
Dmytro Meleshko
819e5e5a33 update the copyright years 2021-01-20 10:04:09 +00:00
Dmytro Meleshko
3d7078d8a1 [scripts/copy-crosscode-emoji-url] change the order of URL params 2021-01-18 10:02:12 +00:00
15d01d0d4f
Merge pull request #18 from dmitmel/master
copy script update that was already done
2021-01-17 14:29:21 +01:00
pull[bot]
6998226ea1
updated 2021-01-17 14:28:31 +01:00
4d6ff353f9
Updated merge strategy. 2021-01-17 14:27:03 +01:00
159a142967
Removed fasd stuff. 2021-01-17 12:07:31 +01:00
62611bb01e
[nvim] Added WakaTime plugin. 2021-01-17 12:07:14 +01:00
9a36e9ecbb
merge dmitmel/master into master 2021-01-16 18:16:48 +01:00
5425d38058
Add pull config. 2021-01-16 18:15:58 +01:00
0ddb5c5777
[zsh] Added completions for gh cli. 2021-01-16 18:15:57 +01:00
51a3ea7777
[nvim] Added Lua to coc. 2021-01-16 18:15:57 +01:00
5e2ea81830
[scripts/copy-emote] Removed requirement of 'safe' 2021-01-16 18:15:57 +01:00
ab7320297f
[scripts/discord-stream] Now uses separate file. 2021-01-16 18:15:57 +01:00
7 changed files with 190 additions and 3 deletions

6
.github/pull.yml vendored Normal file
View file

@ -0,0 +1,6 @@
version: '1'
rules:
- base: master
upstream: dmitmel:master
mergeMethod: merge
mergeUnstable: true

View file

@ -0,0 +1,3 @@
let g:coc_global_extensions += ['coc-lua']
let s:filetypes = ['lua']
let g:coc_filetypes += s:filetypes

View file

@ -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'
" }}}

View file

@ -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)

11
scripts/copy-env-var Executable file
View file

@ -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

View file

@ -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)

159
zsh/completions/_gh Normal file
View file

@ -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