From 0351d2098d0ba42eee95dcbe838f5e99dd243e88 Mon Sep 17 00:00:00 2001 From: TakeV Date: Wed, 29 Mar 2023 16:10:55 -0700 Subject: [PATCH 1/2] Make device conf search relative to the current project --- default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 6176808..1024928 100644 --- a/default.nix +++ b/default.nix @@ -1,12 +1,13 @@ # welcome to saturnOS config, run nixos-help if you need it . { config, pkgs, lib, ... }: let + PROJECT_ROOT = builtins.toString ./.; unstableTarball = builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; homeManagerTarball = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; homeManager = import "${homeManagerTarball}/nixos"; - deviceConf = import "/home/${sysConf.user}/.saturn/hosts/${sysConf.host}/"; + deviceConf = import "${PROJECT_ROOT}/hosts/${sysConf.host}/"; unstable = import unstableTarball config.nixpkgs.config; sysConf = import ./saturn/system.nix; in { From 1ad2de6882a86730b8dfc0c53d78871950c873a4 Mon Sep 17 00:00:00 2001 From: Bit Borealis Date: Wed, 29 Mar 2023 23:15:41 +0000 Subject: [PATCH 2/2] fix styling --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 1024928..a7bb5ed 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ # welcome to saturnOS config, run nixos-help if you need it . { config, pkgs, lib, ... }: let - PROJECT_ROOT = builtins.toString ./.; + projectRoot = builtins.toString ./.; unstableTarball = builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; homeManagerTarball = builtins.fetchTarball