A few bits and bobs

This commit is contained in:
Smaug123
2022-01-26 20:17:50 +00:00
parent 49b4432235
commit 4cdf00f879
4 changed files with 22 additions and 7 deletions

View File

@@ -31,11 +31,7 @@ let python = import ./python.nix { inherit pkgs; }; in
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
environment.darwinConfig = "$HOME/.nixpkgs/darwin-configuration.nix";
nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/9516033899da467b8fcee6536a61ea66ebd0c4fa.tar.gz;
}))
];
nixpkgs.overlays = import ./overlays.nix;
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"vscode"
@@ -45,7 +41,9 @@ let python = import ./python.nix { inherit pkgs; }; in
services.nix-daemon.enable = true;
nix.package = pkgs.nixFlakes;
nix.gc.automatic = true;
nix.useSandbox = true;
# Sandbox causes failure: https://github.com/NixOS/nix/issues/4119
nix.useSandbox = false;
nix.extraOptions = ''
auto-optimise-store = true

View File

@@ -145,6 +145,9 @@ let dotnet = pkgs.dotnet-sdk_6; in
process = "${pkgs.git-lfs}/bin/git-lfs filter-process";
required = true;
};
pull = {
twohead = "ort";
};
};
};

14
overlays.nix Normal file
View File

@@ -0,0 +1,14 @@
[
(self: super: {
# https://github.com/NixOS/nixpkgs/issues/153304
alacritty = super.alacritty.overrideAttrs (
o: rec {
doCheck = false;
}
);
})
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/9516033899da467b8fcee6536a61ea66ebd0c4fa.tar.gz;
}))
]

View File

@@ -27,7 +27,7 @@ with pkgs.vscode-extensions; [
name = "rust-analyzer";
publisher = "matklad";
version = "0.3.904";
sha256 = "poprHSj19QVDaVynYXSypigsqLw5xDd629FUBSJrqdg=";
sha256 = "t5CCUdFCiSYrMsBHG5eOfg3sXMacFWiR0hmVa7S1i8Y=";
}
{
name = "vscode-lldb";