From 14349441ac6fe9ffc40d011fff6acc03e7e4b47a Mon Sep 17 00:00:00 2001
From: materus <materus@podkos.pl>
Date: Sat, 16 Mar 2024 19:24:04 +0100
Subject: [PATCH] materusPC: updates to work on unstable

---
 configurations/host/materusPC/extraHome.nix     | 6 ++++--
 configurations/host/materusPC/gnome.nix         | 2 +-
 configurations/host/materusPC/hardware/boot.nix | 4 ++--
 configurations/host/materusPC/kde.nix           | 2 +-
 configurations/host/materusPC/tmp.nix           | 2 +-
 configurations/profile/home/default.nix         | 3 +--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/configurations/host/materusPC/extraHome.nix b/configurations/host/materusPC/extraHome.nix
index b63554f..4ded04a 100644
--- a/configurations/host/materusPC/extraHome.nix
+++ b/configurations/host/materusPC/extraHome.nix
@@ -34,7 +34,9 @@
       binutils
       coreutils
       util-linux
-
+      openssl
+      openssl.dev
+      pkg-config
       dotnet-sdk_8
       mono
       mold
@@ -82,7 +84,7 @@
   ];
 
   programs.obs-studio = {
-    enable = true;
+    enable = false;
     plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-vaapi obs-vkcapture obs-gstreamer input-overlay obs-multi-rtmp obs-pipewire-audio-capture ];
     package = materusArg.pkgs.obs-amf;
   };
diff --git a/configurations/host/materusPC/gnome.nix b/configurations/host/materusPC/gnome.nix
index a595094..ffa9950 100644
--- a/configurations/host/materusPC/gnome.nix
+++ b/configurations/host/materusPC/gnome.nix
@@ -17,7 +17,7 @@
   services.gnome.core-shell.enable = true;
   services.gnome.core-os-services.enable = true;
 
-  programs.gnupg.agent.pinentryFlavor = "gnome3";
+  #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
 
 
   programs.gnome-terminal.enable = true;
diff --git a/configurations/host/materusPC/hardware/boot.nix b/configurations/host/materusPC/hardware/boot.nix
index df5e1fb..2b0c254 100644
--- a/configurations/host/materusPC/hardware/boot.nix
+++ b/configurations/host/materusPC/hardware/boot.nix
@@ -18,7 +18,7 @@ in
   #Kernel
   boot.kernelPackages = pkgs.linuxPackages_zen;
   boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "vfio_iommu_type1.allow_unsafe_interrupts=1" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video;
-  boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci" "v4l2loopback" ];
+  boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci"];
   boot.extraModprobeConfig = ''
     options kvm_amd nested=1 avic=1 npt=1 sev=0
     options vfio_iommu_type1 allow_unsafe_interrupts=1
@@ -32,7 +32,7 @@ in
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
 
-  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ /*v4l2loopback*/ ];
 
 
   boot.supportedFilesystems = [ "ntfs" "btrfs" "vfat" "exfat" "ext4" ];
diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix
index 9fdc2c5..2fcbbf8 100644
--- a/configurations/host/materusPC/kde.nix
+++ b/configurations/host/materusPC/kde.nix
@@ -42,7 +42,7 @@ in
   };
   services.xserver.desktopManager.plasma6.enable = true;
   services.xserver.desktopManager.plasma6.enableQt5Integration = true;
-  programs.gnupg.agent.pinentryFlavor = "gnome3";
+  #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
   environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
 
   environment.variables = {
diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index fe5d79f..3dc9a6d 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -254,7 +254,7 @@
     protontricks
     gnupg
     pinentry
-    pinentry-gnome
+    pinentry-gnome3
     pinentry-curses
     ncurses
     monkeysphere
diff --git a/configurations/profile/home/default.nix b/configurations/profile/home/default.nix
index c5caa4d..c9b874f 100644
--- a/configurations/profile/home/default.nix
+++ b/configurations/profile/home/default.nix
@@ -60,8 +60,7 @@ in
         enableZshIntegration = lib.mkDefault config.programs.zsh.enable;
       };
 
-      programs.exa.enable = lib.mkDefault cfg.enableTerminalExtra;
-      programs.exa.enableAliases = lib.mkDefault config.programs.exa.enable;
+      programs.eza.enable = lib.mkDefault cfg.enableTerminalExtra;
 
       programs.yt-dlp.enable = lib.mkDefault cfg.enableTerminalExtra;