From e1b2a2350760190b88469a430f4a6d63b735eed7 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Fri, 9 Jul 2021 00:27:02 +0300 Subject: [PATCH] Bunch of changes Credit https://git.sr.ht/~novakane/dotfiles --- README.md | 5 ++-- deploy.sh | 1 + home/.bashrc-bloated | 1 + home/.config/alacritty/alacritty.yml | 1 - home/.config/fish/conf.d/env.fish | 1 + home/.config/git/config | 13 ++++++++ home/.config/git/ignore | 44 ++++++++++++++++++++++++++++ home/.config/nvim/lua/options.lua | 4 +-- home/.config/ripgrep/config | 4 +++ home/.config/zsh/.zshenv | 1 + home/.ssh/environment | 1 + 11 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 home/.config/git/ignore create mode 100644 home/.config/ripgrep/config create mode 100644 home/.ssh/environment diff --git a/README.md b/README.md index 34e04b8..96bdc97 100644 --- a/README.md +++ b/README.md @@ -23,15 +23,16 @@ - [ ] ~~[dotdrop](https://github.com/deadc0de6/dotdrop)~~ / ~~Org Babel~~ / Ansible - [x] Migrate zsh to [zinit](https://github.com/zdharma/zinit) - [x] Wayland compositors +- [x] New Neovim config in Lua - [ ] ~~[ion](https://github.com/redox-os/ion)~~ / [oksh](https://github.com/ibara/oksh) / [nushell](https://www.nushell.sh/) / [oil](https://www.oilshell.org/) / [xonsh](https://xon.sh/) / ~~[elvish](https://elv.sh/)~~ / [oh](https://github.com/michaelmacinnis/oh) - [ ] NixOS / Guix / Gentoo / FreeBSD -- [ ] New Neovim config in Lua - [ ] Independent ~/.emacs.d - [ ] [kakoune](https://github.com/mawww/kakoune) / [lite-xl](https://github.com/franko/lite-xl) ### :star2: Credits -- [@glepnir](https://github.com/glepnir/nvim)'s Neovim config +- [@glepnir](https://github.com/glepnir/nvim)'s Neovim config, and also [NvChad](https://github.com/siduck76/NvChad) +- [@novakane](https://git.sr.ht/~novakane/) for git aliases - [@hlissner](https://github.com/hlissner)'s zsh config - [@daviwil](https://github.com/daviwil)'s/[@tecosaur](https://tecosaur.github.io/emacs-config/config.html)'s Emacs configurations - [@begs](https://git.sr.ht/~begs/dotfiles)'s Waybar config diff --git a/deploy.sh b/deploy.sh index 2f2b8c8..032f7a6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -123,6 +123,7 @@ cp -rfv ./home/.config/pipe-viewer/ ~/.config/pipe-viewer/ cp -rfv ./home/.config/QtProject/ ~/.config/QtProject/ # cp -rfv ./home/.config/qutebrowser/ ~/.config/qutebrowser/ cp -rfv ./home/.config/ranger/ ~/.config/ranger/ +cp -rfv ./home/.config/ripgrep/ ~/.config/ripgrep/ # cp -rfv ./home/.config/tg/ ~/.config/tg/ cp -rfv ./home/.config/tmux/ ~/.config/tmux/ cp -rfv ./home/.config/translate-shell/ ~/.config/translate-shell/ diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated index ea1cf01..ded194c 100644 --- a/home/.bashrc-bloated +++ b/home/.bashrc-bloated @@ -38,6 +38,7 @@ export XINITRC=$XDG_CONFIG_HOME/X11/xinitrc export XSERVERRC=$XDG_CONFIG_HOME/X11/xserverrc export WGETRC=$XDG_CONFIG_HOME/wget/wgetrc export WEECHAT_HOME=$XDG_CONFIG_HOME/weechat +export RIPGREP_CONFIG_PATH=$XDG_CONFIG_HOME/ripgrep/config # env export PAGER="less -R" diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 8bf0d68..e89a9dc 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -2,7 +2,6 @@ env: TERM: alacritty - # TERM: xterm-256color window: padding: diff --git a/home/.config/fish/conf.d/env.fish b/home/.config/fish/conf.d/env.fish index 7ec4202..a94d2e6 100644 --- a/home/.config/fish/conf.d/env.fish +++ b/home/.config/fish/conf.d/env.fish @@ -49,6 +49,7 @@ set -gx XINITRC $XDG_CONFIG_HOME/X11/xinitrc set -gx XSERVERRC $XDG_CONFIG_HOME/X11/xserverrc set -gx WGETRC $XDG_CONFIG_HOME/wget/wgetrc set -gx WEECHAT_HOME $XDG_CONFIG_HOME/weechat +set -gx RIPGREP_CONFIG_PATH $XDG_CONFIG_HOME/ripgrep/config # env set -gx EDITOR nvim diff --git a/home/.config/git/config b/home/.config/git/config index da99ca8..85957e2 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -38,12 +38,25 @@ smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true +[pull] + rebase = true +[fetch] + prune = true +[init] + defaultBranch = main [rebase] autosquash = true [push] followTags = true +[submodule] + recurse = true [help] autocorrect = 1 +[alias] + l = log --graph --pretty=format:'%C(italic)%t%Creset %C(bold)<%an>%Creset -> %C(bold)%d%Creset %C(blue)%s%Creset - %C(italic)(%cr)%Creset' + s = status -sbu + sbu = submodule update --remote --merge + unstage = reset HEAD [url "https://github.com/"] insteadOf = gh: [url "https://gist.github.com/"] diff --git a/home/.config/git/ignore b/home/.config/git/ignore new file mode 100644 index 0000000..120cf2b --- /dev/null +++ b/home/.config/git/ignore @@ -0,0 +1,44 @@ +# Meson +/subprojects/* +!/subprojects/*.wrap +meson-logs +meson-private +meson_benchmark_setup.dat +meson_test_setup.dat + +# Ninja +build.ninja +.ninja_deps +.ninja_logs +.ninja_log + +# Compiled stuff +*.o +*.a +*.exe +*.class +*.elc +*.pyc +*.out +*.obj +*.so +*.so.* +*.dll + +# OS files +.DS_Store? +.DS_Store + +# Neovim +*.swp +.*.sw[a-z] +*.un~ +.netrwhist + +# Misc +compile_commands.json +*.orig +*.rej + +# QtCreator +CMakeLists.txt.user diff --git a/home/.config/nvim/lua/options.lua b/home/.config/nvim/lua/options.lua index ef73282..c4414ce 100644 --- a/home/.config/nvim/lua/options.lua +++ b/home/.config/nvim/lua/options.lua @@ -116,8 +116,8 @@ local function load_options() opt.list = true opt.listchars = 'tab:»·,nbsp:+,trail:·,extends:→,precedes:←' opt.showbreak = '↳ ' - opt.linebreak = true - opt.breakat = [[\ \ ;:,!?]] + -- opt.linebreak = true + -- opt.breakat = [[\ \ ;:,!?]] -- opt.breakindentopt = 'shift:4,min:20' -- Undo file path diff --git a/home/.config/ripgrep/config b/home/.config/ripgrep/config new file mode 100644 index 0000000..0e797fb --- /dev/null +++ b/home/.config/ripgrep/config @@ -0,0 +1,4 @@ +--glob +!git/* + +--smart-case diff --git a/home/.config/zsh/.zshenv b/home/.config/zsh/.zshenv index eddba57..a08059a 100644 --- a/home/.config/zsh/.zshenv +++ b/home/.config/zsh/.zshenv @@ -36,6 +36,7 @@ export XINITRC=$XDG_CONFIG_HOME/X11/xinitrc export XSERVERRC=$XDG_CONFIG_HOME/X11/xserverrc export WGETRC=$XDG_CONFIG_HOME/wget/wgetrc export WEECHAT_HOME=$XDG_CONFIG_HOME/weechat +export RIPGREP_CONFIG_PATH=$XDG_CONFIG_HOME/ripgrep/config # env export PAGER="less -R" diff --git a/home/.ssh/environment b/home/.ssh/environment new file mode 100644 index 0000000..c58352a --- /dev/null +++ b/home/.ssh/environment @@ -0,0 +1 @@ +TERM=xterm-256color