Reformat
This commit is contained in:
@ -37,7 +37,6 @@ in {
|
||||
# } else {
|
||||
# '';
|
||||
# };
|
||||
|
||||
# waybar-hyprland = pkgs.waybar.overrideAttrs (oldAttrs: {
|
||||
# mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
|
||||
# patches = (oldAttrs.patches or []) ++ [workspaces-patch];
|
||||
|
@ -34,7 +34,12 @@
|
||||
};
|
||||
};
|
||||
|
||||
mkStaticSystemdNetwork = {interface, ip, router, nameserver}: {
|
||||
mkStaticSystemdNetwork = {
|
||||
interface,
|
||||
ip,
|
||||
router,
|
||||
nameserver,
|
||||
}: {
|
||||
# name = "enp0s31f6"; # Network interface name?
|
||||
enable = true;
|
||||
|
||||
@ -50,9 +55,9 @@
|
||||
dns = nameserver;
|
||||
|
||||
# routes = [
|
||||
# {
|
||||
# routeConfig.Gateway = (lib.head router);
|
||||
# }
|
||||
# {
|
||||
# routeConfig.Gateway = (lib.head router);
|
||||
# }
|
||||
# ];
|
||||
|
||||
# See man systemd.network
|
||||
|
@ -401,7 +401,8 @@ with mylib.networking; {
|
||||
fwupd.enable = true; # Device firmware (I don't think I have any supported devices)
|
||||
# locate.enable = true; # Periodically update index
|
||||
ntp.enable = true; # Clock sync
|
||||
gvfs = { # Network shares
|
||||
gvfs = {
|
||||
# Network shares
|
||||
enable = true;
|
||||
package = lib.mkForce pkgs.gnome3.gvfs;
|
||||
};
|
||||
|
@ -91,7 +91,7 @@
|
||||
layout = "us";
|
||||
xkbVariant = "altgr-intl";
|
||||
|
||||
videoDrivers = [ "nvidia" ]; # NVIDIA
|
||||
videoDrivers = ["nvidia"]; # NVIDIA
|
||||
# videoDrivers = ["amdgpu"];
|
||||
};
|
||||
}
|
||||
|
@ -15,7 +15,7 @@
|
||||
# Enable early Nvidia kernel modesetting
|
||||
# https://wiki.archlinux.org/title/GDM#GDM_ignores_Wayland_and_uses_X.Org_by_default (not fixed by this)
|
||||
# https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
|
||||
initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ]; # NVIDIA
|
||||
initrd.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"]; # NVIDIA
|
||||
# initrd.kernelModules = ["amdgpu"]; # Initrd modules are always loaded, e.g. when they are required to mount the rootfs
|
||||
# kernelModules = ["kvm-intel" "iwlwifi"];
|
||||
kernelModules = ["kvm-amd"];
|
||||
@ -34,7 +34,7 @@
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2";
|
||||
fsType = "ext4";
|
||||
options = [ "noatime" "nodiratime" "discard" ];
|
||||
options = ["noatime" "nodiratime" "discard"];
|
||||
};
|
||||
|
||||
fileSystems."/boot/efi" = {
|
||||
@ -77,7 +77,7 @@
|
||||
open = true;
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
|
||||
|
||||
# video.hidpi.enable = lib.mkDefault true; # No longer has any effect
|
||||
opengl = {
|
||||
enable = true;
|
||||
@ -98,7 +98,6 @@
|
||||
|
||||
nvidia-vaapi-driver
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
sane.enable = true; # Scanning
|
||||
|
Reference in New Issue
Block a user