some changes, will need to add these to devos
This commit is contained in:
		
							parent
							
								
									b81a694aee
								
							
						
					
					
						commit
						fa53788c7a
					
				|  | @ -6,9 +6,9 @@ | |||
| [init] | ||||
| 	defaultBranch = main | ||||
| [github] | ||||
| 	user = hlissner | ||||
| 	user = chickensoupwithrice  | ||||
| [gitlab] | ||||
| 	user = hlissner | ||||
| 	user =  | ||||
| [rebase] | ||||
| 	autosquash = true | ||||
| [push] | ||||
|  | @ -30,7 +30,7 @@ | |||
|     insteadOf = gh: | ||||
| [url "git@github.com:"] | ||||
|     insteadOf = ssh+gh: | ||||
| [url "git@github.com:hlissner/"] | ||||
| [url "git@github.com:chickensoupwithrice/"] | ||||
|     insteadOf = gh:/ | ||||
| [url "https://gitlab.com/"] | ||||
|     insteadOf = gl: | ||||
|  |  | |||
|  | @ -13,10 +13,10 @@ super + apostrophe | |||
| # Attach to a detached session. If none is available create a new one, rather | ||||
| # than attach to one that is already attached to elsewhere. | ||||
| super + Return | ||||
| 	xst -e bash -c "(tmux ls | grep -qEv 'attached|scratch' && tmux at) || tmux" | ||||
| 	kitty | ||||
| 
 | ||||
| ctrl + super + Return | ||||
| 	xst | ||||
| 	xst -e bash -c "(tmux ls | grep -qEv 'attached|scratch' && tmux at) || tmux" | ||||
| 
 | ||||
| # Open a disposable, floating terminal window, for quick shell commands. | ||||
| super + grave | ||||
|  |  | |||
|  | @ -1,10 +1,10 @@ | |||
| { config, pkgs, ... }: | ||||
| 
 | ||||
| { | ||||
| 	imports = [ | ||||
| #	imports = [ | ||||
| #		./nvim.nix | ||||
| #	  ./unstable.nix | ||||
| 	]; | ||||
| #	]; | ||||
| 
 | ||||
| 
 | ||||
| 	environment.systemPackages = with pkgs; [ | ||||
|  | @ -81,7 +81,6 @@ | |||
| 	  powerline-fonts | ||||
| 	  supercollider | ||||
| 	  haskellPackages.tidal | ||||
| 	  # vim-zettel | ||||
| 	  pandoc | ||||
| 	]; | ||||
| 
 | ||||
|  | @ -90,7 +89,7 @@ | |||
| 	# needed for vcv-rack | ||||
| 	nixpkgs.config.allowUnfree = true;  | ||||
| 
 | ||||
| 	system.copySystemConfiguration = true; | ||||
|   #system.copySystemConfiguration = true; | ||||
|   #services.syncthing = { | ||||
| 	#  enable = true; | ||||
| 	#  openDefaultPorts = true; | ||||
|  |  | |||
|  | @ -32,6 +32,11 @@ | |||
|     };  | ||||
|   }; | ||||
| 
 | ||||
|   services.udev.extraRules = '' | ||||
|     SUBSYSTEMS=="usb", ATTRS{manufacturer}=="NVIDIA Corp.", ATTRS{product}=="APX", GROUP="switch" | ||||
|   ''; | ||||
|   services.udev.packages = [ pkgs.android-udev-rules ]; | ||||
| 
 | ||||
|  # nix = { | ||||
|  #   package = pkgs.nixUnstable; | ||||
|  #   extraOptions = "experimental-features = nix-command flakes"; | ||||
|  | @ -59,10 +64,11 @@ | |||
|   hardware.pulseaudio.enable = true; | ||||
| 
 | ||||
|   services.xserver.libinput.enable = true; | ||||
|   programs.adb.enable = true; | ||||
| 
 | ||||
|   users.users.anish = { | ||||
|     isNormalUser = true; | ||||
|     extraGroups = [ "wheel" "video" ];  | ||||
|     extraGroups = [ "wheel" "video" "switch" "adbusers" ];  | ||||
|   }; | ||||
| 
 | ||||
