Merge branch 'master' of 192.168.1.126:TheCrazyInsanity/nixos-configv3

machines/workstation/configuration.nix

@@ -87,10 +87,9 @@
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
-  # environment.systemPackages = with pkgs; [
-  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #   wget
-  # ];
+  environment.systemPackages = with pkgs; [
+    cura-appimage # I want cura but not kicad so i dont pull in fabrication
+  ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

machines/workstation/hardware-configuration.nix

@@ -19,40 +19,53 @@
     "btrfs"
   ];
   boot.initrd.kernelModules = [ "btrfs" ];
-  boot.kernelModules = [ "kvm-intel" "btrfs" ];
+  boot.kernelModules = [
+    "kvm-intel"
+    "btrfs"
+  ];
   boot.extraModulePackages = [ ];
   boot.supportedFilesystems = [ "btrfs" ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/BUTTER";
     fsType = "btrfs";
-    options = [ "compress=zstd" "subvol=root" ];
+    options = [
+      "compress=zstd"
+      "subvol=root"
+    ];
   };
 
-  fileSystems."/home" = {
-    device = "/dev/disk/by-label/BUTTER";
-    fsType = "btrfs";
-    options = [ "compress=zstd" "subvol=home" ];
-  };
+  # fileSystems."/home" = {
+  #   device = "/dev/disk/by-label/BUTTER";
+  #   fsType = "btrfs";
+  #   options = [ "compress=zstd" "subvol=home" ];
+  # };
 
   fileSystems."/nix" = {
     # device = "/dev/disk/by-uuid/3c89fa92-1d43-4c48-b228-e2725fa70ee9";
     device = "/dev/disk/by-label/BUTTER";
     fsType = "btrfs";
-    options = [ "compress=zstd" "noatime" "subvol=nix" ];
+    options = [
+      "compress=zstd"
+      "noatime"
+      "subvol=nix"
+    ];
   };
 
-#  fileSystems."/swap" = {
-#    device = "/dev/disk/by-label/BUTTER";
-#    fsType = "btrfs";
-#    options = [ "noatime" "subvol=swap" ];
-#  };
+  #  fileSystems."/swap" = {
+  #    device = "/dev/disk/by-label/BUTTER";
+  #    fsType = "btrfs";
+  #    options = [ "noatime" "subvol=swap" ];
+  #  };
 
   fileSystems."/persistent" = {
     device = "/dev/disk/by-label/BUTTER";
     fsType = "btrfs";
     neededForBoot = true;
-    options = [ "compress=zstd" "subvol=persist" ];
+    options = [
+      "compress=zstd"
+      "subvol=persist"
+    ];
   };
 
   fileSystems."/boot" = {
@@ -64,17 +77,56 @@
     ];
   };
 
-#  fileSystems = {
-#    "/".options = [ "compress=zstd" ];
-#    "/home".options = [ "compress=zstd" ];
-#    "/persist".options = [ "compress=zstd" ];
-#    "/nix".options = [ "compress=zstd" "noatime" ];
-#    "/swap".options = [ "noatime" ];
-#  };
+  #  fileSystems = {
+  #    "/".options = [ "compress=zstd" ];
+  #    "/home".options = [ "compress=zstd" ];
+  #    "/persist".options = [ "compress=zstd" ];
+  #    "/nix".options = [ "compress=zstd" "noatime" ];
+  #    "/swap".options = [ "noatime" ];
+  #  };
 
-#  swapDevices = [
-#    { device = "/swap/swapfile"; }
-#  ];
+  #  swapDevices = [
+  #    { device = "/swap/swapfile"; }
+  #  ];
+
+  # Enable OpenGL
+  hardware.graphics = {
+    enable = true;
+  };
+
+  # Load nvidia driver for Xorg and Wayland
+  services.xserver.videoDrivers = [ "nvidia" ];
+
+  hardware.nvidia = {
+
+    # Modesetting is required.
+    modesetting.enable = true;
+
+    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+    # Enable this if you have graphical corruption issues or application crashes after waking
+    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
+    # of just the bare essentials.
+    powerManagement.enable = false;
+
+    # Fine-grained power management. Turns off GPU when not in use.
+    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+    powerManagement.finegrained = false;
+
+    # Use the NVidia open source kernel module (not to be confused with the
+    # independent third-party "nouveau" open source driver).
+    # Support is limited to the Turing and later architectures. Full list of
+    # supported GPUs is at:
+    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+    # Only available from driver 515.43.04+
+    open = false;
+
+    # Enable the Nvidia settings menu,
+    # 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;
+  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

machines/workstation/home.nix

@@ -1,4 +1,11 @@
-{config, pkgs, lib, inputs, outputs, ...}:
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  outputs,
+  ...
+}:
 {
   # These both are probably always going to be the same, but I'll keep them local just in case:tm:
   home.username = "laythe";
@@ -6,9 +13,10 @@
 
   imports = [
     ../../home/default.nix
+    ../../modules/kde/home.nix
   ];
 
-  home.stateVersion = "25.11";
+  home.stateVersion = "24.11";
 
   programs.home-manager.enable = true;
 }