Compare commits
21 Commits
439cb8200f
...
26d59c7ca6
| Author | SHA1 | Date | |
|---|---|---|---|
| 26d59c7ca6 | |||
| 9bc5922e49 | |||
| 2e3ef5fd47 | |||
| 415f3bb057 | |||
| bcc2ca5cf0 | |||
| c202dbcdec | |||
| f3b6a5cddd | |||
| 191733ec51 | |||
| 881a047c75 | |||
| 95c1b53699 | |||
| aecc12a945 | |||
| b5afdc5817 | |||
| ab9acedf49 | |||
| 0e31504687 | |||
| 85147137b0 | |||
| 914b88ac82 | |||
| 646f35e5d4 | |||
| 3ed8d601a2 | |||
| 02a99d31fa | |||
| 2be93bd323 | |||
| 6a43859425 |
@@ -22,7 +22,6 @@ in
|
|||||||
home = {
|
home = {
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.nil
|
pkgs.nil
|
||||||
pkgs.gamemode
|
|
||||||
pkgs.beeper
|
pkgs.beeper
|
||||||
pkgs.my-namespace.udev-steelseries
|
pkgs.my-namespace.udev-steelseries
|
||||||
pkgs.qbittorrent
|
pkgs.qbittorrent
|
||||||
@@ -41,7 +40,7 @@ in
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=Wallpaper Engine
|
Name=Wallpaper Engine
|
||||||
Exec=${pkgs.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 --screen-root DP-2 --bg 2935872330
|
Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 --screen-root DP-2 --bg 2935872330
|
||||||
X-KDE-autostart-after=panel
|
X-KDE-autostart-after=panel
|
||||||
X-KDE-StartupNotify=false
|
X-KDE-StartupNotify=false
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ in
|
|||||||
home = {
|
home = {
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.nil
|
pkgs.nil
|
||||||
pkgs.gamemode
|
|
||||||
pkgs.beeper
|
pkgs.beeper
|
||||||
pkgs.my-namespace.udev-steelseries
|
pkgs.my-namespace.udev-steelseries
|
||||||
pkgs.qbittorrent
|
pkgs.qbittorrent
|
||||||
|
|||||||
98
modules/nixos/desktop-environment/default.nix
Normal file
98
modules/nixos/desktop-environment/default.nix
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
{ config, lib, pkgs, namespace, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.desktop-environment;
|
||||||
|
in {
|
||||||
|
|
||||||
|
options.${namespace}.desktop-environment = {
|
||||||
|
xfce = {
|
||||||
|
enable = lib.mkEnableOption "XFCE desktop environment";
|
||||||
|
};
|
||||||
|
gnome = {
|
||||||
|
enable = lib.mkEnableOption "GNOME desktop environment";
|
||||||
|
};
|
||||||
|
kde = {
|
||||||
|
enable = lib.mkEnableOption "KDE Plasma desktop environment";
|
||||||
|
};
|
||||||
|
cosmic = {
|
||||||
|
enable = lib.mkEnableOption "Cosmic desktop environment";
|
||||||
|
};
|
||||||
|
hyprland = {
|
||||||
|
enable = lib.mkEnableOption "hyprland Wayland shell"
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkMerge [
|
||||||
|
(lib.mkIf cfg.xfce.enable {
|
||||||
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
|
desktopManager = {
|
||||||
|
xfce.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
xfce.xfce4-pulseaudio-plugin
|
||||||
|
xfce.xfce4-clipman-plugin
|
||||||
|
xfce.xfce4-screenshooter
|
||||||
|
xfce.xfce4-whiskermenu-plugin
|
||||||
|
thunar-archive-plugin
|
||||||
|
thunar-volman
|
||||||
|
gvfs
|
||||||
|
gnome-keyring
|
||||||
|
libgnome-keyring
|
||||||
|
];
|
||||||
|
})
|
||||||
|
|
||||||
|
(lib.mkIf cfg.gnome.enable {
|
||||||
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
|
desktopManager.gnome.enable = true;
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
gnome-tweaks
|
||||||
|
gnome-software
|
||||||
|
gnomeExtensions.pop-shell
|
||||||
|
gnome-remote-desktop
|
||||||
|
];
|
||||||
|
})
|
||||||
|
|
||||||
|
(lib.mkIf cfg.kde.enable {
|
||||||
|
services.xserver.enable = true;
|
||||||
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
kdePackages.qtwebsockets
|
||||||
|
kdePackages.qtwebchannel
|
||||||
|
kdePackages.korganizer
|
||||||
|
kdePackages.akonadi
|
||||||
|
kdePackages.akonadi-calendar
|
||||||
|
kdePackages.akonadi-contacts
|
||||||
|
kdePackages.kaddressbook
|
||||||
|
kdePackages.kmail
|
||||||
|
kdePackages.kdepim-runtime
|
||||||
|
kdePackages.kontact
|
||||||
|
kdePackages.kidentitymanagement
|
||||||
|
kdePackages.libkdepim
|
||||||
|
kdePackages.kwin
|
||||||
|
kdePackages.plasma-workspace
|
||||||
|
gnome-keyring
|
||||||
|
libgnome-keyring
|
||||||
|
];
|
||||||
|
})
|
||||||
|
(lib.mkIf cfg.cosmic.enable {
|
||||||
|
services.desktopManager.cosmic.enable = true;
|
||||||
|
services.desktopManager.cosmic.xwayland.enable = true;
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
||||||
|
gnome-keyring
|
||||||
|
libgnome-keyring
|
||||||
|
];
|
||||||
|
})
|
||||||
|
(lib.mkIf cfg.hyprland.enable {
|
||||||
|
programs.hyprland.enable = true; # enable Hyprland
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
pkgs.kitty # required for the default Hyprland config
|
||||||
|
];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
@@ -29,7 +29,6 @@
|
|||||||
# capSysNice = true;
|
# capSysNice = true;
|
||||||
# };
|
# };
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
steam
|
|
||||||
protonup-ng # Tool to install and manage Proton-GE
|
protonup-ng # Tool to install and manage Proton-GE
|
||||||
lutris
|
lutris
|
||||||
vkd3d
|
vkd3d
|
||||||
@@ -38,10 +37,15 @@
|
|||||||
protontricks
|
protontricks
|
||||||
mangohud
|
mangohud
|
||||||
vkbasalt
|
vkbasalt
|
||||||
gamemode
|
gamescope
|
||||||
];
|
];
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.steam.override {
|
||||||
|
extraPkgs = pkgs: with pkgs; [
|
||||||
|
gamemode
|
||||||
|
];
|
||||||
|
};
|
||||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
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
|
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||||
|
|||||||
135
packages/linux-wallpaperengine/default.nix
Normal file
135
packages/linux-wallpaperengine/default.nix
Normal file
@@ -0,0 +1,135 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
autoPatchelfHook,
|
||||||
|
cmake,
|
||||||
|
file,
|
||||||
|
pkg-config,
|
||||||
|
python3,
|
||||||
|
SDL2,
|
||||||
|
SDL2_mixer,
|
||||||
|
cef-binary,
|
||||||
|
egl-wayland,
|
||||||
|
ffmpeg,
|
||||||
|
fftw,
|
||||||
|
glew,
|
||||||
|
glfw,
|
||||||
|
glm,
|
||||||
|
gmp,
|
||||||
|
kissfftFloat,
|
||||||
|
libxau,
|
||||||
|
libxdmcp,
|
||||||
|
libxpm,
|
||||||
|
libxrandr,
|
||||||
|
libxxf86vm,
|
||||||
|
libdecor,
|
||||||
|
libffi,
|
||||||
|
libglut,
|
||||||
|
libpng,
|
||||||
|
libpulseaudio,
|
||||||
|
lz4,
|
||||||
|
mpv,
|
||||||
|
wayland,
|
||||||
|
wayland-protocols,
|
||||||
|
wayland-scanner,
|
||||||
|
zlib,
|
||||||
|
nix-update-script,
|
||||||
|
inputs,
|
||||||
|
namespace, ...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
cef = cef-binary.override {
|
||||||
|
version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47
|
||||||
|
gitRevision = "cbc1c5b";
|
||||||
|
chromiumVersion = "135.0.7049.52";
|
||||||
|
|
||||||
|
srcHashes = {
|
||||||
|
aarch64-linux = "sha256-LK5JvtcmuwCavK7LnWmMF2UDpM5iIZOmsuZS/t9koDs=";
|
||||||
|
x86_64-linux = "sha256-JKwZgOYr57GuosM31r1Lx3DczYs35HxtuUs5fxPsTcY=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "linux-wallpaperengine";
|
||||||
|
version = "0-unstable-2025-12-19";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Almamu";
|
||||||
|
repo = "linux-wallpaperengine";
|
||||||
|
rev = "f79c29f067b2613895419e351033582464577154";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
hash = "sha256-AISdouVqMXTYErQoT7oM5H+vlrw03NtpI9FqDwZ0J9A=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
autoPatchelfHook
|
||||||
|
cmake
|
||||||
|
file
|
||||||
|
pkg-config
|
||||||
|
python3
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
SDL2
|
||||||
|
SDL2_mixer
|
||||||
|
egl-wayland
|
||||||
|
ffmpeg
|
||||||
|
fftw
|
||||||
|
glew
|
||||||
|
glfw
|
||||||
|
glm
|
||||||
|
gmp
|
||||||
|
kissfftFloat
|
||||||
|
libxau
|
||||||
|
libxdmcp
|
||||||
|
libxpm
|
||||||
|
libxrandr
|
||||||
|
libxxf86vm
|
||||||
|
libdecor
|
||||||
|
libffi
|
||||||
|
libglut
|
||||||
|
libpng
|
||||||
|
libpulseaudio
|
||||||
|
lz4
|
||||||
|
mpv
|
||||||
|
wayland
|
||||||
|
wayland-protocols
|
||||||
|
wayland-scanner
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DCEF_ROOT=${cef}"
|
||||||
|
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/linux-wallpaperengine"
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
rm -rf $out/bin $out/lib $out/include
|
||||||
|
chmod 755 $out/share/linux-wallpaperengine/linux-wallpaperengine
|
||||||
|
mkdir $out/bin
|
||||||
|
ln -s $out/share/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine
|
||||||
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
find $out/share/linux-wallpaperengine -type f -exec file {} \; | grep 'ELF' | cut -d: -f1 | while read -r elf_file; do
|
||||||
|
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$elf_file"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Wallpaper Engine backgrounds for Linux";
|
||||||
|
homepage = "https://github.com/Almamu/linux-wallpaperengine";
|
||||||
|
license = lib.licenses.gpl3Plus;
|
||||||
|
mainProgram = "linux-wallpaperengine";
|
||||||
|
maintainers = [ ];
|
||||||
|
platforms = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
];
|
||||||
|
hydraPlatforms = [ "x86_64-linux" ]; # Hydra "aarch64-linux" fails with "Output limit exceeded"
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -44,25 +44,16 @@
|
|||||||
|
|
||||||
services = {
|
services = {
|
||||||
# Enable Gnome Session
|
# Enable Gnome Session
|
||||||
desktopManager.gnome.enable = true;
|
|
||||||
displayManager.gdm.enable = false;
|
displayManager.gdm.enable = false;
|
||||||
displayManager.sddm.enable = true;
|
displayManager.sddm.enable = false;
|
||||||
displayManager.sddm.wayland.enable = true;
|
# displayManager.sddm.wayland.enable = true;
|
||||||
|
services.displayManager.cosmic-greeter.enable = true;
|
||||||
displayManager.defaultSession = "gnome";
|
displayManager.defaultSession = "gnome";
|
||||||
desktopManager.plasma6.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true; # Enable the deprecated X11 teletype terminal connection system.
|
enable = true; # Enable the deprecated X11 teletype terminal connection system.
|
||||||
|
|
||||||
desktopManager = {
|
|
||||||
# Disable xterm
|
|
||||||
xterm.enable = false;
|
|
||||||
# Disable fuckshit plasma
|
|
||||||
};
|
|
||||||
# Configure Display Manager
|
# Configure Display Manager
|
||||||
displayManager = {
|
displayManager = {
|
||||||
# Enable lightdm
|
|
||||||
lightdm.enable = false;
|
lightdm.enable = false;
|
||||||
};
|
};
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
@@ -73,40 +64,6 @@
|
|||||||
|
|
||||||
# Specify first device section to use nvidia GPU
|
# Specify first device section to use nvidia GPU
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# services.xserver.config = lib.mkForce ''
|
|
||||||
# Section "ServerLayout"
|
|
||||||
# Identifier "layout"
|
|
||||||
# Screen 0 "amdgpu"
|
|
||||||
# Inactive "nvidia"
|
|
||||||
# Option "AllowNVIDIAGPUScreens"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Device"
|
|
||||||
# Identifier "nvidia"
|
|
||||||
# Driver "nvidia"
|
|
||||||
# BusID "PCI:01:0:0"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Screen"
|
|
||||||
# Identifier "nvidia"
|
|
||||||
# Device "nvidia"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Device"
|
|
||||||
# Identifier "amdgpu"
|
|
||||||
# Driver "amdgpu"
|
|
||||||
# BusID "PCI:50:0:0"
|
|
||||||
# EndSection
|
|
||||||
|
|
||||||
# Section "Screen"
|
|
||||||
# Identifier "amdgpu"
|
|
||||||
# Device "amdgpu"
|
|
||||||
# EndSection
|
|
||||||
# '';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# services.xserver.displayManager.defaultSession = "gnome-x11"; # services.xserver.displayManager.autoLogin.enable = true;
|
# services.xserver.displayManager.defaultSession = "gnome-x11"; # services.xserver.displayManager.autoLogin.enable = true;
|
||||||
@@ -138,6 +95,9 @@
|
|||||||
#media-session.enable = true;
|
#media-session.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Enable gamemode for game optimization
|
||||||
|
programs.gamemode.enable = true;
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
# services.xserver.libinput.enable = true;
|
# services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
@@ -156,27 +116,25 @@
|
|||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
# Enable --Akonadi--/ kde-pim for calendar backend
|
||||||
|
programs.kde-pim.enable = true;
|
||||||
|
services.dbus.enable = true;
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
# wget
|
# wget
|
||||||
(python312.withPackages (ps: with ps; [ websockets ]))
|
(python312.withPackages (ps: with ps; [ websockets ]))
|
||||||
kdePackages.qtwebsockets
|
sqlite
|
||||||
kdePackages.qtwebchannel
|
|
||||||
kdePackages.korganizer
|
|
||||||
kdePackages.akonadi
|
|
||||||
kdePackages.akonadi-calendar
|
|
||||||
kdePackages.akonadi-contacts
|
|
||||||
javaPackages.compiler.openjdk25
|
javaPackages.compiler.openjdk25
|
||||||
javaPackages.compiler.openjdk21
|
javaPackages.compiler.openjdk21
|
||||||
linux-wallpaperengine
|
|
||||||
qt6.qtwebengine
|
qt6.qtwebengine
|
||||||
gnome-tweaks
|
|
||||||
qemu
|
qemu
|
||||||
mpv
|
mpv
|
||||||
krita
|
krita
|
||||||
ntfs3g
|
ntfs3g
|
||||||
|
htop
|
||||||
];
|
];
|
||||||
environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = ''
|
environment.etc."xdg/autostart/xwaylandvideobridge.desktop".text = ''
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
@@ -194,7 +152,10 @@
|
|||||||
|
|
||||||
services.gvfs.enable = true; # For file manager integration
|
services.gvfs.enable = true; # For file manager integration
|
||||||
|
|
||||||
|
# Disable iBus (not needed unless using Asian input methods)
|
||||||
|
i18n.inputMethod = {
|
||||||
|
enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -41,11 +41,25 @@ in
|
|||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
# Desktops
|
||||||
|
my-namespace.desktop-environment.xfce.enable = true;
|
||||||
|
my-namespace.desktop-environment.gnome.enable = true;
|
||||||
|
my-namespace.desktop-environment.kde.enable = true;
|
||||||
|
my-namespace.desktop-environment.cosmic.enable = true;
|
||||||
|
# GNOME-keyring
|
||||||
my-namespace.gnome-keyring.enable = true;
|
my-namespace.gnome-keyring.enable = true;
|
||||||
|
|
||||||
users.users.andreas = {
|
users.users.andreas = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Andreas Schaafsma";
|
description = "Andreas Schaafsma";
|
||||||
extraGroups = [ "networkmanager" "wheel" "libvirtd" "plugdev" "docker" ] ;
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
"libvirtd"
|
||||||
|
"plugdev"
|
||||||
|
"docker"
|
||||||
|
"gamemode"
|
||||||
|
];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# Packages from inputs
|
# Packages from inputs
|
||||||
inputs.game-of-life.packages.x86_64-linux.default
|
inputs.game-of-life.packages.x86_64-linux.default
|
||||||
@@ -55,9 +69,6 @@ in
|
|||||||
# We want flatpak support
|
# We want flatpak support
|
||||||
flatpak
|
flatpak
|
||||||
# GNOME shit
|
# GNOME shit
|
||||||
gnome-software
|
|
||||||
gnomeExtensions.pop-shell
|
|
||||||
gnome-remote-desktop
|
|
||||||
thunderbird
|
thunderbird
|
||||||
soundwireserver
|
soundwireserver
|
||||||
vscode
|
vscode
|
||||||
@@ -120,6 +131,8 @@ in
|
|||||||
my-namespace.udev-steelseries
|
my-namespace.udev-steelseries
|
||||||
my-namespace.hello
|
my-namespace.hello
|
||||||
kde-rounded-corners
|
kde-rounded-corners
|
||||||
|
my-namespace.linux-wallpaperengine
|
||||||
|
|
||||||
(pkgs.writeShellScriptBin "switch-to-desktop" ''
|
(pkgs.writeShellScriptBin "switch-to-desktop" ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Kill Steam and return to display manager
|
# Kill Steam and return to display manager
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"console=tty0"
|
"console=tty0"
|
||||||
"efifb=off"
|
# "efifb=off"
|
||||||
"xe.force_probe=*"
|
# "xe.force_probe=*"
|
||||||
"module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
|
"module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -32,11 +32,12 @@
|
|||||||
intel-media-driver # Intel VAAPI
|
intel-media-driver # Intel VAAPI
|
||||||
vpl-gpu-rt # oneVPL runtime
|
vpl-gpu-rt # oneVPL runtime
|
||||||
intel-vaapi-driver # fallback
|
intel-vaapi-driver # fallback
|
||||||
|
intel-compute-runtime # OpenCL/Level Zero
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Ensure Arc driver is available (usually auto-loaded)
|
# Ensure Arc driver is available (usually auto-loaded)
|
||||||
boot.kernelModules = [ "xe" ];
|
boot.kernelModules = [ "xe" "i915" ];
|
||||||
# Blacklist everything for nvidia
|
# Blacklist everything for nvidia
|
||||||
boot.blacklistedKernelModules = [
|
boot.blacklistedKernelModules = [
|
||||||
"nouveau"
|
"nouveau"
|
||||||
@@ -55,6 +56,24 @@
|
|||||||
############################
|
############################
|
||||||
## X / Wayland GPU Drivers
|
## 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
|
## User Access
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
inherit (lib.my-namespace) enabled;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
my-namespace.hardware = {
|
|
||||||
# graphics-nvidia-specializations.enabled = false;
|
|
||||||
# graphics-nvidia-prime-amd = enabled;
|
|
||||||
# graphics-nvidia-prime-amd-testing = enabled;
|
|
||||||
# graphics-amd-igpu-only = enabled;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
|
|
||||||
# Enable OpenGL
|
|
||||||
hardware.graphics = {
|
|
||||||
enable = true;
|
|
||||||
extraPackages = with pkgs; [ nvidia-vaapi-driver ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Load nvidia driver for Xorg and Wayland
|
|
||||||
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
|
||||||
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_beta ];
|
|
||||||
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
|
|
||||||
|
|
||||||
|
|
||||||
boot.loader.systemd-boot.consoleMode = "max";
|
|
||||||
|
|
||||||
boot.kernelParams = [
|
|
||||||
# "amdgpu.modeset=0"
|
|
||||||
"nvidia-drm.fbdev=1"
|
|
||||||
"nvidia-drm.modeset=1"
|
|
||||||
"nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
|
||||||
# "amd_iommu=on"
|
|
||||||
# "vfio-pci.ids=\"10de:2489,10de:228b\""
|
|
||||||
# "nomodeset"
|
|
||||||
# "nvidia_drm.modeset=1"
|
|
||||||
];
|
|
||||||
boot.blacklistedKernelModules = [
|
|
||||||
"i915"
|
|
||||||
"nouveau"
|
|
||||||
"amdgpu"
|
|
||||||
];
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
|
||||||
|
|
||||||
boot.initrd.kernelModules = [
|
|
||||||
"nvidia"
|
|
||||||
"nvidia_drm"
|
|
||||||
];
|
|
||||||
hardware.nvidia = {
|
|
||||||
modesetting.enable = true;
|
|
||||||
|
|
||||||
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
|
|
||||||
# Enable this if you have graphical corruption issues or application crashes after waking
|
|
||||||
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
|
|
||||||
# of just the bare essentials.
|
|
||||||
powerManagement.enable = false;
|
|
||||||
|
|
||||||
# Fine-grained power management. Turns off GPU when not in use.
|
|
||||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
|
||||||
powerManagement.finegrained = false;
|
|
||||||
|
|
||||||
# Use the NVidia open source kernel module (not to be confused with the
|
|
||||||
# independent third-party "nouveau" open source driver).
|
|
||||||
# Support is limited to the Turing and later architectures. Full list of
|
|
||||||
# supported GPUs is at:
|
|
||||||
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
|
||||||
# Only available from driver 515.43.04+
|
|
||||||
# Currently alpha-quality/buggy, so false is currently the recommended setting.
|
|
||||||
open = false;
|
|
||||||
|
|
||||||
# Enable the Nvidia settings menu,
|
|
||||||
# accessible via `nvidia-settings`.
|
|
||||||
nvidiaSettings = true;
|
|
||||||
|
|
||||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
|
||||||
# package = config.boot.kernelPackages.nvidiaPackages.none;
|
|
||||||
# package = config.boot.kernelPackages.nvidiaPackages.production;
|
|
||||||
|
|
||||||
forceFullCompositionPipeline = true;
|
|
||||||
|
|
||||||
# prime = {
|
|
||||||
# offload = {
|
|
||||||
# enable = true;
|
|
||||||
# enableOffloadCmd = true;
|
|
||||||
# };
|
|
||||||
# reverseSync.enable = false;
|
|
||||||
# # Make sure to use the correct Bus ID values for your system!
|
|
||||||
# # intelBusId = "PCI:0:2:0";
|
|
||||||
# nvidiaBusId = "PCI:01:0:0";
|
|
||||||
# amdgpuBusId = "PCI:50:0:0"; #For AMD GPU
|
|
||||||
# };
|
|
||||||
|
|
||||||
};
|
|
||||||
users.users.andreas = {
|
|
||||||
extraGroups = [ "video" "render" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -11,7 +11,8 @@
|
|||||||
# ./graphics/nvidia.nix
|
# ./graphics/nvidia.nix
|
||||||
./acer-monitor-edid.nix
|
./acer-monitor-edid.nix
|
||||||
];
|
];
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
|
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
|
||||||
# boot.kernelPackages = pkgs.linuxPackages;
|
# boot.kernelPackages = pkgs.linuxPackages;
|
||||||
|
|||||||
Reference in New Issue
Block a user