merge main

This commit is contained in:
Anish L 2022-04-11 17:31:58 +10:00
commit c0c8d735eb
3 changed files with 13 additions and 12 deletions

View file

@ -7,10 +7,10 @@
# Minimal list of modules to use the EFI system partition and the YubiKey # Minimal list of modules to use the EFI system partition and the YubiKey
boot.initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; boot.initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
# Enable support for the YubiKey PBA # Enable support for the YubiKey PBA
boot.initrd.luks.yubikeySupport = true; boot.initrd.luks.yubikeySupport = true;
# Configuration to use your Luks device # Configuration to use your Luks device
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
"crypthome" = { "crypthome" = {
@ -23,9 +23,9 @@
device = "/dev/sda1"; device = "/dev/sda1";
}; };
}; };
}; };
}; };
networking.hostName = "curve"; # Define your hostname. networking.hostName = "curve";
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
time.timeZone = "Australia/Brisbane"; time.timeZone = "Australia/Brisbane";
@ -34,7 +34,7 @@
networking.interfaces.enp0s31f6.useDHCP = true; networking.interfaces.enp0s31f6.useDHCP = true;
networking.interfaces.wlp3s0.useDHCP = true; networking.interfaces.wlp3s0.useDHCP = true;
networking.wireless.enable = true; networking.wireless.enable = true;
networking.wireless.interfaces = ["wlp3s0"]; networking.wireless.interfaces = [ "wlp3s0" ];
networking.wireless.userControlled.enable = true; networking.wireless.userControlled.enable = true;
# Select internationalisation properties. # Select internationalisation properties.

View file

@ -2,13 +2,13 @@
{ {
#imports = [ ./music.nix ] #imports = [ ./music.nix ]
environment.systemPackages = with pkgs; [ #environment.systemPackages = with pkgs; [
nheko # nheko
newsflash # newsflash
sublime-music # sublime-music
tdesktop # tdesktop
obs-studio # obs-studio
]; #];
#environment.systemPackages = with pkgs; [ #environment.systemPackages = with pkgs; [
# lightdm # lightdm
# dunst # dunst

View file

@ -65,6 +65,7 @@ in
xclip xclip
xdotool xdotool
rofi rofi
obs-studio
lightdm lightdm
dunst dunst
libnotify libnotify