fix: don't add local cache to builder
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
7893d37df5
commit
6be9d173b6
8 changed files with 51 additions and 28 deletions
|
@ -26,7 +26,6 @@
|
||||||
boot.tmp.useTmpfs = true;
|
boot.tmp.useTmpfs = true;
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
# Keep a version that works with nix-eval-jobs
|
|
||||||
package = pkgs.nixVersions.git.overrideAttrs (oldAttrs: {
|
package = pkgs.nixVersions.git.overrideAttrs (oldAttrs: {
|
||||||
pname = "nix";
|
pname = "nix";
|
||||||
version = "2.21.3";
|
version = "2.21.3";
|
||||||
|
@ -107,7 +106,10 @@
|
||||||
home.packages =
|
home.packages =
|
||||||
[
|
[
|
||||||
nix-melt.packages.${pkgs.system}.default
|
nix-melt.packages.${pkgs.system}.default
|
||||||
nurl.packages.${pkgs.system}.default
|
|
||||||
|
(nurl.packages.${pkgs.system}.default.override {
|
||||||
|
nix = config.nix.package;
|
||||||
|
})
|
||||||
]
|
]
|
||||||
++ (with config.nur.repos.rycee; [
|
++ (with config.nur.repos.rycee; [
|
||||||
mozilla-addons-to-nix
|
mozilla-addons-to-nix
|
||||||
|
|
|
@ -2,9 +2,10 @@
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableBashIntegration = true;
|
enableBashIntegration = true;
|
||||||
|
|
||||||
nix-direnv = {
|
nix-direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nix-direnv-flakes;
|
package = pkgs.nix-direnv;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,5 +27,14 @@
|
||||||
usbutils
|
usbutils
|
||||||
wget
|
wget
|
||||||
zip
|
zip
|
||||||
]);
|
])
|
||||||
|
++ [
|
||||||
|
# This could help as well: nix derivation show -r /run/current-system
|
||||||
|
(pkgs.writeShellApplication {
|
||||||
|
name = "listDerivs";
|
||||||
|
text = ''
|
||||||
|
nix-store --query --requisites /run/current-system | cut -d- -f2- | sort -u
|
||||||
|
'';
|
||||||
|
})
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
|
inherit (lib) optionals;
|
||||||
|
in {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writeShellApplication {
|
(pkgs.writeShellApplication {
|
||||||
name = "rebuild-no-cache";
|
name = "rebuild-no-cache";
|
||||||
|
@ -15,7 +18,8 @@
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
substituters = [
|
substituters =
|
||||||
|
[
|
||||||
"https://hyprland.cachix.org"
|
"https://hyprland.cachix.org"
|
||||||
"https://nix-gaming.cachix.org"
|
"https://nix-gaming.cachix.org"
|
||||||
# Nixpkgs-Wayland
|
# Nixpkgs-Wayland
|
||||||
|
@ -28,6 +32,8 @@
|
||||||
"https://viperml.cachix.org"
|
"https://viperml.cachix.org"
|
||||||
# Caddy
|
# Caddy
|
||||||
"https://caddycf.cachix.org"
|
"https://caddycf.cachix.org"
|
||||||
|
]
|
||||||
|
++ optionals (!config.services.nix-serve.enable) [
|
||||||
# Personal config cache
|
# Personal config cache
|
||||||
"https://cache.nelim.org"
|
"https://cache.nelim.org"
|
||||||
];
|
];
|
||||||
|
|
|
@ -8,12 +8,16 @@
|
||||||
inherit (config.vars) mainUser;
|
inherit (config.vars) mainUser;
|
||||||
inherit (config.sops) secrets;
|
inherit (config.sops) secrets;
|
||||||
|
|
||||||
nixPkg = {
|
nix-eval-jobsPkg =
|
||||||
|
nix-eval-jobs.packages.${pkgs.system}.default.override {
|
||||||
|
nix = config.nix.package;
|
||||||
|
}
|
||||||
|
// {
|
||||||
nix = config.nix.package;
|
nix = config.nix.package;
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
|
nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
|
||||||
nix-eval-jobs =
|
nix-eval-jobs = nix-eval-jobsPkg;
|
||||||
nix-eval-jobs.packages.${pkgs.system}.default.override nixPkg // nixPkg;
|
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
services.nix-serve = {
|
services.nix-serve = {
|
||||||
|
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
@ -9,8 +9,8 @@ let
|
||||||
|
|
||||||
# Inputs
|
# Inputs
|
||||||
nixTools = {
|
nixTools = {
|
||||||
nurl = mkInput {
|
nurl = mkDep {
|
||||||
owner = "nix-community";
|
owner = "matt1432";
|
||||||
repo = "nurl";
|
repo = "nurl";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -58,6 +58,7 @@ let
|
||||||
repo = "stylelint-lsp";
|
repo = "stylelint-lsp";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# uses nixVersions.nix_2_19
|
||||||
nixd = mkDep {
|
nixd = mkDep {
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
repo = "nixd";
|
repo = "nixd";
|
||||||
|
|
Loading…
Reference in a new issue