Add ollama and split tardis/default.nix

This commit is contained in:
2026-07-08 22:41:57 +01:00
parent 13f8a22760
commit 86e9663531
6 changed files with 96 additions and 69 deletions
+6 -69
View File
@@ -4,31 +4,14 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/ollama
../../modules/workstation/graphics.nix
../../modules/workstation/audio.nix
../../modules/workstation/xserver.nix
../../modules/workstation/keyd.nix
]; ];
boot.blacklistedKernelModules = [
"nouveau"
];
boot.kernelParams = [ "video=efifb:1920x1080" ];
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
hardware.graphics.enable = true;
hardware.nvidia = {
modesetting.enable = true;
open = true;
prime = {
offload = {
enable = true;
enableOffloadCmd = true;
};
intelBusId = "PCI:0@0:2:0";
nvidiaBusId = "PCI:1@0:0:0";
};
};
environment.systemPackages = lib.mkAfter (with pkgs; [ environment.systemPackages = lib.mkAfter (with pkgs; [
firefox firefox
xdg-utils xdg-utils
@@ -49,52 +32,6 @@
unifont unifont
]; ];
services.xserver = {
enable = true;
displayManager.startx.enable = true;
videoDrivers = [ "nvidia" ];
xkb = {
layout = "us";
variant = "";
options = "terminate:ctrl_alt_bksp";
};
};
services.dbus.enable = true;
services.clipmenu.enable = true;
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
config.common.default = "*";
};
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
services.pulseaudio.enable = false;
services.power-profiles-daemon.enable = true;
services.keyd = {
enable = true;
keyboards.default = {
ids = [ "*" ];
settings.main = {
"leftmeta+leftshift+f23" = "rightcontrol";
};
};
};
programs.steam.enable = true; programs.steam.enable = true;
networking.hostName = "tardis"; networking.hostName = "tardis";
+9
View File
@@ -0,0 +1,9 @@
{ pkgs, ... }:
{
services.ollama = {
enable = true;
package = pkgs.ollama-cuda;
loadModels = [ "deepseek-coder-v2:16b" "qwen3.5:9b" ];
};
}
+17
View File
@@ -0,0 +1,17 @@
{ ... }:
{
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
services.pulseaudio.enable = false;
services.power-profiles-daemon.enable = true;
}
+26
View File
@@ -0,0 +1,26 @@
{ config, ... }:
{
boot.blacklistedKernelModules = [
"nouveau"
];
boot.kernelParams = [ "video=efifb:1920x1080" ];
boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
hardware.graphics.enable = true;
hardware.nvidia = {
modesetting.enable = true;
open = true;
prime = {
offload = {
enable = true;
enableOffloadCmd = true;
};
intelBusId = "PCI:0@0:2:0";
nvidiaBusId = "PCI:1@0:0:0";
};
};
}
+13
View File
@@ -0,0 +1,13 @@
{ ... }:
{
services.keyd = {
enable = true;
keyboards.default = {
ids = [ "*" ];
settings.main = {
"leftmeta+leftshift+f23" = "rightcontrol";
};
};
};
}
+25
View File
@@ -0,0 +1,25 @@
{ config, pkgs, ... }:
{
services.xserver = {
enable = true;
displayManager.startx.enable = true;
videoDrivers = [ "nvidia" ];
xkb = {
layout = "us";
variant = "";
options = "terminate:ctrl_alt_bksp";
};
};
services.dbus.enable = true;
services.clipmenu.enable = true;
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
config.common.default = "*";
};
}