From 0addff6c7d88a544299c3f082cf21429fbf9282f Mon Sep 17 00:00:00 2001 From: James Coleman Date: Mon, 12 Aug 2024 17:07:50 -0500 Subject: [PATCH] Add media-pc, and update --- flake.lock | 42 +++++++++++++------------- hosts/tama/configuration.nix | 5 +++ modules/home/flatpaks.nix | 4 --- modules/home/profiles/gaming-pc.nix | 6 ++++ modules/home/profiles/media-pc.nix | 7 +++++ modules/nixos/video-drivers/amdgpu.nix | 4 +-- modules/nixos/video-drivers/nvidia.nix | 4 +-- modules/nixos/video-drivers/qxl.nix | 4 +-- modules/nixos/zfs.nix | 2 +- profiles/media-pc.nix | 8 +++++ 10 files changed, 51 insertions(+), 35 deletions(-) create mode 100644 modules/home/profiles/media-pc.nix create mode 100644 profiles/media-pc.nix diff --git a/flake.lock b/flake.lock index b029af9..a0d63f1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1720056646, - "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1707326266, - "narHash": "sha256-vRVih6iltuyLdj305Pj236BfhzFaOkAbHg3r5VsFdxs=", + "lastModified": 1722178161, + "narHash": "sha256-9Nmg+1ngRCsKMJXN4JWFzg4SLTj1iJfakxiOsF48rZw=", "owner": "GermanBread", "repo": "declarative-flatpak", - "rev": "efe7897ddcfbca085fba0690b3094e7f8e8911dd", + "rev": "cbabea429cd7d659041e5338e869a8e70f59fa74", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1720327769, - "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -83,11 +83,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -99,11 +99,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -115,11 +115,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/hosts/tama/configuration.nix b/hosts/tama/configuration.nix index 646dfb9..09695c6 100644 --- 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 index 4d7718b..f66bd64 100644 --- 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" ]; } \ No newline at end of file diff --git a/modules/home/profiles/gaming-pc.nix b/modules/home/profiles/gaming-pc.nix index 7b8e717..d2102df 100644 --- 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" + ]; } \ No newline at end of file diff --git a/modules/home/profiles/media-pc.nix b/modules/home/profiles/media-pc.nix new file mode 100644 index 0000000..7b8e717 --- /dev/null +++ b/modules/home/profiles/media-pc.nix @@ -0,0 +1,7 @@ +{pkgs, settings, ...}: + +{ + imports = [ + ./desktop.nix + ]; +} \ No newline at end of file diff --git a/modules/nixos/video-drivers/amdgpu.nix b/modules/nixos/video-drivers/amdgpu.nix index 337b936..5228cfc 100644 --- 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 index 5be4545..b452776 100644 --- 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 index bb22c3d..f522254 100644 --- 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 index 87037ff..4482b99 100644 --- 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 new file mode 100644 index 0000000..145251f --- /dev/null +++ b/profiles/media-pc.nix @@ -0,0 +1,8 @@ +{ config, lib, pkgs, settings, ... }: + +{ + # Import modules. + imports = [ + ./desktop.nix + ]; +}