diff --git a/dot_config/i3/private_config b/dot_config/i3/private_config index 3479b2d..d0bf89c 100644 --- a/dot_config/i3/private_config +++ b/dot_config/i3/private_config @@ -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 diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index 2dba8df..1e18f9f 100644 --- a/dot_config/nvim/init.vim +++ b/dot_config/nvim/init.vim @@ -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 diff --git a/dot_local/scripts/common/aliases.sh b/dot_local/scripts/common/aliases.sh index 67a70a5..04dd80e 100644 --- a/dot_local/scripts/common/aliases.sh +++ b/dot_local/scripts/common/aliases.sh @@ -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 diff --git a/dot_zshrc b/dot_zshrc index 8306c92..fbebcff 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -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"