switch tabbing on common, add some more things to nvim
This commit is contained in:
		
							parent
							
								
									76eb03211c
								
							
						
					
					
						commit
						c19a9a5705
					
				|  | @ -1,10 +1,10 @@ | |||
| { config, pkgs, ... }: | ||||
| 
 | ||||
| { | ||||
| #	imports = [ | ||||
| # imports = [ | ||||
| #		./nvim.nix | ||||
| #	  ./unstable.nix | ||||
| #	]; | ||||
| #		./unstable.nix | ||||
| # ]; | ||||
| 
 | ||||
| 
 | ||||
| 	environment.systemPackages = with pkgs; [ | ||||
|  | @ -12,111 +12,111 @@ | |||
| 		iftop | ||||
| 		wget | ||||
| 		curl | ||||
|     exa | ||||
|     bat | ||||
|     fd | ||||
|     ag | ||||
|     viu | ||||
|     w3m | ||||
|     ranger | ||||
|     ripgrep | ||||
| 		exa | ||||
| 		bat | ||||
| 		fd | ||||
| 		ag | ||||
| 		viu | ||||
| 		w3m | ||||
| 		ranger | ||||
| 		ripgrep | ||||
| 		tcpdump | ||||
| 		whois | ||||
| 		mtr | ||||
| 		file | ||||
| 		lsof | ||||
| 	  atool | ||||
| 		atool | ||||
| 		inotify-tools | ||||
| 	  strace | ||||
| 		strace | ||||
| 		zip | ||||
| 		unzip | ||||
| 		rsync | ||||
| 		tmux | ||||
| 		pwgen | ||||
| 	  glow | ||||
| 		glow | ||||
| 		gitAndTools.gitFull | ||||
|     dig | ||||
|     wpa_supplicant | ||||
| 	  #neovim defined in ./nvim.nix | ||||
|     #wofi | ||||
| 		dig | ||||
| 		wpa_supplicant | ||||
| 		#neovim defined in ./nvim.nix | ||||
| 		#wofi | ||||
| 		#firefox | ||||
| 		#fractal | ||||
| 	  #pinentry_gnome | ||||
| 		#pinentry_gnome | ||||
| 		pass | ||||
| 		gcc | ||||
| 		less | ||||
| 		mpv | ||||
| 		zathura | ||||
| 	  #qmk_firmware | ||||
| 		#qmk_firmware | ||||
| 		python3 | ||||
| 	  gdb | ||||
|     #vcv-rack | ||||
| 	  #xdotool | ||||
| 	  #neofetch | ||||
| 	  #calibre | ||||
| 		gdb | ||||
| 		#vcv-rack | ||||
| 		#xdotool | ||||
| 		#neofetch | ||||
| 		#calibre | ||||
| 		#openvpn | ||||
|     #gimp | ||||
| 	  xxd | ||||
|     #tilix | ||||
| 	  kitty | ||||
| 		#gimp | ||||
| 		xxd | ||||
| 		#tilix | ||||
| 		kitty | ||||
| 		taskwarrior | ||||
| 		gnupg | ||||
|     #openjdk | ||||
|     #glslviewer | ||||
|     #filezilla | ||||
| 		#openjdk | ||||
| 		#glslviewer | ||||
| 		#filezilla | ||||
| 		#signal-desktop | ||||
| 	  #wire-desktop | ||||
| 		#wire-desktop | ||||
| 		#tdesktop | ||||
| 		#feedreader | ||||
|     #newsflash | ||||
|     #syncthing | ||||
| 	  dijo | ||||
| 	  #kdeconnect | ||||
| 	  #ssb-patchwork | ||||
|     #gnome3.gnome-tweaks | ||||
| 	  #gnome3.pomodoro | ||||
| 		#newsflash | ||||
| 		#syncthing | ||||
| 		dijo | ||||
| 		#kdeconnect | ||||
| 		#ssb-patchwork | ||||
| 		#gnome3.gnome-tweaks | ||||
| 		#gnome3.pomodoro | ||||
| 		#gnomeExtensions.gsconnect | ||||
| 		#gnomeExtensions.taskwhisperer | ||||
| 	  #gnome3.networkmanager-openvpn | ||||
| 		#gnome3.networkmanager-openvpn | ||||
| 		#python3Packages.youtube-dl | ||||
|     #appimage-run | ||||
|     #home-manager | ||||
| 		#appimage-run | ||||
| 		#home-manager | ||||
| 		libreoffice | ||||
| 		fontconfig | ||||
|     #hugo | ||||
| 	  #processing | ||||
| 	  #nextcloud-client | ||||
|     #zsh-powerlevel10k | ||||
| 	  powerline-fonts | ||||
|     #supercollider | ||||
| 	  haskellPackages.tidal | ||||
| 	  pandoc | ||||
| 		#hugo | ||||
| 		#processing | ||||
| 		#nextcloud-client | ||||
| 		#zsh-powerlevel10k | ||||
| 		powerline-fonts | ||||
| 		#supercollider | ||||
| 		haskellPackages.tidal | ||||
| 		pandoc | ||||
| 	]; | ||||
| 
 | ||||
|   #programs.bash.enableCompletion = true; | ||||
|   environment.shellAliases = { | ||||
|     "cat": "bat"; | ||||
|     "ls":"exa"; | ||||
|     "grep": "rg"; | ||||
|   };     | ||||
| 	#programs.bash.enableCompletion = true; | ||||
| 	environment.shellAliases = { | ||||
| 		"cat": "bat"; | ||||
| 		"ls":"exa"; | ||||
| 		"grep": "rg"; | ||||
| 	};		 | ||||
| 
 | ||||
| 	# needed for vcv-rack | ||||
|   #nixpkgs.config.allowUnfree = true;  | ||||
|   programs.gnupg.agent.enable = true; | ||||
|   programs.gnupg.agent.pinentryFlavor = "curses"; | ||||
|   programs.gnupg.agent.enableSSHSupport = false; | ||||
| 	#nixpkgs.config.allowUnfree = true;  | ||||
| 	programs.gnupg.agent.enable = true; | ||||
| 	programs.gnupg.agent.pinentryFlavor = "curses"; | ||||
| 	programs.gnupg.agent.enableSSHSupport = false; | ||||
| 
 | ||||
|   #system.copySystemConfiguration = true; | ||||
|   #services.syncthing = { | ||||
|   #  enable = true; | ||||
| 	#system.copySystemConfiguration = true; | ||||
| 	#services.syncthing = { | ||||
| 	#  enable = true; | ||||
| 	#  openDefaultPorts = true; | ||||
| 	#  systemService = true; | ||||
| 	#  user    = "anish"; | ||||
| 	#  user		 = "anish"; | ||||
| 	#  dataDir = "/home/anish/usr/syncthing"; | ||||
| 	#}; | ||||
| 
 | ||||
| 	#zsh powerlevel10k | ||||
|   #programs.zsh.enable = true; | ||||
| 	#programs.zsh.enable = true; | ||||
| 	#programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; | ||||
| 	#users.users.anish.shell = pkgs.zsh; | ||||
| 
 | ||||
|  | @ -124,9 +124,9 @@ | |||
| 	programs.adb.enable = true; | ||||
| 	users.users.anish.extraGroups = ["adbusers"]; | ||||
| 
 | ||||
|   nix.extraOptions = '' | ||||
|     keep-outputs = true | ||||
|     keep-derivations = true | ||||
|   ''; | ||||
| 	nix.extraOptions = '' | ||||
| 		keep-outputs = true | ||||
| 		keep-derivations = true | ||||
| 	''; | ||||
| 
 | ||||
| } | ||||
|  |  | |||
|  | @ -192,15 +192,39 @@ in | |||
| 			map <leader>q :wq<CR> | ||||
| 			map <leader>r :RainbowParenthesesToggleAll<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 | ||||
| 			nmap <leader>gd :SignifyDiff<CR> | ||||
| 			map <leader>ghu :SignifyHunkUndo<CR> | ||||
| 			nmap <leader>gl :SignifyList<CR> | ||||
| 			nnoremap <leader>ga :G fetch --all | ||||
| 			nmap <leader>gs :G<CR> | ||||
| 			nmap <leader>gh :diffget //3 | ||||
| 			nmap <leader>gl :diffget //2 | ||||
| 			nmap <leader>gc :GChecout<CR> | ||||
| 			nmap <leader>gc :GCheckout<CR> | ||||
| 
 | ||||
| 			" kitaab | ||||
| 			map <leader>zs :ZettelSearch<CR> | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue