forked from jan-leila/nix-config
		
	ran linter
This commit is contained in:
		
							parent
							
								
									5da0753b7c
								
							
						
					
					
						commit
						dcd5accea0
					
				
					 23 changed files with 372 additions and 309 deletions
				
			
		|  | @ -1,15 +1,18 @@ | |||
| # server nas | ||||
| { config, pkgs, inputs, ... }: | ||||
| { | ||||
|   imports = | ||||
|     [ | ||||
|       inputs.home-manager.nixosModules.default | ||||
|       inputs.sops-nix.nixosModules.sops | ||||
|   config, | ||||
|   pkgs, | ||||
|   inputs, | ||||
|   ... | ||||
| }: { | ||||
|   imports = [ | ||||
|     inputs.home-manager.nixosModules.default | ||||
|     inputs.sops-nix.nixosModules.sops | ||||
| 
 | ||||
|       ./hardware-configuration.nix | ||||
|        | ||||
|       ../../enviroments/server | ||||
|     ]; | ||||
|     ./hardware-configuration.nix | ||||
| 
 | ||||
|     ../../enviroments/server | ||||
|   ]; | ||||
| 
 | ||||
|   users.leyla.isThinUser = true; | ||||
| 
 | ||||
|  | @ -27,7 +30,7 @@ | |||
|       autoScrub.enable = true; | ||||
|       autoSnapshot.enable = true; | ||||
|     }; | ||||
|      | ||||
| 
 | ||||
|     # temp enable desktop enviroment for setup | ||||
|     # Enable the X11 windowing system. | ||||
|     xserver = { | ||||
|  | @ -43,7 +46,7 @@ | |||
|       }; | ||||
| 
 | ||||
|       # Get rid of xTerm | ||||
|       excludePackages = [ pkgs.xterm ]; | ||||
|       excludePackages = [pkgs.xterm]; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|  | @ -54,4 +57,4 @@ | |||
|   # Before changing this value read the documentation for this option | ||||
|   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). | ||||
|   system.stateVersion = "23.05"; # Did you read the comment? | ||||
| } | ||||
| } | ||||
|  |  | |||
|  | @ -1,11 +1,10 @@ | |||
| { lib, ... }: | ||||
| let | ||||
| {lib, ...}: let | ||||
|   bootDisk = devicePath: { | ||||
|     type = "disk"; | ||||
|     device = devicePath; | ||||
|     content = { | ||||
|       type = "gpt"; | ||||
|    | ||||
| 
 | ||||
|       partitions = { | ||||
|         boot = { | ||||
|           size = "1M"; | ||||
|  | @ -86,11 +85,13 @@ in { | |||
|                 # should this only mirror for this inital config with 3 drives we will used raidz2 for future configs??? | ||||
|                 mode = "mirror"; | ||||
|                 members = [ | ||||
|                   "hd_13_tb_a" "hd_13_tb_b" "hd_13_tb_c" | ||||
|                   "hd_13_tb_a" | ||||
|                   "hd_13_tb_b" | ||||
|                   "hd_13_tb_c" | ||||
|                 ]; | ||||
|               } | ||||
|             ]; | ||||
|             cache = [ ]; | ||||
|             cache = []; | ||||
|             # cache = [ "ssd_2_tb_a" ]; | ||||
|           }; | ||||
|         }; | ||||
|  | @ -98,7 +99,7 @@ in { | |||
|         options = { | ||||
|           ashift = "12"; | ||||
|         }; | ||||
|          | ||||
| 
 | ||||
|         rootFsOptions = { | ||||
|           encryption = "on"; | ||||
|           keyformat = "hex"; | ||||
|  | @ -111,7 +112,7 @@ in { | |||
| 
 | ||||
|         mountpoint = "/"; | ||||
|         postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank"; | ||||
|          | ||||
| 
 | ||||
|         datasets = { | ||||
|           "nix" = { | ||||
|             type = "zfs_fs"; | ||||
|  | @ -133,4 +134,3 @@ in { | |||
|     }; | ||||
|   }; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,9 +1,13 @@ | |||
| # Do not modify this file!  It was generated by ‘nixos-generate-config’ | ||||
| # and may be overwritten by future invocations.  Please make changes | ||||
| # to /etc/nixos/configuration.nix instead. | ||||
| { config, lib, pkgs, modulesPath, ... }: | ||||
| 
 | ||||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   pkgs, | ||||
|   modulesPath, | ||||
|   ... | ||||
| }: { | ||||
|   imports = [ | ||||
|     (modulesPath + "/installer/scan/not-detected.nix") | ||||
|     ../hardware-common.nix | ||||
|  | @ -11,15 +15,15 @@ | |||
| 
 | ||||
|   boot = { | ||||
|     initrd = { | ||||
|       availableKernelModules = [ "xhci_pci" "aacraid" "ahci" "usbhid" "usb_storage" "sd_mod" ]; | ||||
|       kernelModules = [ ]; | ||||
|       availableKernelModules = ["xhci_pci" "aacraid" "ahci" "usbhid" "usb_storage" "sd_mod"]; | ||||
|       kernelModules = []; | ||||
|     }; | ||||
|     kernelModules = [ "kvm-amd" ]; | ||||
|     extraModulePackages = [ ]; | ||||
|      | ||||
|     supportedFilesystems = [ "zfs" ]; | ||||
|     kernelModules = ["kvm-amd"]; | ||||
|     extraModulePackages = []; | ||||
| 
 | ||||
|     zfs.extraPools = [ "zroot" ]; | ||||
|     supportedFilesystems = ["zfs"]; | ||||
| 
 | ||||
|     zfs.extraPools = ["zroot"]; | ||||
|   }; | ||||
| 
 | ||||
|   # fileSystems."/" = | ||||
|  | @ -27,7 +31,7 @@ | |||
|   #     fsType = "ext4"; | ||||
|   #   }; | ||||
| 
 | ||||
|   swapDevices = [ ]; | ||||
|   swapDevices = []; | ||||
| 
 | ||||
|   networking = { | ||||
|     # Enables DHCP on each ethernet and wireless interface. In case of scripted networking | ||||
|  | @ -46,4 +50,4 @@ | |||
|     # TODO: hardware graphics | ||||
|     cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
|   }; | ||||
| } | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue