From b3c8f5b550970d194b565733292710fac61289fa Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 6 Jun 2019 11:27:45 -0700
Subject: [PATCH] [NixOS] Move some stuff around

---
 nixos/configuration.nix            | 4 +---
 nixos/machines/dfinity-blade15.nix | 2 ++
 nixos/machines/imalison-home.nix   | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index fa30e586..e90a56a8 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -128,6 +128,7 @@ in
     haskellPackages.gtk-sni-tray
     haskellPackages.status-notifier-item
     haskellPackages.xmonad
+    haskellPackages.taffybar
 
     autorandr
     betterlockscreen
@@ -272,9 +273,6 @@ in
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
   programs.adb.enable = true;
 
-  services.tlp.enable = true;
-  services.acpid.enable = false;
-
   services.openssh.enable = true;
 
   services.avahi = {
diff --git a/nixos/machines/dfinity-blade15.nix b/nixos/machines/dfinity-blade15.nix
index 6cc4818a..31bb085c 100644
--- a/nixos/machines/dfinity-blade15.nix
+++ b/nixos/machines/dfinity-blade15.nix
@@ -19,6 +19,8 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   services.xserver.libinput.enable = true;
+  services.tlp.enable = true;
+  services.acpid.enable = false;
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6";
diff --git a/nixos/machines/imalison-home.nix b/nixos/machines/imalison-home.nix
index 7c1b2fae..dad05f52 100644
--- a/nixos/machines/imalison-home.nix
+++ b/nixos/machines/imalison-home.nix
@@ -4,9 +4,7 @@
   imports = [
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ../configuration.nix
-    ../games.nix
     ../cachix.nix
-    ../extra.nix
   ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];