This commit is contained in:
Anish Lakhwara 2020-09-28 00:47:04 +10:00
parent 7d9acb774c
commit a71fa5adac
3 changed files with 89 additions and 74 deletions

View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
./nvim.nix ./nvim.nix
# ./unstable.nix # ./unstable.nix
]; ];
@ -17,83 +17,92 @@
mtr mtr
file file
lsof lsof
atool atool
inotify-tools inotify-tools
strace strace
zip zip
unzip unzip
rsync rsync
tmux tmux
pwgen pwgen
glow glow
gitAndTools.gitFull gitAndTools.gitFull
#neovim defined in ./nvim.nix #neovim defined in ./nvim.nix
#rofi wofi
firefox firefox
fractal fractal
pinentry_gnome pinentry_gnome
pass pass
gcc gcc
less less
mpv mpv
zathura zathura
#qmk_firmware
python3 python3
gdb gdb
vcv-rack vcv-rack
#xdotool #xdotool
#neofetch #neofetch
#calibre #calibre
#openvpn #openvpn
gimp gimp
xxd xxd
tilix tilix
kitty
taskwarrior taskwarrior
gnupg gnupg
openjdk openjdk
glslviewer glslviewer
filezilla filezilla
signal-desktop signal-desktop
wire-desktop wire-desktop
tdesktop tdesktop
feedreader feedreader
syncthing syncthing
#kdeconnect dijo
#ssb-patchwork #kdeconnect
#ssb-patchwork
gnome3.gnome-tweaks gnome3.gnome-tweaks
gnome3.pomodoro gnome3.pomodoro
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
gnomeExtensions.taskwhisperer gnomeExtensions.taskwhisperer
#gnome3.networkmanager-openvpn #gnome3.networkmanager-openvpn
#python3Packages.youtube-dl #python3Packages.youtube-dl
appimage-run appimage-run
home-manager home-manager
libreoffice libreoffice
fontconfig fontconfig
hugo hugo
nodejs nodejs
#processing #processing
#nextcloud-client #nextcloud-client
zsh-powerlevel10k zsh-powerlevel10k
powerline-fonts powerline-fonts
supercollider supercollider
haskellPackages.tidal haskellPackages.tidal
#(let neuronSrc = builtins.fetchTarball https://github.com/srid/neuron/archive/master.tar.gz; # vim-zettel
#in import neuronSrc) pandoc
ag
]; ];
programs.bash.enableCompletion = true; programs.bash.enableCompletion = true;
# needed for vcv-rack # needed for vcv-rack
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
system.copySystemConfiguration = true; system.copySystemConfiguration = true;
services.syncthing.enable = true; services.syncthing = {
services.syncthing.user = "anish"; enable = true;
openDefaultPorts = true;
systemService = true;
user = "anish";
dataDir = "/home/anish/usr/syncthing";
};
#zsh powerlevel10k #zsh powerlevel10k
programs.zsh.enable = true; programs.zsh.enable = true;
programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
users.users.anish.shell = pkgs.zsh; users.users.anish.shell = pkgs.zsh;
#android #android
programs.adb.enable = true; programs.adb.enable = true;

View file

