From 642cee956648be458592e9d071fd65ba55d485ee Mon Sep 17 00:00:00 2001 From: ChUrl Date: Sat, 4 Nov 2023 11:58:19 +0100 Subject: [PATCH] Reformat --- home/modules/waybar/default.nix | 1 - lib/networking.nix | 13 +++++++++---- system/default.nix | 3 ++- system/nixinator/default.nix | 2 +- system/nixinator/hardware-configuration.nix | 7 +++---- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/home/modules/waybar/default.nix b/home/modules/waybar/default.nix index 64d786c1..447eb620 100644 --- a/home/modules/waybar/default.nix +++ b/home/modules/waybar/default.nix @@ -37,7 +37,6 @@ in { # } else { # ''; # }; - # waybar-hyprland = pkgs.waybar.overrideAttrs (oldAttrs: { # mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; # patches = (oldAttrs.patches or []) ++ [workspaces-patch]; diff --git a/lib/networking.nix b/lib/networking.nix index e5a398b4..49ed1e56 100644 --- a/lib/networking.nix +++ b/lib/networking.nix @@ -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 diff --git a/system/default.nix b/system/default.nix index 66ca23d8..b96d0a5a 100644 --- a/system/default.nix +++ b/system/default.nix @@ -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; }; diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix index 1a7657c4..d59f479b 100644 --- a/system/nixinator/default.nix +++ b/system/nixinator/default.nix @@ -91,7 +91,7 @@ layout = "us"; xkbVariant = "altgr-intl"; - videoDrivers = [ "nvidia" ]; # NVIDIA + videoDrivers = ["nvidia"]; # NVIDIA # videoDrivers = ["amdgpu"]; }; } diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix index 59b0c324..3258abd4 100644 --- a/system/nixinator/hardware-configuration.nix +++ b/system/nixinator/hardware-configuration.nix @@ -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