tdpeuter/sisyphus
tdpeuter/sisyphus
1
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

[vim] Move into user config

Browse source
This commit is contained in:
Tibo De Peuter 2023-10-19 21:03:53 +02:00
parent 5db79a309f
commit a0819d97f2
7 changed files with 76 additions and 2984 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules-old/default.nix
View file

@ -4,7 +4,6 @@
imports = [
./apps
./shells
./utils
];
# Nix Flakes

5
nixos/modules-old/utils/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./vim
];
}

81
nixos/modules-old/utils/vim/default.nix
View file

@ -1,81 +0,0 @@
{ inputs, lib, config, pkgs, ... }:
{
home-manager.users.tdpeuter = { pkgs, ... }: {
home.file = {
".vim".source = ../../../../stow/vim/.vim;
};
programs.vim = {
enable = true;
extraConfig = ''
colorscheme tdpeuter-light
" Tags
" pacman -S ctags
command! MakeTags !ctags -R . &
" Move to defintion using ^]
" Move to ambigious using g^]
" Move back using ^t
filetype on
filetype indent on
filetype plugin on
" File browsing
let g:netrw_browse_split=4 " open in the previous window
let g:netrw_altv=1 " split new windows to the right
let g:netrw_liststyle=3 " treeview
set autoindent
set conceallevel=2
set incsearch
set linebreak
set nocompatible
set path+=**
set scrolloff=3
set showcmd
set showmatch
set smartindent
set smarttab
set title
set wildignore=*.docx,*.jpg,*.png,*.gif,*.pdf,*.pyc,*.exe,*.flv,*.img,*.xlsx
set wildmenu
syntax enable
if $TERM == 'alacritty'
set ttymouse=sgr " Alacritty specific
endif
if $TERM == 'xterm-kitty'
" Fix <HOME> and <END> not working
set term=xterm-256color
endif
if has("autocmd")
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
" https://stackoverflow.com/a/37558470/19044747
augroup remember_folds
autocmd!
autocmd BufWinLeave * silent! mkview
autocmd BufWinEnter * silent! loadview
augroup END
endif
'';
plugins = with pkgs.vimPlugins; [
ale
catppuccin-vim
statix
vifm-vim
];
settings = {
expandtab = true;
mouse = "a";
number = true;
relativenumber = true;
shiftwidth = 4;
tabstop = 4;
};
};
};
}

27
nixos/modules/users/tdpeuter/default.nix
View file

