Add media-pc, and update

grmrgecko · Aug 12, 2024 · 0addff6 · 0addff6
1 parent 0323133
commit 0addff6
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 35 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/hosts/tama/configuration.nix b/hosts/tama/configuration.nix
@@ -15,6 +15,11 @@
     ../../modules/nixos/zfs.nix
   ];
 
+  # Fix AMD SATA bug?
+  boot.kernelParams = [
+    "iommu=soft"
+  ];
+
   # Enable NFS export for kvm storage.
   services.nfs.server.enable = true;
   services.nfs.server.exports = ''

diff --git a/modules/home/flatpaks.nix b/modules/home/flatpaks.nix
@@ -7,15 +7,11 @@
     "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
   };
   services.flatpak.packages = [
-    "flathub:app/org.kde.kdenlive/x86_64/stable"
     "flathub:app/org.libreoffice.LibreOffice/x86_64/stable"
     "flathub:app/org.onlyoffice.desktopeditors/x86_64/stable"
     "flathub:app/md.obsidian.Obsidian/x86_64/stable"
-    "flathub:app/org.mozilla.Thunderbird/x86_64/stable"
-    "flathub:app/com.calibre_ebook.calibre/x86_64/stable"
     "flathub:app/org.gimp.GIMP/x86_64/stable"
     "flathub:app/org.kde.krita/x86_64/stable"
     "flathub:app/org.inkscape.Inkscape/x86_64/stable"
-    "flathub:app/org.blender.Blender/x86_64/stable"
   ];
 }
diff --git a/modules/home/profiles/gaming-pc.nix b/modules/home/profiles/gaming-pc.nix
@@ -4,4 +4,10 @@
   imports = [
     ./desktop.nix
   ];
+  services.flatpak.packages = [
+    "flathub:app/org.kde.kdenlive/x86_64/stable"
+    "flathub:app/org.mozilla.Thunderbird/x86_64/stable"
+    "flathub:app/com.calibre_ebook.calibre/x86_64/stable"
+    "flathub:app/org.blender.Blender/x86_64/stable"
+  ];
 }
diff --git a/modules/home/profiles/media-pc.nix b/modules/home/profiles/media-pc.nix
@@ -0,0 +1,7 @@
+{pkgs, settings, ...}:
+
+{
+  imports = [
+    ./desktop.nix
+  ];
+}
diff --git a/modules/nixos/video-drivers/amdgpu.nix b/modules/nixos/video-drivers/amdgpu.nix
@@ -2,10 +2,8 @@
 
 {
   # Display drivers.
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
   };
   boot.initrd.kernelModules = [ "amdgpu" ];
   services.xserver.videoDrivers = [ "amdgpu" ];

diff --git a/modules/nixos/video-drivers/nvidia.nix b/modules/nixos/video-drivers/nvidia.nix
@@ -2,10 +2,8 @@
 
 {
   # Display drivers.
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
   };
   services.xserver.videoDrivers = [ "nvidia" ];
 

diff --git a/modules/nixos/video-drivers/qxl.nix b/modules/nixos/video-drivers/qxl.nix
@@ -2,10 +2,8 @@
 
 {
   # Display drivers.
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
   };
   services.xserver.videoDrivers = [ "qxl" ];
   # services.qemuGuest.enable = true;

diff --git a/modules/nixos/zfs.nix b/modules/nixos/zfs.nix
@@ -4,7 +4,7 @@
   boot.supportedFilesystems = [ "zfs" ];
 
   # Set kernel to latest compatible version with ZFS.
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  #boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
 
   environment.systemPackages = with pkgs; [
     zfs

diff --git a/profiles/media-pc.nix b/profiles/media-pc.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, settings, ... }:
+
+{
+  # Import modules.
+  imports = [
+    ./desktop.nix
+  ];
+}