Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
931ee4f862
|
|||
|
81ae20f672
|
|||
|
5a03f66a34
|
|||
| a5b2e46586 | |||
| 64c1ea18e0 | |||
| 1a866719ea | |||
| a0125116cd | |||
| 2c6ea390f0 | |||
| 78df628955 | |||
| fae8f3580a | |||
| b6e8297085 | |||
| 8864af1ddf | |||
|
5942c97c1c
|
|||
| 1c2f11debc | |||
| 4d55336eeb |
@@ -10,14 +10,6 @@
|
||||
PermitRootLogin = "no";
|
||||
};
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 22 ];
|
||||
||||||| parent of 1c2f11d (lib/ssh: add more ssh keys)
|
||||
|
||||
users.users.root.openssh.authorizedKeys.keys = builtins.attrValues {
|
||||
inherit (import "${self}/lib/ssh/keys.nix") error javalsai;
|
||||
};
|
||||
=======
|
||||
>>>>>>> 1c2f11d (lib/ssh: add more ssh keys)
|
||||
}
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
memorySize = 4096;
|
||||
|
||||
qemu.networkingOptions = lib.mkForce [
|
||||
"-nic bridge,br=virbr0,id=hn0,model=virt-net-pci,helper=\${QEMU_BRIDGE_HELPER_PATH}"
|
||||
"-device virtio-net-pci,netdev=hn0,id=nic1,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
|
||||
"-net nic,netdev=user.0,model=virtio"
|
||||
"-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,24 +5,6 @@
|
||||
{
|
||||
devShells.default = pkgs.mkShell {
|
||||
name = "configuration.nix";
|
||||
|
||||
shellHook = ''
|
||||
for path in \
|
||||
/usr/lib/qemu/qemu-bridge-helper \
|
||||
/run/wrappers/bin/qemu-bridge-helper
|
||||
do
|
||||
if [ -x "$path" ]; then
|
||||
export QEMU_BRIDGE_HELPER_PATH="$path"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$QEMU_BRIDGE_HELPER_PATH" ]; then
|
||||
printf "\033[1;33m%s\033[0m\n" \
|
||||
"WARN: 'qemu-bridge-helper' not found, make sure it is installed and the nix shell hook is looking for it" >&2
|
||||
fi
|
||||
'';
|
||||
|
||||
packages = with pkgs; [
|
||||
bat
|
||||
cachix
|
||||
|
||||
Reference in New Issue
Block a user