updated
This commit is contained in:
parent
7d9acb774c
commit
a71fa5adac
19
common.nix
19
common.nix
|
@ -28,7 +28,7 @@
|
||||||
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
|
||||||
|
@ -37,6 +37,7 @@
|
||||||
less
|
less
|
||||||
mpv
|
mpv
|
||||||
zathura
|
zathura
|
||||||
|
#qmk_firmware
|
||||||
python3
|
python3
|
||||||
gdb
|
gdb
|
||||||
vcv-rack
|
vcv-rack
|
||||||
|
@ -47,6 +48,7 @@
|
||||||
gimp
|
gimp
|
||||||
xxd
|
xxd
|
||||||
tilix
|
tilix
|
||||||
|
kitty
|
||||||
taskwarrior
|
taskwarrior
|
||||||
gnupg
|
gnupg
|
||||||
openjdk
|
openjdk
|
||||||
|
@ -57,6 +59,7 @@
|
||||||
tdesktop
|
tdesktop
|
||||||
feedreader
|
feedreader
|
||||||
syncthing
|
syncthing
|
||||||
|
dijo
|
||||||
#kdeconnect
|
#kdeconnect
|
||||||
#ssb-patchwork
|
#ssb-patchwork
|
||||||
gnome3.gnome-tweaks
|
gnome3.gnome-tweaks
|
||||||
|
@ -77,8 +80,9 @@
|
||||||
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;
|
||||||
|
@ -87,8 +91,13 @@
|
||||||
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;
|
||||||
|
|
|
@ -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;
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.initrd.luks.devices = {
|
||||||
|
"root" = {
|
||||||
|
#name = "root";
|
||||||
device = "/dev/disk/by-uuid/f37f3222-47d7-42d8-b400-363320a31853"; # UUID for /dev/nvme01np2
|
device = "/dev/disk/by-uuid/f37f3222-47d7-42d8-b400-363320a31853"; # UUID for /dev/nvme01np2
|
||||||
preLVM = true;
|
preLVM = true;
|
||||||
keyFile = "/keyfile0.bin";
|
|
||||||
allowDiscards = true;
|
allowDiscards = true;
|
||||||
}
|
keyFile = "/keyfile0.bin";
|
||||||
];
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Data mount
|
# Data mount
|
||||||
fileSystems."/data" = {
|
fileSystems."/data" = {
|
||||||
|
|
46
nvim.nix
46
nvim.nix
|
@ -2,7 +2,12 @@
|
||||||
|
|
||||||
|
|
||||||
#nvim
|
#nvim
|
||||||
{ environment.variables.EDITOR = "nvim";
|
{
|
||||||
|
environment.variables.EDITOR = "nvim";
|
||||||
|
environment.shellAliases = {
|
||||||
|
k = "vim -c :VimwikiIndex";
|
||||||
|
kz = "vim -c :VimwikiIndex -c :ZettelNew";
|
||||||
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
( neovim.override {
|
( neovim.override {
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
@ -12,8 +17,6 @@
|
||||||
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
|
||||||
|
@ -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
|
||||||
"
|
"
|
||||||
|
|
Loading…
Reference in a new issue