diff options
Diffstat (limited to 'machines/labnet')
-rw-r--r-- | machines/labnet/labtop/configuration.nix (renamed from machines/labnet/labtop.nix) | 48 | ||||
-rw-r--r-- | machines/labnet/labtop/hardware-configuration.nix | 26 |
2 files changed, 59 insertions, 15 deletions
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop/configuration.nix index a66ceea3..b1d54b2a 100644 --- a/machines/labnet/labtop.nix +++ b/machines/labnet/labtop/configuration.nix @@ -24,31 +24,37 @@ let }; in { + imports = [ + ./hardware-configuration.nix + ]; + 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"; + boot.loader.grub.device = "/dev/sda"; - environment.systemPackages = [ + environment.systemPackages = with pkgs; [ 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 + firefox + gimp + git + freecad + openscad + #pronterface <- TODO + blender + #slic3r + libreoffice + inkscape + filezilla + gmpc + vlc + vim + wget ]; # TODO: Needed for slic3r right now. @@ -62,9 +68,21 @@ in { 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 = + [ <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; +} |