From 57e1f9a17cd8369d37b757ed18d2b0f05c38abb1 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 22 Dec 2024 04:52:07 -0500 Subject: [PATCH] fix(droid): set the correct options attr --- homeManagerModules/neovim/langs/nix-lang/default.nix | 6 +++++- modules/base/substituters/default.nix | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/homeManagerModules/neovim/langs/nix-lang/default.nix b/homeManagerModules/neovim/langs/nix-lang/default.nix index 354b7335..18c79af6 100644 --- a/homeManagerModules/neovim/langs/nix-lang/default.nix +++ b/homeManagerModules/neovim/langs/nix-lang/default.nix @@ -18,6 +18,10 @@ self: { flakeEnv = config.programs.bash.sessionVariables.FLAKE; flakeDir = "${removePrefix "${mainHmCfg.home.homeDirectory}/" flakeEnv}"; + optionsAttr = + if osConfig != null + then "nixosConfigurations.${hostName}.options" + else "nixOnDroidConfigurations.default"; in { config = mkIf cfg.enable { assertions = [ @@ -46,7 +50,7 @@ in { expr = "import (builtins.getFlake \"${flakeDir}\").inputs.nixpkgs {}"; }; options.nixos = { - expr = "(builtins.getFlake \"${flakeDir}\").nixosConfigurations.${hostName}.options"; + expr = "(builtins.getFlake \"${flakeDir}\").${optionsAttr}"; }; }; diff --git a/modules/base/substituters/default.nix b/modules/base/substituters/default.nix index 7c592f36..6ac2cf2d 100644 --- a/modules/base/substituters/default.nix +++ b/modules/base/substituters/default.nix @@ -34,13 +34,14 @@ in }; in mergeAttrsList ([ - (mkSubstituterConf 1000 "https://cache.nixos.org" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=") + (mkSubstituterConf 200 "https://cache.nixos.org" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=") (mkSubstituterConf 1000 "https://hyprland.cachix.org" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=") (mkSubstituterConf 1000 "https://nix-gaming.cachix.org" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=") (mkSubstituterConf 1000 "https://nixpkgs-wayland.cachix.org" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=") (mkSubstituterConf 1000 "https://nix-community.cachix.org" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=") (mkSubstituterConf 1000 "https://viperml.cachix.org" "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8=") (mkSubstituterConf 1000 "https://cuda-maintainers.cachix.org" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=") + (mkSubstituterConf 1100 "https://nix-on-droid.cachix.org" "nix-on-droid.cachix.org-1:56snoMJTXmDRC1Ei24CmKoUqvHJ9XCp+nidK7qkMQrU=") ] ++ optionals (config.networking.hostName != "servivi") [ (mkSubstituterConf 100 "https://cache.nelim.org" "cache.nelim.org:JmFqkUdH11EA9EZOFAGVHuRYp7EbsdJDHvTQzG2pPyY=")