1

Add servenix home config + flake

This commit is contained in:
2023-07-09 11:00:42 +02:00
parent 478ef1cc16
commit ee7094590c
3 changed files with 67 additions and 22 deletions

View File

@ -111,6 +111,18 @@
hyprland.nixosModules.default # Use system module for SDDM config hyprland.nixosModules.default # Use system module for SDDM config
]; ];
}; };
# Usage: sudo nixos-rebuild switch --flake .#nixtop
servenix = mylib.nixos.mkNixosConfig {
inherit system mylib;
hostname = "servenix";
username = "christoph";
extraModules = [
hyprland.nixosModules.default # Use system module for SDDM config
];
};
}; };
}; };
} }

View File

@ -0,0 +1,47 @@
{
inputs,
hostname,
username,
lib,
mylib,
config,
nixosConfig,
pkgs,
...
}:
# Here goes the stuff that will only be enabled on the desktop
rec {
imports = [
../../modules
];
config = {
modules = {
hyprland = {
kb-layout = "us";
kb-variant = "altgr-intl";
monitors = {
"HDMI-A-1" = {
width = 2560;
height = 1440;
rate = 144;
x = 1920;
y = 0;
scale = 1;
};
};
workspaces = {
"HDMI-A-1" = [1 2 3 4 5 6 7 8 9 10];
};
};
waybar.monitor = "HDMI-A-1";
};
home.packages = with pkgs; [
# quartus-prime-lite # Intel FPGA design software
];
};
}

View File

@ -11,34 +11,27 @@
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot = { boot = {
initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
# Enable early Nvidia kernel modesetting initrd.kernelModules = []; # Initrd modules are always loaded, e.g. when they are required to mount the rootfs
# https://wiki.archlinux.org/title/GDM#GDM_ignores_Wayland_and_uses_X.Org_by_default (not fixed by this) kernelModules = ["kvm-intel" "iwlwifi"];
# https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start # kernelModules = ["kvm-amd"];
# 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"];
# extraModprobeConfig = '' # extraModprobeConfig = ''
# options iwlwifi 11n_disable=1 wd_disable=0 # options iwlwifi 11n_disable=1 wd_disable=0
# ''; # '';
# Specific to used kernel (currently linux_zen) # Specific to used kernel (currently linux_zen)
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [];
# new-lg4ff # Logitech force feedback
v4l2loopback
];
}; };
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2"; device = "/dev/disk/by-uuid/611e86c7-67e4-41ce-a7ee-e6639bbe8f07";
fsType = "ext4"; fsType = "ext4";
options = [ "noatime" "nodiratime" "discard" ]; options = [ "noatime" "nodiratime" "discard" ];
}; };
fileSystems."/boot/efi" = { fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/36A9-3D74"; device = "/dev/disk/by-uuid/CD5E-E3AB";
fsType = "vfat"; fsType = "vfat";
}; };
@ -69,8 +62,7 @@
# Use all redistributable firmware (i.e. nonfree) # Use all redistributable firmware (i.e. nonfree)
enableAllFirmware = true; enableAllFirmware = true;
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
# cpu.intel.updateMicrocode = true; cpu.intel.updateMicrocode = true;
cpu.amd.updateMicrocode = true;
# nvidia.modesetting.enable = true; # Not officially supported by NVidia but needed for wayland # nvidia.modesetting.enable = true; # Not officially supported by NVidia but needed for wayland
# video.hidpi.enable = lib.mkDefault true; # No longer has any effect # video.hidpi.enable = lib.mkDefault true; # No longer has any effect
@ -96,13 +88,7 @@
# libvdpau # NOTE: Don't know if needed/where it belongs... # libvdpau # NOTE: Don't know if needed/where it belongs...
# libva # NOTE: Don't know if needed/where it belongs... # libva # NOTE: Don't know if needed/where it belongs...
]; ];
sane.enable = true; # Scanning
xpadneo.enable = true; # Xbox Controller
}; };
environment.variables.AMD_VULKAN_ICD = "RADV"; # Choose mesa driver by default
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
} }