Merge remote-tracking branch 'origin/fish'

merge master with fish config

desktop/kde.nix

@@ -1,9 +1,12 @@
-{ config, ... }:
+{ pkgs, config, ... }:
 {
   services.xserver.enable = true;
   hardware.graphics.enable = true;
   services.displayManager.sddm.enable = true;
   services.desktopManager.plasma6.enable = true;
   programs.kdeconnect.enable = true;
+  environment.systemPackages = [
+    pkgs.kde-rounded-corners
+  ];
 
 }

home/yaroslav/home.nix

@@ -27,26 +27,23 @@ in
   programs.ssh = {
     enable = true;
   };
-  programs.zsh = {
+  programs.fish = {
     enable = true;
-    enableCompletion = true;
+    interactiveShellInit = ''
-    autosuggestion.enable = true;
+      set fish_greeting # Disable greeting
-    syntaxHighlighting.enable = true;
+      starship init fish | source
-    oh-my-zsh = {
-      enable = true;
-      };
-    initContent = ''
-      source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
-      test -f ~/.p10k.zsh && source ~/.p10k.zsh
-      eval "$(ssh-agent -s)"
-      ssh-add ~/.ssh/id_github
     '';
   };
+  programs.starship = {
+    enable = true;
+    enableTransience = true;
+  };
   programs.ncmpcpp = {
     enable = true;
   };
   services.mpd-mpris.enable = true;
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "android-studio-stable"
     "code"
     "obsidian"
     "yandex-music"

home/yaroslav/home_gui.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
+    android-studio
     ayugram-desktop
     audacity
     darktable
@@ -25,5 +26,6 @@
     vscodium
     bottles
     wl-kbptr
+    brave
   ];
 }

hosts/Ratchet/hardware-Ratchet.nix

@@ -42,8 +42,13 @@
       fsType = "tmpfs";
     };
 
+
+  services.nfs.server.enable = true;
   swapDevices = [ ];
 
+  boot.supportedFilesystems = [ "zfs" ];
+  networking.hostId = "63367a21";
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction

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;
     };
+  };
    
 }