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; | ||||
|   }; | ||||
| } | ||||
| } | ||||
|  |  | |||
|  | @ -1,5 +1,4 @@ | |||
| { lib, ... }: | ||||
| { | ||||
| {lib, ...}: { | ||||
|   options = { | ||||
|     hardware = { | ||||
|       piperMouse = { | ||||
|  | @ -13,4 +12,4 @@ | |||
|       }; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
| } | ||||
|  |  | |||
|  | @ -1,15 +1,18 @@ | |||
| # leyla laptop | ||||
| { 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/client | ||||
|     ]; | ||||
|     ./hardware-configuration.nix | ||||
| 
 | ||||
|     ../../enviroments/client | ||||
|   ]; | ||||
| 
 | ||||
|   users = { | ||||
|     leyla.isFullUser = true; | ||||
|  | @ -25,7 +28,7 @@ | |||
|       setSocketVariable = true; | ||||
|     }; | ||||
|   }; | ||||
|   users.extraGroups.docker.members = [ "leyla" ]; | ||||
|   users.extraGroups.docker.members = ["leyla"]; | ||||
| 
 | ||||
|   # Enable touchpad support (enabled default in most desktopManager). | ||||
|   # services.xserver.libinput.enable = true; | ||||
|  |  | |||
|  | @ -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,12 +15,12 @@ | |||
| 
 | ||||
|   boot = { | ||||
|     initrd = { | ||||
|       availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; | ||||
|       kernelModules = [ ]; | ||||
|       availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; | ||||
|       kernelModules = []; | ||||
|     }; | ||||
|     kernelModules = [ "kvm-intel" "sg" ]; | ||||
|     extraModulePackages = [ ]; | ||||
|      | ||||
|     kernelModules = ["kvm-intel" "sg"]; | ||||
|     extraModulePackages = []; | ||||
| 
 | ||||
|     # Bootloader. | ||||
|     loader = { | ||||
|       systemd-boot.enable = true; | ||||
|  | @ -25,43 +29,39 @@ | |||
|   }; | ||||
| 
 | ||||
|   fileSystems = { | ||||
|     "/" = | ||||
|       { device = "/dev/disk/by-uuid/866d422b-f816-4ad9-9846-791839cb9337"; | ||||
|         fsType = "ext4"; | ||||
|       }; | ||||
|     "/" = { | ||||
|       device = "/dev/disk/by-uuid/866d422b-f816-4ad9-9846-791839cb9337"; | ||||
|       fsType = "ext4"; | ||||
|     }; | ||||
| 
 | ||||
|     "/boot" = | ||||
|       { device = "/dev/disk/by-uuid/E138-65B5"; | ||||
|         fsType = "vfat"; | ||||
|       }; | ||||
|     "/boot" = { | ||||
|       device = "/dev/disk/by-uuid/E138-65B5"; | ||||
|       fsType = "vfat"; | ||||
|     }; | ||||
| 
 | ||||
|     "/mnt/leyla_home" = | ||||
|       { | ||||
|         device = "defiant:/home/leyla"; | ||||
|         fsType = "nfs"; | ||||
|         options = [ "x-systemd.automount" "user" "noatime" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc" ]; | ||||
|       }; | ||||
|     "/mnt/leyla_home" = { | ||||
|       device = "defiant:/home/leyla"; | ||||
|       fsType = "nfs"; | ||||
|       options = ["x-systemd.automount" "user" "noatime" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"]; | ||||
|     }; | ||||
| 
 | ||||
|     "/mnt/eve_home" = | ||||
|       { | ||||
|         device = "defiant:/home/eve"; | ||||
|         fsType = "nfs"; | ||||
|         options = [ "x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc" ]; | ||||
|       }; | ||||
|     "/mnt/eve_home" = { | ||||
|       device = "defiant:/home/eve"; | ||||
|       fsType = "nfs"; | ||||
|       options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"]; | ||||
|     }; | ||||
| 
 | ||||
|     "/mnt/ester_home" = | ||||
|       { | ||||
|         device = "defiant:/home/ester"; | ||||
|         fsType = "nfs"; | ||||
|         options = [ "x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc" ]; | ||||
|       }; | ||||
|     "/mnt/ester_home" = { | ||||
|       device = "defiant:/home/ester"; | ||||
|       fsType = "nfs"; | ||||
|       options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"]; | ||||
|     }; | ||||
| 
 | ||||
|     "/mnt/users_home" = | ||||
|       { | ||||
|         device = "defiant:/home/users"; | ||||
|         fsType = "nfs"; | ||||
|         options = [ "x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc" ]; | ||||
|       }; | ||||
|     "/mnt/users_home" = { | ||||
|       device = "defiant:/home/users"; | ||||
|       fsType = "nfs"; | ||||
|       options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"]; | ||||
|     }; | ||||
| 
 | ||||
|     # "/mnt/legacy_leyla_home" = | ||||
|     #   { | ||||
|  | @ -87,9 +87,9 @@ | |||
| 
 | ||||
|   services.cachefilesd.enable = true; | ||||
| 
 | ||||
|   swapDevices = | ||||
|     [ { device = "/dev/disk/by-uuid/be98e952-a072-4c3a-8c12-69500b5a2fff"; } | ||||
|     ]; | ||||
|   swapDevices = [ | ||||
|     {device = "/dev/disk/by-uuid/be98e952-a072-4c3a-8c12-69500b5a2fff";} | ||||
|   ]; | ||||
| 
 | ||||
|   networking = { | ||||
|     useDHCP = lib.mkDefault true; | ||||
|  | @ -99,7 +99,6 @@ | |||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||
|   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; | ||||
| 
 | ||||
| 
 | ||||
|   hardware = { | ||||
|     graphics.enable = true; | ||||
|     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
|  |  | |||
|  | @ -1,15 +1,18 @@ | |||
| # leyla laptop | ||||
| { 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/client | ||||
|     ]; | ||||
|     ./hardware-configuration.nix | ||||
| 
 | ||||
|     ../../enviroments/client | ||||
|   ]; | ||||
| 
 | ||||
|   users = { | ||||
|     leyla = { | ||||
|  | @ -19,7 +22,7 @@ | |||
|     ester.isFullUser = true; | ||||
|     eve.isFullUser = true; | ||||
|   }; | ||||
|    | ||||
| 
 | ||||
|   # enabled virtualisation for docker | ||||
|   # virtualisation.docker.enable = true; | ||||
| 
 | ||||
|  |  | |||
|  | @ -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,11 +15,11 @@ | |||
| 
 | ||||
|   boot = { | ||||
|     initrd = { | ||||
|       availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; | ||||
|       kernelModules = [ ]; | ||||
|       availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; | ||||
|       kernelModules = []; | ||||
|     }; | ||||
|     kernelModules = [ "kvm-amd" "sg" ]; | ||||
|     extraModulePackages = [ ]; | ||||
|     kernelModules = ["kvm-amd" "sg"]; | ||||
|     extraModulePackages = []; | ||||
| 
 | ||||
|     # Bootloader. | ||||
|     loader = { | ||||
|  | @ -33,40 +37,37 @@ | |||
|   }; | ||||
| 
 | ||||
|   fileSystems = { | ||||
|     "/" = | ||||
|       { device = "/dev/disk/by-uuid/8be49c65-2b57-48f1-b74d-244d26061adb"; | ||||
|         fsType = "ext4"; | ||||
|       }; | ||||
|     "/" = { | ||||
|       device = "/dev/disk/by-uuid/8be49c65-2b57-48f1-b74d-244d26061adb"; | ||||
|       fsType = "ext4"; | ||||
|     }; | ||||
| 
 | ||||
|     "/boot" = | ||||
|       { device = "/dev/disk/by-uuid/3006-3867"; | ||||
|         fsType = "vfat"; | ||||
|         options = [ "fmask=0022" "dmask=0022" ]; | ||||
|       }; | ||||
|        | ||||
|     "/mnt/leyla_home" = | ||||
|       { | ||||
|         device = "server.arpa:/home/leyla"; | ||||
|         fsType = "nfs"; | ||||
|         options = [ "x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc" ]; | ||||
|       }; | ||||
|     "/boot" = { | ||||
|       device = "/dev/disk/by-uuid/3006-3867"; | ||||
|       fsType = "vfat"; | ||||
|       options = ["fmask=0022" "dmask=0022"]; | ||||
|     }; | ||||
| 
 | ||||
|     "/mnt/share_home" = | ||||
|       { | ||||
|         device = "server.arpa:/home/share"; | ||||
|         fsType = "nfs"; | ||||
|         options = [ "x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc" ]; | ||||
|       }; | ||||
|     "/mnt/leyla_home" = { | ||||
|       device = "server.arpa:/home/leyla"; | ||||
|       fsType = "nfs"; | ||||
|       options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"]; | ||||
|     }; | ||||
| 
 | ||||
|     "/mnt/docker_home" = | ||||
|       { | ||||
|         device = "server.arpa:/home/docker"; | ||||
|         fsType = "nfs"; | ||||
|         options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" ]; | ||||
|       }; | ||||
|     "/mnt/share_home" = { | ||||
|       device = "server.arpa:/home/share"; | ||||
|       fsType = "nfs"; | ||||
|       options = ["x-systemd.automount" "user" "nofail" "soft" "x-systemd.idle-timeout=600" "fsc"]; | ||||
|     }; | ||||
| 
 | ||||
|     "/mnt/docker_home" = { | ||||
|       device = "server.arpa:/home/docker"; | ||||
|       fsType = "nfs"; | ||||
|       options = ["x-systemd.automount" "noauto" "x-systemd.idle-timeout=600"]; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
|   swapDevices = [ ]; | ||||
|   swapDevices = []; | ||||
| 
 | ||||
|   networking = { | ||||
|     # Enables DHCP on each ethernet and wireless interface. In case of scripted networking | ||||
|  | @ -86,7 +87,7 @@ | |||
| 
 | ||||
|     # Enable OpenGL | ||||
|     graphics.enable = true; | ||||
|      | ||||
| 
 | ||||
|     # install graphics drivers | ||||
|     nvidia = { | ||||
|       # Modesetting is required. | ||||
|  | @ -94,7 +95,7 @@ | |||
| 
 | ||||
|       # Nvidia power management. Experimental, and can cause sleep/suspend to fail. | ||||
|       # Enable this if you have graphical corruption issues or application crashes after waking | ||||
|       # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead  | ||||
|       # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead | ||||
|       # of just the bare essentials. | ||||
|       powerManagement.enable = false; | ||||
| 
 | ||||
|  | @ -104,15 +105,15 @@ | |||
| 
 | ||||
|       # Use the NVidia open source kernel module (not to be confused with the | ||||
|       # independent third-party "nouveau" open source driver). | ||||
|       # Support is limited to the Turing and later architectures. Full list of  | ||||
|       # supported GPUs is at:  | ||||
|       # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus  | ||||
|       # Support is limited to the Turing and later architectures. Full list of | ||||
|       # supported GPUs is at: | ||||
|       # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus | ||||
|       # Only available from driver 515.43.04+ | ||||
|       # Currently alpha-quality/buggy, so false is currently the recommended setting. | ||||
|       open = false; | ||||
| 
 | ||||
|       # Enable the Nvidia settings menu, | ||||
|     # accessible via `nvidia-settings`. | ||||
|       # accessible via `nvidia-settings`. | ||||
|       nvidiaSettings = true; | ||||
| 
 | ||||
|       # Optionally, you may need to select the appropriate driver version for your specific GPU. | ||||
|  | @ -122,4 +123,3 @@ | |||
|     cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
|   }; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue