christoph/flake-nixinator
1
Fork 0
Code Activity

Reformat

Browse Source
This commit is contained in:
Christoph Urlacher
2023-11-04 11:58:19 +01:00
parent 0b0e2717d2
commit 1ebcf758f6
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
home/modules/waybar/default.nix
View File

@ -37,7 +37,6 @@ in {
# } else { # } else {
# ''; # '';
# }; # };
# waybar-hyprland = pkgs.waybar.overrideAttrs (oldAttrs: { # waybar-hyprland = pkgs.waybar.overrideAttrs (oldAttrs: {
# mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; # mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
# patches = (oldAttrs.patches or []) ++ [workspaces-patch]; # patches = (oldAttrs.patches or []) ++ [workspaces-patch];

13
lib/networking.nix
View File

@ -34,7 +34,12 @@
}; };
}; };
mkStaticSystemdNetwork = {interface, ip, router, nameserver}: { mkStaticSystemdNetwork = {
interface,
ip,
router,
nameserver,
}: {
# name = "enp0s31f6"; # Network interface name? # name = "enp0s31f6"; # Network interface name?
enable = true; enable = true;
@ -50,9 +55,9 @@
dns = nameserver; dns = nameserver;
# routes = [ # routes = [
# { # {
# routeConfig.Gateway = (lib.head router); # routeConfig.Gateway = (lib.head router);
# } # }
# ]; # ];
# See man systemd.network # See man systemd.network

3
system/default.nix
View File

@ -401,7 +401,8 @@ with mylib.networking; {
fwupd.enable = true; # Device firmware (I don't think I have any supported devices) fwupd.enable = true; # Device firmware (I don't think I have any supported devices)
# locate.enable = true; # Periodically update index # locate.enable = true; # Periodically update index
ntp.enable = true; # Clock sync ntp.enable = true; # Clock sync
gvfs = { # Network shares gvfs = {
# Network shares
enable = true; enable = true;
package = lib.mkForce pkgs.gnome3.gvfs; package = lib.mkForce pkgs.gnome3.gvfs;
}; };

2
system/nixinator/default.nix
View File

@ -91,7 +91,7 @@
layout = "us"; layout = "us";
xkbVariant = "altgr-intl"; xkbVariant = "altgr-intl";
videoDrivers = [ "nvidia" ]; # NVIDIA videoDrivers = ["nvidia"]; # NVIDIA
# videoDrivers = ["amdgpu"]; # videoDrivers = ["amdgpu"];
}; };
} }

7
system/nixinator/hardware-configuration.nix
View File

@ -15,7 +15,7 @@
# Enable early Nvidia kernel modesetting # 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/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 # 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 # initrd.kernelModules = ["amdgpu"]; # Initrd modules are always loaded, e.g. when they are required to mount the rootfs
# kernelModules = ["kvm-intel" "iwlwifi"]; # kernelModules = ["kvm-intel" "iwlwifi"];
kernelModules = ["kvm-amd"]; kernelModules = ["kvm-amd"];
@ -34,7 +34,7 @@
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2"; device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2";
fsType = "ext4"; fsType = "ext4";
options = [ "noatime" "nodiratime" "discard" ]; options = ["noatime" "nodiratime" "discard"];
}; };
fileSystems."/boot/efi" = { fileSystems."/boot/efi" = {
@ -77,7 +77,7 @@
open = true; open = true;
nvidiaSettings = true; nvidiaSettings = true;
}; };
# video.hidpi.enable = lib.mkDefault true; # No longer has any effect # video.hidpi.enable = lib.mkDefault true; # No longer has any effect
opengl = { opengl = {
enable = true; enable = true;
@ -98,7 +98,6 @@
nvidia-vaapi-driver nvidia-vaapi-driver
]; ];
}; };
sane.enable = true; # Scanning sane.enable = true; # Scanning