From 8a70027a84b02b287fc8c9ef0eb2060a46c559cd Mon Sep 17 00:00:00 2001 From: Nate Anderson Date: Tue, 14 Apr 2026 14:04:26 -0600 Subject: [PATCH] unstable libreoffice and evolution --- flake.lock | 12 +-- hosts/nate-work/default.nix | 77 ++----------------- hosts/nate-work/modules/home-manager/home.nix | 8 +- shared/modules/system/noctalia-system.nix | 8 +- 4 files changed, 24 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index 9e8d13f..e88bc84 100644 --- a/flake.lock +++ b/flake.lock @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774799055, - "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", + "lastModified": 1776067740, + "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", + "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { diff --git a/hosts/nate-work/default.nix b/hosts/nate-work/default.nix index 4e5f455..a0a8b1b 100644 --- a/hosts/nate-work/default.nix +++ b/hosts/nate-work/default.nix @@ -5,7 +5,7 @@ let system = "x86_64-linux"; config.allowUnfree = true; }; - isOnTheGo = builtins.elem "on-the-go" config.system.nixos.tags; + in { imports = [ @@ -96,7 +96,7 @@ in enable = true; useNonFree = true; user = deskCfg.userName; - systemPackages = with pkgs; [ libreoffice ]; + systemPackages = [ unstable.libreoffice ]; }; # Steam with gamescope @@ -138,9 +138,8 @@ in # Nate-work session variables environment.sessionVariables = { FIREFOX_USE_SYSTEM_THEME = "true"; - # For NVIDIA — only enable if not using on-the-go - GBM_BACKEND = if isOnTheGo then "" else "nvidia-drm"; - __GLX_VENDOR_LIBRARY_NAME = if isOnTheGo then "" else "nvidia"; + GBM_BACKEND = "nvidia-drm"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; }; # Nate-work extra packages @@ -208,80 +207,18 @@ in }; nvidia = { modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = true; + powerManagement.enable = true; + powerManagement.finegrained = false; open = true; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.stable; prime = { - offload.enable = true; - offload.enableOffloadCmd = true; + sync.enable = true; intelBusId = "PCI:0:2:0"; nvidiaBusId = "PCI:1:0:0"; }; }; }; - # On-the-go specialisation — disables NVIDIA GPU, uses Intel only - specialisation = { - on-the-go.configuration = { - system.nixos.tags = [ "on-the-go" ]; - - # Blacklist all NVIDIA kernel modules - boot.blacklistedKernelModules = [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" "nvidia_uvm" ]; - - # Force Intel i915 driver for 13th gen (Raptor Lake) integrated graphics - boot.kernelParams = [ - "i915.force_probe=a7a0" - "module_blacklist=nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm" - ]; - - boot.extraModprobeConfig = '' - blacklist nouveau - blacklist nvidia - blacklist nvidia_drm - blacklist nvidia_modeset - blacklist nvidia_uvm - options nouveau modeset=0 - ''; - - # Remove NVIDIA devices from PCI bus to save power - services.udev.extraRules = '' - # Remove NVIDIA USB xHCI Host Controller devices, if present - ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1" - # Remove NVIDIA USB Type-C UCSI devices, if present - ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1" - # Remove NVIDIA Audio devices, if present - ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1" - # Remove NVIDIA VGA/3D controller devices - ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1" - ''; - - # Use Intel modesetting driver only - services.xserver.videoDrivers = lib.mkForce [ "modesetting" ]; - - # Disable all NVIDIA hardware configurations - hardware.nvidia = { - prime.offload.enable = lib.mkForce false; - prime.offload.enableOffloadCmd = lib.mkForce false; - powerManagement.finegrained = lib.mkForce false; - prime.sync.enable = lib.mkForce false; - }; - - # Ensure Intel graphics packages are available - hardware.graphics.extraPackages = lib.mkForce (with pkgs; [ - intel-vaapi-driver - intel-media-driver - vpl-gpu-rt - ]); - - # Clear NVIDIA-specific environment variables - environment.sessionVariables = { - GBM_BACKEND = lib.mkForce ""; - __GLX_VENDOR_LIBRARY_NAME = lib.mkForce ""; - }; - }; - }; - system.stateVersion = "23.11"; } diff --git a/hosts/nate-work/modules/home-manager/home.nix b/hosts/nate-work/modules/home-manager/home.nix index 5a0b985..f354ca2 100644 --- a/hosts/nate-work/modules/home-manager/home.nix +++ b/hosts/nate-work/modules/home-manager/home.nix @@ -584,11 +584,11 @@ in enableUserTheming = false; }; nightLight = { - enabled = false; - forced = false; - autoSchedule = true; + enabled = true; + forced = true; + autoSchedule = false; nightTemp = "4000"; - dayTemp = "6500"; + dayTemp = "4000"; manualSunrise = "06:30"; manualSunset = "18:30"; }; diff --git a/shared/modules/system/noctalia-system.nix b/shared/modules/system/noctalia-system.nix index e6a072b..5fa028c 100644 --- a/shared/modules/system/noctalia-system.nix +++ b/shared/modules/system/noctalia-system.nix @@ -4,6 +4,10 @@ with lib; let cfg = config.noctaliaSystem; + unstable = import inputs.nixpkgs-unstable { + system = "x86_64-linux"; + config.allowUnfree = true; + }; in { # Import Noctalia's NixOS module for systemd service @@ -34,7 +38,9 @@ in # Required system services for Noctalia features # Evolution data server and Evolution - for calendar events support in Noctalia services.gnome.evolution-data-server.enable = mkDefault true; - environment.systemPackages = [ pkgs.evolution ]; + # TODO)) switched to unstable instead of pkgs.evolution due to spam swarm build error Apr 14, 2026 + # Can be changed back at some point to stable. + environment.systemPackages = [ unstable.evolution ]; # NetworkManager - for wifi widget networking.networkmanager.enable = mkDefault true;