diff options
| -rw-r--r-- | .config/foot/foot.ini | 2 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 66 | ||||
| -rw-r--r-- | .config/zsh/.zshrc | 10 | ||||
| -rw-r--r-- | .zprofile | 11 |
4 files changed, 13 insertions, 76 deletions
diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index 71b00c0..0ba0936 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -10,7 +10,7 @@ term=foot # title=foot # locked-title=no -font=monospace:size=18 +font=monospace:size=12 # font-bold=<bold variant of regular font> # font-italic=<italic variant of regular font> # font-bold-italic=<bold+italic variant of regular font> diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index b0d7c35..293ad57 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,13 +1,9 @@ -- curl https://git.runxiyu.org/runxiyu/current/uconf.git/plain/.local/share/nvim/site/autoload/plug.vim -o "$HOME"/.local/share/nvim/site/autoload/plug.vim local Plug = vim.fn['plug#'] vim.call('plug#begin') -Plug 'https://github.com/tpope/vim-fugitive' -Plug 'https://github.com/lervag/vimtex' Plug 'https://github.com/nvim-treesitter/nvim-treesitter' Plug 'https://github.com/neovim/nvim-lspconfig' Plug 'https://github.com/tomasiser/vim-code-dark' -Plug 'https://github.com/skwee357/nvim-prose' -Plug 'https://github.com/ethanholz/nvim-lastplace' Plug 'https://github.com/vim-airline/vim-airline' vim.call('plug#end') @@ -51,54 +47,10 @@ let leader = '\' require'nvim-treesitter.configs'.setup { ensure_installed = { - "ada", - "asm", - "bash", - -- "bibtex", -- seems broken on commented lines - "c", - "commonlisp", - "comment", - "css", - "csv", - "diff", - "git_config", - "git_rebase", - "go", - "gomod", - "gosum", - "hare", - "haskell", - "html", - "htmldjango", - "http", - "ini", - "javascript", - "json", - "lua", - "make", - "markdown", - "markdown_inline", - "nasm", - "passwd", - "python", - "r", - "racket", - "regex", - "rst", - "rust", - "scheme", - "scss", - "sql", - "ssh_config", - "toml", - "tsv", - "vim", - "vimdoc", - "xml", - "yaml", + -- "ada", "asm", "bash", -- "bibtex", -- seems broken on commented lines "c", "commonlisp", "comment", "css", "csv", "diff", "git_config", "git_rebase", "go", "gomod", "gosum", "hare", "haskell", "html", "htmldjango", "http", "ini", "javascript", "json", "lua", "make", "markdown", "markdown_inline", "nasm", "passwd", "python", "r", "racket", "regex", "rst", "rust", "scheme", "scss", "sql", "ssh_config", "toml", "tsv", "vim", "vimdoc", "xml", "yaml", }, sync_install = false, - auto_install = true, + auto_install = false, ignore_install = { "latex", "bibtex" }, highlight = { enable = true, @@ -118,17 +70,3 @@ require'lspconfig'.ccls.setup{} require'lspconfig'.pylsp.setup{} require'lspconfig'.gopls.setup{} require'lspconfig'.eslint.setup{} -require('nvim-prose').setup { - wpm = 200.0, - filetypes = { 'markdown' }, - placeholders = { - words = 'words', - minutes = 'min' - } -} - -require'nvim-lastplace'.setup { - lastplace_ignore_buftype = {"quickfix", "nofile", "help"}, - lastplace_ignore_filetype = {"gitcommit", "gitrebase", "svn", "hgcommit"}, - lastplace_open_folds = true -} diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 096a1d2..72f2124 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -100,10 +100,10 @@ alias bright="brightnessctl set" alias mypy="python3 -m mypy --strict" alias venv=". $HOME/.local/share/venv/bin/activate" -# if [ "$(uname)" != "Darwin" ] -# then -# alias git="today git" -# fi +if [ "$(uname)" != "Darwin" ] +then + alias git="today git" +fi e() { emacsclient -c "$@" & @@ -125,3 +125,5 @@ chpwd_functions=(${chpwd_functions[@]} "cd_list") export QT_ENABLE_HIGHDPI_SCALING=1 export QT_AUTO_SCREEN_SCALE_FACTOR=1.5 export QT_SCALE_FACTOR=1.5 + +alias tcommit="git commit --date='Thu Jan 1 00:00:00 UTC 1970'" @@ -60,14 +60,11 @@ sudo -n loadkeys ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/ umask 007 - -PLAN9="$HOME"/.local/src/plan9port-master -export PLAN9 -PATH=$PATH:$PLAN9/bin -export PATH -[ "$(tty)" = "/dev/tty1" ] && ! pidof -s sway >/dev/null 2>&1 && exec dbus-run-session -- sway +[ -d "$PLAN9" ] && {PLAN9="$HOME"/.local/src/plan9port-master; export PLAN9; export PATH=$PATH:$PLAN9/bin } #export GOPROXY=https://mirrors.aliyun.com/goproxy/ -#export GOPROXY=https://goproxy.io,direct +export GOPROXY=https://goproxy.io,direct export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" + +[ "$(tty)" = "/dev/tty1" ] && ! pidof -s sway >/dev/null 2>&1 && exec dbus-run-session -- sway |