top-level should direnv fine now (hwtr)
parent
c6d74c6b3e
commit
313a5e7f3e
|
@ -96,7 +96,7 @@
|
|||
unit_tests = lib.runTests unit_tests;
|
||||
secrets = import ./secrets final_inputs;
|
||||
debug = {
|
||||
inherit final_inputs hosts users modules lib inputs_w_pkgs unit_tests pkgs;
|
||||
inherit final_inputs hosts users modules lib inputs_w_lib unit_tests pkgs;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,7 +9,9 @@ flake_input@{ kpcli-py, nixgl, rust-overlay, neovim-nightly-overlay, ... }: [
|
|||
(final: prev:
|
||||
let
|
||||
nightlyRustWithExts = exts: final.rust-bin.selectLatestNightlyWith (
|
||||
toolchain: toolchain.minimal.override.extensions = exts;
|
||||
toolchain: (toolchain.minimal.override {
|
||||
extensions = exts;
|
||||
})
|
||||
);
|
||||
# https://rust-lang.github.io/rustup/concepts/profiles.html
|
||||
rust-default-components = [ "rust-docs" "rustfmt" "clippy" ];
|
||||
|
@ -32,7 +34,7 @@ flake_input@{ kpcli-py, nixgl, rust-overlay, neovim-nightly-overlay, ... }: [
|
|||
|
||||
rust4devs = nightlyRustWithExts rust-dev-components;
|
||||
rust4cargo = nightlyRustWithExts [ ];
|
||||
rust4normi = nightlyRustWIthExts rust-default-components;
|
||||
rust4normi = nightlyRustWithExts rust-default-components;
|
||||
})
|
||||
|
||||
]
|
||||
|
|
|
@ -13,6 +13,8 @@ rm -rf ~/.local/share/nvim/mason
|
|||
# test if we have home-manager, if not, attempt to use nix to put home-manager to
|
||||
# our environment
|
||||
if [ $(home-manager >/dev/null 2>&1) ]; then
|
||||
# highly likely we don't even have nix support to start with, so let's fix that
|
||||
sudo mv /etc/
|
||||
nix-shell -p home-manager --run "home-manager switch --flake $HOME_MANAGER_DIR"
|
||||
else
|
||||
home-manager switch -b backup --flake "$HOME_MANAGER_DIR"
|
||||
|
|
Loading…
Reference in New Issue