From 99f59ffb8c2fc5069c636cdbf589cf27f5a85ec6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 1 Apr 2015 18:31:48 +0200
Subject: labtop: Merge hardware config into one labtop.nix.

This reverts the split up of the config from 55ec3a1 and puts all the
stuff from the hardware configuration file into the main config. The
reason for this is that vuizvui is structured so that the machine
definition *IS* the actual hardware configuration which deviates from a
common profile.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/labnet/labtop/configuration.nix          | 88 -----------------------
 machines/labnet/labtop/hardware-configuration.nix | 26 -------
 2 files changed, 114 deletions(-)
 delete mode 100644 machines/labnet/labtop/configuration.nix
 delete mode 100644 machines/labnet/labtop/hardware-configuration.nix

(limited to 'machines/labnet/labtop')

diff --git a/machines/labnet/labtop/configuration.nix b/machines/labnet/labtop/configuration.nix
deleted file mode 100644
index b1d54b2a..00000000
--- a/machines/labnet/labtop/configuration.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ pkgs, ... }:
-
-let
-  greybird = pkgs.stdenv.mkDerivation {
-    name = "greybird-xfce-theme";
-
-    src = pkgs.fetchFromGitHub {
-      repo = "Greybird";
-      owner = "shimmerproject";
-      rev = "61ec18d22780aa87998381599c941e0cf4f7bfb5";
-      sha256 = "03h8hba4lfp337a4drylcplrbggry9gz8dq1f3gjy25fhqkgvq05";
-    };
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
-      mkdir -p "$out/share/themes/Greybird" \
-               "$out/share/themes/Greybird-compact/xfwm4"
-      cp -vrt "$out/share/themes/Greybird" \
-        gtk-* metacity-1 unity xfce-notify-4.0 xfwm4
-      cp -vrt "$out/share/themes/Greybird-compact/xfwm4" \
-        xfwm4_compact/*
-    '';
-  };
-
-in {
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  i18n = {
-    consoleFont = "lat9w-16";
-    consoleKeyMap = "us";
-    defaultLocale = "de_DE.UTF-8";
-  };
-
-  fileSystems."/".label = "root";
-  boot.loader.grub.device = "/dev/sda";
-
-  environment.systemPackages = with pkgs; [
-    greybird
-    #repetierhost <- TODO
-    firefox
-    gimp
-    git
-    freecad
-    openscad
-    #pronterface <- TODO
-    blender
-    #slic3r
-    libreoffice
-    inkscape
-    filezilla
-    gmpc
-    vlc
-    vim
-    wget
-  ];
-
-  # TODO: Needed for slic3r right now.
-  nixpkgs.config.allowBroken = true;
-
-  services.xserver.enable = true;
-  services.xserver.layout = "us";
-  services.xserver.xkbOptions = "eurosign:e";
-
-  services.xserver.displayManager.auto.enable = true;
-  services.xserver.displayManager.auto.user = "openlab";
-  services.xserver.desktopManager.xfce.enable = true;
-
-  services.openssh.enable = true;
-
-  networking.networkmanager.enable = true;
-
-  users.mutableUsers = false;
-  users.extraUsers.openlab = {
-    uid = 1000;
-    isNormalUser = true;
-    password = "openlab";
-    extraGroups = [ "wheel" "networkmanager" ];
-    openssh.authorizedKeys.keys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJhthfk38lzDvoI7lPqRneI0yBpZEhLDGRBpcXzpPSu+V0YlgrDix5fHhBl+EKfw4aeQNvQNuAky3pDtX+BDK1b7idbz9ZMCExy2a1kBKDVJz/onLSQxiiZMuHlAljVj9iU4uoTOxX3vB85Ok9aZtMP1rByRIWR9e81/km4HdfZTCjFVRLWfvo0s29H7l0fnbG9bb2E6kydlvjnXJnZFXX+KUM16X11lK53ilPdPJdm87VtxeSKZ7GOiBz6q7FHzEd2Zc3CnzgupQiXGSblXrlN22IY3IWfm5S/8RTeQbMLVoH0TncgCeenXH7FU/sXD79ypqQV/WaVVDYMOirsnh/ philip@nyx"
-    ];
-  };
-
-  # fix for emacs
-  programs.bash.promptInit = "PS=\"# \"";
-}
diff --git a/machines/labnet/labtop/hardware-configuration.nix b/machines/labnet/labtop/hardware-configuration.nix
deleted file mode 100644
index 2791d3a9..00000000
--- a/machines/labnet/labtop/hardware-configuration.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-    ];
-
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "firewire_ohci" "usb_storage" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/754fd3e3-2e04-4028-9363-0c6bb4c54367";
-      fsType = "ext4";
-    };
-
-  hardware.trackpoint.emulateWheel = true;
-
-  swapDevices = [ ];
-
-  nix.maxJobs = 2;
-  networking.enableIntel3945ABGFirmware = true;
-}
-- 
cgit 1.4.1