Merge branch 'master' of github.com:aciceri/fleet

This commit is contained in:
Andrea Ciceri 2021-10-06 10:50:25 +02:00
commit 8e4f077b23
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
5 changed files with 170 additions and 103 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, config, ... }:
{
programs.zsh = {
enable = true;
@ -55,5 +55,8 @@
PROMPT = "\\\${IN_NIX_SHELL:+[nix-shell] }$PROMPT";
};
loginExtra = "[[ -z $DISPLAY && $TTY = /dev/tty1 ]] && exec sway";
initExtra = if pkgs.system == "x86_64-darwin"
then "if test -e /etc/static/bashrc; then source /etc/static/bashrc > /dev/null 2>&1; fi"
else "";
};
}