added tmux module

src/system/machines/desktop/modules/home-manager/home.nix

@@ -23,6 +23,8 @@
           gpg.enable = true;
         };
 
+        tmux.enable = true;
+
         utils = {
           enable = true;
           dev.enable = true;

src/system/machines/vm/system.nix

@@ -43,10 +43,10 @@
     };
   };
 
-  fonts.packages = with pkgs; [
+  #fonts.packages = with pkgs; [
-    terminus_font
+  #  terminus_font
-    terminus-nerdfont
+  #  terminus-nerdfont
-  ];
+  #];
 
   security.sudo = {
     wheelNeedsPassword = false;

src/user/modules/bash/default.nix

@@ -26,9 +26,10 @@ in
       eza = {
         enable = true;
         enableAliases = true;
-      } // optionalAttrs wm.enable {
-        icons = true;
       };
+      #// optionalAttrs wm.enable {
+      #  icons = true;
+      #};
     };
   };
 }

src/user/modules/default.nix

@@ -4,6 +4,7 @@
     ./git
     ./gui
     ./security
+    ./tmux
     ./utils
   ];
 }

src/user/modules/gui/modules/wm/sway/config/shellHook.nix

@@ -1,5 +1,22 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  tmux = config.modules.user.tmux;
+
+in
 ''
-if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
+case $- in
-  exec sway
+  *i*)
-fi
+    if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
+      exec sway
+    fi
+
+    ${optionalString tmux.enable ''
+    if [ -z "$DISPLAY" ] && [ -z "$TMUX" ]; then
+      exec tmux
+    fi
+    ''}
+    ;;
+esac
 ''

src/user/modules/gui/modules/wm/sway/config/sway.nix

@@ -17,6 +17,10 @@ in
   '';
 
   config = {
+    fonts = {
+      names = [ "Terminus" ];
+    };
+
     output = {
       HDMI-A-1 = {
         resolution = "1920x1080";
@@ -50,7 +54,7 @@ in
         position = "top";
         statusCommand = ''while :; do echo "$(free -h | awk '/^Mem/ {print $3}') '|' $(date +'%I:%M:%S %p') '|' $(date +'%m-%d-%Y')"; sleep 1; done'';
         fonts = {
-          names = [ "Noto Sans" ];
+          names = [ "Terminus" ];
           size = 10.0;
         };
         colors = {
@@ -82,6 +86,9 @@ in
       "${modifier}+Print" = ''exec sh -c 'grim -g "$(swaymsg -t get_tree | jq -j '"'"'.. | select(.type?) | select(.focused).rect | "\(.x),\(.y) \(.width)x\(.height)"'"'"')" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png' '';
       "${modifier}+Shift+f" = "exec alacritty -e sh -c 'EDITOR=nvim ranger'";
       "${modifier}+Shift+d" = "exec rofi -modi emoji -show emoji";
+      "${modifier}+Shift+Return" = ''
+        exec alacritty --working-directory -e $(pwd)
+      '';
     };
   };
 

src/user/modules/gui/modules/wm/sway/default.nix

@@ -16,7 +16,7 @@ in
     };
 
     programs.bash = {
-      profileExtra = import ./config/shellHook.nix;
+      profileExtra = import ./config/shellHook.nix { inherit config lib; };
       shellAliases = {
         open = "xdg-open";
       };

src/user/modules/tmux/config/shellHook.nix

@@ -0,0 +1,9 @@
+''
+case $- in
+  *i*)
+    if [ -z "$DISPLAY" ] && [ -z "$TMUX" ]; then
+      exec tmux
+    fi
+    ;;
+esac
+''

src/user/modules/tmux/config/tmux.nix

@@ -0,0 +1,10 @@
+''
+bind -n M-C source-file ~/.config/tmux/tmux.conf
+
+bind-key -n M-h select-pane -L
+bind-key -n M-j select-pane -D
+bind-key -n M-k select-pane -U
+bind-key -n M-l select-pane -R
+
+bind-key -n M-q kill-pane
+''

src/user/modules/tmux/default.nix

@@ -0,0 +1,41 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.user.tmux;
+  gui = config.modules.user.gui.wm;
+
+  wm = {
+    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
+  };
+
+in
+{ options.modules.user.tmux = { enable = mkEnableOption "Enable tmux module"; };
+  config = mkIf cfg.enable {
+    programs.bash = mkIf (!wm.enable) {
+      profileExtra = import ./config/shellHook.nix;
+    };
+
+    programs.tmux = {
+      enable = true;
+      newSession = true;
+      disableConfirmationPrompt = true;
+      keyMode = "vi";
+      mouse = if wm.enable then true else false;
+
+      prefix = "M";
+      shell = "\${pkgs.bash}/bin/bash";
+
+      plugins = with pkgs.tmuxPlugins; [
+        {
+          plugin = tilish;
+          extraConfig = ''
+            set -g @tilish-default 'tiled'
+          '';
+        }
+      ];
+
+      extraConfig = import ./config/tmux.nix;
+    };
+  };
+}

src/user/modules/utils/modules/vim/config/vimrc

@@ -70,7 +70,7 @@ nnoremap <leader>ga :Git add<CR>
 nnoremap <leader>gc :Git commit<CR>
 nnoremap <leader>gd :Git diff<CR>
 
-nnoremap <leader>e :Explore<CR>
+nnoremap <leader>e :Ex<CR>
 nnoremap <leader>/ :Rg<Space>
 
 nnoremap <leader>bd :bd<CR>