mirror of
https://github.com/starr-dusT/dotfiles.git
synced 2025-02-16 01:37:31 -08:00
fix merge conflict with bulwark
This commit is contained in:
commit
94b7310dc7
@ -9,7 +9,7 @@
|
||||
"user": "tstarr"
|
||||
},
|
||||
"bulwark": {
|
||||
"user": "test"
|
||||
"user": "tstarr"
|
||||
},
|
||||
"osprey": {
|
||||
"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
|
||||
user = specialArgs.user;
|
||||
in {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
|
||||
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
|
||||
let
|
||||
user = specialArgs.user;
|
||||
in {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
|
||||
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
|
||||
let
|
||||
user = specialArgs.user;
|
||||
in {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, specialArgs, system, user, inputs, agenix, home-manager, ... }:
|
||||
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }:
|
||||
let
|
||||
user = specialArgs.user;
|
||||
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
|
||||
user = specialArgs.user;
|
||||
in {
|
||||
|
Loading…
x
Reference in New Issue
Block a user