summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-01-30 21:07:48 +0100
committermakefu <github@syntax-fehler.de>2018-01-30 21:07:48 +0100
commitfac9f4d2a0d855e4b27244df6a3bb831e0305f6b (patch)
tree1412cf1283c90199ec5c3abbe3d87a6035f8e66b /lass
parentb31a37799eff274215d4cd9d435a9c16d496a88c (diff)
parentffc294575cb59585c3bfb6b85fa45fb69cdf1d41 (diff)
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/games.nix4
-rw-r--r--lass/2configs/zsh.nix3
2 files changed, 5 insertions, 2 deletions
diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix
index 6cea271c1..50362cda4 100644
--- a/lass/2configs/games.nix
+++ b/lass/2configs/games.nix
@@ -73,6 +73,10 @@ in {
extraGroups = [ "audio" "video" "input" "loot" ];
createHome = true;
useDefaultShell = true;
+ packages = with pkgs; [
+ ftb
+ minecraft
+ ];
};
};
diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index f2c32ba26..add30fbf1 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -136,6 +136,5 @@
};
environment.shellAliases.ns = "nix-shell --command zsh";
- users.users.mainUser.shell = "/run/current-system/sw/bin/zsh";
- users.users.root.shell = "/run/current-system/sw/bin/zsh";
+ users.defaultUserShell = "/run/current-system/sw/bin/zsh";
}