From e0fe0b3dacc5c8dcecb47656e84dc8c8064f8b52 Mon Sep 17 00:00:00 2001 From: minhtrannhat Date: Sat, 30 Oct 2021 20:42:15 -0400 Subject: [PATCH] Changes: git commit author, emacs and lunarvim --- doom-emacs/.doom.d/config.el | 5 ++++- doom-emacs/.doom.d/init.el | 2 +- fish/.config/fish/config.fish | 12 ++++++++++-- lvim/.config/lvim/config.lua | 20 ++++++++++---------- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/doom-emacs/.doom.d/config.el b/doom-emacs/.doom.d/config.el index cf88f8f..27ccdb9 100644 --- a/doom-emacs/.doom.d/config.el +++ b/doom-emacs/.doom.d/config.el @@ -6,7 +6,7 @@ ;; Some functionality uses this to identify you, e.g. GPG configuration, email ;; clients, file templates and snippets. -(setq user-full-name "Minh Tran" +(setq user-full-name "minhtrannhat" user-mail-address "minhtrannhat2001@gmail.com") ;; Doom exposes five (optional) variables for controlling fonts in Doom. Here @@ -22,6 +22,8 @@ doom-unicode-font (font-spec :family "JuliaMono") doom-serif-font (font-spec :family "IBM Plex Mono" :weight 'light)) +(setq fancy-splash-image "/home/minhradz/.doom.d/marivector.png") + (defun synchronize-theme () (let* ((light-theme 'doom-nord-light) (dark-theme 'doom-nord) @@ -148,6 +150,7 @@ ;; Deft - a Major mode for text searching (setq deft-directory org-roam-directory) (setq deft-recursive t) +(setq deft-default-extension "org") (setq deft-use-filter-string-for-filename t) ;; Function for inserting node into Org Roam diff --git a/doom-emacs/.doom.d/init.el b/doom-emacs/.doom.d/init.el index 0ac1f23..76af9ed 100644 --- a/doom-emacs/.doom.d/init.el +++ b/doom-emacs/.doom.d/init.el @@ -135,7 +135,7 @@ ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on json ; At least it ain't XML - (java +lsp +meghanada) ; the poster child for carpal tunnel syndrome + (java +lsp) ; the poster child for carpal tunnel syndrome javascript ; all(hope(abandon(ye(who(enter(here)))))) (julia +lsp) ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 7281e8a..de54711 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,19 +1,27 @@ set fish_greeting fish_vi_key_bindings - set fish_bind_mode insert + alias rm 'rm -i' alias nnn 'nnn -e' alias mpv 'mpv --hwdec=vaapi' alias icat 'kitty +kitten icat' -set -gx MOZ_WEBRENDER 1 +alias magit 'emacs -nw --eval "(magit-status)"' + export GPG_TTY=(tty) + +set -gx MOZ_WEBRENDER 1 set -gx XDG_SESSION_TYPE wayland set -gx XDG_CURRENT_DESKTOP sway set -gx MOZ_ENABLE_WAYLAND 1 + set -gx EDITOR vim set -gx NVIM_LISTEN_ADDRESS /tmp/nvimsocket + set -gx LC_ALL en_US.UTF-8 + set -x PATH /usr/libexec /usr/local/bin /home/minhradz/.cargo/bin /home/minhradz/.local/bin $PATH + starship init fish | source + eval (direnv hook fish) diff --git a/lvim/.config/lvim/config.lua b/lvim/.config/lvim/config.lua index 6cb178e..49e2908 100644 --- a/lvim/.config/lvim/config.lua +++ b/lvim/.config/lvim/config.lua @@ -39,26 +39,25 @@ lvim.lang.python.formatters = { lvim.lang.c.formatters = { { exe = "clang_format" } } lvim.lang.cpp.formatters = lvim.lang.c.formatters -lvim.lang.javascript.formatters = { { exe = "prettier" } } -lvim.lang.javascriptreact.formatters = lvim.lang.javascript.formatters + lvim.lang.rust.formatters = { { exe = "rustfmt" } } + lvim.lang.json.formatters = { { exe = "prettier" } } -lvim.lang.typescript.formatters = { { exe = "prettier" } } -lvim.lang.typescriptreact.formatters = lvim.lang.typescript.formatters + lvim.lang.go.formatters = { { exe = "gofmt" } } lvim.lang.javascript.linters = { { exe = "eslint_d" } } lvim.lang.javascriptreact.linters = lvim.lang.javascript.linters lvim.lang.typescript.linters = { { exe = "eslint_d" } } lvim.lang.typescriptreact.linters = lvim.lang.typescript.linters +lvim.lang.typescript.formatters = { { exe = "prettier" } } +lvim.lang.typescriptreact.formatters = lvim.lang.typescript.formatters +lvim.lang.javascript.formatters = { { exe = "prettier" } } +lvim.lang.javascriptreact.formatters = lvim.lang.javascript.formatters + lvim.lang.lua.formatters = { { exe = "stylua" } } -lvim.lang.python.linters = { - { - exe = "flake8", - args = {}, - }, -} +lvim.lang.python.linters = { { exe = "flake8", args = {} } } -- Additional Plugins lvim.plugins = { @@ -71,6 +70,7 @@ lvim.plugins = { event = "InsertEnter", }, { "andweeb/presence.nvim" }, + { "tpope/vim-fugitive" }, } -- Autocommands (https://neovim.io/doc/user/autocmd.html)