diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2025-12-05 13:59:04 -0700 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2025-12-05 13:59:04 -0700 |
| commit | 20e19407fdda236840e6afa5edeef49f9c0dbece (patch) | |
| tree | dabc91a1db5e2896d615da56f49ef8190babe481 /machines | |
| parent | 5a2f357efb76b7adfcb361c560ae6706f225bbcc (diff) | |
upgrade major version to 25.11
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/khad/default.nix | 6 | ||||
| -rw-r--r-- | machines/vm/foolcreek/default.nix | 22 | ||||
| -rw-r--r-- | machines/zenbook/default.nix | 6 |
3 files changed, 15 insertions, 19 deletions
diff --git a/machines/khad/default.nix b/machines/khad/default.nix index 0f3e32f..67a6f26 100644 --- a/machines/khad/default.nix +++ b/machines/khad/default.nix @@ -54,10 +54,6 @@ enable = true; enable32Bit = true; }; - amdgpu.amdvlk = { - enable = true; - support32Bit.enable = true; - }; }; environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/khad/configuration.nix"''; @@ -125,7 +121,7 @@ android-tools adbfs-rootless xorg.xrandr - glxinfo + mesa-demos gpu-viewer hardinfo2 starsector diff --git a/machines/vm/foolcreek/default.nix b/machines/vm/foolcreek/default.nix index 624c6a7..ad3fc92 100644 --- a/machines/vm/foolcreek/default.nix +++ b/machines/vm/foolcreek/default.nix @@ -26,23 +26,23 @@ # }; # }; microvm = { - forwardPorts = [ # forward local port 2222-> 22, to ssh into the VM - { from = "host"; host.port = 2222; guest.port = 22; } + # forwardPorts = [ # forward local port 2222-> 22, to ssh into the VM + # { from = "host"; host.port = 2222; guest.port = 22; } - # forward local port 80 -> 10.1.11.100:80 in the VLAN - { from = "guest"; host.port = 8080; guest.port = 80; # website - # guest.address = "10.1.11.101"; guest.port = 80; - # host.address = "127.0.0.1"; host.port = 80; - } - ]; - interfaces =[ + # # forward local port 80 -> 10.1.11.100:80 in the VLAN + # { from = "guest"; host.port = 8080; guest.port = 80; # website + # # guest.address = "10.1.11.101"; guest.port = 80; + # # host.address = "127.0.0.1"; host.port = 80; + # } + # ]; + # interfaces =[ # { # type = "tap"; # id = "vm-foolcreek"; # mac = "02:00:00:00:00:01"; # } - { type = "user"; } - ]; + # { type = "user"; } + # ]; }; systemd.network = { diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix index 7edf9d2..8352802 100644 --- a/machines/zenbook/default.nix +++ b/machines/zenbook/default.nix @@ -152,9 +152,9 @@ # enable the OpenSSH daemon services.openssh.enable = true; - services.udev.packages = [ # for flashing calyxos - pkgs.android-udev-rules - ]; + # services.udev.packages = [ # for flashing calyxos + # pkgs.android-udev-rules + # ]; # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you |