Commit 93657f12c13c

@@ -7,10 +7,10 @@
 			../profiles/server.nix
 			../profiles/gitconfig.nix
 			../profiles/dev.nix
-			../profiles/dev.nix
 			../profiles/avahi.nix
 			../profiles/syncthing.nix
 			../service/ssh-tunnel.nix
+      ../location/home.nix
 		];
 
 	time.timeZone = "Europe/Paris";

@@ -5,10 +5,6 @@
     [
     ./users.nix
   ];
-  programs = {
-    zsh.enable = true;
-    fish.enable = true;
-  };
   environment = {
     variables = {
       EDITOR = pkgs.lib.mkOverride 0 "vim";

@@ -11,6 +11,11 @@
 		./syncthing.nix
 	];
 
+  programs = {
+    zsh.enable = true;
+    fish.enable = true;
+  };
+  
 	boot.loader.efi.canTouchEfiVariables = true;
 	boot.tmpOnTmpfs = true;
 

@@ -8,7 +8,7 @@
 				uid = 1000;
 				createHome = true;
 				extraGroups = [ "networkmanager" "wheel" "docker" "vboxusers" "libvirtd" "input" "audio" "video" "scanner" ];
-				shell = pkgs.fish;
+				shell = if config.programs.fish.enable then pkgs.fish else pkgs.bash;
 				initialPassword = "changeMe";
 				openssh.authorizedKeys.keys =
 					with import ../ssh-keys.nix; [ honshu wakasu kobe ];