Compare commits

..

No commits in common. "d3ff73c7eda02c8e6e71a6a54bde983242c5ca6f" and "322653d25fbcfb4425817f57e4c8bbcea5edc1ef" have entirely different histories.

3 changed files with 13 additions and 24 deletions

View File

@ -30,13 +30,8 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config = { config = {
allowUnfreePredicate = pkg: allowUnfree = true;
builtins.elem (nixpkgs.lib.getName pkg) [ rocmSupport = true;
"discord"
"samsung-UnifiedLinuxDriver"
"steam"
"steam-unwrapped"
];
}; };
}; };
in { in {

View File

@ -26,14 +26,10 @@
# NIXOS # NIXOS
nix.settings = { nix.settings = {
experimental-features = ["nix-command" "flakes"]; experimental-features = ["nix-command" "flakes"];
substituters = ["https://cache.nixos.org" "https://nix-community.cachix.org"]; substituters = ["https://nix-community.cachix.org" "https://cache.nixos.org"];
trusted-public-keys = [ trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
auto-optimise-store = true;
max-jobs = "auto";
cores = 12;
}; };
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
@ -61,6 +57,7 @@
wget wget
fprintd fprintd
qemu qemu
quickemu
home-manager home-manager
(let (let
base = appimageTools.defaultFhsEnvArgs; base = appimageTools.defaultFhsEnvArgs;
@ -153,6 +150,7 @@
enable = true; enable = true;
packages = with pkgs; [ packages = with pkgs; [
picoprobe-udev-rules picoprobe-udev-rules
teensy-udev-rules
qmk-udev-rules qmk-udev-rules
game-devices-udev-rules game-devices-udev-rules
android-udev-rules android-udev-rules
@ -192,6 +190,10 @@
"musnix" "musnix"
"--commit-lock-file" "--commit-lock-file"
"-L" "-L"
"--cores"
"12"
"-j"
"12"
]; ];
dates = "daily"; dates = "daily";
randomizedDelaySec = "45min"; randomizedDelaySec = "45min";
@ -205,6 +207,7 @@
randomizedDelaySec = "45min"; randomizedDelaySec = "45min";
options = "--delete-older-than 14d"; options = "--delete-older-than 14d";
}; };
nix.settings.auto-optimise-store = true;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

View File

@ -14,18 +14,8 @@ in {
boot.initrd.kernelModules = ["amdgpu"]; boot.initrd.kernelModules = ["amdgpu"];
services.xserver.videoDrivers = ["amdgpu"]; services.xserver.videoDrivers = ["amdgpu"];
systemd.tmpfiles.rules = let systemd.tmpfiles.rules = [
rocmEnv = pkgs.symlinkJoin { "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
name = "rocm-combined";
paths = with pkgs.rocmPackages; [
rocblas
hipblas
rocm-smi
clr
];
};
in [
"L+ /opt/rocm - - - - ${rocmEnv}"
]; ];
hardware.graphics = { hardware.graphics = {
@ -33,6 +23,7 @@ in {
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
rocmPackages.clr.icd rocmPackages.clr.icd
rocmPackages.rocm-smi
amdvlk amdvlk
]; ];
extraPackages32 = with pkgs; [ extraPackages32 = with pkgs; [