forked from jan-leila/nix-config
		
	added nix language server
removed ollama
This commit is contained in:
		
							parent
							
								
									1790d785f5
								
							
						
					
					
						commit
						77e3d687d4
					
				
					 4 changed files with 27 additions and 10 deletions
				
			
		|  | @ -1,8 +1,16 @@ | ||||||
| {pkgs, ...}: { | { | ||||||
|  |   pkgs, | ||||||
|  |   inputs, | ||||||
|  |   ... | ||||||
|  | }: { | ||||||
|   imports = [ |   imports = [ | ||||||
|     ../common |     ../common | ||||||
|   ]; |   ]; | ||||||
| 
 | 
 | ||||||
|  |   nix = { | ||||||
|  |     nixPath = ["nixpkgs=${inputs.nixpkgs}"]; | ||||||
|  |   }; | ||||||
|  | 
 | ||||||
|   services = { |   services = { | ||||||
|     # Enable CUPS to print documents. |     # Enable CUPS to print documents. | ||||||
|     printing.enable = true; |     printing.enable = true; | ||||||
|  | @ -51,6 +59,9 @@ | ||||||
|     # helvetica font |     # helvetica font | ||||||
|     aileron |     aileron | ||||||
| 
 | 
 | ||||||
|  |     # nix langauge server | ||||||
|  |     nixd | ||||||
|  | 
 | ||||||
|     cachefilesd |     cachefilesd | ||||||
| 
 | 
 | ||||||
|     gnomeExtensions.dash-to-dock |     gnomeExtensions.dash-to-dock | ||||||
|  |  | ||||||
|  | @ -46,10 +46,10 @@ in { | ||||||
|     ); |     ); | ||||||
| 
 | 
 | ||||||
|     services = { |     services = { | ||||||
|       ollama = { |       # ollama = { | ||||||
|         enable = cfg.hasGPU; |       #   enable = cfg.hasGPU; | ||||||
|         acceleration = "cuda"; |       #   acceleration = "cuda"; | ||||||
|       }; |       # }; | ||||||
| 
 | 
 | ||||||
|       # TODO: this should reference the home directory from the user config |       # TODO: this should reference the home directory from the user config | ||||||
|       openssh.hostKeys = [ |       openssh.hostKeys = [ | ||||||
|  |  | ||||||
|  | @ -1,9 +1,7 @@ | ||||||
| { | { | ||||||
|   lib, |   lib, | ||||||
|   config, |  | ||||||
|   osConfig, |   osConfig, | ||||||
|   pkgs, |   pkgs, | ||||||
|   inputs, |  | ||||||
|   ... |   ... | ||||||
| }: let | }: let | ||||||
|   cfg = osConfig.nixos.users.leyla; |   cfg = osConfig.nixos.users.leyla; | ||||||
|  |  | ||||||
|  | @ -36,10 +36,18 @@ in { | ||||||
|         "cSpell.userWords" = [ |         "cSpell.userWords" = [ | ||||||
|           "webdav" |           "webdav" | ||||||
|         ]; |         ]; | ||||||
|  |         "nix.serverPath" = "nixd"; | ||||||
|  |         "nix.enableLanguageServer" = true; | ||||||
|  |         "nixpkgs" = { | ||||||
|  |           "expr" = "import <nixpkgs> {}"; | ||||||
|  |         }; | ||||||
|  |         # "fomratting": { | ||||||
|  |         #   "command": [ "alejandra" ]; | ||||||
|  |         # }; | ||||||
|       }; |       }; | ||||||
| 
 | 
 | ||||||
|       extensions = ( |       extensions = ( | ||||||
|         with extensions.open-vsx; |         with open-vsx; | ||||||
|           [ |           [ | ||||||
|             # vs code feel extensions |             # vs code feel extensions | ||||||
|             ms-vscode.atom-keybindings |             ms-vscode.atom-keybindings | ||||||
|  | @ -68,10 +76,10 @@ in { | ||||||
|             # misc extensions |             # misc extensions | ||||||
|             bungcip.better-toml |             bungcip.better-toml | ||||||
| 
 | 
 | ||||||
|             open-vsx."10nates".ollama-autocoder |             # lib.mkIf open-vsx."10nates".ollama-autocoder | ||||||
|           ] |           ] | ||||||
|           ++ ( |           ++ ( | ||||||
|             with extensions.vscode-marketplace; [ |             with vscode-marketplace; [ | ||||||
|               # js extensions |               # js extensions | ||||||
|               karyfoundation.nearley |               karyfoundation.nearley | ||||||
|             ] |             ] | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue