From 5349af5427136198fbdd050aa25ae14342f2da39 Mon Sep 17 00:00:00 2001 From: vib Date: Wed, 27 Sep 2023 09:39:57 +0300 Subject: [PATCH] Adding vim. Also using Plasma now I guess --- .gitignore | 5 +++ .vim/vimrc | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .zprofile | 23 ++++++------ install.sh | 26 ++++++++++++++ 4 files changed, 145 insertions(+), 11 deletions(-) create mode 100644 .vim/vimrc diff --git a/.gitignore b/.gitignore index cef350c..6f3e484 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,8 @@ ncmpcpp/error.log emacs/auto-save-list/ emacs/elpa/ emacs/melpa/ + +.vim/plugged/ +.vim/.netrwhist +.vim/*.swp +.vim/autoload/plug.vim diff --git a/.vim/vimrc b/.vim/vimrc new file mode 100644 index 0000000..67a550b --- /dev/null +++ b/.vim/vimrc @@ -0,0 +1,102 @@ +" Use the default config as base because lazy lazy +unlet! skip_defaults_vim +source $VIMRUNTIME/defaults.vim + +"" +" General stuffies +"" +if has('termguicolors') " if terminal supports truecolor enable it + set termguicolors +endif + +filetype plugin on +set number " blub- plain numbering on the left, nothin fancy +set splitbelow splitright " spawn splits where I expect them to be.. +syntax enable +set title +set autoread " automagically reload files if edited elsewhere + +" Indenting settings :o +set tabstop=4 +set expandtab +set shiftwidth=4 +set autoindent +set smartindent +set confirm " ask for comfirmation to save a file before quitting + +"" +" Loading plugins woaaahh (VimPlug) +"" + + +call plug#begin() + Plug 'mhinz/vim-signify' " show uncommited changes + Plug 'ntpeters/vim-better-whitespace' " Whitespace Highlighting + Plug 'preservim/nerdcommenter' " I am lazy with commenting + Plug 'lambdalisue/fern.vim' " File manager, file tree sidebar, fancy thing + Plug 'junegunn/fzf.vim' " fuzzy find files, very handy + Plug 'jiangmiao/auto-pairs' " I like my brackets and quotes to double down + Plug 'vimwiki/vimwiki' " it's, like, for taking notes + Plug 'wincent/terminus' " makes vim in terminal nicer! btw this makes the cursor change shape :3 + Plug 'voldikss/vim-floaterm' + Plug 'moll/vim-bbye' " retain windows when deleting buffers + + let g:polyglot_disabled = ['autoindent'] " disable autoindent polyglot's autoindent cause bleh + Plug 'https://github.com/sheerun/vim-polyglot' " Many many little language gremlins in a trenchcoat + + " Fancy status bar + Plug 'vim-airline/vim-airline' + + " Theme + Plug 'ghifarit53/tokyonight-vim' + + let g:airline#extensions#tabline#enabled = 1 + let g:airline_powerline_fonts = 0 + set noshowmode " Airline already shows the mode +call plug#end() + +" Set the theme! it be really comfi +colorscheme tokyonight + +" spawn fzf on the bottom of the editor instead of a popup in the middle +let g:fzf_layout = { 'down': '40%' } + +"" +" Key binds stuffies +"" + +" leader key +let mapleader=" " + +" Reload this very config file +nmap cr :source ~/.vim/vimrc +" Open this very config file +nmap ce :e ~/.vim/vimrc + +" Fern sidebar +nmap ff :Fern . -drawer +nmap ft :Fern . -drawer -toggle + +" Buffer stuff +nmap bl :buffers +nmap bb :Buffers +nmap bd :Bdelete +nmap bn :bNext +nmap bp :bPrevious + +" Toggle spell checking +map tse :setlocal spell! spelllang=en +map tsr :setlocal spell! spelllang=ro + +" Manouver files +nmap fw :w +nmap . :cd +nmap :Files + +" Open lazygit +nmap gg :FloatermNew lazygit + +" Exit vim entirely +nmap qq :qa +" Exit vim forcefuly!! +nmap qQ :qa! diff --git a/.zprofile b/.zprofile index 362e5e1..e2eb93e 100644 --- a/.zprofile +++ b/.zprofile @@ -1,18 +1,19 @@ -export PATH=$PATH:$HOME/.local/bin +export PATH=$PATH:$HOME/.local/bin:$HOME/flutter/bin # Default programs: -export EDITOR="nvim" -export TERMINAL="foot" -export BROWSER="firefox-bin" -export BROWSER2="chromium" -export READER="xreader" -export FILEMANAGER="pcmanfm-qt" +export EDITOR="vim" +#export TERMINAL="foot" +#export BROWSER="firefox-bin" +#export BROWSER2="chromium" +#export READER="xreader" +#export FILEMANAGER="dolphin" #export QT_STYLE_OVERRIDE=kvantum -export QT_QPA_PLATFORMTHEME=qt5ct +#export QT_QPA_PLATFORMTHEME=qt5ct #export DESKTOP_SESSION=KDE # If running from tty1 start sway -if [ "$(tty)" = "/dev/tty1" ]; then - startsway -fi +#if [ "$(tty)" = "/dev/tty1" ]; then +# #startsway +# exec dbus-launch --exit-with-session startplasma-wayland +#fi diff --git a/install.sh b/install.sh index 0e9737d..27e56a9 100755 --- a/install.sh +++ b/install.sh @@ -22,9 +22,35 @@ read choice if [ "$choice" = "y" ] then + echo "Now, are what are you installing this on?" + echo "1 - desktop" + echo "2 - laptop" + read device + + while : + do + case $device in + 1) + echo "installing desktop specific bits" + # just plop desktop configs here idk + + ;; + 2) + echo "installing laptop specific bits" + # or plop lapop configs here + + break + ;; + *) + echo "wot?" + ;; + esac + done + gohome .zshrc gohome .zprofile gohome .doom.d + gohome .vim goconfig dunst goconfig foot