|   # Enable the OpenSSH daemon. | ||||
|  |  | |||
|  | @ -52,7 +52,7 @@ | |||
|     editors = { | ||||
|       default = "vim"; | ||||
|       #emacs.enable = true; | ||||
|       vim.enable = true; | ||||
|       #vim.enable = true; | ||||
|     }; | ||||
|     shell = { | ||||
|       adl.enable = true; | ||||
|  |  | |||
|  | @ -274,7 +274,7 @@ in { | |||
|     #    taskwiki | ||||
|     #    #vim-zettel | ||||
|     #  ]; | ||||
|     #}; | ||||
|     }; | ||||
| 
 | ||||
|     environment.shellAliases = { | ||||
|       vim = "nvim"; | ||||
|  |  | |||
|  | @ -1,17 +1,63 @@ | |||
| { pkgs, ... }: | ||||
| 
 | ||||
| 
 | ||||
| 	#nvim | ||||
| let | ||||
|   customPlugins = { | ||||
|       vim-zettel = pkgs.vimUtils.buildVimPlugin { | ||||
|         name = "vim-zettel"; | ||||
|         src = pkgs.fetchFromGitHub { | ||||
|           owner = "michal-h21"; | ||||
|           repo = "vim-zettel"; | ||||
|           rev = "929d90eec62e6f693c2702d2b6f76a93f2f1689d"; | ||||
|           sha256 = "1fzKmknfVlEYwqeXgbKITbb2/PJ023iJyMz6vak3qh4="; | ||||
|         }; | ||||
|       }; | ||||
|       vimwiki-dev = pkgs.vimUtils.buildVimPlugin { | ||||
|         name = "vimwiki-dev"; | ||||
|         src = pkgs.fetchFromGitHub { | ||||
|           owner = "vimwiki"; | ||||
|           repo = "vimwiki"; | ||||
|           rev = "d035a3428c6343b4f218e51340ddf690ad8c57ee"; | ||||
|           sha256 = "000000000000000000000000PJ023iJyMz6vak3qh4="; | ||||
|         }; | ||||
|       }; | ||||
|       taskwiki-t = pkgs.vimUtils.buildVimPluginFrom2Nix { | ||||
|         pname = "taskwiki"; | ||||
|         version = "2021-09-22"; | ||||
|         src = pkgs.fetchFromGitHub { | ||||
|           owner = "tools-life"; | ||||
|           repo = "taskwiki"; | ||||
|           rev = "c4392c36c01cfffcb06f460d722990b98bc53bdb"; | ||||
|           sha256 = "QrxFqu/Y6FykXGqIlK52+nDwmnBhubURl6v2Zc/KwPw="; | ||||
|         }; | ||||
|         meta.homepage = "https://github.com/tools-life/taskwiki/"; | ||||
|       }; | ||||
|   }; | ||||
|   my-python-packages = python-packages: with python-packages; [ | ||||
|     tasklib | ||||
|     pynvim | ||||
|     six | ||||
|     # other python packages you want | ||||
|   ];  | ||||
|   python-with-my-packages = pkgs.python3.withPackages my-python-packages; | ||||
| in | ||||
|   {  | ||||
|     environment.variables.EDITOR = "nvim"; | ||||
|     environment.shellAliases = { | ||||
|       k = "vim -c :VimwikiIndex"; | ||||
|       kz = "vim -c :VimwikiIndex -c :ZettelNew"; | ||||
|     }; | ||||
|     environment.systemPackages = with pkgs; [  | ||||
|     environment.systemPackages = with pkgs // customPlugins; [  | ||||
|       nodejs | ||||
|       python-with-my-packages | ||||
|       #python3Packages.pynvim | ||||
|       #python3Packages.six | ||||
|       #python3Packages.tasklib | ||||
|       #python3 | ||||
|   ( neovim.override { | ||||
|   vimAlias = true; | ||||
|   withPython3 = true; | ||||
|   extraPython3Packages = pkgs: with pkgs; [ tasklib six ]; | ||||
|   configure = { | ||||
| 		packages.myPlugins = with pkgs.vimPlugins; { | ||||
| 			start = [  | ||||
|  | @ -30,21 +76,24 @@ | |||
| 				coc-python | ||||
| 				coc-pairs | ||||
| 				coc-emmet | ||||
| 				emmet-vim | ||||
| 				LanguageClient-neovim | ||||
| 				ayu-vim | ||||
| 				rainbow_parentheses-vim | ||||
| 				vim-surround | ||||
| 				vim-fugitive | ||||
| 				#iron-nvim | ||||
| 				#nvim-colorizer | ||||
| 				vim-devicons | ||||
| 				# testing | ||||
| 				#vim-processing | ||||
| 				#vim-tidal | ||||
| 				taskwiki | ||||
| 				#vim-zettel | ||||
| 				vim-zettel | ||||
| 				#vimwiki-sync | ||||
|         telescope-nvim | ||||
|         # Clojure stuff | ||||
|         conjure | ||||
|         vim-sexp | ||||
|         vim-sexp-mappings-for-regular-people | ||||
| 			]; | ||||
| 		}; | ||||
|     customRC = '' | ||||
|  | @ -105,6 +154,9 @@ | |||
| 			let g:syntastic_check_on_open = 1 | ||||
| 			let g:syntastic_check_on_wq = 0 | ||||
| 
 | ||||
|       " Sexp in Conjure (since it's fennel) | ||||
|       " let g:sexp_filetypes = [ "fennel" ] | ||||
| 
 | ||||
|       let g:rainbow_active = 0 | ||||
|       autocmd BufReadPost,BufNewFile c,py,nix RainbowParenthesesToggleAll | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue