diff options
| -rwxr-xr-x | machines/base.nix | 49 | ||||
| -rwxr-xr-x | machines/hp-compaq/configuration.nix | 22 | ||||
| -rwxr-xr-x | machines/hp-compaq/default.nix | 10 | ||||
| -rwxr-xr-x | machines/hp-compaq/hardware-configuration.nix | 37 | ||||
| -rwxr-xr-x | machines/pl.nix | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | machines/x220/hardware-configuration.nix (renamed from hardware-configuration.nix) | 0 | ||||
| -rwxr-xr-x | modules/larbs.nix | 22 | ||||
| -rwxr-xr-x | modules/nur.nix | 9 | ||||
| -rwxr-xr-x | pkgs/nvim.nix | 168 | ||||
| -rwxr-xr-x | users/pn.nix | 11 |
10 files changed, 339 insertions, 0 deletions
diff --git a/machines/base.nix b/machines/base.nix new file mode 100755 index 0000000..5976448 --- /dev/null +++ b/machines/base.nix @@ -0,0 +1,49 @@ +## Base setup, absolute minimum + +{ pkgs, ... }: +{ + + imports = [ + ../modules/nur.nix + ../users/pn.nix + ]; + + environment.systemPackages = with pkgs; [ + wget vim curl htop file + stdenv git zip unzip + dnsutils ripgrep jq + ]; + + console.font = "${pkgs.terminus_font}/share/consolefonts/ter-v22n"; + + ## === Vim configuration === + programs.vim.defaultEditor = true; + environment.etc."vim/vimrc".text = '' + set undodir=$XDG_DATA_HOME/vim/undo + set directory=$XDG_DATA_HOME/vim/swap + set backupdir=$XDG_DATA_HOME/vim/backup + set viewdir=$XDG_DATA_HOME/vim/view + set viminfo+='1000,n$XDG_DATA_HOME/vim/viminfo + set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after + ''; + + ## === ZSH configuration === + + ## Make zsh the default shell + users.defaultUserShell = "/run/current-system/sw/bin/zsh"; + + ## Cleanup home + environment.etc."zshenv.local".text = '' + export ZDOTDIR=$HOME/.config/zsh + ''; + + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestions.enable = true; + histFile = "$XDG_DATA_HOME/zsh/history"; + + syntaxHighlighting.enable = true; + }; + +} diff --git a/machines/hp-compaq/configuration.nix b/machines/hp-compaq/configuration.nix new file mode 100755 index 0000000..958088c --- /dev/null +++ b/machines/hp-compaq/configuration.nix @@ -0,0 +1,22 @@ +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + + networking.hostName = "hp-compaq"; + + networking.useDHCP = false; + networking.interfaces.enp2s0.useDHCP = true; + + environment.systemPackages = with pkgs; [ + ]; + +} + diff --git a/machines/hp-compaq/default.nix b/machines/hp-compaq/default.nix new file mode 100755 index 0000000..2b96276 --- /dev/null +++ b/machines/hp-compaq/default.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ./configuration.nix + ./hardware-configuration.nix + + ../base.nix + ../pl.nix + ../../modules/larbs.nix + ]; +} diff --git a/machines/hp-compaq/hardware-configuration.nix b/machines/hp-compaq/hardware-configuration.nix new file mode 100755 index 0000000..a2f8180 --- /dev/null +++ b/machines/hp-compaq/hardware-configuration.nix @@ -0,0 +1,37 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, ... }: + +{ + imports = + [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> + ]; + + boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/ad2775d5-5890-493e-b709-60c1f7f3c63b"; + fsType = "ext4"; + }; + + fileSystems."/nix/store" = + { device = "/nix/store"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/C6DC-F51D"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/ad2b96eb-341c-40e2-bb86-1ed2f03a0713"; } + ]; + + nix.maxJobs = lib.mkDefault 2; +} diff --git a/machines/pl.nix b/machines/pl.nix new file mode 100755 index 0000000..14d8a5f --- /dev/null +++ b/machines/pl.nix @@ -0,0 +1,11 @@ +## Configuration for writing in polish + +{ + i18n.defaultLocale = "en_US.UTF-8"; # Less confusing locale than polish one + + console.keyMap = "pl"; + + time.timeZone = "Europe/Warsaw"; + + services.xserver.layout = "pl"; +} diff --git a/hardware-configuration.nix b/machines/x220/hardware-configuration.nix index 3b34522..3b34522 100644..100755 --- a/hardware-configuration.nix +++ b/machines/x220/hardware-configuration.nix diff --git a/modules/larbs.nix b/modules/larbs.nix new file mode 100755 index 0000000..89c04c0 --- /dev/null +++ b/modules/larbs.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: +let + pnvim = import ../pkgs/nvim.nix pkgs; +in +{ + environment.systemPackages = with pkgs.nur.repos.pn; [ + pnvim + larbs-mail + larbs-news + larbs-music + dmenu + dwm + dwmblocks + larbs-scripts + st + ]; + + services.xserver = { + displayManager.startx.enable = true; + libinput.enable = true; + }; +} diff --git a/modules/nur.nix b/modules/nur.nix new file mode 100755 index 0000000..c8326e9 --- /dev/null +++ b/modules/nur.nix @@ -0,0 +1,9 @@ +{ + nixpkgs.config.packageOverrides = pkgs: { + nur = import (builtins.fetchTarball { + url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; + }) { + inherit pkgs; + }; + }; +} diff --git a/pkgs/nvim.nix b/pkgs/nvim.nix new file mode 100755 index 0000000..6ce3e7b --- /dev/null +++ b/pkgs/nvim.nix @@ -0,0 +1,168 @@ +## 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 <leader>f :Goyo \| set bg=light \| set linebreak<CR> + + " Spell-check set to <leader>o, 'o' for 'orthography': + map <leader>o :setlocal spell! spelllang=en_us<CR> + + " Splits open at the bottom and right, which is non-retarded, unlike vim defaults. + set splitbelow splitright + + " Nerd tree + map <leader>n :NERDTreeToggle<CR> + 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 <leader>d :call ToggleDeadKeys()<CR> + imap <leader>d <esc>:call ToggleDeadKeys()<CR>a + nm <leader>i :call ToggleIPA()<CR> + imap <leader>i <esc>:call ToggleIPA()<CR>a + nm <leader>q :call ToggleProse()<CR> + + " Shortcutting split navigation, saving a keypress: + map <C-h> <C-w>h + map <C-j> <C-w>j + map <C-k> <C-w>k + map <C-l> <C-w>l + + " Replace ex mode with gq + map Q gq + + " Check file in shellcheck: + map <leader>s :!clear && shellcheck %<CR> + + " Open my bibliography file in split + map <leader>b :vsp<space>$BIB<CR> + map <leader>r :vsp<space>$REFER<CR> + + " Replace all is aliased to S. + nnoremap S :%s//g<Left><Left> + + " Compile document, be it groff/LaTeX/markdown/etc. + map <leader>c :w! \| !compiler <c-r>%<CR> + + " Open corresponding .pdf/.html or preview + map <leader>p :!opout <c-r>%<CR><CR> + + " 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 <leader>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' <bar> 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!<CR> + autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR> + + " 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=235 + + + let g:ycm_key_list_select_completion = ['<tab>', '<Down>'] + let g:ycm_key_list_previous_completion = ['<Up>'] + + let g:UltiSnipsExpandTrigger = "<S-tab>" + let g:UltiSnipsEditSplit="vertical" + nnoremap <silent> <C-f> :GFiles<CR> + nnoremap <silent> <Leader>f :Rg<CR> + map <C-n> :NERDTreeToggle<CR> + + map <F9> gg=G + + " Fuzzy finding + set path+=** + ''; + + packages.myVimPackage = with pkgs.vimPlugins; { + start = [ + vim-surround + vim-fugitive + nerdtree + 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 new file mode 100755 index 0000000..8789721 --- /dev/null +++ b/users/pn.nix @@ -0,0 +1,11 @@ +## My default user + +{ + users.users.pn = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + }; + + ## Although it's less secure I tend not to have sensitive data on my machines + security.sudo.wheelNeedsPassword = false; +} |