diff options
| author | Grigory Shipunov | 2022-10-17 01:21:43 +0200 |
|---|---|---|
| committer | Grigory Shipunov | 2022-10-17 01:21:43 +0200 |
| commit | 78b28f5110feed1634bb22a6da4f0501a9101493 (patch) | |
| tree | 329ef46a1e613da59b23e1034f7891f6ccf74998 | |
| parent | 966f65a2fe332cfd5dace2f1bebd545fd1ba12d3 (diff) | |
clean up fenix and add direnv
| -rw-r--r-- | modules/devtools.nix | 31 | ||||
| -rw-r--r-- | modules/graphical.nix | 2 |
2 files changed, 20 insertions, 13 deletions
diff --git a/modules/devtools.nix b/modules/devtools.nix index e3fe07b..02e2bc6 100644 --- a/modules/devtools.nix +++ b/modules/devtools.nix @@ -1,9 +1,5 @@ { pkgs, inputs, ... }: { - nixpkgs.overlays = [ - inputs.fenix.overlay - inputs.emacs-overlay.overlay - ]; environment.systemPackages = with pkgs; [ # general cmake @@ -11,16 +7,27 @@ binutils clang clang-tools + direnv + (nix-direnv.override { enableFlakes = true; }) # rust - (inputs.fenix.packages."x86_64-linux".stable.withComponents [ - "cargo" - "clippy" - "rust-src" - "rustc" - "rustfmt" - ]) - rust-analyzer-nightly + (inputs.fenix.packages."x86_64-linux".stable.toolchain) # nix rnix-lsp ]; + + ## direnv + programs.bash.interactiveShellInit = '' + eval "$(direnv hook bash)" + ''; + programs.zsh.interactiveShellInit = '' + eval "$(direnv hook zsh)" + ''; + # nix options for derivations to persist garbage collection + nix.extraOptions = '' + keep-outputs = true + keep-derivations = true + ''; + environment.pathsToLink = [ + "/share/nix-direnv" + ]; } diff --git a/modules/graphical.nix b/modules/graphical.nix index 6a6aa1f..550b01e 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -58,8 +58,8 @@ allowBitmaps = true; useEmbeddedBitmaps = true; defaultFonts.emoji = [ - "Twitter Color Emoji" "Noto Color Emoji" + "Twitter Color Emoji" ]; }; |