@ -32,7 +32,7 @@ in {
home = {
username = user;
homeDirectory = "/home/${user}";
stateVersion = config.system.stateVersion;
inherit (config.system) stateVersion;
# If you specify an application here, it will be detected by the configuration module
# and the configuration files will be put in place for you.
@ -55,6 +55,9 @@ in {
zellij # Tmux + screen alternative
]) ++ (with pkgs-unstable; [
mpv
]) ++ (with pkgs.vimPlugins; [
statix
vim-plug
]);
# Put dotfiles in place.
@ -74,19 +77,23 @@ in {
".ssh/config" = lib.mkIf config.sisyphus.programs.ssh.enable {
source = ../../../../stow/ssh/.ssh/config;
};
# Put Vifm files separately so history fill still works.
".config/vifm/colors" = lib.mkIf (builtins.elem pkgs.vifm installedPkgs) {
source = ../../../../stow/vifm/.config/vifm/colors;
};
".config/vifm/scripts" = lib.mkIf (builtins.elem pkgs.vifm installedPkgs) {
source = ../../../../stow/vifm/.config/vifm/scripts;
};
".config/vifm/vifmrc" = lib.mkIf (builtins.elem pkgs.vifm installedPkgs) {
source = ../../../../stow/vifm/.config/vifm/vifmrc;
".config/vifm" = lib.mkIf (builtins.elem pkgs.vifm installedPkgs) {
source = ../../../../stow/vifm/.config/vifm;
recursive = true;
};
".config/zellij" = lib.mkIf (builtins.elem pkgs.zellij installedPkgs) {
source = ../../../../stow/zellij/.config/zellij;
};
".vim" = lib.mkIf (builtins.elem pkgs.vim installedPkgs) {
source = ../../../../stow/vim/.vim;
recursive = true;
};
".vim/autoload/plug.vim" = lib.mkIf (builtins.elem pkgs.vim installedPkgs) {
source = "${pkgs.vimPlugins.vim-plug}/plug.vim";
};
".vimrc" = lib.mkIf (builtins.elem pkgs.vim installedPkgs) {
source = ../../../../stow/vim/.vimrc;
};
};
};

2812
stow/vim/.vim/autoload/plug.vim
View file

File diff suppressed because it is too large Load diff

4
stow/vim/.vim/colors/tdpeuter-light.vim
View file

@ -51,7 +51,9 @@ endfun
" User interface colors {
call s:h("Normal", s:fg, s:bg, "")
" call s:h("Normal", s:fg, s:bg, "")
" Transparent background
hi Normal guisp=NONE guifg=#383a42 guibg=#1E1E2E ctermfg=237 ctermbg=None gui=NONE cterm=NONE
call s:h("Cursor", s:bg, s:blue, "")
call s:h("CursorColumn", "", s:cursor_line, "")

130
stow/vim/.vimrc
View file

@ -2,88 +2,35 @@
" ~/.vimrc
"
filetype on
filetype plugin on
filetype indent on
set expandtab
set smarttab
set smartindent
set incsearch
set showmatch
set title
set wildignore=*.docx,*.jpg,*.png,*.gif,*.pdf,*.pyc,*.exe,*.flv,*.img,*.xlsx
syntax enable
" --
set scrolloff=3
set showcmd
colorscheme tdpeuter-light
set autoindent
set linebreak
set shiftwidth=4
set tabstop=4
set number
set relativenumber
set conceallevel=2
" Add mouse support
set expandtab
set incsearch
set linebreak
set mouse=a
if $TERM == 'alacritty'
set ttymouse=sgr " Alacritty specific
endif
" PLUGINS --------------------------------------------------------------- {{{
call plug#begin('~/.vim/plugged')
Plug 'dense-analysis/ale'
Plug 'https://github.com/vifm/vifm.vim.git'
Plug 'catppuccin/vim', { 'as': 'catppuccin' }
call plug#end()
" }}}
colorscheme catppuccin_mocha_mod
" AUTOMATIC STUFF ------------------------------------------------------- {{{
if has("autocmd")
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
" https://stackoverflow.com/a/37558470/19044747
augroup remember_folds
autocmd!
autocmd BufWinLeave * silent! mkview
autocmd BufWinEnter * silent! loadview
augroup END
endif
" }}}
" TALK ------------------------------------------------------------------ {{{
" https://youtu.be/XA2WjJbmmoM ----------------------------------------------
set nocompatible
" Finding files using :find <name>
set number
set path+=**
" Also use :b to select files in buffer
" Show suggestions on another line instead of inplace
set relativenumber
set scrolloff=3
set shiftwidth=4
set showcmd
set showmatch
set smartindent
set smarttab
set tabstop=4
set title
set wildignore=*.docx,*.jpg,*.png,*.gif,*.pdf,*.pyc,*.exe,*.flv,*.img,*.xlsx
"" Show suggestions on another line instead of inplace
set wildmenu
" Tags
" pacman -S ctags
command! MakeTags !ctags -R . &
" Move to defintion using ^]
" Move to ambigious using g^]
" Move back using ^t
syntax enable
filetype on
filetype indent on
filetype plugin on
" File browsing
let g:netrw_browse_split=4 " open in the previous window
@ -96,4 +43,39 @@ let g:netrw_liststyle=3 " treeview
" ^p previous
" ^x^f filename completion
if $TERM == 'alacritty'
set ttymouse=sgr " Alacritty specific
endif
if $TERM == 'xterm-kitty'
" Fix <HOME> and <END> not working
set term=xterm-256color
endif
" AUTO ------------------------------------------------------------------ {{{
if has("autocmd")
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
" https://stackoverflow.com/a/37558470/19044747
augroup remember_folds
autocmd!
autocmd BufWinLeave * silent! mkview
autocmd BufWinEnter * silent! loadview
augroup END
endif
" }}}
" PLUGINS --------------------------------------------------------------- {{{
call plug#begin()
Plug 'dense-analysis/ale'
Plug 'vifm/vifm.vim'
Plug 'catppuccin/vim', { 'as': 'catppuccin' }
Plug 'NerdyPepper/statix'
call plug#end()
" }}}