mirror of
https://github.com/starr-dusT/dotfiles.git
synced 2025-02-19 03:07:32 -08:00
fix merge conflict with bulwark
This commit is contained in:
commit
94b7310dc7
@ -9,7 +9,7 @@
|
|||||||
"user": "tstarr"
|
"user": "tstarr"
|
||||||
},
|
},
|
||||||
"bulwark": {
|
"bulwark": {
|
||||||
"user": "test"
|
"user": "tstarr"
|
||||||
},
|
},
|
||||||
"osprey": {
|
"osprey": {
|
||||||
"user": "tstarr"
|
"user": "tstarr"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
|
{ lib, specialArgs, system, inputs, agenix, home-manager, jovian-nixos, ... }:
|
||||||
let
|
let
|
||||||
user = specialArgs.user;
|
user = specialArgs.user;
|
||||||
in {
|
in {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
|
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
|
||||||
let
|
let
|
||||||
user = specialArgs.user;
|
user = specialArgs.user;
|
||||||
in {
|
in {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
|
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
|
||||||
let
|
let
|
||||||
user = specialArgs.user;
|
user = specialArgs.user;
|
||||||
in {
|
in {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
|
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
|
||||||
let
|
let
|
||||||
user = specialArgs.user;
|
user = specialArgs.user;
|
||||||
in {
|
in {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, nixos-wsl, ... }:
|
{ lib, specialArgs, system, inputs, agenix, home-manager, nixos-wsl, ... }:
|
||||||
let
|
let
|
||||||
user = specialArgs.user;
|
user = specialArgs.user;
|
||||||
in {
|
in {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user