diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-20 10:01:19 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-20 10:01:19 +0200 |
| commit | 789063319e78a9e2c1df6cf4a436a188886887ae (patch) | |
| tree | c32a3c15559a6dc1bd6503cf01c876b300c1eeef /lass | |
| parent | 3ceb087cc8c7475e98ceac70f82dee2e46e9a85d (diff) | |
| parent | 0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff) | |
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/uriel.nix | 6 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index aa5286ae0..e1417c83d 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -9,6 +9,7 @@ with config.krebs.lib; ../2configs/exim-retiolum.nix { # locke config + i18n.defaultLocale ="de_DE.UTF-8"; time.timeZone = "Europe/Berlin"; services.xserver.enable = true; users.users.locke = { @@ -28,6 +29,7 @@ with config.krebs.lib; systemWide = true; }; environment.systemPackages = with pkgs; [ + pavucontrol firefox hexchat networkmanagerapplet @@ -51,8 +53,8 @@ with config.krebs.lib; #loader.grub.version = 2; #loader.grub.device = "/dev/sda"; - loader.gummiboot.enable = true; - loader.gummiboot.timeout = 5; + loader.systemd-boot.enable = true; + loader.timeout = 5; initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 2fc3d3732..628fdf61f 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -172,7 +172,6 @@ in { "hashPassword", "haskellPackages.blessings", "haskellPackages.email-header", - "haskellPackages.megaparsec", "haskellPackages.scanner", "haskellPackages.xmonad-stockholm", "krebspaste", |