Compare commits
16 Commits
fd8f18eeec
...
31102ae362
| Author | SHA1 | Date | |
|---|---|---|---|
| 31102ae362 | |||
| 33893cafd8 | |||
| 61e41fca0a | |||
| b90bfdaed8 | |||
| 9eff6a3a6a | |||
| fbbd74bfae | |||
| fcf8efe577 | |||
| ec3d963494 | |||
| 82b9b48493 | |||
| e03b3d229d | |||
| 06a3b10079 | |||
| 613a9c5540 | |||
| 0c754590f1 | |||
| 5474251a64 | |||
| dd1aa0957e | |||
| ddce79071d |
@@ -1,25 +0,0 @@
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit (lib.my-namespace) enabled;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
# ../modules.nix
|
||||
];
|
||||
my-namespace.home = {
|
||||
stream-tools = enabled;
|
||||
# networking = enabled;
|
||||
# personal-apps = enabled;
|
||||
# suites.laptop = enabled;
|
||||
};
|
||||
home = {
|
||||
packages = [
|
||||
pkgs.nil
|
||||
pkgs.beeper
|
||||
];
|
||||
};
|
||||
}
|
||||
23
modules/nixos/file-organization/default.nix
Normal file
23
modules/nixos/file-organization/default.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
namespace,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.${namespace}.file-organization;
|
||||
in
|
||||
{
|
||||
options.${namespace}.file-organization = {
|
||||
enable = lib.mkEnableOption "file organization software";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
ranger
|
||||
fsearch
|
||||
qdirstat
|
||||
veracrypt
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -39,6 +39,30 @@
|
||||
vkbasalt
|
||||
gamescope
|
||||
];
|
||||
|
||||
hardware.uinput.enable = true;
|
||||
users.users.andreas.extraGroups = [ "input" ];
|
||||
|
||||
programs.gamescope.enable = true;
|
||||
programs.steam.gamescopeSession = {
|
||||
enable = true;
|
||||
args = [
|
||||
"-w" "1920"
|
||||
"-h" "1080"
|
||||
"-r" "172"
|
||||
"-e" # Enable steam integration
|
||||
"--steam"
|
||||
"--prefer-vk-device 8086:e20b" # lspci -nn | grep VGA
|
||||
];
|
||||
env = {
|
||||
WLR_RENDERER = "vulkan";
|
||||
DXVK_HDR = "0 ";
|
||||
ENABLE_GAMESCOPE_WSI = "0";
|
||||
WINE_FULLSCREEN_FSR = "1";
|
||||
SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
|
||||
};
|
||||
};
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
package = pkgs.steam.override {
|
||||
@@ -46,49 +70,13 @@
|
||||
gamemode
|
||||
];
|
||||
extraEnv = {
|
||||
SDL_VIDEODRIVER = "wayland";
|
||||
# SDL_VIDEODRIVER = "wayland,x11";
|
||||
SDL_VIDEODRIVER = "x11";
|
||||
};
|
||||
};
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||
|
||||
# gamescopeSession = {
|
||||
# enable = true;
|
||||
# env = {
|
||||
# WLR_RENDERER = "vulkan";
|
||||
# DXVK_HDR = "0 ";
|
||||
# ENABLE_GAMESCOPE_WSI = "0";
|
||||
# WINE_FULLSCREEN_FSR = "1";
|
||||
# # Games allegedly prefer X11
|
||||
# SDL_VIDEODRIVER = "x11";
|
||||
# };
|
||||
# args = [
|
||||
# "--xwayland-count 1"
|
||||
# "--expose-wayland"
|
||||
|
||||
# "-e" # Enable steam integration
|
||||
# "--steam"
|
||||
|
||||
# # "--adaptive-sync"
|
||||
# # "--hdr-enabled"
|
||||
# # "--hdr-itm-enable"
|
||||
|
||||
# # External monitor
|
||||
# "--prefer-output DP-3"
|
||||
# "--output-width 1920"
|
||||
# "--output-height 1080"
|
||||
# "-r 172"
|
||||
|
||||
# # Laptop display
|
||||
# # "--prefer-output eDP-1"
|
||||
# # "--output-width 2560"
|
||||
# # "--output-height 1600"
|
||||
# # "-r 120"
|
||||
|
||||
# # "--prefer-vk-device 10de:1b81" # lspci -nn | grep VGA
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
7
overlays/mesa-gcc/default.nix
Normal file
7
overlays/mesa-gcc/default.nix
Normal file
@@ -0,0 +1,7 @@
|
||||
{ ... }:
|
||||
|
||||
final: prev: {
|
||||
mesa = prev.mesa.overrideAttrs (old: {
|
||||
stdenv = prev.gcc14Stdenv;
|
||||
});
|
||||
}
|
||||
@@ -2,7 +2,11 @@
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
# config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
@@ -88,7 +92,7 @@
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
jack.enable = true;
|
||||
|
||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||
# no need to redefine it in your config for now)
|
||||
@@ -135,6 +139,9 @@
|
||||
krita
|
||||
ntfs3g
|
||||
htop
|
||||
reaper
|
||||
discord
|
||||
betterdiscordctl
|
||||
];
|
||||
environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = ''
|
||||
[Desktop Entry]
|
||||
|
||||
@@ -104,16 +104,7 @@ in
|
||||
];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
programs.gamescope.enable = true;
|
||||
programs.steam.gamescopeSession = {
|
||||
enable = true;
|
||||
args = [
|
||||
"-w" "1920"
|
||||
"-h" "1080"
|
||||
"-r" "172"
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
# Install firefox.
|
||||
programs.firefox.enable = true;
|
||||
|
||||
BIN
systems/x86_64-linux/drivebystation-nix/hardware/firmware/U32J59x-edid.bin
Executable file
BIN
systems/x86_64-linux/drivebystation-nix/hardware/firmware/U32J59x-edid.bin
Executable file
Binary file not shown.
@@ -52,6 +52,13 @@
|
||||
};
|
||||
|
||||
|
||||
############################
|
||||
## LACT Settings for Overclocking
|
||||
############################
|
||||
|
||||
services.lact.enable = true;
|
||||
|
||||
|
||||
|
||||
############################
|
||||
## X / Wayland GPU Drivers
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
############################
|
||||
## Display + Mesa Settings
|
||||
############################
|
||||
|
||||
# hardware.enableRedistributableFirmware = true;
|
||||
|
||||
hardware.firmware = [
|
||||
pkgs.linux-firmware
|
||||
# pkgs.firmwareLinuxNonfree
|
||||
# pkgs.firmwareLinuxStrict
|
||||
# pkgs.firmwareLinuxLatest
|
||||
];
|
||||
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = [
|
||||
"console=tty0"
|
||||
# "efifb=off"
|
||||
# "xe.force_probe=*"
|
||||
"module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
|
||||
];
|
||||
|
||||
# environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
|
||||
hardware.intel-gpu-tools.enable = true;
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver # Intel VAAPI
|
||||
vpl-gpu-rt # oneVPL runtime
|
||||
intel-vaapi-driver # fallback
|
||||
intel-compute-runtime # OpenCL/Level Zero
|
||||
];
|
||||
};
|
||||
|
||||
# Ensure Arc driver is available (usually auto-loaded)
|
||||
boot.kernelModules = [ "i915" ];
|
||||
# Blacklist everything for nvidia
|
||||
boot.blacklistedKernelModules = [
|
||||
"nouveau"
|
||||
"nvidia"
|
||||
"nvidia_drm"
|
||||
"nvidia_modeset"
|
||||
"nvidia_uvm"
|
||||
"xe"
|
||||
];
|
||||
|
||||
environment.variables = {
|
||||
KWIN_DRM_DEVICES = "/dev/dri/card0";
|
||||
};
|
||||
|
||||
|
||||
############################
|
||||
## LACT Settings for Overclocking
|
||||
############################
|
||||
|
||||
services.lact.enable = true;
|
||||
|
||||
|
||||
|
||||
############################
|
||||
## X / Wayland GPU Drivers
|
||||
############################
|
||||
|
||||
# Enable modesetting driver for X11 (required for Intel Xe)
|
||||
services.xserver.videoDrivers = [
|
||||
"modesetting"
|
||||
#"intel"
|
||||
];
|
||||
|
||||
services.xserver.enable = true;
|
||||
services.xserver.autorun = false;
|
||||
services.xserver.displayManager.startx.enable = true;
|
||||
|
||||
# Xorg configuration for Intel Arc Battlemage (xe driver)
|
||||
# Based on: https://www.reddit.com/r/crtgaming/comments/1knom2t/guide_intel_arc_b580_arch_linux_xorg/
|
||||
# Intel Arc B-series at PCI 0000:03:00.0
|
||||
#services.xserver.deviceSection = ''
|
||||
# Option "AccelMethod" "glamor"
|
||||
# BusID "PCI:3:0:0"
|
||||
#'';
|
||||
|
||||
############################
|
||||
## User Access
|
||||
############################
|
||||
users.users.andreas.extraGroups = [ "video" "render" ];
|
||||
}
|
||||
@@ -7,9 +7,11 @@
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
./graphics/intel.nix
|
||||
# ./graphics/intel.nix
|
||||
./graphics/intel_i915.nix
|
||||
# ./graphics/nvidia.nix
|
||||
./acer-monitor-edid.nix
|
||||
./samsung-monitor-edid.nix
|
||||
];
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest;
|
||||
@@ -22,6 +24,20 @@
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback r8125 ];
|
||||
boot.supportedFilesystems = [ "ntfs" ];
|
||||
boot.blacklistedKernelModules = [ "r8169" ];
|
||||
|
||||
systemd.services.disable-realtek-eee = {
|
||||
description = "Disable Realtek Energy Efficient Ethernet";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp75s0 eee off";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76";
|
||||
fsType = "ext4";
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
# boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
|
||||
boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid2.bin" ];
|
||||
|
||||
|
||||
hardware.firmware = [
|
||||
(
|
||||
pkgs.runCommand "edid2.bin" { } ''
|
||||
mkdir -p $out/lib/firmware/edid
|
||||
cp ${./firmware/U32J59x-edid.bin} $out/lib/firmware/edid/edid2.bin
|
||||
''
|
||||
)];
|
||||
}
|
||||
Reference in New Issue
Block a user