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