updated
This commit is contained in:
parent
7d9acb774c
commit
a71fa5adac
87
common.nix
87
common.nix
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
imports = [
|
||||
./nvim.nix
|
||||
# ./unstable.nix
|
||||
# ./unstable.nix
|
||||
];
|
||||
|
||||
|
||||
|
|
@ -17,83 +17,92 @@
|
|||
mtr
|
||||
file
|
||||
lsof
|
||||
atool
|
||||
atool
|
||||
inotify-tools
|
||||
strace
|
||||
strace
|
||||
zip
|
||||
unzip
|
||||
rsync
|
||||
tmux
|
||||
pwgen
|
||||
glow
|
||||
glow
|
||||
gitAndTools.gitFull
|
||||
#neovim defined in ./nvim.nix
|
||||
#rofi
|
||||
#neovim defined in ./nvim.nix
|
||||
wofi
|
||||
firefox
|
||||
fractal
|
||||
pinentry_gnome
|
||||
pinentry_gnome
|
||||
pass
|
||||
gcc
|
||||
less
|
||||
mpv
|
||||
zathura
|
||||
#qmk_firmware
|
||||
python3
|
||||
gdb
|
||||
vcv-rack
|
||||
#xdotool
|
||||
#neofetch
|
||||
#calibre
|
||||
gdb
|
||||
vcv-rack
|
||||
#xdotool
|
||||
#neofetch
|
||||
#calibre
|
||||
#openvpn
|
||||
gimp
|
||||
xxd
|
||||
gimp
|
||||
xxd
|
||||
tilix
|
||||
kitty
|
||||
taskwarrior
|
||||
gnupg
|
||||
openjdk
|
||||
openjdk
|
||||
glslviewer
|
||||
filezilla
|
||||
filezilla
|
||||
signal-desktop
|
||||
wire-desktop
|
||||
wire-desktop
|
||||
tdesktop
|
||||
feedreader
|
||||
syncthing
|
||||
#kdeconnect
|
||||
#ssb-patchwork
|
||||
dijo
|
||||
#kdeconnect
|
||||
#ssb-patchwork
|
||||
gnome3.gnome-tweaks
|
||||
gnome3.pomodoro
|
||||
gnome3.pomodoro
|
||||
gnomeExtensions.gsconnect
|
||||
gnomeExtensions.taskwhisperer
|
||||
#gnome3.networkmanager-openvpn
|
||||
#gnome3.networkmanager-openvpn
|
||||
#python3Packages.youtube-dl
|
||||
appimage-run
|
||||
home-manager
|
||||
home-manager
|
||||
libreoffice
|
||||
fontconfig
|
||||
hugo
|
||||
nodejs
|
||||
#processing
|
||||
#nextcloud-client
|
||||
zsh-powerlevel10k
|
||||
powerline-fonts
|
||||
supercollider
|
||||
haskellPackages.tidal
|
||||
#(let neuronSrc = builtins.fetchTarball https://github.com/srid/neuron/archive/master.tar.gz;
|
||||
#in import neuronSrc)
|
||||
nodejs
|
||||
#processing
|
||||
#nextcloud-client
|
||||
zsh-powerlevel10k
|
||||
powerline-fonts
|
||||
supercollider
|
||||
haskellPackages.tidal
|
||||
# vim-zettel
|
||||
pandoc
|
||||
ag
|
||||
];
|
||||
|
||||
programs.bash.enableCompletion = true;
|
||||
|
||||
# needed for vcv-rack
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
# needed for vcv-rack
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
system.copySystemConfiguration = true;
|
||||
services.syncthing.enable = true;
|
||||
services.syncthing.user = "anish";
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
openDefaultPorts = true;
|
||||
systemService = true;
|
||||
user = "anish";
|
||||
dataDir = "/home/anish/usr/syncthing";
|
||||
};
|
||||
|
||||
#zsh powerlevel10k
|
||||
programs.zsh.enable = true;
|
||||
programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
users.users.anish.shell = pkgs.zsh;
|
||||
#zsh powerlevel10k
|
||||
programs.zsh.enable = true;
|
||||
programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
users.users.anish.shell = pkgs.zsh;
|
||||
|
||||
#android
|
||||
programs.adb.enable = true;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
./common.nix
|
||||
./box.nix
|
||||
];
|
||||
|
||||
|
||||
# Use the GRUB 2 boot loader.
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
|
|
@ -21,18 +21,22 @@
|
|||
version = 2;
|
||||
efiSupport = true;
|
||||
enableCryptodisk = true;
|
||||
extraInitrd = /boot/initrd.keys.gz;
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices = [
|
||||
{
|
||||
name = "root";
|
||||
device = "/dev/disk/by-uuid/f37f3222-47d7-42d8-b400-363320a31853"; # UUID for /dev/nvme01np2
|
||||
preLVM = true;
|
||||
keyFile = "/keyfile0.bin";
|
||||
allowDiscards = true;
|
||||
}
|
||||
];
|
||||
boot.initrd.secrets = {
|
||||
"/keyfile0.bin" = /etc/secrets/initrd/keyfile0.bin;
|
||||
"/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
|
||||
preLVM = true;
|
||||
allowDiscards = true;
|
||||
keyFile = "/keyfile0.bin";
|
||||
};
|
||||
};
|
||||
|
||||
# Data mount
|
||||
fileSystems."/data" = {
|
||||
|
|
|
|||
50
nvim.nix
50
nvim.nix
|
|
@ -2,8 +2,13 @@
|
|||
|
||||
|
||||
#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 {
|
||||
vimAlias = true;
|
||||
configure = {
|
||||
|
|
@ -12,15 +17,13 @@
|
|||
vim-nix
|
||||
fzf-vim
|
||||
vim-elixir
|
||||
# vim-processing
|
||||
# scvim
|
||||
emmet-vim
|
||||
nerdtree
|
||||
goyo-vim
|
||||
vim-sneak
|
||||
lightline-vim
|
||||
csv-vim
|
||||
vimwiki
|
||||
vimwiki
|
||||
coc-nvim
|
||||
coc-json
|
||||
coc-python
|
||||
|
|
@ -31,7 +34,12 @@
|
|||
ayu-vim
|
||||
rainbow_parentheses-vim
|
||||
vim-surround
|
||||
#neuron-vim
|
||||
vim-fugitive
|
||||
# testing
|
||||
#vim-processing
|
||||
#vim-tidal
|
||||
taskwiki
|
||||
vim-zettel
|
||||
];
|
||||
};
|
||||
customRC = ''
|
||||
|
|
@ -56,6 +64,11 @@
|
|||
|
||||
let mapleader = "\<Space>"
|
||||
|
||||
" lightline colorscheme
|
||||
let g:lightline = {
|
||||
\ 'colorscheme': 'seoul256',
|
||||
\ }
|
||||
|
||||
" moving splits with vim movements.
|
||||
:tnoremap <A-h> <C-\><C-N><C-w>h
|
||||
:tnoremap <A-j> <C-\><C-N><C-w>j
|
||||
|
|
@ -65,10 +78,10 @@
|
|||
:inoremap <A-j> <C-\><C-N><C-w>j
|
||||
:inoremap <A-k> <C-\><C-N><C-w>k
|
||||
:inoremap <A-l> <C-\><C-N><C-w>l
|
||||
:nnoremap <A-h> <C-w>h
|
||||
:nnoremap <A-j> <C-w>j
|
||||
:nnoremap <A-k> <C-w>k
|
||||
:nnoremap <A-l> <C-w>l
|
||||
:nnoremap <A-h> <leader>h
|
||||
:nnoremap <A-j> <leader>j
|
||||
:nnoremap <A-k> <leader>k
|
||||
:nnoremap <A-l> <leader>l
|
||||
:nnoremap <F5> "=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
|
||||
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
|
||||
map <leader>t :NERDTreeToggle<CR>
|
||||
map <leader>s :w<CR>
|
||||
map <leader>q :wq<CR>
|
||||
map <leader>z :NV<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
|
||||
" open on directory
|
||||
autocmd StdinReadPre * let s:std_in=1
|
||||
autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
|
||||
|
||||
|
||||
" coc
|
||||
"
|
||||
|
|
|
|||
Loading…
Reference in a new issue