misc: various changes
This commit is contained in:
parent
5e2a68566b
commit
4944f2ba36
10 changed files with 99 additions and 60 deletions
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
assertions = [
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
options,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
|
@ -30,6 +29,23 @@
|
|||
./libvirtd.nix
|
||||
];
|
||||
|
||||
# So that I can get to the netgear router
|
||||
networking.extraHosts = ''
|
||||
10.0.0.152 routerlogin.net
|
||||
10.0.0.152 www.routerlogin.net
|
||||
'';
|
||||
|
||||
services.flatpak.enable = true;
|
||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
xdg.portal.config.common.default = "gtk";
|
||||
|
||||
security.polkit.enable = true;
|
||||
systemd.services.fprxintd = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig.Type = "simple";
|
||||
};
|
||||
services.fprintd.enable = true;
|
||||
|
||||
vfio = {
|
||||
enable = true;
|
||||
earlyKMS = true;
|
||||
|
@ -101,6 +117,7 @@
|
|||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg)
|
||||
[
|
||||
"keyguard"
|
||||
"steam"
|
||||
# "steam-original"
|
||||
# "steam-run"
|
||||
|
@ -139,9 +156,36 @@
|
|||
};
|
||||
services.openssh.enable = true;
|
||||
|
||||
### Stuff for running a dhcp server for wobbuffet stuff
|
||||
### MAKE SURE TO DISABLE THIS BEFORE NORMAL OPERATION
|
||||
# networking.networkmanager.dns = "dnsmasq";
|
||||
|
||||
# systemd.network.networks = {
|
||||
# matchConfig.name = "en0";
|
||||
# address = [
|
||||
# "192.168.70.1/24"
|
||||
# ];
|
||||
# networkConfig = {
|
||||
# ConfigureWithoutCarrier = true;
|
||||
# };
|
||||
# };
|
||||
|
||||
# services.dnsmasq = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# port = 0;
|
||||
# interface = "en0";
|
||||
# listen-address = "192.168.70.1";
|
||||
# dhcp-range = [ "192.168.70.2,192.168.70.255,1h" ];
|
||||
# dhcp-option = "option:router,192.168.70.1";
|
||||
# };
|
||||
# };
|
||||
|
||||
### System software
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.bolt-launcher
|
||||
|
||||
pkgs.git
|
||||
pkgs.gdu
|
||||
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
services.xserver.enable = true;
|
||||
|
|
40
nixos/vm.nix
40
nixos/vm.nix
|
@ -59,7 +59,7 @@ in {
|
|||
fi
|
||||
'';
|
||||
in
|
||||
pkgs.writeTextDir "/lib/udev/rules.d/99-vm-attach-usb-anker-hub.rules" ''
|
||||
pkgs.writeTextDir "/lib/udev/rules.d/60-vm-attach-usb-anker-hub.rules" ''
|
||||
SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="5411", ATTR{idVendor}!="0bda", ATTR{idProduct}!="5411", RUN+="${updateBin}"
|
||||
SUBSYSTEM=="usb", ACTION=="remove", RUN+="${updateBin}"
|
||||
''
|
||||
|
@ -88,6 +88,29 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
networking.dhcpcd.denyInterfaces = [ "winvm0" ];
|
||||
|
||||
# ensure the bridge network doesn't cause us to wait
|
||||
# on boot
|
||||
systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
|
||||
boot.initrd.systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
|
||||
|
||||
# These are needed, since I'm not currently trying to
|
||||
# reserve a static IP for the bridge interface
|
||||
networking.interfaces.winvm0 = {
|
||||
useDHCP = false;
|
||||
ipv4 = {
|
||||
addresses = [
|
||||
{ address = "10.0.5.1"; prefixLength = 16; }
|
||||
];
|
||||
routes = [{
|
||||
address = "10.0.0.0";
|
||||
prefixLength = 16;
|
||||
options = { scope = "link"; metric = "900"; };
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
# For sharing filesystems
|
||||
# I followed https://www.heiko-sieger.info/sharing-files-between-the-linux-host-and-a-windows-vm-using-virtiofs/
|
||||
|
@ -101,21 +124,6 @@ in {
|
|||
pkgs.scream
|
||||
];
|
||||
|
||||
# These are needed, since I'm not currently trying to
|
||||
# reserve a static IP for the bridge interface
|
||||
networking.interfaces.winvm0 = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [
|
||||
{ address = "10.0.5.1"; prefixLength = 16; }
|
||||
];
|
||||
};
|
||||
|
||||
# Trying to ensure the bridge network doesn't cause us to wait
|
||||
# on boot
|
||||
systemd.services.network-addresses-eth0.before = lib.mkForce [ ];
|
||||
systemd.services.network-addresses-winvm0.before = lib.mkForce [ ];
|
||||
systemd.services.winvm0-netdev.before = lib.mkForce [ ];
|
||||
|
||||
programs.virt-manager.enable = true;
|
||||
users.groups.libvirtd.members = ["evar"]; # let me do stuff with vms
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue