feat: simplify rust settings, update xdg config

This commit is contained in:
winston 2023-11-05 08:30:08 +01:00
parent df80782198
commit c066d0c62b
Signed by: winston
GPG key ID: 3786770EDBC2B481
4 changed files with 7 additions and 36 deletions

View file

@ -6,7 +6,7 @@
}: let
inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
in {
imports = [./apps ./langs ./secrets/sops.nix ./xdg.nix];
imports = [./apps ./secrets/sops.nix ./xdg.nix];
home = {
packages = with pkgs; ([

View file

@ -1,5 +0,0 @@
{
imports = [
./rust.nix
];
}

View file

@ -1,30 +0,0 @@
{
config,
pkgs,
...
}: let
inherit (config.xdg) dataHome;
in {
home = rec {
packages = [
pkgs.sccache
pkgs.cargo-mommy
];
sessionVariables = {
CARGO_HOME = "${dataHome}/cargo";
CARGO_REGISTRIES_CRATES_IO_PROTOCOL = "sparse";
CARGO_UNSTABLE_SPARSE_REGISTRY = "true";
CARGO_MOMMYS_LITTLE = "boy";
CARGO_MOMMYS_PRONOUNS = "his";
CARGO_MOMMYS_ROLES = "daddy";
RUSTC_WRAPPER = "sccache";
RUSTUP_HOME = "${dataHome}/rustup";
};
sessionPath = [
"${sessionVariables.CARGO_HOME}/bin"
];
shellAliases = {
"cargo" = "cargo mommy";
};
};
}

View file

@ -12,13 +12,19 @@ in {
home = rec {
sessionVariables = {
AZURE_CONFIG_DIR = "${configHome}/azure";
BUNDLE_USER_CACHE = "${cacheHome}/bundle";
BUNDLE_USER_CONFIG = "${configHome}/bundle";
BUNDLE_USER_PLUGIN = "${dataHome}/bundle";
CARGO_HOME = "${dataHome}/cargo";
CUDA_CACHE_PATH = "${dataHome}/nv";
DOCKER_CONFIG = "${configHome}/docker";
GEM_HOME = "${dataHome}/gem";
GEM_SPEC_CACHE = "${cacheHome}/gem";
GOPATH = "${dataHome}/go";
IPYTHONDIR = "${configHome}/ipython";
NODE_REPL_HISTORY = "${dataHome}/node_repl_history";
NPM_CONFIG_USERCONFIG = "${configHome}/npm/npmrc";
RUSTUP_HOME = "${dataHome}/rustup";
W3M_DIR = "${dataHome}/w3m";
WAKATIME_HOME = "${configHome}/wakatime";
WINEPREFIX = "${dataHome}/wine";