From c60ce8997c9b2c0f330ea982f4cf53b66ca58e05 Mon Sep 17 00:00:00 2001 From: minhtrannhat Date: Wed, 22 Dec 2021 15:16:28 -0500 Subject: [PATCH] emacs changes/disabling swayidle in the mean time --- .gitignore | 1 + bash/.bashrc | 4 ++- doom-emacs/.doom.d/config.el | 18 +++------- doom-emacs/.doom.d/custom.el | 2 ++ doom-emacs/.doom.d/init.el | 16 ++++----- fish/.config/fish/config.fish | 7 ++-- git/.gitconfig | 2 ++ lvim/.config/lvim/config.lua | 32 +++++++++++------- lvim/.config/lvim/plugin/packer_compiled.lua | 18 +++++++--- sway/.config/sway/config | 8 ++--- .../william-moreland-W61Rp5RouCA-unsplash.png | Bin 21678768 -> 0 bytes 11 files changed, 62 insertions(+), 46 deletions(-) create mode 100644 .gitignore delete mode 100644 wallpaper/Downloads/william-moreland-W61Rp5RouCA-unsplash.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b1ad771 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wallpaper/ diff --git a/bash/.bashrc b/bash/.bashrc index 40a7cf7..05d3f8c 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -25,7 +25,9 @@ export GTK_IM_MODULE=ibus export XMODIFIERS=@im=ibus export QT_IM_MODULE=ibus -alias mpv="mpv --hwdec=vaapi" +alias arduino="_JAVA_AWT_WM_NONREPARENTING=1 arduino" + +export VDPAU_DRIVER=va_gl export GPG_TYY=$(tty) diff --git a/doom-emacs/.doom.d/config.el b/doom-emacs/.doom.d/config.el index 0a460ce..265a245 100644 --- a/doom-emacs/.doom.d/config.el +++ b/doom-emacs/.doom.d/config.el @@ -16,7 +16,7 @@ ;; + `doom-variable-pitch-font' ;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for ;; presentations or streaming. -(setq doom-font (font-spec :family "JetBrainsMono Nerd Font" :size 16) +(setq doom-font (font-spec :family "JetBrainsMono Nerd Font" :size 18) doom-big-font (font-spec :family "JetBrainsMono Nerd Font" :size 26) doom-variable-pitch-font (font-spec :family "Overpass" :size 16) doom-unicode-font (font-spec :family "JuliaMono") @@ -24,19 +24,7 @@ (setq fancy-splash-image "/home/minhradz/.doom.d/marivector.png") -(defun synchronize-theme () - (let* ((light-theme 'doom-nord-light) - (dark-theme 'doom-nord) - (start-time-light-theme 6) - (end-time-light-theme 16) - (hour (string-to-number (substring (current-time-string) 11 13))) - (next-theme (if (member hour (number-sequence start-time-light-theme end-time-light-theme)) - light-theme dark-theme))) - (when (not (equal doom-theme next-theme)) - (setq doom-theme next-theme) - (load-theme next-theme t)))) - -(run-with-timer 0 900 'synchronize-theme) +(setq doom-theme 'doom-nord) (with-eval-after-load 'doom-themes (doom-themes-treemacs-config)) @@ -164,3 +152,5 @@ (map! :leader :desc "Insert node immediately" "n r I" #'org-roam-node-insert-immediate) + +(setq inhibit-x-resources t) diff --git a/doom-emacs/.doom.d/custom.el b/doom-emacs/.doom.d/custom.el index b87f0b3..80c8707 100644 --- a/doom-emacs/.doom.d/custom.el +++ b/doom-emacs/.doom.d/custom.el @@ -7,6 +7,8 @@ '(custom-safe-themes '("7eea50883f10e5c6ad6f81e153c640b3a288cd8dc1d26e4696f7d40f754cc703" "5784d048e5a985627520beb8a101561b502a191b52fa401139f4dd20acb07607" "e3b2bad7b781a968692759ad12cb6552bc39d7057762eefaf168dbe604ce3a4b" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" default)) '(git-gutter:update-interval 1) + '(smtpmail-smtp-server "smtp.gmail.com") + '(smtpmail-smtp-service 25) '(warning-suppress-log-types '((iedit) (iedit) (iedit) (iedit) (iedit) (iedit) (iedit))) '(warning-suppress-types '((org-load-hook) diff --git a/doom-emacs/.doom.d/init.el b/doom-emacs/.doom.d/init.el index 3ae271d..29e7fa5 100644 --- a/doom-emacs/.doom.d/init.el +++ b/doom-emacs/.doom.d/init.el @@ -61,7 +61,7 @@ ;;parinfer ; turn lisp into python, sort of ;;rotate-text ; cycle region at point between text candidates snippets ; my elves. They type so I don't have to - word-wrap ; soft wrapping with language-aware indent + ;;word-wrap ; soft wrapping with language-aware indent :emacs (dired +icons +ranger) ; making dired pretty [functional] @@ -89,7 +89,7 @@ ;;editorconfig ; let someone else argue about tabs vs spaces ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) - ;;gist ; interacting with github gists + gist ; interacting with github gists lookup ; navigate your code and its documentation lsp ; M-x vscode magit ; a git porcelain for Emacs @@ -115,22 +115,22 @@ common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans + csharp ; unity, .NET, and mono shenanigans ;;data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;dhall - ;;elixir ; erlang done right + elixir ; erlang done right ;;elm ; care for a cup of TEA? emacs-lisp ; drown in parentheses - ;;erlang ; an elegant language for a more civilized age + erlang ; an elegant language for a more civilized age ;;ess ; emacs speaks statistics ;;factor ;;faust ; dsp, but you get to keep your soul ;;fsharp ; ML stands for Microsoft's Language ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for - ;;(go +lsp) ; the hipster dialect - ;;(haskell +dante) ; a language that's lazier than I am + (go +lsp) ; the hipster dialect + (haskell +dante) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on json ; At least it ain't XML @@ -170,7 +170,7 @@ ;;zig ; C, but simpler :email - ;;(mu4e +org +gmail) + ;;(mu4e +gmail +org) ;;notmuch ;;(wanderlust +gmail) diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index d24eb69..b9b4b2e 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -4,7 +4,6 @@ set fish_bind_mode insert alias rm 'rm -i' alias nnn 'nnn -e' -alias mpv 'mpv --hwdec=vaapi' alias icat 'kitty +kitten icat' alias magit 'emacs -nw --eval "(magit-status)"' alias qutebrowser 'qutebrowser --qt-flag ignore-gpu-blocklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag num-raster-threads=4' @@ -17,6 +16,8 @@ set -gx XDG_CURRENT_DESKTOP sway set -gx MOZ_ENABLE_WAYLAND 1 set -gx QT_AUTO_SCREEN_SCALE_FACTOR 1 +set -gx VDPAU_DRIVER va_gl + set -Ux GTK_IM_MODULE ibus set -Ux QT_IM_MODULE ibus set -Ux XMODIFIERS @im=ibus @@ -26,6 +27,8 @@ 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 +set -gx _JAVA_AWT_WM_NONREPARENTING 1 + +set -x PATH /usr/libexec /usr/local/bin /home/minhradz/.cargo/bin /home/minhradz/.local/bin /home/minhradz/go/bin $PATH starship init fish | source diff --git a/git/.gitconfig b/git/.gitconfig index c0bca13..1292903 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -24,3 +24,5 @@ [interactive] diffFilter = delta --color-only +[github] + user = minhtrannhat diff --git a/lvim/.config/lvim/config.lua b/lvim/.config/lvim/config.lua index ab073dd..eb3c77f 100644 --- a/lvim/.config/lvim/config.lua +++ b/lvim/.config/lvim/config.lua @@ -68,9 +68,20 @@ lvim.plugins = { }, { "andweeb/presence.nvim" }, { "tpope/vim-fugitive" }, + { "TimUntersberger/neogit", requires = "nvim-lua/plenary.nvim" }, } --- The setup config table shows all available config options with their default values: +-- Neogit - A emacs magit clone +local neogit = require("neogit") + +neogit.setup({}) + +lvim.builtin.which_key.mappings["gg"] = { + "Neogit kind=split", + "Neogit", +} + +-- Discord stuffs require("presence"):setup({ -- General options auto_update = true, -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`) @@ -84,16 +95,11 @@ require("presence"):setup({ buttons = true, -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "