diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2021-03-07 15:40:52 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2021-03-07 15:40:52 -0500 |
| commit | 0f687ac0289b9d6402ebd595f84b774a7294aab9 (patch) | |
| tree | d85f4af7c69194b583748127b2c7cbb860543d2c /machines | |
| parent | 78529ae2641e8645ee3459753819d0ecff655d86 (diff) | |
Fix errors
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/dragon.nix | 2 | ||||
| -rw-r--r-- | machines/firelink.nix | 9 | ||||
| -rw-r--r-- | machines/x1-pincer.nix | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/machines/dragon.nix b/machines/dragon.nix index 63479c9..cded6e7 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -8,8 +8,6 @@ in #../config/minecraft.nix ../config/mpd.nix ../config/borg-backup.nix - ../config/common.nix - ../config/users.nix # ../config/weechat.nix ../config/dns.nix # ../config/hydra.nix diff --git a/machines/firelink.nix b/machines/firelink.nix index 9ccaa7c..b04c60b 100644 --- a/machines/firelink.nix +++ b/machines/firelink.nix @@ -7,7 +7,7 @@ let patches = [../patches/xow/0001-Single-controller-patch.patch]; }); my-linuxPackages = - let linuxPkgs = super.my-extras.nixpkgs-unstable.legacyPackages.${pkgs.system}.linuxPackages_latest; + let linuxPkgs = super.unstable.linuxPackages_latest; in linuxPkgs.extend (self: super: { # xpadneo = super.xpadneo.overrideAttrs (o: rec { # version = "master"; @@ -22,13 +22,8 @@ let }; in { - imports = [ - ../config/common.nix - ../config/desktop.nix - ../config/yubikey.nix - ]; - orbekk.gaming.enable = true; + orbekk.desktop.enable = true; environment.systemPackages = with pkgs; [ openmw diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix index 35523d6..8c20c59 100644 --- a/machines/x1-pincer.nix +++ b/machines/x1-pincer.nix @@ -3,7 +3,7 @@ let ports = { minecraft = 25565; }; in { - # orbekk.gaming.enable = true; + orbekk.gaming.enable = true; orbekk.desktop.enable = true; orbekk.thinkpad.enable = true; |