From df4feef3298d9927f4a1400e96f4e21ac3ce5e26 Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 5 Jun 2023 22:05:49 +0200 Subject: [PATCH] feat: top-secret important commit --- home/default.nix | 1 + home/langs/default.nix | 5 +++++ home/langs/rust.nix | 30 ++++++++++++++++++++++++++++++ home/xdg.nix | 7 ------- 4 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 home/langs/default.nix create mode 100644 home/langs/rust.nix diff --git a/home/default.nix b/home/default.nix index 181ac55..cf86f7c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -22,6 +22,7 @@ in { ./apps/vscode.nix ./apps/wezterm.nix ./apps/zsh.nix + ./langs ./secrets/sops.nix ./xdg.nix ]; diff --git a/home/langs/default.nix b/home/langs/default.nix new file mode 100644 index 0000000..5b03eb0 --- /dev/null +++ b/home/langs/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./rust.nix + ]; +} diff --git a/home/langs/rust.nix b/home/langs/rust.nix new file mode 100644 index 0000000..335d61e --- /dev/null +++ b/home/langs/rust.nix @@ -0,0 +1,30 @@ +{ + 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"; + }; + }; +} diff --git a/home/xdg.nix b/home/xdg.nix index 52c0745..8078e48 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -10,12 +10,8 @@ inherit (config.home) homeDirectory; in { home = rec { - packages = [pkgs.sccache]; sessionVariables = { AZURE_CONFIG_DIR = "${configHome}/azure"; - CARGO_HOME = "${dataHome}/cargo"; - CARGO_REGISTRIES_CRATES_IO_PROTOCOL = "sparse"; - CARGO_UNSTABLE_SPARSE_REGISTRY = "true"; CUDA_CACHE_PATH = "${dataHome}/nv"; DOCKER_CONFIG = "${configHome}/docker"; GEM_HOME = "${dataHome}/gem"; @@ -23,8 +19,6 @@ in { GOPATH = "${dataHome}/go"; NODE_REPL_HISTORY = "${dataHome}/node_repl_history"; NPM_CONFIG_USERCONFIG = "${configHome}/npm/npmrc"; - RUSTC_WRAPPER = "sccache"; - RUSTUP_HOME = "${dataHome}/rustup"; W3M_DIR = "${dataHome}/w3m"; WINEPREFIX = "${dataHome}/wine"; XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; @@ -35,7 +29,6 @@ in { "$HOME/.local/bin" "${dataHome}/krew/bin" "${sessionVariables.GOPATH}/bin" - "${sessionVariables.CARGO_HOME}/bin" ]; };