switch tabbing on common, add some more things to nvim

This commit is contained in:
Anish L 2022-02-26 01:58:16 +10:00
parent 76eb03211c
commit c19a9a5705
2 changed files with 95 additions and 71 deletions

View file

@ -1,10 +1,10 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# imports = [ # imports = [
# ./nvim.nix # ./nvim.nix
# ./unstable.nix # ./unstable.nix
# ]; # ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -12,111 +12,111 @@
iftop iftop
wget wget
curl curl
exa exa
bat bat
fd fd
ag ag
viu viu
w3m w3m
ranger ranger
ripgrep ripgrep
tcpdump tcpdump
whois whois
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
dig dig
wpa_supplicant wpa_supplicant
#neovim defined in ./nvim.nix #neovim defined in ./nvim.nix
#wofi #wofi
#firefox #firefox
#fractal #fractal
#pinentry_gnome #pinentry_gnome
pass pass
gcc gcc
less less
mpv mpv
zathura zathura
#qmk_firmware #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 kitty
taskwarrior taskwarrior
gnupg gnupg
#openjdk #openjdk
#glslviewer #glslviewer
#filezilla #filezilla
#signal-desktop #signal-desktop
#wire-desktop #wire-desktop
#tdesktop #tdesktop
#feedreader #feedreader
#newsflash #newsflash
#syncthing #syncthing
dijo dijo
#kdeconnect #kdeconnect
#ssb-patchwork #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
#processing #processing
#nextcloud-client #nextcloud-client
#zsh-powerlevel10k #zsh-powerlevel10k
powerline-fonts powerline-fonts
#supercollider #supercollider
haskellPackages.tidal haskellPackages.tidal
pandoc pandoc
]; ];
#programs.bash.enableCompletion = true; #programs.bash.enableCompletion = true;
environment.shellAliases = { environment.shellAliases = {
"cat": "bat"; "cat": "bat";
"ls":"exa"; "ls":"exa";
"grep": "rg"; "grep": "rg";
}; };
# needed for vcv-rack # needed for vcv-rack
#nixpkgs.config.allowUnfree = true; #nixpkgs.config.allowUnfree = true;
programs.gnupg.agent.enable = true; programs.gnupg.agent.enable = true;
programs.gnupg.agent.pinentryFlavor = "curses"; programs.gnupg.agent.pinentryFlavor = "curses";
programs.gnupg.agent.enableSSHSupport = false; programs.gnupg.agent.enableSSHSupport = false;
#system.copySystemConfiguration = true; #system.copySystemConfiguration = true;
#services.syncthing = { #services.syncthing = {
# enable = true; # enable = true;
# openDefaultPorts = true; # openDefaultPorts = true;
# systemService = true; # systemService = true;
# user = "anish"; # user = "anish";
# dataDir = "/home/anish/usr/syncthing"; # 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;
@ -124,9 +124,9 @@
programs.adb.enable = true; programs.adb.enable = true;
users.users.anish.extraGroups = ["adbusers"]; users.users.anish.extraGroups = ["adbusers"];
nix.extraOptions = '' nix.extraOptions = ''
keep-outputs = true keep-outputs = true
keep-derivations = true keep-derivations = true
''; '';
} }

View file

@ -192,15 +192,39 @@ in
map <leader>q :wq<CR> map <leader>q :wq<CR>
map <leader>r :RainbowParenthesesToggleAll<CR> map <leader>r :RainbowParenthesesToggleAll<CR>
map <leader><BS> :noh<CR> map <leader><BS> :noh<CR>
nnoremap Y y$
" center moving
nnoremap n nzzzv
nnoremap N Nzzzv
nnoremap J mzJ'z
" undo points
inoremap , ,<c-g>u
inoremap . .<c-g>u
inoremap ! !<c-g>u
inoremap ? ?<c-g>u
inoremap ( (<c-g>u
inoremap ) )<c-g>u
inoremap [ [<c-g>u
inoremap ] ]<c-g>u
inoremap { {<c-g>u
inoremap } }<c-g>u
" moving text
vnoremap J :m '>+1<CR>gv=gv
vnoremap K :m '>-2<CR>gv=gv
inoremap <c-j> <esc>:m .+1<CR>==
inoremap <c-k> <esc>:m .-2<CR>==
nnoremap <leader>j <esc>:m .+1<CR>==
nnoremap <leader>k <esc>:m .-2<CR>==
" git " git
nmap <leader>gd :SignifyDiff<CR> nmap <leader>gd :SignifyDiff<CR>
map <leader>ghu :SignifyHunkUndo<CR> map <leader>ghu :SignifyHunkUndo<CR>
nmap <leader>gl :SignifyList<CR> nmap <leader>gl :SignifyList<CR>
nnoremap <leader>ga :G fetch --all
nmap <leader>gs :G<CR> nmap <leader>gs :G<CR>
nmap <leader>gh :diffget //3 nmap <leader>gh :diffget //3
nmap <leader>gl :diffget //2 nmap <leader>gl :diffget //2
nmap <leader>gc :GChecout<CR> nmap <leader>gc :GCheckout<CR>
" kitaab " kitaab
map <leader>zs :ZettelSearch<CR> map <leader>zs :ZettelSearch<CR>