Merge remote-tracking branch 'origin/master'

This commit is contained in:
Chris Cochrun 2022-06-23 12:19:09 -05:00
commit a7476a1222
5 changed files with 37 additions and 14 deletions

View file

@ -11,14 +11,18 @@
};
# Use the systemd-boot EFI boot loader.
boot.kernelPackages = pkgs.linuxPackages_zen;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot = {
kernelPackages = pkgs.linuxPackages_zen;
kernelParams = [ "mem_sleep_default=deep" ];
initrd.kernelModules = [ "amdgpu" ];
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
};
nixpkgs.config.allowUnfree = true;
boot.kernelParams = [ "mem_sleep_default=deep" ];
networking.hostName = "kaladin"; # Define your hostname.
networking.networkmanager.enable = true;
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -33,6 +37,8 @@
networking.interfaces.enp0s31f6.useDHCP = true;
networking.interfaces.wlp7s0.useDHCP = true;
virtualisation.podman.enable = true;
virtualisation.docker.enable = true;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
@ -231,7 +237,7 @@
quickemu
OVMFFull
element-desktop-wayland
# rustdesk
scrcpy
# hyprland
blender
neofetch
@ -259,6 +265,8 @@
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
plasma5Packages.kirigami2
sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
];

View file

@ -254,7 +254,7 @@
quickemu
OVMFFull
element-desktop-wayland
# rustdesk
scrcpy
# hyprland
neofetch
afetch
@ -285,6 +285,8 @@
libsForQt5.kirigami2
libsForQt5.ki18n
libsForQt5.kcoreaddons
plasma5Packages.kirigami2
sqlite
fennel
# (libsForQt5.callPackage ../../LightlyShaders {})
];