pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

top-level should direnv fine now (hwtr)

pull/5/head
pegasust 2023-01-12 11:04:56 -07:00
parent c6d74c6b3e
commit 313a5e7f3e
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -96,7 +96,7 @@
unit_tests = lib.runTests unit_tests; unit_tests = lib.runTests unit_tests;
secrets = import ./secrets final_inputs; secrets = import ./secrets final_inputs;
debug = { 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;
}; };
}; };
} }

58
overlays.nix
View File

@ -6,34 +6,36 @@ flake_input@{ kpcli-py, nixgl, rust-overlay, neovim-nightly-overlay, ... }: [
neovim-nightly-overlay.overlay neovim-nightly-overlay.overlay
(final: prev: (final: prev:
let let
nightlyRustWithExts = exts: final.rust-bin.selectLatestNightlyWith ( 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"]; );
rust-dev-components = rust-default-components ++ ["rust-src" "rust-analyzer" "miri"]; # https://rust-lang.github.io/rustup/concepts/profiles.html
in rust-default-components = [ "rust-docs" "rustfmt" "clippy" ];
{ rust-dev-components = rust-default-components ++ [ "rust-src" "rust-analyzer" "miri" ];
# use python3.9, which works because of cython somehow? in
kpcli-py = final.poetry2nix.mkPoetryApplication { {
projectDir = kpcli-py; # use python3.9, which works because of cython somehow?
python = final.python39; kpcli-py = final.poetry2nix.mkPoetryApplication {
overrides = final.poetry2nix.defaultPoetryOverrides.extend (self: super: { projectDir = kpcli-py;
# tableformatter requires setuptools python = final.python39;
tableformatter = super.tableformatter.overridePythonAttrs ( overrides = final.poetry2nix.defaultPoetryOverrides.extend (self: super: {
old: { # tableformatter requires setuptools
buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools super.cython_3 ]; tableformatter = super.tableformatter.overridePythonAttrs (
} old: {
); buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools super.cython_3 ];
}); }
}; );
});
rust4devs = nightlyRustWithExts rust-dev-components; };
rust4cargo = nightlyRustWithExts [];
rust4normi = nightlyRustWIthExts rust-default-components; rust4devs = nightlyRustWithExts rust-dev-components;
}) rust4cargo = nightlyRustWithExts [ ];
rust4normi = nightlyRustWithExts rust-default-components;
})
] ]

2
scripts/hm-switch.sh
View File

@ -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 # test if we have home-manager, if not, attempt to use nix to put home-manager to
# our environment # our environment
if [ $(home-manager >/dev/null 2>&1) ]; then 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" nix-shell -p home-manager --run "home-manager switch --flake $HOME_MANAGER_DIR"
else else
home-manager switch -b backup --flake "$HOME_MANAGER_DIR" home-manager switch -b backup --flake "$HOME_MANAGER_DIR"