@ -11,7 +11,7 @@
./common.nix ./common.nix
./box.nix ./box.nix
]; ];
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.loader.efi.efiSysMountPoint = "/boot/efi";
@ -21,18 +21,22 @@
version = 2; version = 2;
efiSupport = true; efiSupport = true;
enableCryptodisk = true; enableCryptodisk = true;
extraInitrd = /boot/initrd.keys.gz;
}; };
boot.initrd.luks.devices = [ boot.initrd.secrets = {
{ "/keyfile0.bin" = /etc/secrets/initrd/keyfile0.bin;
name = "root"; "/keyfile1.bin" = /etc/secrets/initrd/keyfile1.bin;
device = "/dev/disk/by-uuid/f37f3222-47d7-42d8-b400-363320a31853"; # UUID for /dev/nvme01np2 };
preLVM = true;
keyFile = "/keyfile0.bin"; boot.initrd.luks.devices = {
allowDiscards = true; "root" = {
} #name = "root";
]; device = "/dev/disk/by-uuid/f37f3222-47d7-42d8-b400-363320a31853"; # UUID for /dev/nvme01np2
preLVM = true;
allowDiscards = true;
keyFile = "/keyfile0.bin";
};
};
# Data mount # Data mount
fileSystems."/data" = { fileSystems."/data" = {

View file

@ -2,8 +2,13 @@
#nvim #nvim
{ environment.variables.EDITOR = "nvim"; {
environment.systemPackages = with pkgs; [ environment.variables.EDITOR = "nvim";
environment.shellAliases = {
k = "vim -c :VimwikiIndex";
kz = "vim -c :VimwikiIndex -c :ZettelNew";
};
environment.systemPackages = with pkgs; [
( neovim.override { ( neovim.override {
vimAlias = true; vimAlias = true;
configure = { configure = {
@ -12,15 +17,13 @@
vim-nix vim-nix
fzf-vim fzf-vim
vim-elixir vim-elixir
# vim-processing
# scvim
emmet-vim emmet-vim
nerdtree nerdtree
goyo-vim goyo-vim
vim-sneak vim-sneak
lightline-vim lightline-vim
csv-vim csv-vim
vimwiki vimwiki
coc-nvim coc-nvim
coc-json coc-json
coc-python coc-python
@ -31,7 +34,12 @@
ayu-vim ayu-vim
rainbow_parentheses-vim rainbow_parentheses-vim
vim-surround vim-surround
#neuron-vim vim-fugitive
# testing
#vim-processing
#vim-tidal
taskwiki
vim-zettel
]; ];
}; };
customRC = '' customRC = ''
@ -56,6 +64,11 @@
let mapleader = "\<Space>" let mapleader = "\<Space>"
" lightline colorscheme
let g:lightline = {
\ 'colorscheme': 'seoul256',
\ }
" moving splits with vim movements. " moving splits with vim movements.
:tnoremap <A-h> <C-\><C-N><C-w>h :tnoremap <A-h> <C-\><C-N><C-w>h
:tnoremap <A-j> <C-\><C-N><C-w>j :tnoremap <A-j> <C-\><C-N><C-w>j
@ -65,10 +78,10 @@
:inoremap <A-j> <C-\><C-N><C-w>j :inoremap <A-j> <C-\><C-N><C-w>j
:inoremap <A-k> <C-\><C-N><C-w>k :inoremap <A-k> <C-\><C-N><C-w>k
:inoremap <A-l> <C-\><C-N><C-w>l :inoremap <A-l> <C-\><C-N><C-w>l
:nnoremap <A-h> <C-w>h :nnoremap <A-h> <leader>h
:nnoremap <A-j> <C-w>j :nnoremap <A-j> <leader>j
:nnoremap <A-k> <C-w>k :nnoremap <A-k> <leader>k
:nnoremap <A-l> <C-w>l :nnoremap <A-l> <leader>l
:nnoremap <F5> "=strftime("%Y-%m-%d %H:%M:") :nnoremap <F5> "=strftime("%Y-%m-%d %H:%M:")
:inoremap <F5> <C-R>=strftime("%Y-%m-%d %H:%M:") :inoremap <F5> <C-R>=strftime("%Y-%m-%d %H:%M:")
@ -80,30 +93,19 @@
let g:rainbow_active = 0 let g:rainbow_active = 0
autocmd BufReadPost,BufNewFile c,py,nix RainbowParenthesesToggleAll autocmd BufReadPost,BufNewFile c,py,nix RainbowParenthesesToggleAll
" call plug#begin('~/.vim/plugged')
" call plug#end()
" fzf notational vim
" let g:nv_search_paths = ['~/vimwiki', '~/usr/devlog']
" let g:nv_default_extension = '.wiki'
" keyboard commands " keyboard commands
map <leader>t :NERDTreeToggle<CR> map <leader>t :NERDTreeToggle<CR>
map <leader>s :w<CR> map <leader>s :w<CR>
map <leader>q :wq<CR> map <leader>q :wq<CR>
map <leader>z :NV<CR>
map <leader>r :RainbowParenthesesToggleAll<CR> map <leader>r :RainbowParenthesesToggleAll<CR>
map <leader>zs :ZettelSearch<CR>
map <leader>zo :ZettelOpen<CR>
map <leader>zn :ZettelNew<CR>
" lightline colorscheme
let g:lightline = {
\ 'colorscheme': 'seoul256',
\ }
" NERDTree " NERDTree
" open on directory " open on directory
autocmd StdinReadPre * let s:std_in=1 autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
" coc " coc
" "