From f35a2c5e85af9f07395018889924266c87d7d3d5 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Tue, 16 Sep 2025 21:02:35 +0200 Subject: [PATCH] chore: Update to 25.05 --- nixos/flake.nix | 3 ++- nixos/modules/hardware/nvidia/default.nix | 26 ++++++++++++++--------- nixos/modules/programs/direnv/default.nix | 2 +- nixos/users/tdpeuter/default.nix | 15 +++++++------ 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/nixos/flake.nix b/nixos/flake.nix index 2e337c4..80814dc 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -45,7 +45,7 @@ "spotify" "steam" "steam-unwrapped" "steam-run" "vista-fonts" - "nvidia-persistenced" # Docker + "intel-ocl" ]; in utils.lib.mkFlake { @@ -73,6 +73,7 @@ modules = [ home-manager.nixosModule sops-nix.nixosModules.sops + ./modules ./users ]; diff --git a/nixos/modules/hardware/nvidia/default.nix b/nixos/modules/hardware/nvidia/default.nix index 4418f36..e98ed6d 100644 --- a/nixos/modules/hardware/nvidia/default.nix +++ b/nixos/modules/hardware/nvidia/default.nix @@ -25,21 +25,27 @@ in { }; config = lib.mkIf cfg.enable { -# boot = { -# extraModprobeConfig = "options nvidia-drm modeset=1"; -# -# initrd.kernelModules = [ -# "nvidia" -# "nvidia_modeset" -# "nvidia_uvm" -# "nvidia_drm" -# ]; -# }; + boot = { + extraModprobeConfig = '' + options nvidia-drm modeset=1 + ''; + kernelParams = [ + "nvidia_drm.modeset=1" + ]; + }; hardware = { graphics = { enable = true; enable32Bit = true; + extraPackages = with pkgs; [ + intel-ocl + intel-compute-runtime + opencl-clhpp + opencl-clang + opencl-headers + ocl-icd + ]; }; nvidia = { diff --git a/nixos/modules/programs/direnv/default.nix b/nixos/modules/programs/direnv/default.nix index ad16c7c..f974886 100644 --- a/nixos/modules/programs/direnv/default.nix +++ b/nixos/modules/programs/direnv/default.nix @@ -8,7 +8,7 @@ in { config = lib.mkIf cfg.enable { programs.direnv = { enable = true; - nix-direnv.enable = true; # Use nix-specific direnv. + nix-direnv.enable = true; # Use nix-specific direnv, https://github.com/nix-community/nix-direnv }; # This is also done by setting programs.direnv.persistDerivations. diff --git a/nixos/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix index 3a92666..6435828 100644 --- a/nixos/users/tdpeuter/default.nix +++ b/nixos/users/tdpeuter/default.nix @@ -8,7 +8,7 @@ let cursor = { package = pkgs.phinger-cursors; - name = "phinger-cursors"; + name = "phinger-cursors-light"; size = 24; }; in { @@ -79,12 +79,13 @@ in { fonts.packages = with pkgs; [ corefonts # Calibri for Uni + dejavu_fonts font-awesome # Dependency of Vifm & zsh config letter # Personal font + noto-fonts # Dependency of Zellij config noto-fonts-cjk-sans # Dependency of Zellij config noto-fonts-cjk-serif # Dependency of Zellij config - noto-fonts # Dependency of Zellij config - noto-fonts-emoji # Dependency of Zellij config + noto-fonts-emoji noto-fonts-color-emoji # Emoji's! vistafonts # Microsoft fonts ]; @@ -109,7 +110,6 @@ in { pointerCursor = { inherit (cursor) package name size; gtk.enable = true; - x11.enable = true; }; }; @@ -140,9 +140,12 @@ in { }; }; - gtk = { + services.syncthing = { enable = true; - cursorTheme = cursor; + extraOptions = [ + "--no-default-folder" + ]; + tray.enable = true; }; xdg = {