diff --git a/flake.nix b/flake.nix index 7f0b34b..3a0a3e4 100644 --- a/flake.nix +++ b/flake.nix @@ -119,13 +119,7 @@ "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" ]; - outputs = { - self, - nixos-hardware, - nixos-nspawn, - nixos-generators-2405, - ... - } @ inputs': + outputs = { self, ... } @ inputs': let input-views.inputs-edge = inputs' // { nixpkgs = inputs'.nixpkgs-edge; diff --git a/hardware/gpu/rocm.nix b/hardware/gpu/rocm.nix index 00f0b1d..9a296f7 100644 --- a/hardware/gpu/rocm.nix +++ b/hardware/gpu/rocm.nix @@ -1,7 +1,8 @@ -{ pkgs, lib, options, ... }: lib.mkMerge [ -# assumes common-gpu-amd from nixos-hardware is also added -# TODO: should we move it from flake.nix to here? +{ inputs, pkgs, lib, options, ... }: +lib.mkMerge [ + # https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/amd/default.nix +inputs.nixos-hardware.nixosModules.common-gpu-amd (lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") { hardware.opengl.enable = true; @@ -60,4 +61,5 @@ systemd.services.lactd.enable = true; systemd.services.lactd.wantedBy = [ "multi-user.target" ]; # add this if you want the unit to auto start at boot time } + ] diff --git a/hosts/nixos/eple/configuration.nix b/hosts/nixos/eple/configuration.nix index 8ffc4a2..8b81e62 100644 --- a/hosts/nixos/eple/configuration.nix +++ b/hosts/nixos/eple/configuration.nix @@ -17,7 +17,6 @@ inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.nixos-hardware.nixosModules.common-cpu-intel ../../../hardware/gpu/intel.nix - inputs.nixos-hardware.nixosModules.common-gpu-amd ../../../hardware/gpu/rocm.nix ../../../profiles/sshd diff --git a/hosts/nixos/nord/configuration.nix b/hosts/nixos/nord/configuration.nix index 5c43130..1c99cdb 100644 --- a/hosts/nixos/nord/configuration.nix +++ b/hosts/nixos/nord/configuration.nix @@ -25,9 +25,7 @@ inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.nixos-hardware.nixosModules.common-cpu-intel-cpu-only inputs.nixos-hardware.nixosModules.common-gpu-intel-sandy-bridge - inputs.nixos-hardware.nixosModules.common-gpu-amd ../../../hardware/gpu/rocm.nix - inputs.nixos-hardware.nixosModules.common-hidpi ../../../profiles/hidpi.nix ../../../profiles/sshd diff --git a/profiles/hidpi.nix b/profiles/hidpi.nix index d0ec06a..8d51552 100644 --- a/profiles/hidpi.nix +++ b/profiles/hidpi.nix @@ -1,4 +1,9 @@ +{ inputs, ... }: { + imports = [ + inputs.nixos-hardware.nixosModules.common-hidpi + ]; + environment.variables = { # better fonts: # https://web.archive.org/web/20230921201835/https://old.reddit.com/r/linux_gaming/comments/16lwgnj/is_it_possible_to_improve_font_rendering_on_linux/