update to 25.05

configurations/host/Old-materusPC/configuration.nix

@@ -264,14 +264,10 @@ in
     ubuntu_font_family
     wqy_zenhei
     monocraft
-    (nerdfonts.override {
-      fonts = [
-        "FiraCode"
-        "DroidSansMono"
-        "Meslo"
-        "ProFont"
-      ];
-    })
+    nerd-fonts.fira-code
+    nerd-fonts.droid-sans-mono
+    nerd-fonts.meslo-lg
+    nerd-fonts.profont
   ];
   fonts.fontconfig.enable = true;
   fonts.fontconfig.cache32Bit = true;

configurations/host/materusPC/home/materus/default.nix

@@ -2,6 +2,7 @@
   pkgs,
   materusArg,
   lib,
+  config,
   ...
 }:
 {
@@ -10,7 +11,9 @@
   ];
   home.stateVersion = "23.05";
   home.homeDirectory = "/home/materus";
-
+  
+  materus.profile.wezterm.enable = true;
+  
   programs.git.signing.signByDefault = true;
 
   xdg.userDirs.enable = true;
@@ -129,6 +132,7 @@
     org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME,JAVA_21_HOME
     org.gradle.home=${pkgs.jdk21}
   '';
+  
 
   xdg.desktopEntries.brave-browser =
     let

configurations/host/materusPC/home/materus/plasma.nix

@@ -2,7 +2,7 @@
 {
   home.packages = [
     pkgs.papirus-icon-theme
-    (pkgs.nerdfonts.override { fonts = [ "Hack" ]; })
+    pkgs.nerd-fonts.hack
   ];
 
   xdg.dataFile."konsole/materus-linux.keytab".source = ("${materusArg.cfg.path}" + "/extraFiles/config/plasma/materus-linux.keytab");

configurations/host/materusPC/other/apps.nix

@@ -16,12 +16,7 @@
 
   environment.systemPackages = with pkgs; [
 
-    (vivaldi.overrideAttrs
-      (oldAttrs: {
-        dontWrapQtApps = false;
-        dontPatchELF = true;
-        nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.kdePackages.wrapQtAppsHook];
-      }))
+    vivaldi
 
     #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs;  [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
     materusArg.pkgs.amdgpu-pro-libs.prefixes
@@ -112,7 +107,7 @@
 
     nix-du
 
-    kate
+    kdePackages.kate
     krusader
 
     wineWowPackages.stagingFull

configurations/host/materusPC/other/desktop/kde.nix

@@ -8,8 +8,8 @@
 
   services.desktopManager.plasma6.enable = true;
   services.desktopManager.plasma6.enableQt5Integration = true;
-  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
+  #programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+  #environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
   environment.variables = {
     # Old fix for black cursor on amdgpu, seems to work fine now
     #KWIN_DRM_NO_AMS = "1";

configurations/profile/common/packages/fonts.nix

@@ -17,14 +17,17 @@ let
     pkgs.wqy_zenhei
     pkgs.corefonts
     pkgs.hack-font
-    (pkgs.nerdfonts.override { fonts = [ "Hack" ]; })
+    pkgs.nerd-fonts.hack
 
   ] ++ defaultFonts;
 
   moreFonts = [
     pkgs.ubuntu_font_family
     pkgs.monocraft
-    (pkgs.nerdfonts.override { fonts = [ "DroidSansMono" "Meslo" "ProFont" "FiraCode"]; })
+    pkgs.nerd-fonts.droid-sans-mono
+    pkgs.nerd-fonts.meslo-lg
+    pkgs.nerd-fonts.profont
+    pkgs.nerd-fonts.fira-code
   ];
 in
 {

configurations/profile/home/editor/emacs/default.nix

@@ -3,9 +3,10 @@
   lib,
   pkgs,
   materusArg,
+  materusCfg,
   ...
 }: let
-  emacs-pkg = pkgs.emacs;
+  emacs-pkg = materusCfg.configInputs.emacs-overlay.packages.x86_64-linux.emacs-git;
 
   materus-nix = e:
     e.trivialBuild {
@@ -188,8 +189,12 @@
       ripgrep
       cmake
       gnumake
-      nixfmt-rfc-style
-      python3Full
+      nixfmt-rfc-style  
+      (python3.withPackages (python-pkgs: with python-pkgs; [
+        matplotlib
+        pandas
+        requests
+      ]))
       multimarkdown
       git
       emacs-lsp-booster

configurations/profile/home/terminal/wezterm.nix

@@ -31,9 +31,7 @@ in
     '';
 
       home.packages = [
-        (lib.mkIf cfg.enableHackFont (pkgs.nerdfonts.override {
-          fonts = [ "Hack" ];
-        }))
+        (lib.mkIf cfg.enableHackFont (pkgs.nerd-fonts.hack))
         (lib.mkIf cfg.enableWezcraft (pkgs.monocraft))
         (lib.mkIf cfg.enableWezcraft (pkgs.writeShellScriptBin "wezcraft" ''
           ${lib.getExe config.programs.wezterm.package} --config font="wezterm.font 'Monocraft Nerd Font'" $@