Merge branch 'main' of github.com:FabricSoul/nixos-configs

hosts/common/optional/nvidia.nix

@@ -3,6 +3,7 @@
   config,
   lib,
   pkgs,
+  nvidiaPkgs,
   ...
 }: {
   services.xserver.videoDrivers = ["nvidia"];
@@ -16,6 +17,36 @@
       open = false;
       nvidiaSettings = true;
       package = config.boot.kernelPackages.nvidiaPackages.stable;
+      # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #   version = "565.77";
+      #
+      #   sha256_64bit = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw=";
+      #   sha256_aarch64 = "sha256-LSAYUnhfnK3rcuPe1dixOwAujSof19kNOfdRHE7bToE=";
+      #   openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I=";
+      #   settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk=";
+      #   persistencedSha256 = "sha256-wnDjC099D8d9NJSp9D0CbsL+vfHXyJFYYgU3CwcqKww=";
+      #
+      #   # Optional: include patches from that version if needed
+      #   # patches = [
+      #   #   ./fix-for-linux-6.13.patch
+      #   # ];
+      #   # patchesOpen = [
+      #   #   ./nvidia-nv-Convert-symbol-namespace-to-string-literal.patch
+      #   #   ./crypto-Add-fix-for-6.13-Module-compilation.patch
+      #   #   ./Use-linux-aperture.c-for-removing-conflict.patch
+      #   #   ./TTM-fbdev-emulation-for-Linux-6.13.patch
+      #   # ];
+      # };
+
+      # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #   version = "555.58";
+      #
+      #   sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew=";
+      #   sha256_aarch64 = lib.fakeSha256;
+      #   openSha256 = lib.fakeSha256;
+      #   settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M=";
+      #   persistencedSha256 = lib.fakeSha256;
+      # };
     };
   };
 }

hosts/common/optional/plasma.nix

@@ -0,0 +1,26 @@
+{pkgs, ...}: {
+  services = {
+    desktopManager.plasma6.enable = true;
+
+    displayManager.sddm.enable = true;
+
+    displayManager.sddm.wayland.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    kdePackages.discover # Optional: Install if you use Flatpak or fwupd firmware update sevice
+    kdePackages.kcalc # Calculator
+    kdePackages.kcharselect # Tool to select and copy special characters from all installed fonts
+    kdePackages.kcolorchooser # A small utility to select a color
+    kdePackages.kolourpaint # Easy-to-use paint program
+    kdePackages.ksystemlog # KDE SystemLog Application
+    kdePackages.sddm-kcm # Configuration module for SDDM
+    kdiff3 # Compares and merges 2 or 3 files or directories
+    kdePackages.isoimagewriter # Optional: Program to write hybrid ISO files onto USB disks
+    kdePackages.partitionmanager # Optional Manage the disk devices, partitions and file systems on your computer
+    hardinfo2 # System information and benchmarks for Linux systems
+    haruna # Open source video player built with Qt/QML and libmpv
+    wayland-utils # Wayland utilities
+    wl-clipboard # Command-line copy/paste utilities for Wayland
+  ];
+}

hosts/zion/default.nix

@@ -10,6 +10,7 @@
     ./hardware-configuration.nix
 
     # Common configurations
+    ../common/optional/plasma.nix
     ../common/global
     ../common/optional/nvidia.nix
     ../common/optional/docker.nix