Skip to content

Commit

Permalink
Move cache settings to flake
Browse files Browse the repository at this point in the history
  • Loading branch information
arunoruto committed Dec 15, 2024
1 parent 45a5d78 commit 27619fe
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:
# --impure
# --show-trace
# run: NIXPKGS_ALLOW_INSECURE=1 nix flake check --no-build --accept-flake-config --impure
run: NIXPKGS_ALLOW_INSECURE=1 nix flake check --impure
run: NIXPKGS_ALLOW_INSECURE=1 nix flake check --accept-flake-config --impure
22 changes: 14 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,18 @@
# packages.${system} = import ./pkgs nixpkgs.legacyPackages.${system};
};

# nixConfig = {
# extra-substituters = [
# "https://wezterm.cachix.org"
# ];
# extra-trusted-public-keys = [
# "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
# ];
# };
nixConfig = {
extra-substituters = [
"https://nix-community.cachix.org"
"https://helix.cachix.org"
"https://wezterm.cachix.org"
"https://cuda-maintainers.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
];
};
}
16 changes: 8 additions & 8 deletions modules/home-manager/server/nix-utils.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ in
"flakes"
# "pipe-operators"
];
extra-substituters = [
"https://helix.cachix.org"
"https://wezterm.cachix.org"
];
extra-trusted-public-keys = [
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
];
# extra-substituters = [
# "https://helix.cachix.org"
# "https://wezterm.cachix.org"
# ];
# extra-trusted-public-keys = [
# "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
# "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
# ];
};
extraOptions = ''
trusted-users = root ${user}
Expand Down
20 changes: 10 additions & 10 deletions modules/nixos/system/nix-utils.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
"flakes"
"pipe-operators"
];
extra-substituters = [
"https://nix-community.cachix.org"
"https://helix.cachix.org"
"https://wezterm.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
];
# extra-substituters = [
# "https://nix-community.cachix.org"
# "https://helix.cachix.org"
# "https://wezterm.cachix.org"
# ];
# extra-trusted-public-keys = [
# "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
# "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
# "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
# ];
};
# extraOptions = ''
# trusted-users = root ${username}
Expand Down
16 changes: 8 additions & 8 deletions modules/nixos/system/nvidia/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
options.hosts.nvidia.enable = lib.mkEnableOption "Setup Nvidia environment";

config = lib.mkIf config.hosts.nvidia.enable {
nix.settings = {
extra-substituters = [
"https://cuda-maintainers.cachix.org"
];
extra-trusted-public-keys = [
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
];
};
# nix.settings = {
# extra-substituters = [
# "https://cuda-maintainers.cachix.org"
# ];
# extra-trusted-public-keys = [
# "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
# ];
# };

# Latest kernel does not work well with some web browsers...
boot.kernelPackages = pkgs.linuxPackages;
Expand Down

0 comments on commit 27619fe

Please sign in to comment.