merge main
This commit is contained in:
		
						commit
						c0c8d735eb
					
				|  | @ -7,10 +7,10 @@ | |||
| 
 | ||||
|   # Minimal list of modules to use the EFI system partition and the YubiKey | ||||
|   boot.initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; | ||||
|    | ||||
| 
 | ||||
|   # Enable support for the YubiKey PBA | ||||
|   boot.initrd.luks.yubikeySupport = true; | ||||
|    | ||||
| 
 | ||||
|   # Configuration to use your Luks device | ||||
|   boot.initrd.luks.devices = { | ||||
|     "crypthome" = { | ||||
|  | @ -23,9 +23,9 @@ | |||
|           device = "/dev/sda1"; | ||||
|         }; | ||||
|       }; | ||||
|     };  | ||||
|     }; | ||||
|   }; | ||||
|   networking.hostName = "curve"; # Define your hostname. | ||||
|   networking.hostName = "curve"; | ||||
|   #networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant. | ||||
| 
 | ||||
|   time.timeZone = "Australia/Brisbane"; | ||||
|  | @ -34,7 +34,7 @@ | |||
|   networking.interfaces.enp0s31f6.useDHCP = true; | ||||
|   networking.interfaces.wlp3s0.useDHCP = true; | ||||
|   networking.wireless.enable = true; | ||||
|   networking.wireless.interfaces = ["wlp3s0"]; | ||||
|   networking.wireless.interfaces = [ "wlp3s0" ]; | ||||
|   networking.wireless.userControlled.enable = true; | ||||
| 
 | ||||
|   # Select internationalisation properties. | ||||
|  |  | |||
|  | @ -2,13 +2,13 @@ | |||
| 
 | ||||
| { | ||||
|   #imports = [ ./music.nix ] | ||||
|   environment.systemPackages = with pkgs; [ | ||||
|     nheko | ||||
|     newsflash | ||||
|     sublime-music | ||||
|     tdesktop | ||||
|     obs-studio | ||||
|   ]; | ||||
|   #environment.systemPackages = with pkgs; [ | ||||
|   #  nheko | ||||
|   #  newsflash | ||||
|   #  sublime-music | ||||
|   #  tdesktop | ||||
|   #  obs-studio | ||||
|   #]; | ||||
|   #environment.systemPackages = with pkgs; [ | ||||
|   #   lightdm | ||||
|   #   dunst | ||||
|  |  | |||
|  | @ -65,6 +65,7 @@ in | |||
|     xclip | ||||
|     xdotool | ||||
|     rofi | ||||
|     obs-studio | ||||
|     lightdm | ||||
|     dunst | ||||
|     libnotify | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue