From bcf73c8e753094358ecc0ed5c3727119418db177 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Feb 2018 17:31:42 +0100 Subject: Revert "machines: Remove tyree" This reverts commit dfd3d86562f09d812b330893cec053ab3d371bdf. The machine is back on NixOS again :-) Signed-off-by: aszlig Cc: @brokkoliberta --- machines/aszlig/managed/tyree.nix | 47 +++++++++++++++++++++++++++++++++++++++ machines/default.nix | 1 + 2 files changed, 48 insertions(+) create mode 100644 machines/aszlig/managed/tyree.nix (limited to 'machines') diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix new file mode 100644 index 00000000..3cc336d8 --- /dev/null +++ b/machines/aszlig/managed/tyree.nix @@ -0,0 +1,47 @@ +{ pkgs, lib, ... }: + +{ + boot.initrd.availableKernelModules = [ "usbhid" ]; + boot.kernelModules = [ "kvm-intel" ]; + + environment.systemPackages = with pkgs; [ + mosh wget krita rawtherapee darktable gphoto2 digikam + ]; + + fileSystems."/boot".device = "/dev/disk/by-uuid/A0D5-269D"; + fileSystems."/boot".fsType = "vfat"; + + fileSystems."/".label = "tyree-root"; + fileSystems."/".fsType = "btrfs"; + fileSystems."/".options = [ + "compress=lzo" + "discard" + "noatime" + "space_cache" + "ssd" + ]; + + swapDevices = lib.singleton { + label = "tyree-swap"; + }; + + i18n.defaultLocale = "de_DE.UTF-8"; + + networking.hostName = "tyree"; + networking.useNetworkd = true; + + nix.maxJobs = 4; + + # English within the shell, German otherwise (like in KDE). + programs.bash.interactiveShellInit = lib.mkBefore '' + export LANG=en_US.UTF-8 + ''; + + services.xserver.xkbOptions = "eurosign:e,caps:none"; + services.xserver.wacom.enable = true; + + vuizvui.user.aszlig.profiles.managed.enable = true; + vuizvui.user.aszlig.profiles.managed.mainUser = "bla"; + + vuizvui.hardware.t100ha.enable = true; +} diff --git a/machines/default.nix b/machines/default.nix index ad51472b..151576f8 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -9,6 +9,7 @@ with import ../lib; tishtushi = callMachine ./aszlig/tishtushi.nix {}; managed = { brawndo = callMachine ./aszlig/managed/brawndo.nix {}; + tyree = callMachine ./aszlig/managed/tyree.nix {}; }; }; devhell = { -- cgit 1.4.1