diff options
| author | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
| commit | 9329c1e47ddda0653d7e9824a01632ce3766e8f0 (patch) | |
| tree | 2bfb70737a757d0bd61ca0aa895c77d740b21e73 /lass/1systems/uriel.nix | |
| parent | 844d347ce7cf0b7646e9ecba3fbdc0b90e608501 (diff) | |
| parent | 0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/uriel.nix')
| -rw-r--r-- | lass/1systems/uriel.nix | 6 |
1 files changed, 4 insertions, 2 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" ]; |