From 2fa6d7a07d6ab596044d8fce4de0219c92e0aac8 Mon Sep 17 00:00:00 2001
From: NovaViper <coder.nova99@mailbox.org>
Date: Thu, 17 Oct 2024 22:16:50 -0500
Subject: [PATCH] Fixes to work with latest flake update - Pin kernel to
 6.10.11 for ryzennova, due to NixOS/nixpkgs#344167 - Fix eza icon options,
 made it set to "auto" instead of true - Removed qtbase, breaks Plasma 6.2.1
 theming - Remove python nose as it was deprecated and remove from nixpkgs -
 Add space to transient prompt for oh-my-posh - Switch from base
 xwaylandvideobridge to kdePackages.xwaylandvideobridge - Remove gpg scdaemon
 settings as it seems to break Yubikey support

---
 hosts/ryzennova/configuration.nix             | 20 +++++++++++++++++--
 .../users/desktop/displayManager/wayland.nix  |  2 +-
 modules/users/desktop/plasma6.nix             |  1 -
 modules/users/development/python.nix          |  2 +-
 modules/users/oh-my-posh.nix                  |  2 +-
 modules/users/yubikey.nix                     |  6 ------
 modules/users/zsh.nix                         |  2 +-
 7 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/hosts/ryzennova/configuration.nix b/hosts/ryzennova/configuration.nix
index d0ad4b8..d7d627a 100644
--- a/hosts/ryzennova/configuration.nix
+++ b/hosts/ryzennova/configuration.nix
@@ -57,8 +57,24 @@ in
     ../../modules/linux/graphical
   ];
 
-  # Make NixOS use the latest Linux Kernel
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
+  # Make NixOS use the Xanmod kernel (pinned to 6.10.11), see https://github.com/NixOS/nixpkgs/issues/344167
+  #boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod;
+  boot.kernelPackages = pkgs.linuxPackagesFor (
+    pkgs.linux_xanmod_latest.override {
+      argsOverride = rec {
+        modDirVersion = "${version}-${suffix}";
+        suffix = "xanmod1";
+        version = "6.10.11";
+
+        src = pkgs.fetchFromGitHub {
+          owner = "xanmod";
+          repo = "linux";
+          rev = modDirVersion;
+          hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8=";
+        };
+      };
+    }
+  );
 
   nixpkgs.config.cudaSupport = outputs.lib.mkForce true;
 
diff --git a/modules/users/desktop/displayManager/wayland.nix b/modules/users/desktop/displayManager/wayland.nix
index 014c0d7..e4285e0 100644
--- a/modules/users/desktop/displayManager/wayland.nix
+++ b/modules/users/desktop/displayManager/wayland.nix
@@ -32,7 +32,7 @@ in
 
     home.packages = with pkgs; [
       #xorg.xeyes
-      xwaylandvideobridge
+      kdePackages.xwaylandvideobridge
       libsForQt5.qt5.qtwayland
       qt6.qtwayland
     ];
diff --git a/modules/users/desktop/plasma6.nix b/modules/users/desktop/plasma6.nix
index e359a5d..22113bb 100644
--- a/modules/users/desktop/plasma6.nix
+++ b/modules/users/desktop/plasma6.nix
@@ -98,7 +98,6 @@
         qtimageformats
         packagekit-qt
         sddm-kcm # Add KCM for sddm
-        qtbase
       ]);
   };
 }
diff --git a/modules/users/development/python.nix b/modules/users/development/python.nix
index 3d6af1a..69b565b 100644
--- a/modules/users/development/python.nix
+++ b/modules/users/development/python.nix
@@ -15,7 +15,7 @@ outputs.lib.mkModule config "python" {
     packages = with pkgs; [
       # :lang python, debugger, formatter
       (python312.withPackages
-        (ps: with ps; [debugpy pyflakes isort pytest black pip pipx nose]))
+        (ps: with ps; [debugpy pyflakes isort pytest black pip pipx]))
       pyright
       pipenv
     ];
diff --git a/modules/users/oh-my-posh.nix b/modules/users/oh-my-posh.nix
index b4828da..b6bd288 100644
--- a/modules/users/oh-my-posh.nix
+++ b/modules/users/oh-my-posh.nix
@@ -145,7 +145,7 @@ in
             "{{if gt .Code 0}}1{{end}}"
             "{{if eq .Code 0}}10{{end}}"
           ];
-          template = "{{.Var.PromptChar}}";
+          template = "{{.Var.PromptChar}} ";
         };
       };
     };
diff --git a/modules/users/yubikey.nix b/modules/users/yubikey.nix
index a292cb5..d911d80 100644
--- a/modules/users/yubikey.nix
+++ b/modules/users/yubikey.nix
@@ -6,12 +6,6 @@
   ...
 }:
 outputs.lib.mkModule config "yubikey" {
-  # Make Yubikeys work with gnupg
-  programs.gpg.scdaemonSettings = {
-    reader-port = "Yubico Yubi";
-    disable-ccid = true;
-  };
-
   home.shellAliases = {
     # Make gpg switch Yubikey
     gpg-switch-yubikey = ''gpg-connect-agent "scd serialno" "learn --force" /bye'';
diff --git a/modules/users/zsh.nix b/modules/users/zsh.nix
index 7e1c997..8c6b0c0 100644
--- a/modules/users/zsh.nix
+++ b/modules/users/zsh.nix
@@ -55,7 +55,7 @@ with outputs.lib;
       eza = {
         enable = true;
         git = true;
-        icons = true;
+        icons = "auto";
         extraOptions = ["--color=always" "--group-directories-first" "--classify"];
       };