This commit is contained in:
Michael Zhang 2021-09-11 01:35:16 -05:00
parent 5419242882
commit b86aa8791a
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
4 changed files with 17 additions and 12 deletions

View file

@ -68,7 +68,7 @@ bindsym $mod+F12 exec --no-startup-id mpc next
floating_modifier $mod
# start a terminal
bindsym $mod+Return exec i3-sensible-terminal
bindsym $mod+Return exec WINIT_X11_SCALE_FACTOR=1.15 i3-sensible-terminal
# kill focused window
bindsym $mod+Shift+q kill

View file

@ -13,28 +13,25 @@ exe 'source' (stdpath('config') . '/nerdtree.vim')
" Plug 'ctrlpvim/ctrlp.vim'
let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
Plug 'FStarLang/VimFStar', {'for': 'fstar'}
Plug 'LnL7/vim-nix'
Plug 'ashinkarov/nvim-agda'
Plug 'prettier/vim-prettier', { 'do': 'yarn install' }
Plug 'evanleck/vim-svelte', {'branch': 'main'}
Plug 'FStarLang/VimFStar', {'for': 'fstar'}
Plug 'prettier/vim-prettier', { 'do': 'yarn install' }
Plug 'sheerun/vim-polyglot'
Plug 'tomasiser/vim-code-dark'
Plug 'editorconfig/editorconfig-vim'
" Plug 'jiangmiao/auto-pairs', { 'for': 'rust' }
" Plug 'kovisoft/slimv', { 'for': 'lisp' }
" Plug 'leafOfTree/vim-svelte-plugin'
" Plug 'JuliaEditorSupport/julia-vim'
Plug 'FStarLang/VimFStar', {'for': 'fstar'}
" Plug 'mhinz/vim-startify'
Plug 'tomasiser/vim-code-dark'
" Plug 'tpope/vim-sleuth'
" Language plugins
" Plug 'kovisoft/slimv'
" Plug 'leafOfTree/vim-svelte-plugin'
" Plug 'vmchale/dhall-vim'
" Plug 'qnighy/lalrpop.vim'
" Plug 'cespare/vim-toml'
@ -46,17 +43,15 @@ Plug 'tomasiser/vim-code-dark'
" Plug 'godlygeek/tabular'
" Plug 'plasticboy/vim-markdown'
Plug 'wakatime/vim-wakatime'
" Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'}
call plug#end()
let g:go_fmt_command = 'goimports'
let g:vim_markdown_new_list_item_indent = 2
let g:vim_markdown_folding_disabled = 1
let g:vim_markdown_toml_frontmatter = 1
Plug 'editorconfig/editorconfig-vim'
call plug#end()
" General config

View file

@ -9,6 +9,15 @@ alias kill-gpg-agent="gpgconf --kill gpg-agent"
alias dcompose="docker-compose"
alias ytmp3="youtube-dl --extract-audio --audio-format mp3 --embed-thumbnail --add-metadata"
function nixdev() {
DIR=$(pwd)
while [ ! -f "$DIR/flake.nix" ]; do
DIR=$(dirname $DIR)
if [[ "$DIR" == "/" ]]; then break; fi
done
nix develop "$DIR#$1" -c zsh
}
function ced() {
# if the file doesn't exist, prompt to make a new one
if [ ! -f "$1" ]; then

View file

@ -2,6 +2,7 @@ source $HOME/.common.sh
source_if_exists $HOME/.local/scripts/zsh/zsh-prelude.zsh
source_if_exists $HOME/.local/scripts/zsh/check-update.zsh
source_if_exists $HOME/Projects/sift/lmcas/code/etc/env.sh
# oh-my-zsh
export ZSH="$HOME/.oh-my-zsh"