Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/.envrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# shellcheck shell=bash
use flake
2 changes: 1 addition & 1 deletion channels.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rec {
# "Channel name" = {
# # This should be the <value> part of
# # https://hydra.nixos.org/job/<value>/latest-finished
# job = "project/jobset/jobname";
# job = "project/jobset/jobname";
#
# # When adding a new version, determine if it needs to be tagged as a
# # variant -- for example:
Expand Down
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Nixos org infra";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
Expand Down
1 change: 1 addition & 0 deletions non-critical-infra/.envrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# shellcheck shell=bash
use flake .#non-critical-infra
2 changes: 1 addition & 1 deletion non-critical-infra/modules/vaultwarden.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

services.vaultwarden = {
enable = true;
backupDir = "/var/lib/bitwarden_rs/backups/";
backupDir = "/var/backup/vaultwarden/";
environmentFile = "/var/lib/bitwarden_rs/vaultwarden.env";
config = {
DOMAIN = "https://vault.nixos.org";
Expand Down
1 change: 1 addition & 0 deletions terraform-iam/.envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# shellcheck shell=bash
use flake .#terraform-iam

export AWS_CONFIG_FILE=$PWD/aws-config
Expand Down
1 change: 1 addition & 0 deletions terraform/.envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# shellcheck shell=bash
use flake .#terraform

export AWS_CONFIG_FILE=$PWD/aws-config
Expand Down
10 changes: 7 additions & 3 deletions terraform/flake-module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ let
convert2Tofu =
provider:
provider.override (prev: {
homepage = builtins.replaceStrings [ "registry.terraform.io/providers" ] [
"registry.opentofu.org"
] prev.homepage;
homepage =
builtins.replaceStrings
[ "registry.terraform.io/providers" ]
[
"registry.opentofu.org"
]
prev.homepage;
});
in
{
Expand Down