fix merge conflict with bulwark

This commit is contained in:
Tyler Starr 2024-12-19 11:14:47 -08:00
commit 94b7310dc7
6 changed files with 6 additions and 6 deletions

View File

@ -9,7 +9,7 @@
"user": "tstarr"
},
"bulwark": {
"user": "test"
"user": "tstarr"
},
"osprey": {
"user": "tstarr"

View File

@ -1,4 +1,4 @@
{ lib, specialArgs, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
{ lib, specialArgs, system, inputs, agenix, home-manager, jovian-nixos, ... }:
let
user = specialArgs.user;
in {

View File

@ -1,4 +1,4 @@
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
let
user = specialArgs.user;
in {

View File

@ -1,4 +1,4 @@
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
let
user = specialArgs.user;
in {

View File

@ -1,4 +1,4 @@
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
let
user = specialArgs.user;
in {

View File

@ -1,4 +1,4 @@
{ lib, specialArgs, system, user, inputs, agenix, home-manager, nixos-wsl, ... }:
{ lib, specialArgs, system, inputs, agenix, home-manager, nixos-wsl, ... }:
let
user = specialArgs.user;
in {