fallingsky04
/
nixos-config
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix things

This commit is contained in:
fallingsky04 2024-09-15 18:39:01 +00:00
parent 7478740a0a
commit 199d06538a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.nix
View File

@ -143,7 +143,6 @@
publicKey = "il12KBAwODC1TTZgT4JIL0f6AZcYWxylmuVlTlWd80s="; publicKey = "il12KBAwODC1TTZgT4JIL0f6AZcYWxylmuVlTlWd80s=";
allowedIPs = [ "10.100.0.18/32" ]; allowedIPs = [ "10.100.0.18/32" ];
} }
<<<<<<< HEAD
{ # Mari { # Mari
publicKey = "NfEjPn+ZYgB1vfNZ353AQOKPZLKUt4gPoNUSrywXjl0="; publicKey = "NfEjPn+ZYgB1vfNZ353AQOKPZLKUt4gPoNUSrywXjl0=";
allowedIPs = [ "10.100.0.20/32" ] allowedIPs = [ "10.100.0.20/32" ]
@ -152,7 +151,6 @@
publicKey = "k+PkzHREDszWnzvY79JcBL2XCkwtQ/XSunxNft7pjwY="; publicKey = "k+PkzHREDszWnzvY79JcBL2XCkwtQ/XSunxNft7pjwY=";
allowedIPs = ["10.100.0.19/32"]; allowedIPs = ["10.100.0.19/32"];
} }
>>>>>>> f246dff (add witu)
]; ];
}; };
}; };