Compare commits

..

4 commits

2 changed files with 8 additions and 5 deletions

View file

@ -21,20 +21,22 @@
outputs = inputs@{ self, nixpkgs, home-manager, agenix, birdsong, ... }: { outputs = inputs@{ self, nixpkgs, home-manager, agenix, birdsong, ... }: {
colmena = { colmena = {
meta.nixpkgs = import nixpkgs { system = "x86_64-linux"; }; meta.nixpkgs = import nixpkgs { system = "x86_64-linux"; };
nodeNixpkgs.kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow meta.nodeNixpkgs.kalessin = import nixpkgs { system = "aarch64-linux"; }; # TODO: this should be generated from the host config somehow
defaults = { name, nodes, config, lib, pkgs, ... }: { defaults = { name, nodes, config, lib, pkgs, ... }: {
deployment.replaceUnknownProfiles = lib.mkDefault false; deployment.replaceUnknownProfiles = lib.mkDefault false;
networking.hostName = name; networking.hostName = name;
nix.settings.experimental-features = "nix-command flakes"; nix.settings.experimental-features = "nix-command flakes";
nixpkgs.flake.source = nixpkgs;
nix.nixPath = [ "nixpkgs=flake:nixpkgs" ];
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
packageOverrides = pkgs: packageOverrides = pkgs:
let sources = import ./npins; let sources = import ./npins;
in { in {
agenix = agenix.packages.x86_64-linux.default; # TODO: This should check the host architecture agenix = agenix.packages.${config.nixpkgs.hostPlatform.system}.default;
nur = (import sources.nur { inherit pkgs; }); nur = (import sources.nur { inherit pkgs; });
}; };
}; };

View file

@ -1,9 +1,9 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, osConfig, ... }:
let let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (pkgs) fetchFromGitHub; inherit (pkgs) fetchFromGitHub;
system = "x86_64-linux"; # TODO: This should check the host architecture inherit (osConfig.nixpkgs.hostPlatform) system;
extensions = extensions =
(import (fetchFromGitHub { (import (fetchFromGitHub {
# On a stable channel, do NOT keep this up-to-date! VS Code extensions # On a stable channel, do NOT keep this up-to-date! VS Code extensions
@ -13,7 +13,8 @@ let
rev = "27ce569a199d2da1a8483fe3d69dd41664da3a63"; rev = "27ce569a199d2da1a8483fe3d69dd41664da3a63";
hash = "sha256-yyB4Kh3EFbYP+1JHza/IEeHwABypcYVi6vvWTmad/rY="; hash = "sha256-yyB4Kh3EFbYP+1JHza/IEeHwABypcYVi6vvWTmad/rY=";
})).extensions.${system}; })).extensions.${system};
in { in
{
programs.vscode = { programs.vscode = {
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
enableUpdateCheck = false; enableUpdateCheck = false;