clean the shit

This commit is contained in:
Zastian Pretorius
2025-09-07 14:47:56 +01:00
parent 59cb67267c
commit 3839a0e292
10 changed files with 874 additions and 907 deletions

View File

@@ -6,51 +6,52 @@
...
}:
let
isLaptop = systemName == "laptop";
isPc = systemName == "pc";
initrdBaseModules = [ "btusb" ];
initrdLPModules = [ "kvm" ]; # for laptop & pc
kernelBaseModules = [ "v4l2loopback" ];
kernelBaseParams = [ ];
kernelLPParams = [ "ipv6e=1" ]; # for laptop & pc
kernelLaptopOnly = [ "i915.force_probe=46a6" ];
kernelPcOnly = [ "video=2560x1440x32" ];
in
{
# Use the systemd-boot EFI boot loader.
boot = {
loader = {
systemd-boot = {
enable = true;
};
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd.kernelModules = lib.mkMerge [
[
"btusb"
]
(lib.mkIf (systemName == "laptop") [
"kvm"
])
(lib.mkIf (systemName == "pc") [
"kvm"
])
initrdBaseModules
(lib.mkIf (isLaptop || isPc) initrdLPModules)
];
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = [ "v4l2loopback" ];
extraModulePackages = [
kernelModules = kernelBaseModules;
extraModulePackages = [
pkgs.linuxPackages_latest.v4l2loopback
];
kernelParams = lib.mkMerge [
(lib.mkIf (systemName == "laptop") [
"ipv6e=1"
"i915.force_probe=46a6"
])
(lib.mkIf (systemName == "pc") [
"video=2560x1440x32"
"ipv6e=1"
])
(lib.mkIf (isLaptop || isPc) kernelLPParams)
(lib.mkIf isLaptop kernelLaptopOnly)
(lib.mkIf isPc kernelPcOnly)
];
extraModprobeConfig = ''
options v4l2loopback devices=2 video_nr=1,0 card_label="OBS Cam","phone cam" exclusive_caps=1,1
'';
plymouth = {
enable = false;
themePackages = [
pkgs.plymouth-matrix-theme
];
themePackages = [ pkgs.plymouth-matrix-theme ];
theme = "matrix";
};
};

View File

@@ -6,9 +6,18 @@
...
}:
let
# Shared VA-API / VDPAU bits across both machines
commonVA = with pkgs; [
libva
vaapiVdpau
libvdpau-va-gl
];
in
{
# hardware stuff
# ── Graphics ─────────────────────────────────────────────────────────────────
hardware.graphics = lib.mkMerge [
# Laptop: Intel stack
(lib.mkIf (systemName == "laptop") {
enable = true;
enable32Bit = true;
@@ -16,11 +25,10 @@
intel-media-driver
intel-vaapi-driver
vpl-gpu-rt
libva
vaapiVdpau
libvdpau-va-gl
];
] ++ commonVA;
})
# PC: AMD/ROCm stack
(lib.mkIf (systemName == "pc") {
enable = true;
enable32Bit = true;
@@ -36,35 +44,34 @@
rocmPackages.rocsolver
rocmPackages.rocm-comgr
rocmPackages.rocsparse
libva
vaapiVdpau
libvdpau-va-gl
#amdvlk
#driversi686Linux.amdvlk
#mesa
#driversi686Linux.mesa
];
# amdvlk
# driversi686Linux.amdvlk
# mesa
# driversi686Linux.mesa
] ++ commonVA;
})
];
hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
# hardware.pulseaudio = {
# package = pkgs.pulseaudioFull;
# };
hardware.bluetooth.settings = {
General = {
# ── Bluetooth ────────────────────────────────────────────────────────────────
hardware.bluetooth = {
enable = true; # Enable Bluetooth support
powerOnBoot = true; # Power up controller on boot
settings.General = {
Enable = "Source,Sink,Media,Socket";
#Experimental = true;
# Experimental = true;
};
};
hardware.opentabletdriver.enable = true;
hardware.opentabletdriver.daemon.enable = true;
# Enable sound.
# sound.enable = true;
#hardware.pulseaudio = {
# enable = true;
# package = pkgs.pulseaudioFull;
#};
# ── Tablets ─────────────────────────────────────────────────────────────────
hardware.opentabletdriver = {
enable = true;
daemon.enable = true;
};
# ── Audio (disabled examples) ───────────────────────────────────────────────
# sound.enable = true;
# hardware.pulseaudio = {
# enable = true;
# package = pkgs.pulseaudioFull;
# };
}

View File

@@ -5,57 +5,57 @@
systemName,
...
}:
let
isLaptop = systemName == "laptop";
isPc = systemName == "pc";
in
{
networking = {
# Define hostname based on system type
hostName = lib.mkMerge [
(lib.mkIf (systemName == "laptop") "mrfluffyLaptop")
(lib.mkIf (systemName == "pc") "mrfluffyPC")
];
networking = lib.mkMerge [
# Hostname per system type
(lib.mkIf isLaptop { hostName = "mrfluffyLaptop"; })
(lib.mkIf isPc { hostName = "mrfluffyPC"; })
# Firewall configuration
firewall = {
# Open ports in the firewall.
# allowedTCPPorts = [ ... ];
# allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
enable = false;
checkReversePath = false;
};
# Common networking config
{
# Firewall
firewall = {
# allowedTCPPorts = [ ... ];
# allowedUDPPorts = [ ... ];
enable = false;
checkReversePath = false;
};
# Networking options
# Pick only one of the below networking options.
# wireless.enable = true; # Enables wireless support via wpa_supplicant.
networkmanager = {
enable = true; # Easiest to use and most distros use this by default.
dns = "none";
};
# NetworkManager
networkmanager = {
enable = true;
dns = "none";
};
# DHCP settings
useDHCP = false;
dhcpcd.enable = false;
# DHCP
useDHCP = false;
dhcpcd.enable = false;
# IPv6 configuration
enableIPv6 = true;
# IPv6
enableIPv6 = true;
# Configure network proxy if necessary
# proxy.default = "http://user:password@proxy:port/";
# proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Hosts and DNS configuration
extraHosts = ''
127.0.0.0 localhost
'';
nameservers = [
"192.168.1.1"
# Hosts & DNS
extraHosts = ''
127.0.0.0 localhost
'';
nameservers = [
"192.168.1.1"
];
search = [
"localdomain"
"local"
];
search = [
"localdomain"
"local"
];
# # environment.etc = {
# # "resolv.conf".text = "nameserver 192.168.1.180\noptions edns0 trust-ad\nsearch home\n";
# # };
};
# Proxies (disabled)
# proxy.default = "http://user:password@proxy:port/";
# proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Wireless (alternative approach, disabled)
# wireless.enable = true; # wpa_supplicant
}
];
}

View File

@@ -9,7 +9,7 @@
let
inherit (pkgs) anime4k;
# Use writeText instead of writeLua luacheck can't cry about the long lines
# Use writeText instead of writeLua so linters don't complain about long lines
autoAnime4k = pkgs.writeText "auto-anime4k-switcher.lua" ''
local function get_nearest(x, numbers)
local min_index = nil
@@ -26,13 +26,7 @@ let
return numbers[min_index]
end
-- Fast
-- local shader_map = {
-- [1080] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_M.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl",
-- [720] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_Soft_M.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl",
-- [480] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
-- }
-- HQ
-- HQ shader map
local shader_map = {
[1080] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_VL.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl",
[720] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_Soft_VL.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl",
@@ -55,162 +49,154 @@ let
end)
'';
in
{
programs.gamescope = {
enable = true;
capSysNice = true;
};
nixpkgs.config = {
allowUnfree = true;
############################
# Nixpkgs & overlays
############################
nixpkgs = {
config.allowUnfree = true;
overlays = [
(self: super: {
mpv = super.wrapMpv (super.mpv.unwrapped.override { sixelSupport = true; }) {
scripts = [ self.mpvScripts.mpris ];
};
})
];
};
nixpkgs.overlays = [
(self: super: {
mpv = super.wrapMpv (super.mpv.unwrapped.override { sixelSupport = true; }) {
scripts = [ self.mpvScripts.mpris ];
};
})
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
#
#
programs.nh = {
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "$HOME/nixos-dots/"; # sets NH_OS_FLAKE variable for you
};
programs.direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv.enable = true;
silent = true;
};
programs.virt-manager.enable = true;
programs.zsh.enable = true;
programs.corectrl.enable = true;
programs.opengamepadui = {
enable = true;
gamescopeSession.enable = true;
};
programs.steam = {
enable = true;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
extraCompatPackages = with pkgs; [ gamescope mangohud gamemode ];
gamescopeSession = {
############################
# Core programs
############################
programs = {
gamescope = {
enable = true;
capSysNice = true;
};
nh = {
enable = true;
clean = {
enable = true;
extraArgs = "--keep-since 4d --keep 3";
};
flake = "$HOME/nixos-dots/"; # sets NH_OS_FLAKE
};
direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv.enable = true;
silent = true;
};
virt-manager.enable = true;
zsh.enable = true;
corectrl.enable = true;
opengamepadui = {
enable = true;
gamescopeSession.enable = true;
};
steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
extraCompatPackages = with pkgs; [ gamescope mangohud gamemode ];
gamescopeSession.enable = true;
};
# Dynamic linker for foreign binaries
nix-ld = {
enable = true;
libraries = with pkgs; [
# add libraries here if needed
# alsa-lib
# libGL
# glibc
# ...
];
};
# Backlight tool
light.enable = true;
# NetworkManager applet
nm-applet = {
enable = true;
indicator = false;
};
};
# enable dynamic bin executables
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
# add libraries here
#alsa-lib
#libGL
#glibc
#glib
#fontconfig
#xorg.libX11
#xorg.libXcomposite
#xorg.libXdamage
#xorg.libXfixes
#xorg.libXrender
#xorg.libXrandr
#xorg.libXtst
#xorg_sys_opengl
#xorg.libXi
#xorg.libxshmfence
#xorg.libxkbfile
#xorg.libxcb
#xorg.xcbutilwm
#xorg.xcbutilimage
#xorg.xcbutilkeysyms
#xorg.xcbutilrenderutil
#xcb-util-cursor
#libgbm
#libxkbcommon
#freetype
#dbus
#krb5
#nss
#zotero
#nspr
#gtk3
#libappindicator-gtk3
#mesa
#vulkan-loader
];
#backlight tool
programs.light.enable = true;
programs.nm-applet = {
enable = true;
indicator = false;
};
# List packages installed in system profile. To search, run:
# $ nix search wget
############################
# System packages
############################
environment.systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
neovim
wl-clipboard
# --- Editors & Shell UX ---
bat
anime4k
socat
neovim
vim
zoxide
# --- CLI essentials ---
eza
wget
foot
spaceship-prompt
git
bitwarden
zip
xclip
fd
fzf
zotero
jdk11
hunspell
hunspellDicts.en_US
pavucontrol
zoxide
ripgrep
wget
xcp
polkit_gnome
zip
unzip
# --- Nix tooling ---
nil
nixfmt-rfc-style
inputs.nix-alien.packages.${pkgs.system}.nix-alien
# --- Wayland / Desktop ---
foot
libdecor
wl-clipboard
xwayland-satellite
# --- Media / Graphics ---
anime4k
ffmpeg
libva-utils
nixfmt-rfc-style
nil
kdePackages.qt6ct
ripgrep
xwayland-satellite
pavucontrol
# --- Networking / Secrets ---
bitwarden
polkit_gnome
xclip
socat
# --- Development toolchains ---
cmake
gnumake
gcc
libtool
gnumake
jdk11
ladspaPlugins
inputs.nix-alien.packages.${pkgs.system}.nix-alien
libtool
python311
# --- Spellcheck / Fonts ---
hunspell
hunspellDicts.en_US
# --- KDE Wallet bits ---
kdePackages.kwallet
kdePackages.kwalletmanager
kdePackages.kwallet-pam # For PAM integration if needed
#
kdePackages.kwallet-pam
# --- Apps ---
git
zotero
# --- Handy script: send steam URL to FIFO ---
(pkgs.writeShellScriptBin "steam-run-url" ''
FIFO="/run/user/$(id --user)/steam-run-url.fifo"
echo "$1" > "$FIFO"
'')
libdecor
];
}

