From 740d6ed8b990cd402846ebdc1b7bcd7052112ebf Mon Sep 17 00:00:00 2001 From: Julius de Jeu Date: Sat, 13 Nov 2021 09:43:43 +0100 Subject: [PATCH] Fix stuff --- .gitignore | 1 + common/default.nix | 4 +++- common/users/default.nix | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..38156aa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +keys \ No newline at end of file diff --git a/common/default.nix b/common/default.nix index 2185e1e..65d78ff 100644 --- a/common/default.nix +++ b/common/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { imports = [ ./users ]; @@ -16,6 +16,8 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; + programs.fish.enable = true; + # Optimize nix store by hardlinking identitical files. nix = { package = pkgs.nixUnstable; diff --git a/common/users/default.nix b/common/users/default.nix index 2579ef6..d9eebfa 100644 --- a/common/users/default.nix +++ b/common/users/default.nix @@ -5,6 +5,8 @@ programs.neovim.enable = true; programs.neovim.viAlias = true; + users.defaultUserShell = pkgs.fish; + users.extraUsers.jdejeu = { isNormalUser = true; home = "/home/jdejeu"; @@ -22,6 +24,6 @@ openssh.authorizedKeys.keys = config.users.users.jdejeu.openssh.authorizedKeys.keys; # Also use zsh for root - shell = pkgs.zsh; + shell = pkgs.fish; }; }