summaryrefslogtreecommitdiff
path: root/machines
diff options
context:
space:
mode:
Diffstat (limited to 'machines')
-rw-r--r--machines/firelink.nix4
-rw-r--r--machines/x1-pincer.nix14
-rw-r--r--machines/x220-aji.nix1
3 files changed, 8 insertions, 11 deletions
diff --git a/machines/firelink.nix b/machines/firelink.nix
index 22c42eb..9ccaa7c 100644
--- a/machines/firelink.nix
+++ b/machines/firelink.nix
@@ -23,13 +23,13 @@ let
in
{
imports = [
- ../config/gaming.nix
- # ../config/ap.nix
../config/common.nix
../config/desktop.nix
../config/yubikey.nix
];
+ orbekk.gaming.enable = true;
+
environment.systemPackages = with pkgs; [
openmw
kodi
diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix
index ec6fe50..35523d6 100644
--- a/machines/x1-pincer.nix
+++ b/machines/x1-pincer.nix
@@ -3,17 +3,12 @@ let ports = {
minecraft = 25565;
}; in
{
- networking.networkmanager.enable = true;
+ # orbekk.gaming.enable = true;
+ orbekk.desktop.enable = true;
+ orbekk.thinkpad.enable = true;
+ networking.networkmanager.enable = true;
networking.firewall.allowedTCPPorts = [ ports.minecraft ]; # socks proxy
- imports = [
- ../config/desktop.nix
- #../config/laptop.nix
- ../config/yubikey.nix
- ../config/thinkpad.nix
- # ../config/ap.nix
- # ../config/pxe.nix
- ];
networking = {
hostName = "pincer";
@@ -82,4 +77,5 @@ let ports = {
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" ];
nix.maxJobs = lib.mkDefault 4;
hardware.enableRedistributableFirmware = lib.mkDefault true;
+ system.stateVersion = "17.04";
}
diff --git a/machines/x220-aji.nix b/machines/x220-aji.nix
index eb41e3c..b05f16a 100644
--- a/machines/x220-aji.nix
+++ b/machines/x220-aji.nix
@@ -75,4 +75,5 @@
swapDevices =
[ { device = "/dev/mapper/cryptvg-swap"; }
];
+ system.stateVersion = "17.04";
}