From 55ec3a129010158af186fedaaa3f95c72d97c99e Mon Sep 17 00:00:00 2001 From: Openlab Labtop Date: Wed, 1 Apr 2015 06:36:00 +0000 Subject: Improved Config for Labtop --- machines/labnet/labtop.nix | 70 ------------------ machines/labnet/labtop/configuration.nix | 88 +++++++++++++++++++++++ machines/labnet/labtop/hardware-configuration.nix | 26 +++++++ 3 files changed, 114 insertions(+), 70 deletions(-) delete mode 100644 machines/labnet/labtop.nix create mode 100644 machines/labnet/labtop/configuration.nix create mode 100644 machines/labnet/labtop/hardware-configuration.nix (limited to 'machines/labnet') diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix deleted file mode 100644 index a66ceea3..00000000 --- a/machines/labnet/labtop.nix +++ /dev/null @@ -1,70 +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 { - i18n = { - consoleFont = "lat9w-16"; - consoleKeyMap = "us"; - defaultLocale = "de_DE.UTF-8"; - }; - - # TODO: This is a dummy, replace it once we know about the real root fs. - fileSystems."/".label = "root"; - boot.loader.grub.device = "nodev"; - - environment.systemPackages = [ - greybird - #repetierhost <- TODO - pkgs.firefox - pkgs.gimp - pkgs.freecad - pkgs.openscad - #pkgs.pronterface <- TODO - pkgs.blender - pkgs.slic3r - pkgs.libreoffice - pkgs.inkscape - pkgs.filezilla - pkgs.gmpc - pkgs.vlc - ]; - - # 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; - - users.mutableUsers = false; - users.extraUsers.openlab = { - uid = 1000; - isNormalUser = true; - }; -} diff --git a/machines/labnet/labtop/configuration.nix b/machines/labnet/labtop/configuration.nix new file mode 100644 index 00000000..b1d54b2a --- /dev/null +++ b/machines/labnet/labtop/configuration.nix @@ -0,0 +1,88 @@ +{ 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 new file mode 100644 index 00000000..2791d3a9 --- /dev/null +++ b/machines/labnet/labtop/hardware-configuration.nix @@ -0,0 +1,26 @@ +# 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 = + [ + ]; + + 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