clean the shit
This commit is contained in:
Zastian Pretorius
@@ -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"
|
||||
# '';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user