Updated configuration

home/panotaka/common/core/default.nix

@@ -19,13 +19,11 @@ in {
     ./${platform}.nix
 
     # FIXME(starter): add/edit as desired
-    ./fish.nix
-    ./bash.nix
-    ./direnv.nix
     ./fonts.nix
     ./kitty.nix
     ./git.nix
     ./ssh.nix
+    ./shell
   ];
 
   inherit hostSpec;

home/panotaka/common/core/screen.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.screen ];
-  home.file.".screenrc".text = ''
-    startup_message off
-    defbce on
-    setenv TERM xterm-256color
-  '';
-}

home/panotaka/common/core/shell/atuin.nix

@@ -0,0 +1,6 @@
+{
+  programs.atuin = {
+    enable = true;
+    flags = ["--disable-up-arrow"];
+  };
+}

home/panotaka/common/core/shell/autojump.nix

@@ -0,0 +1,5 @@
+{...}: {
+  programs.autojump = {
+    enable = true;
+  };
+}

home/panotaka/common/core/shell/bat.nix

@@ -0,0 +1,5 @@
+{
+  programs.bat = {
+    enable = true;
+  };
+}

home/panotaka/common/core/shell/btop.nix

@@ -0,0 +1,5 @@
+{
+  programs.btop = {
+    enable = true;
+  };
+}

home/panotaka/common/core/shell/carapace.nix

@@ -0,0 +1,9 @@
+{
+  programs.carapace = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableNushellIntegration = true;
+    enableFishIntegration = true;
+  };
+}

home/panotaka/common/core/shell/default.nix

@@ -0,0 +1,18 @@
+# FIXME(starter): customize your bash preferences here
+{
+  imports = [
+    ./atuin.nix
+    ./autojump.nix
+    ./bash.nix
+    ./bat.nix
+    ./btop.nix
+    ./carapace.nix
+    ./direnv.nix
+    ./eza.nix
+    ./fish.nix
+    ./rip.nix
+    ./tldr.nix
+    ./zellij.nix
+    ./zoxide.nix
+  ];
+}

home/panotaka/common/core/shell/direnv.nix

@@ -3,6 +3,7 @@
     enable = true;
     enableBashIntegration = true;
     enableZshIntegration = true;
+    #enableFishIntegration = true;
     nix-direnv.enable = true; # better than native direnv nix functionality - https://github.com/nix-community/nix-direnv
   };
 }

home/panotaka/common/core/shell/eza.nix

@@ -0,0 +1,14 @@
+{...}: {
+  programs.eza = {
+    enable = true;
+    extraOptions = [
+      "--group-directories-first"
+      "--header"
+    ];
+    icons = "auto";
+  };
+
+  home.shellAliases = {
+    l = "eza -1 --group-directories-first";
+  };
+}

home/panotaka/common/core/shell/rip.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    rm-improved
+  ];
+}

home/panotaka/common/core/shell/tldr.nix

@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    #tlrc
+  ];
+
+  services.tldr-update = {
+    enable = true;
+    package = pkgs.tlrc;
+    period = "weekly";
+  };
+}

home/panotaka/common/core/shell/zellij.nix

@@ -0,0 +1,13 @@
+{
+  programs.zellij = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    settings = {
+      #simplified_ui = true;
+      pane_frames = false;
+      copy_on_select = false;
+    };
+  };
+}

home/panotaka/common/core/shell/zoxide.nix

@@ -0,0 +1,9 @@
+{
+  programs.zoxide = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableNushellIntegration = true;
+    enableFishIntegration = true;
+  };
+}

home/panotaka/common/core/ssh.nix

@@ -1,22 +1,17 @@
 # FIXME(starter): adjust to you security requirements
-{
-  config,
-  ...
-}:
-{
-  programs.ssh =
-   {
-      enable = true;
+{config, ...}: {
+  programs.ssh = {
+    enable = true;
 
-      controlMaster = "auto";
-      controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p";
-      controlPersist = "20m";
-      # Avoids infinite hang if control socket connection interrupted. ex: vpn goes down/up
-      serverAliveCountMax = 3;
-      serverAliveInterval = 5; # 3 * 5s
-      hashKnownHosts = true;
-      addKeysToAgent = "yes";
-   };
+    controlMaster = "auto";
+    controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p";
+    controlPersist = "20m";
+    # Avoids infinite hang if control socket connection interrupted. ex: vpn goes down/up
+    serverAliveCountMax = 3;
+    serverAliveInterval = 5; # 3 * 5s
+    hashKnownHosts = true;
+    addKeysToAgent = "yes";
+  };
   home.file = {
     ".ssh/config.d/.keep".text = "# Managed by Home Manager";
     ".ssh/sockets/.keep".text = "# Managed by Home Manager";