updgrade to 23.11

This commit is contained in:
Tim Schubert 2023-12-02 15:48:36 +01:00
parent 2c0f9dd7f8
commit eb9cd9d8cf
Signed by: dadada
SSH key fingerprint: SHA256:bFAjFH3hR8zRBaJjzQDjc3o4jqoq5EZ87l+KXEjxIz0
40 changed files with 18 additions and 621 deletions

View file

@ -6,7 +6,6 @@ let
useFeatures = [
"alacritty"
#"emacs"
"vim"
"direnv"
"git"
"gpg"

View file

@ -89,6 +89,7 @@ with pkgs; [
nmap
nmon
nodePackages.prettier
map-cmd
obs-studio
offlineimap
openscad

View file

@ -16,7 +16,6 @@
syncthing = import ./syncthing.nix;
termite = import ./termite.nix;
tmux = import ./tmux.nix;
vim = import ./vim;
xdg = import ./xdg.nix;
zsh = import ./zsh.nix;
}

View file

@ -14,7 +14,6 @@
./syncthing.nix
./termite.nix
./tmux.nix
./vim
./xdg.nix
./zsh.nix
]

View file

@ -1,45 +0,0 @@
{ config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.home.vim;
vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { };
in
{
options.dadada.home.vim = {
enable = mkEnableOption "Enable VIM config";
};
config = mkIf cfg.enable {
programs.vim = {
enable = true;
extraConfig = builtins.readFile ./vimrc;
plugins = [
pkgs.vimPlugins.vim-nix
#pkgs.vimPlugins.kotlin-vim
pkgs.vimPlugins.ale
pkgs.vimPlugins.fzf-vim
pkgs.vimPlugins.rust-vim
pkgs.vimPlugins.base16-vim
pkgs.vimPlugins.typescript-vim
pkgs.vimPlugins.vim-airline
pkgs.vimPlugins.vim-airline-themes
pkgs.vimPlugins.vim-fish
pkgs.vimPlugins.vim-gitgutter
vimPlugins.vim-buftabline
vimPlugins.spacemacsTheme
vimPlugins.filetype
pkgs.vimPlugins.vim-ledger
];
};
home.packages = with pkgs; [
languagetool
nixpkgs-fmt
shellcheck
perlPackages.PerlCritic
texlab
];
};
}

View file

@ -1,157 +0,0 @@
filetype plugin on
filetype indent on
set autoread
" :W sudo saves the file
" (useful for handling the permission-denied error)
command W w !sudo tee % > /dev/null
" no command execution from modeline
set nomodeline
" Turn on the Wild menu
set wildmenu
" Enable hidden buffers
set hidden
" Clipboard copy & paste
set clipboard=unnamedplus
" Always show current position
set ruler
" When searching try to be smart about cases
set smartcase
" Highlight search results
set hlsearch
" Inenteremental search
set incsearch
" Don't redraw while executing macros (good performance config)
set lazyredraw
" Do not show matching brackets when text indicator is over them
" set noshowmatch
" let loaded_matchparen = 1
" No annoying sound on errors
set noerrorbells
set novisualbell
set wrap
set linebreak
set nolist " list disables linebreak
set mouse=a
" Enable syntax highlighting
syntax enable
if (has("termguicolors"))
let &t_8f="\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b="\<Esc>[48;2;%lu;%lu;%lum"
set termguicolors
endif
set t_Co=256
set background=dark
colorscheme spacemacs-theme
set tabstop=4
set softtabstop=4
set softtabstop=4
set expandtab
set smarttab
set smartindent
set autoindent
set copyindent
set preserveindent
set wildmode=longest,list,full
set wildmenu
set cursorline
set number
set relativenumber
" Transparency
"hi Normal guibg=NONE ctermbg=NONE
"set list!
"set listchars=trail:⛤,extends:⟩,precedes:⟨,nbsp:␣,conceal:…
" Map leader to do extra key combinations
let mapleader = " "
" Toggle paste mode on and off
map <leader>pp :setlocal paste!<Enter>
" Fast saving
nmap <leader>w :w<Enter>
" Buffer switching
nmap <leader>bl :Buffers<Enter>
nmap <leader>bd :bdelete<Enter>
nmap <leader>bn :bnext<Enter>
nmap <leader>bp :bprevious<Enter>
" List things
nmap <leader>hl :History/<Enter>
nmap <leader>ll :Lines<Enter>
nmap <leader>ml :Marks<Enter>
nmap <leader>rl :reg<Enter>
nmap <leader>wl :Windows<Enter>
" finding files
nmap <leader>ff :Files<Enter>
set statusline+=%#warningmsg#
set statusline+=%{SyntasticStatuslineFlag()}
set statusline+=%*
"let g:syntastic_always_populate_loc_list = 1
"let g:syntastic_auto_loc_list = 1
"let g:syntastic_check_on_open = 1
"let g:syntastic_check_on_wq = 0
nmap <leader>fr :ALEFindReferences<Enter>
nmap <leader>gd :ALEGoToDefinition<Enter>
nmap <leader>hh :ALEHover<Enter>
nmap <leader>ss :ALESymbolSearch <C-R><C-A><Enter>
nmap <leader>rn :ALERename<Enter>
nmap <leader>rf :ALERefactor<Enter>
nmap <leader>ca :ALE<Enter>
nmap <leader>fx :ALEFix<Enter>
" Enable completion where available.
" This setting must be set before ALE is loaded.
let g:ale_completion_enabled = 1
let g:ale_fix_on_save = 0
let g:ale_warn_about_trailing_whitespace = 1
let g:ale_warn_about_trailing_lines = 1
let g:ale_completion_autoimport = 1
let g:ale_languagetool_executable = 'languagetool-commandline'
let g:ale_set_quickfix = 1
"let g:ale_lint_on_text_changed = 'never'
" You can disable this option too
" if you don't want linters to run on opening a file
"let g:ale_lint_on_enter = 0
" Set airline theme
let g:airline_theme='base16_spacemacs'
" Load all plugins now.
" Plugins need to be added to runtimepath before helptags can be generated.
packloadall
" Load all of the helptags now, after plugins have been loaded.
" All messages and errors will be ignored.
silent! helptags ALL
set omnifunc=ale#completion#OmniFunc
"
" autocmd BufWritePost <buffer> RunBuf make
command! -nargs=1 RunBuf execute ':let job = job_start("<args>", {"out_io": "buffer", "out_name": "<args>"})'

View file

@ -18,7 +18,6 @@ with lib; let
"application/xhtml+xml" = "firefox.desktop";
"application/x-extension-xhtml" = "firefox.desktop";
"application/x-extension-xht" = "firefox.desktop";
"text/plain" = "vim.desktop";
"application/pdf" = "org.pwmt.zathura.desktop";
};
cfg = config.dadada.home.xdg;