From f6e72b0f72275fdb27f3813afa4dbe569bfea9d1 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Mon, 2 Dec 2024 12:20:07 +0100
Subject: [PATCH] update

---
 flake.lock                   | 6 +++---
 modules/graphical/gnome.nix  | 2 +-
 modules/graphical/shared.nix | 5 +++--
 modules/graphical/stylix.nix | 6 ++----
 modules/hardware/nvidia.nix  | 2 +-
 overlays.nix                 | 3 +--
 systems/pc/configuration.nix | 6 ++----
 7 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5680244..2f94e35 100644
--- a/flake.lock
+++ b/flake.lock
@@ -669,11 +669,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1732014248,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "lastModified": 1733015953,
+        "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
         "type": "github"
       },
       "original": {
diff --git a/modules/graphical/gnome.nix b/modules/graphical/gnome.nix
index 37d2c77..af1bb56 100644
--- a/modules/graphical/gnome.nix
+++ b/modules/graphical/gnome.nix
@@ -44,7 +44,7 @@ in {
       wmctrl
       rofi-wayland
       gnome.mutter
-      gnome.adwaita-icon-theme
+      adwaita-icon-theme
       gnome.gnome-settings-daemon
       gnome.gnome-tweaks
       gnome.dconf-editor
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index d95ec38..c48a63a 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -17,7 +17,8 @@ in {
     fonts.packages = with pkgs; [
       #uw-ttyp0
       #corefonts
-      nerdfonts # noto and hack
+      nerd-fonts.noto
+      nerd-fonts.hack
       #noto-fonts
       #noto-fonts-emoji
       noto-fonts-cjk-sans
@@ -88,7 +89,7 @@ in {
       xarchiver # archive tool
       ani-cli
       mangal
-      gnome.adwaita-icon-theme
+      adwaita-icon-theme
     ];
   };
 }
diff --git a/modules/graphical/stylix.nix b/modules/graphical/stylix.nix
index b499904..eb5c9c0 100644
--- a/modules/graphical/stylix.nix
+++ b/modules/graphical/stylix.nix
@@ -29,9 +29,7 @@ in {
   };
 
   # https://danth.github.io/stylix/options/nixos.html
-  config =
-    let nerdfonts = pkgs.nerdfonts.override { fonts = [ "Hack" "Noto" ]; };
-    in lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
       home-manager = {
         users.${config.mainUser.name}.stylix = {
@@ -72,7 +70,7 @@ in {
             terminal = 12;
           };
           monospace = {
-            package = nerdfonts;
+            package = pkgs.nerd-fonts.hack;
             name = "Hack";
           };
         };
diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix
index e7782ee..c8ec012 100644
--- a/modules/hardware/nvidia.nix
+++ b/modules/hardware/nvidia.nix
@@ -53,7 +53,7 @@ in {
       # accessible via `nvidia-settings`.
       nvidiaSettings = true;
       # Optionally, you may need to select the appropriate driver version for your specific GPU.
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
       #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
       #  version = "560.35.03";
       #  sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M=";
diff --git a/overlays.nix b/overlays.nix
index 9297677..0413783 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -12,10 +12,9 @@ in {
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays
   modifications = final: prev: {
-    discord = prev.discord.override { withVencord = true; };
+    discord = prev.discord-canary.override { withVencord = true; };
     #discord = prev.vesktop;
     tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; };
-    nerdfonts = prev.nerdfonts.override { fonts = [ "Hack" "Noto" ]; };
       #hyprland = prev.hyprland.overrideAttrs (oldAttrs: {
       #  version = "0.45.0";
 
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index 0e41160..b87a13d 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -78,7 +78,7 @@
     };
   };
   services.ollama = {
-    enable = true;
+    enable = false;
     acceleration = "cuda";
   };
 
@@ -90,10 +90,8 @@
     ifuse # optional, to mount using 'ifuse'
   ];
 
-  #nvidida drivers fail to build on new kernel https://github.com/NixOS/nixpkgs/issues/357643
-  boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_6_11;
   nixpkgs.config.permittedInsecurePackages =
-    [ "electron-28.3.3" "electron-27.3.11" ];
+    [ "electron-27.3.11" ];
 
   networking.firewall.allowedTCPPorts = [ 6567 ]; # mindustry
   networking.firewall.allowedUDPPorts = [ 6567 ]; # mindustry