diff --git a/hosts/android/configuration.nix b/hosts/android/configuration.nix index 4c5b220..34b14a9 100644 --- a/hosts/android/configuration.nix +++ b/hosts/android/configuration.nix @@ -23,7 +23,7 @@ gnugrep #gnupg #gnused - #gnutar + gnutar #bzip2 #gzip #xz @@ -42,6 +42,8 @@ experimental-features = nix-command flakes ''; + user.shell = "${lib.getExe pkgs.zsh}"; + # Set your time zone #time.timeZone = "Europe/Berlin"; diff --git a/hosts/android/home.nix b/hosts/android/home.nix index 962b7a2..b553c8c 100644 --- a/hosts/android/home.nix +++ b/hosts/android/home.nix @@ -8,5 +8,6 @@ imports = [ ../../modules/home-manager/nixvim ../../modules/home-manager/emacs + ../../modules/home-manager/zsh ]; } diff --git a/modules/nixos/user.nix b/modules/nixos/user.nix index e01204f..384481f 100644 --- a/modules/nixos/user.nix +++ b/modules/nixos/user.nix @@ -1,19 +1,4 @@ {pkgs, ...}: { - programs.zsh.enable = true; - - nix.settings = { - trusted-users = ["mthomson"]; - - substituters = [ - "https://cache.nixos.org" - "https://nix-community.cachix.org" - ]; - - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; - users.users.mthomson = { shell = pkgs.zsh; isNormalUser = true;