mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(grfn): Prepare for restricted-eval

Browse source 
Change-Id: I672ad0898b2ef6a11f8bc9233da0ded4a296fe0e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5686
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2022-05-26 14:44:11 +02:00 committed by tazjin
parent 7a0a4224a5
commit 5d9d03057c
6 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
users/grfn/system/home/default.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
rec { rec {
home = confPath: (import "${pkgs.home-manager.src}/modules" { home = confPath: (import (pkgs.home-manager.src + "/modules") {
inherit pkgs; inherit pkgs;
configuration = { config, lib, ... }: { configuration = { config, lib, ... }: {

1
users/grfn/system/home/modules/common.nix
View file

@ -13,6 +13,7 @@
../modules/lib/cloneRepo.nix ../modules/lib/cloneRepo.nix
]; ];
home.username = "grfn";
home.homeDirectory = "/home/grfn"; home.homeDirectory = "/home/grfn";
programs.password-store.enable = true; programs.password-store.enable = true;

4
users/grfn/system/system/iso.nix
View file

@ -3,8 +3,8 @@
let let
configuration = { ... }: { configuration = { ... }: {
imports = [ imports = [
"${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" (pkgs.path + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
"${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" (pkgs.path + "/nixos/modules/installer/cd-dvd/channel.nix")
]; ];
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

8
users/grfn/system/system/machines/mugwump.nix
View file

@ -6,10 +6,10 @@ with lib;
imports = [ imports = [
../modules/common.nix ../modules/common.nix
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
"${depot.path}/ops/modules/prometheus-fail2ban-exporter.nix" (depot.path.origSrc + "/ops/modules/prometheus-fail2ban-exporter.nix")
"${depot.path}/users/grfn/xanthous/server/module.nix" (depot.path.origSrc + "/users/grfn/xanthous/server/module.nix")
"${depot.third_party.agenix.src}/modules/age.nix" (depot.third_party.agenix.src + "/modules/age.nix")
"${depot.path}/users/grfn/bbbg/module.nix" (depot.path.origSrc + "/users/grfn/bbbg/module.nix")
]; ];
networking.hostName = "mugwump"; networking.hostName = "mugwump";

2
users/grfn/terraform/nixosMachine.nix
View file

@ -15,7 +15,7 @@
let let
os = depot.ops.nixos.nixosFor ({ modulesPath, ... }: { os = depot.ops.nixos.nixosFor ({ modulesPath, ... }: {
imports = [ imports = [
"${pkgs.path}/nixos/modules/virtualisation/amazon-image.nix" (pkgs.path + "/nixos/modules/virtualisation/amazon-image.nix")
configuration configuration
]; ];

8
users/grfn/xanthous/server/default.nix
View file

@ -7,6 +7,14 @@ depot.third_party.naersk.buildPackage {
name = "xanthous-server"; name = "xanthous-server";
version = "0.0.1"; version = "0.0.1";
src = depot.third_party.gitignoreSource ./.; src = depot.third_party.gitignoreSource ./.;
# Workaround for a potential Nix bug related to restricted eval.
# See https://github.com/nix-community/naersk/issues/169
root = depot.nix.sparseTree ./. [
./Cargo.toml
./Cargo.lock
];
passthru = { passthru = {
docker = import ./docker.nix args; docker = import ./docker.nix args;
}; };