From ab478a238e930293f6248f79dc613a352b204733 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Wed, 8 May 2024 20:50:30 -0400 Subject: [PATCH] actually works lol --- hosts/gerg-desktop/vfio.nix | 6 +++--- lib/default.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix index 48f48d4..deb4d87 100644 --- a/hosts/gerg-desktop/vfio.nix +++ b/hosts/gerg-desktop/vfio.nix @@ -1,4 +1,4 @@ -_: +{self, ...}: { pkgs, lib, @@ -55,13 +55,13 @@ in "Xorg/1_mon.conf".source = pkgs.runCommand "1_mon.conf" { } ( xserverbase + '' - cat ${./1_mon.conf} >> $out + cat ${self}/hosts/gerg-desktop/1_mon.conf >> $out '' ); "Xorg/2_mon.conf".source = pkgs.runCommand "2_mon.conf" { } ( xserverbase + '' - cat ${./2_mon.conf} >> $out + cat ${self}/hosts/gerg-desktop/1_mon.conf >> $out '' ); }; diff --git a/lib/default.nix b/lib/default.nix index 552be81..6cd1250 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -48,10 +48,8 @@ rec { lib.listToAttrs ( map (name: { name = lib.pipe name [ - - toString (lib.removeSuffix ".nix") - (lib.removePrefix "${toString path}/") + (lib.removePrefix "${path}/") ]; value = fixModuleSystem name; }) (listNixFilesRecursiveDiscardStringContext path)