View File

@@ -1,27 +1,20 @@
{
config,
lib,
pkgs,
systemName,
...
}:
{ config, lib, pkgs, systemName, ... }:
{
###############################################
# Desktop & Input
###############################################
services.xserver.windowManager.fvwm2.gestures = true;
# Enable CUPS to print documents.
services.printing.enable = true;
# power managment
services.power-profiles-daemon.enable = true;
services.upower = {
# Enable touchpad support (enabled by default in most desktop managers).
services.libinput = {
enable = true;
touchpad = {
tapping = true;
# horizontalScrolling = false;
};
};
#direnv speedup
services.lorri.enable = true;
#services.gnome.gnome-keyring.enable = true;
# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
@@ -31,10 +24,10 @@
# Enable the GNOME Desktop Environment.
# services.xserver.displayManager.gdm.enable = true;
# services.xserver.desktopManager.gnome.enable = true;
#
services.flatpak.enable = true;
services.automatic-timezoned.enable = true;
###############################################
# Audio / Bluetooth
###############################################
services.pipewire = lib.mkMerge [
(lib.mkIf (systemName == "laptop") {
enable = true;
@@ -61,11 +54,7 @@
"92-low-latency" = {
"context.properties" = {
"default.clock.rate" = 96000;
"default.clock.allowed-rates" = [
44100
48000
96000
];
"default.clock.allowed-rates" = [ 44100 48000 96000 ];
};
};
};
@@ -74,20 +63,105 @@
services.blueman.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
services.libinput = {
###############################################
# Printing & Files
###############################################
# Enable CUPS to print documents.
services.printing.enable = true;
services.gvfs.enable = true;
services.tumbler.enable = true;
###############################################
# Time & Power
###############################################
services.automatic-timezoned.enable = true;
# Power management
services.power-profiles-daemon.enable = true;
services.upower = {
enable = true;
touchpad = {
tapping = true;
#horizontalScrolling = false;
};
};
# List services that you want to enable:
services.emacs = {
enable = true;
package = pkgs.emacs-pgtk; # replace with emacs-gtk, or a version provided by the community overlay if desired.
};
# Laptop-specific lid and sleep behavior
services.logind = lib.mkIf (systemName == "laptop") {
lidSwitch = "suspend-then-hibernate";
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitchDocked = "suspend-then-hibernate";
};
systemd.sleep.extraConfig = lib.mkIf (systemName == "laptop") ''
HibernateDelaySec=120min
SuspendState=mem
'';
###############################################
# Developer Tools & Services
###############################################
# direnv speedup
services.lorri.enable = true;
services.emacs = {
enable = true;
# replace with emacs-gtk, or a version provided by the community overlay if desired.
package = pkgs.emacs-pgtk;
};
services.flatpak.enable = true;
# Sunshine (only on PC)
services.sunshine = lib.mkIf (systemName == "pc") {
enable = true;
settings = {
sunshine_name = "nixos";
port = 47989;
output_name = 0;
};
applications = {
apps = [
{
name = "Steam";
env = {
PATH = "$(PATH):/run/current-system/sw/bin";
};
output = "steam.txt";
detached = [
"setsid /run/current-system/sw/bin/steam steam://open/bigpicture"
];
prep-cmd = [
{
"do" = "";
"undo" = "setsid /run/current-system/sw/bin/steam steam://close/bigpicture";
}
];
image-path = "steam.png";
}
];
};
capSysAdmin = false;
openFirewall = true;
};
# Ollama (only on PC)
services.ollama = lib.mkIf (systemName == "pc") {
enable = true;
port = 11434;
host = "0.0.0.0";
acceleration = "rocm";
rocmOverrideGfx = "11.0.0";
environmentVariables = {
OLLAMA_DEBUG = "1";
OLLAMA_MMAP = "0";
OLLAMA_NUM_CTX = "8192";
OLLAMA_NUM_GPU = "20";
# HSA_OVERRIDE_GFX_VERSION = "11.0.0";
# OLLAMA_KV_CACHE_TYPE = "q4";
};
};
###############################################
# Systemd User Services
###############################################
systemd.user.services.steam-run-url-service = {
description = "Service to launch Steam URLs via FIFO";
wantedBy = [ "default.target" ];
@@ -115,56 +189,9 @@
path = [ pkgs.steam ];
};
services.sunshine = lib.mkIf (systemName == "pc") {
enable = true;
settings = {
sunshine_name = "nixos";
port = 47989;
output_name = 0;
};
applications = {
apps = [
{
name = "Steam";
env = {
PATH = "$(PATH):/run/current-system/sw/bin";
};
output = "steam.txt";
detached = [ "setsid /run/current-system/sw/bin/steam steam://open/bigpicture" ];
prep-cmd = [
{
"do" = "";
"undo" = "setsid /run/current-system/sw/bin/steam steam://close/bigpicture";
}
];
image-path = "steam.png";
}
];
};
capSysAdmin = false;
openFirewall = true;
};
services.ollama = lib.mkIf (systemName == "pc") {
enable = true;
port = 11434;
host = "0.0.0.0";
acceleration = "rocm";
rocmOverrideGfx = "11.0.0";
environmentVariables = {
OLLAMA_DEBUG = "1";
OLLAMA_MMAP = "0";
OLLAMA_NUM_CTX="8192";
OLLAMA_NUM_GPU="20";
#HSA_OVERRIDE_GFX_VERSION = "11.0.0";
#OLLAMA_KV_CACHE_TYPE = "q4";
};
};
services.gvfs.enable = true;
services.tumbler.enable = true;
###############################################
# Networking & Remote
###############################################
# services.resolved = {
# enable = true;
# dnssec = "true";
@@ -173,29 +200,25 @@
# dnsovertls = "true";
# };
virtualisation.libvirtd.enable = true;
# Enable the OpenSSH daemon.
services.openssh.enable = true;
# laptop screen lid colose stuff
services.logind = lib.mkIf (systemName == "laptop") {
lidSwitch = "suspend-then-hibernate";
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitchDocked = "suspend-then-hibernate";
};
#suspend stuff
systemd.sleep.extraConfig = lib.mkIf (systemName == "laptop") ''
HibernateDelaySec=120min
SuspendState=mem
'';
#udev rules
###############################################
# Virtualization
###############################################
virtualisation.libvirtd.enable = true;
###############################################
# Udev Rules
###############################################
services.udev.packages = [
pkgs.platformio-core
pkgs.platformio
pkgs.openocd
pkgs.brave
];
#services.udev.extraRules = ''
# KERNEL=="hidraw*", KERNELS=="*054C:0CE6*", MODE="0660", TAG+="uaccess"
#'';
# services.udev.extraRules = ''
# KERNEL=="hidraw*", KERNELS=="*054C:0CE6*", MODE="0660", TAG+="uaccess"
# '';
}