mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2024-11-07 23:33:59 +01:00
Adding proper imports, fixed rebuild alias, added amd driver module
This commit is contained in:
parent
de1687998d
commit
493e93f428
@ -14,6 +14,7 @@ in
|
|||||||
imports = [
|
imports = [
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./users.nix
|
./users.nix
|
||||||
|
../../modules/amd-drivers.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
@ -24,6 +25,14 @@ in
|
|||||||
};
|
};
|
||||||
boot.tmp.useTmpfs = false;
|
boot.tmp.useTmpfs = false;
|
||||||
boot.tmp.tmpfsSize = "30%";
|
boot.tmp.tmpfsSize = "30%";
|
||||||
|
boot.binfmt.registrations.appimage = {
|
||||||
|
wrapInterpreterInShell = false;
|
||||||
|
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
|
||||||
|
recognitionType = "magic";
|
||||||
|
offset = 0;
|
||||||
|
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
|
||||||
|
magicOrExtension = ''\x7fELF....AI\x02'';
|
||||||
|
};
|
||||||
|
|
||||||
# This is for OBS Virtual Cam Support - v4l2loopback setup
|
# This is for OBS Virtual Cam Support - v4l2loopback setup
|
||||||
boot.kernelModules = [ "v4l2loopback" ];
|
boot.kernelModules = [ "v4l2loopback" ];
|
||||||
@ -215,6 +224,9 @@ in
|
|||||||
driSupport32Bit = true;
|
driSupport32Bit = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Extra Module Options
|
||||||
|
drivers.amdgpu.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
|
@ -29,6 +29,7 @@ in
|
|||||||
inputs.nix-colors.homeManagerModules.default
|
inputs.nix-colors.homeManagerModules.default
|
||||||
inputs.hyprland.homeManagerModules.default
|
inputs.hyprland.homeManagerModules.default
|
||||||
../../config/hyprland.nix
|
../../config/hyprland.nix
|
||||||
|
../../config/waybar.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Define Settings For Xresources
|
# Define Settings For Xresources
|
||||||
@ -88,7 +89,7 @@ in
|
|||||||
};
|
};
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
sv = "sudo nvim";
|
sv = "sudo nvim";
|
||||||
flake-rebuild = "nh os switch --hostname ${host}";
|
flake-rebuild = "nh os switch --hostname ${host} /home/${username}/zaneyos";
|
||||||
flake-update = "nh os switch --hostname ${host} --update";
|
flake-update = "nh os switch --hostname ${host} --update";
|
||||||
gcCleanup = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
|
gcCleanup = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
|
||||||
v = "nvim";
|
v = "nvim";
|
||||||
|
31
modules/amd-drivers.nix
Normal file
31
modules/amd-drivers.nix
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
cfg = config.drivers.amdgpu;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
# Declare what settings a user of this "hello.nix" module CAN SET.
|
||||||
|
options.drivers.amdgpu = {
|
||||||
|
enable = mkEnableOption "Enable AMD Drivers";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Define what other settings, services and resources should be active IF
|
||||||
|
# a user of this "hello.nix" module ENABLED this module
|
||||||
|
# by setting "services.hello.enable = true;".
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ];
|
||||||
|
services.xserver.enable = true;
|
||||||
|
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||||
|
# OpenGL
|
||||||
|
hardware.opengl = {
|
||||||
|
## amdvlk: an open-source Vulkan driver from AMD
|
||||||
|
extraPackages = [ pkgs.amdvlk ];
|
||||||
|
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user