fix merge

provision/nixos/hosts/kestrel/configuration.nix

@@ -53,7 +53,7 @@
   users.users.${user} = {
     isNormalUser = true;
     extraGroups = [ "wheel" "docker" "libvirtd" ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.bash;
+    #shell = pkgs.bash;
   };
 
   # Enable modules

provision/nixos/hosts/torus/configuration.nix

@@ -48,42 +48,22 @@
     setLdLibraryPath = true;
   };
 
-  # Enable zsh
-  programs.zsh.enable = true;
-
   # Define user account.
   users.users.${user} = {
     isNormalUser = true;
     extraGroups = [ "wheel" "docker" ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.zsh;
+    shell = pkgs.bash;
   };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    vim
-    git
-    killall
-    pciutils
-    syncthing
-    pinentry-curses 
-    trash-cli
-    unzip
-    nnn
     docker-compose
     python3
     zk
     gollum
   ];
 
-  # Enable user services
-  #services = {
-  #  syncthing = {
-  #    enable = true;
-  #    user = "${user}";
-  #  };
-  #};
-
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
   services.pcscd.enable = true;
@@ -136,20 +116,22 @@
     };
   };
 
-
-
-
   # Enable modules
   imports = [ ../../modules ];
   modules = {
-    services = {
-      samba-server.enable = true;
-      jellyfin.enable = true;
-    };
     devel = {
       tooling.enable = true;
     };
+    services = {
+      samba-server.enable = true;
+      jellyfin.enable = true;
+      syncthing.enable = true;
+    };
+    system = {
+      terminal.enable = true;
+      ssh.enable = true;
+    };
   };
-  
-  system.stateVersion = "23.05"; # Did you read the comment?
+  # Did you read the comment?
+  system.stateVersion = "23.05";
 }

provision/nixos/modules/services/syncthing.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, user, ... }:
 
 let cfg = config.modules.services.syncthing;
 in {