From 110720bae4584f4d7d091a2fbff2f58897ba8bce Mon Sep 17 00:00:00 2001 From: Patryk Niedzwiedzinski Date: Sun, 29 Sep 2024 18:22:10 +0200 Subject: Remove users and neovim --- pkgs/nvim.nix | 167 ---------------------------------------------------------- users/pn.nix | 66 ----------------------- 2 files changed, 233 deletions(-) delete mode 100755 pkgs/nvim.nix delete mode 100755 users/pn.nix diff --git a/pkgs/nvim.nix b/pkgs/nvim.nix deleted file mode 100755 index 037ba05..0000000 --- a/pkgs/nvim.nix +++ /dev/null @@ -1,167 +0,0 @@ -## Usage -## pneovim = import ./programs/nvim.nix pkgs; - - -pkgs: -pkgs.neovim.override { - configure = { - customRC = '' - let mapleader ="," - - if ! filereadable(system('echo -n "$HOME/.config/nvim/autoload/plug.vim"')) - echo "Downloading junegunn/vim-plug to manage plugins..." - silent !mkdir -p $HOME/.config/nvim/autoload/ - silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > $HOME/.config/nvim/autoload/plug.vim - autocmd VimEnter * PlugInstall - endif - - set bg=light - set go=a - set mouse=a - set nohlsearch - set clipboard+=unnamedplus - - " Some basics: - nnoremap c "_c - set nocompatible - filetype plugin on - syntax on - set encoding=utf-8 - set number relativenumber - " Enable autocompletion: - set wildmode=longest,list,full - " Disables automatic commenting on newline: - autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o - - " Goyo plugin makes text more readable when writing prose: - map f :Goyo \| set bg=light \| set linebreak - - " Spell-check set to o, 'o' for 'orthography': - map o :setlocal spell! spelllang=en_us - - " Splits open at the bottom and right, which is non-retarded, unlike vim defaults. - set splitbelow splitright - - " Nerd tree - map n :NERDTreeToggle - autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif - if has('nvim') - let NERDTreeBookmarksFile = stdpath('data') . '/NERDTreeBookmarks' - else - let NERDTreeBookmarksFile = '~/.vim' . '/NERDTreeBookmarks' - endif - - " vimling: - nm d :call ToggleDeadKeys() - imap d :call ToggleDeadKeys()a - nm i :call ToggleIPA() - imap i :call ToggleIPA()a - nm q :call ToggleProse() - - " Shortcutting split navigation, saving a keypress: - map h - map j - map k - map l - - " Replace ex mode with gq - map Q gq - - " Check file in shellcheck: - map s :!clear && shellcheck % - - " Open my bibliography file in split - map b :vsp$BIB - map r :vsp$REFER - - " Replace all is aliased to S. - nnoremap S :%s//g - - " Compile document, be it groff/LaTeX/markdown/etc. - map c :w! \| !compiler % - - " Open corresponding .pdf/.html or preview - map p :!opout % - - " Runs a script that cleans out tex build files whenever I close out of a .tex file. - autocmd VimLeave *.tex !texclear % - - " Ensure files are read as what I want: - let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'} - map v :VimwikiIndex - let g:vimwiki_list = [{'path': '~/vimwiki', 'syntax': 'markdown', 'ext': '.md'}] - autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown - autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff - autocmd BufRead,BufNewFile *.tex set filetype=tex - - " Save file as sudo on files that require root permission - cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' edit! - - " Enable Goyo by default for mutt writing - autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80 - autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo | set bg=light - autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x! - autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q! - - " Automatically deletes all trailing whitespace and newlines at end of file on save. - autocmd BufWritePre * %s/\s\+$//e - autocmd BufWritepre * %s/\n\+\%$//e - - " When shortcut files are updated, renew bash and ranger configs with new material: - autocmd BufWritePost bm-files,bm-dirs !shortcuts - " Run xrdb whenever Xdefaults or Xresources are updated. - autocmd BufWritePost *Xresources,*Xdefaults,*xresources,*xdefaults !xrdb % - - " Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable. - if &diff - highlight! link DiffText MatchParen - endif - - set tabstop=2 - set shiftwidth=2 - set expandtab - set linebreak - set colorcolumn=80 - highlight ColorColumn ctermbg=8 - - - let g:ycm_key_list_select_completion = ['', ''] - let g:ycm_key_list_previous_completion = [''] - - let g:UltiSnipsExpandTrigger = "" - let g:UltiSnipsEditSplit="vertical" - nnoremap :GFiles - nnoremap f :Rg - map :NERDTreeToggle - - map gg=G - - " Fuzzy finding - set path+=** - ''; - - packages.myVimPackage = with pkgs.vimPlugins; { - start = [ - vim-surround - vim-fugitive - goyo-vim - # vimagit - vimwiki - vim-airline - vim-commentary - vim-css-color - vim-nix - UltiSnips - vim-snippets - YouCompleteMe - Supertab - fzf-vim - pkgs.nur.repos.pn.gemini-vim-syntax - - ]; - opt = []; - }; - }; - vimAlias = true; - viAlias = true; - } diff --git a/users/pn.nix b/users/pn.nix deleted file mode 100755 index 7a01354..0000000 --- a/users/pn.nix +++ /dev/null @@ -1,66 +0,0 @@ -## My default user -{ pkgs, ... }: - -let - home-manager = builtins.fetchTarball { - url = "https://github.com/nix-community/home-manager/archive/63f299b3347aea183fc5088e4d6c4a193b334a41.tar.gz"; - sha256 = "0iksjch94wfvyq0cgwv5wq52j0dc9cavm68wka3pahhdvjlxd3js"; - }; -in - { - - imports = [ - (import "${home-manager}/nixos") - ]; - - nix.trustedUsers = [ "pn" ]; - - users.users.pn = { - isNormalUser = true; - extraGroups = [ "wheel" "video" "audio" ]; - }; - - environment.systemPackages = [ pkgs.picom ]; - - home-manager.users.pn = { - imports = [ - ../home.nix - ../platforms/linux/user-dirs.nix - ../platforms/linux/gtk.nix - ]; - - gtk.enable = true; - - xsession = { - enable = true; - windowManager.command = "dbus-run-session -- dwm"; - profileExtra = '' - # Fix Gnome Apps Slow Start due to failing services - # Add this when you include flatpak in your system - dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY - - mpd & # music player daemon-you might prefer it as a service though - remaps & # run the remaps script, switching caps/esc and more; check it for more info - setbg & # set the background with the `setbg` script - xrdb $HOME/.config/Xresources & # Uncomment to use Xresources colors/settings on startup - #xcompmgr & - picom & - dunst & # dunst for notifications - xset r rate 300 50 & # Speed xrate up - # unclutter & # Remove mouse when idle - #sxhkd & - dockd --daemon & - for app in `ls ~/.config/autostart/*.desktop`; do - $(grep '^Exec' $app | sed 's/^Exec=//') & - done - sleep .5 && screen-orient & - duckling-proxy --serverCert $HOME/.config/duckling-proxy/ca.crt --serverKey $HOME/.config/duckling-proxy/ca.key & - ''; - scriptPath = ".xinitrc"; - }; - - }; - - ## Although it's less secure I tend not to have sensitive data on my machines - security.sudo.wheelNeedsPassword = false; -} -- cgit 1.4.1