From a7acccc49bb38c213ca66313761b1814ed6434f6 Mon Sep 17 00:00:00 2001 From: minhtrannhat Date: Tue, 26 Jul 2022 22:39:00 -0400 Subject: [PATCH] Feat: email and tmux very pog --- doom-emacs/.doom.d/config.el | 15 ++++++++++++++- doom-emacs/.doom.d/init.el | 2 +- doom-emacs/.doom.d/packages.el | 1 + fish/.config/fish/fish_variables | 4 ++-- lvim/.config/lvim/config.lua | 13 ++++++++++++- sway/.config/sway/config | 23 +++++++++++++++++++++++ tmux/.tmux.conf | 7 ++++++- waybar/.config/waybar/config | 10 ++++++++++ 8 files changed, 69 insertions(+), 6 deletions(-) diff --git a/doom-emacs/.doom.d/config.el b/doom-emacs/.doom.d/config.el index 0538777..02ced70 100644 --- a/doom-emacs/.doom.d/config.el +++ b/doom-emacs/.doom.d/config.el @@ -175,6 +175,13 @@ :desc "Search org-roam with consult-ripgrep" "n r F" #'org-roam-rg-search) +(setq org-roam-node-display-template +#("${doom-hierarchy:20} ${doom-type:12} ${doom-tags:42}" 20 35 + (face font-lock-keyword-face) + 36 51 + (face org-tag)) +) + (setq avy-all-windows 't) ;; Disables lsp-signature-auto-activate @@ -287,5 +294,11 @@ (mu4e-trash-folder . "/minhtrannhat@minhtrannhat.com/Trash") (mu4e-refile-folder . "/minhtrannhat@minhtrannhat.com/All Mail") (smtpmail-smtp-user . "minhtrannhat@minhtrannhat.com") - (mu4e-compose-signature . "---\nMinh Tran")) + (mu4e-compose-signature . "Minh Tran")) t) + +(setq sendmail-program "/usr/bin/msmtp" + send-mail-function #'smtpmail-send-it + message-sendmail-f-is-evil t + message-sendmail-extra-arguments '("--read-envelope-from") + message-send-mail-function #'message-send-mail-with-sendmail) diff --git a/doom-emacs/.doom.d/init.el b/doom-emacs/.doom.d/init.el index 1faf1ac..ee900c4 100644 --- a/doom-emacs/.doom.d/init.el +++ b/doom-emacs/.doom.d/init.el @@ -161,7 +161,7 @@ yaml ; JSON, but readable zig ; C, but simpler :email - (mu4e +org) + (mu4e) ;;notmuch ;;(wanderlust +gmail) :app diff --git a/doom-emacs/.doom.d/packages.el b/doom-emacs/.doom.d/packages.el index b6b0617..2dcbd5e 100644 --- a/doom-emacs/.doom.d/packages.el +++ b/doom-emacs/.doom.d/packages.el @@ -55,3 +55,4 @@ (package! magit-delta) (package! blamer :recipe (:host github :repo "artawower/blamer.el")) (package! org-fragtog) +(unpin! rustic) diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index 67e70dd..a2c0b47 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -2,8 +2,8 @@ # VERSION: 3.0 SETUVAR --export GTK_IM_MODULE:ibus SETUVAR --export QT_IM_MODULE:ibus -SETUVAR --export SSH_AGENT_PID:1167 -SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXZc9gOi/agent\x2e1166 +SETUVAR --export SSH_AGENT_PID:1188 +SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXmZ7SUl/agent\x2e1187 SETUVAR --export XMODIFIERS:\x40im\x3dibus SETUVAR __fish_initialized:3400 SETUVAR fish_color_autosuggestion:4c566a diff --git a/lvim/.config/lvim/config.lua b/lvim/.config/lvim/config.lua index e43c5dd..4a9018f 100644 --- a/lvim/.config/lvim/config.lua +++ b/lvim/.config/lvim/config.lua @@ -11,6 +11,7 @@ lvim.builtin.autopairs.active = true lvim.builtin.gitsigns.active = true lvim.builtin.notify.active = false lvim.builtin.dap.active = true +lvim.builtin.treesitter.rainbow.enable = true lvim.builtin.nvimtree.side = "left" lvim.builtin.terminal.shell = "/bin/fish" @@ -62,10 +63,10 @@ lvim.plugins = { { "shaunsingh/nord.nvim" }, { "ray-x/lsp_signature.nvim", + event = "BufRead", config = function() require("lsp_signature").on_attach() end, - event = "InsertEnter", }, { "machakann/vim-sandwich" }, { "tpope/vim-fugitive" }, @@ -88,6 +89,16 @@ lvim.plugins = { require("hlargs").setup() end, }, + { + "windwp/nvim-ts-autotag", + config = function() + require("nvim-ts-autotag").setup() + end, + }, + { + "p00f/nvim-ts-rainbow", + event = "InsertEnter", + }, { "aserowy/tmux.nvim", config = function() diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 8a20136..ff1a38b 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -158,6 +158,19 @@ for_window [app_id="kitty"] inhibit_idle visible; max_render_time off bindsym $mod+8 workspace number 8 bindsym $mod+9 workspace number 9 bindsym $mod+0 workspace number 10 + + # workspaces from 11-20 + bindsym $mod+Control+1 workspace 11 + bindsym $mod+Control+2 workspace 12 + bindsym $mod+Control+3 workspace 13 + bindsym $mod+Control+4 workspace 14 + bindsym $mod+Control+5 workspace 15 + bindsym $mod+Control+6 workspace 16 + bindsym $mod+Control+7 workspace 17 + bindsym $mod+Control+8 workspace 18 + bindsym $mod+Control+9 workspace 19 + bindsym $mod+Control+0 workspace 20 + # Move focused container to workspace bindsym $mod+Shift+1 move container to workspace number 1 bindsym $mod+Shift+2 move container to workspace number 2 @@ -169,6 +182,16 @@ for_window [app_id="kitty"] inhibit_idle visible; max_render_time off bindsym $mod+Shift+8 move container to workspace number 8 bindsym $mod+Shift+9 move container to workspace number 9 bindsym $mod+Shift+0 move container to workspace number 10 + bindsym $mod+Control+Shift+1 move container to workspace 11 + bindsym $mod+Control+Shift+2 move container to workspace 12 + bindsym $mod+Control+Shift+3 move container to workspace 13 + bindsym $mod+Control+Shift+4 move container to workspace 14 + bindsym $mod+Control+Shift+5 move container to workspace 15 + bindsym $mod+Control+Shift+6 move container to workspace 16 + bindsym $mod+Control+Shift+7 move container to workspace 17 + bindsym $mod+Control+Shift+8 move container to workspace 18 + bindsym $mod+Control+Shift+9 move container to workspace 19 + bindsym $mod+Control+Shift+0 move container to workspace 20 # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. # diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 7ddba97..b183764 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -38,7 +38,12 @@ bind-key -T copy-mode-vi 'C-j' if -F '#{pane_at_bottom}' '' 'select-pane -D' bind-key -T copy-mode-vi 'C-k' if -F '#{pane_at_top}' '' 'select-pane -U' bind-key -T copy-mode-vi 'C-l' if -F '#{pane_at_right}' '' 'select-pane -R' -is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?vim?x?)(diff)?$'" +#is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?vim?x?)(diff)?$'" + +is_vim="children=(); i=0; pids=( $(ps -o pid= -t '#{pane_tty}') ); \ +while read -r c p; do [[ -n c && c -ne p && p -ne 0 ]] && children[p]+=\" $\{c\}\"; done <<< \"$(ps -Ao pid=,ppid=)\"; \ +while (( $\{#pids[@]\} > i )); do pid=$\{pids[i++]\}; pids+=( $\{children[pid]-\} ); done; \ +ps -o state=,comm= -p \"$\{pids[@]\}\" | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?vim?x?)(diff)?$'" bind -n 'M-h' if-shell "$is_vim" 'send-keys M-h' 'resize-pane -L 1' bind -n 'M-j' if-shell "$is_vim" 'send-keys M-j' 'resize-pane -D 1' diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index 62904fa..c6b169b 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -29,6 +29,16 @@ "8": "八", "9": "九", "10": "十", + "11": "十一", + "12": "十二", + "13": "十三", + "14": "十四", + "15": "十五", + "16": "十六", + "17": "十七", + "18": "十八", + "19": "十九", + "20": "二十", "focused": "", "default": "" }