Merge remote-tracking branch 'origin/fish'

merge master with fish config

hosts/generic/configuration_generic.nix

@@ -11,6 +11,7 @@
   time.timeZone = "Europe/Moscow";
 
   programs.zsh.enable = true;
+  programs.fish.enable = true;
 
   environment.systemPackages = with pkgs; [
     git
@@ -28,7 +29,7 @@
 
   # networking
   networking.networkmanager.enable = true;
-  networking.firewall.allowedTCPPorts = [ 22 3240 ];
+  networking.firewall.allowedTCPPorts = [ 22 3240 2049 ];
   networking.firewall.allowedUDPPorts = [ 38401 ];
   networking.nftables.enable = true;
   networking.hosts = {

hosts/generic/users.nix

@@ -4,7 +4,7 @@
   users.users.yaroslav = {
     isNormalUser = true;
     extraGroups = [ "wheel" "incus-admin" "networkmanager" "libvirtd" ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
     packages = with pkgs; [
       tree
     ];

hosts/generic/virtualization.nix

@@ -23,6 +23,18 @@
             }).fd];
         };
         };
+      };
+    virtualisation.containers.enable = true;
+    virtualisation = {
+      podman = {
+        enable = true;
+
+      # Create a `docker` alias for podman, to use it as a drop-in replacement
+        dockerCompat = true;
+
+      # Required for containers under podman-compose to be able to talk to each other.
+        defaultNetwork.settings.dns_enabled = true;
     };
+  };
    
 }