Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

system-modules/boot.nix

@@ -103,7 +103,7 @@ in
           '';
         };
       };
-      kernelPackages = pkgs-unstable.linuxPackages_6_11;
+      kernelPackages = pkgs-unstable.linuxPackages_latest;
       extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
       kernelModules = [ "v4l2loopback" ];
       extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1'';

system-modules/fcitx5.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, ... }:
+{ pkgs, ... }:
 {
   # i18n.inputMethod = {
   #   type = "fcitx5";
@@ -10,7 +10,8 @@
   #   ];
   # };
   i18n.inputMethod = {
-    enabled = "fcitx5";
+    enable = true;
+    type = "fcitx5";
     fcitx5.waylandFrontend = true;
     fcitx5.addons = with pkgs; [
       fcitx5-gtk             # alternatively, kdePackages.fcitx5-qt

system-modules/ollama.nix

@@ -1,17 +1,6 @@
-{ pkgs, pkgs-unstable, pkgs-latest, lib, host, nvidia, ... }: 
+{ pkgs, lib, host, nvidia, ... }: 
 let
-  p = pkgs-latest.ollama;
-  # p = pkgs-unstable.ollama.overrideAttrs (oldAttrs: rec {
-  #   inherit (oldAttrs) pname;
-  #   version = "0.3.0";
-  #   src = pkgs.fetchFromGitHub {
-  #     owner = "ollama";
-  #     repo = "ollama";
-  #     rev = "v${version}";
-  #     hash = "sha256-69CpRAggx6a1NJq+CA9QliXuUbDgC1ERRuA3y17KVAM=";
-  #     fetchSubmodules = true;
-  #   };   
-  # });
+  p = if nvidia.enable then pkgs.ollama-cuda else pkgs.ollama;
 in {
   environment.systemPackages = [ p ];