Various fixes

This commit is contained in:
minhtrannhat 2022-01-24 10:37:58 -05:00
parent 7643436ad1
commit 06d488ab21
No known key found for this signature in database
GPG Key ID: 894C6A5801E01CA9
7 changed files with 63 additions and 24 deletions

View File

@ -82,11 +82,6 @@
;; org org ;; org org
(setq +latex-viewers '(zathura)) (setq +latex-viewers '(zathura))
;; (after! org (setq org-hide-emphasis-markers t))
;; (add-hook! org-mode (electric-indent-local-mode -1))
;; (add-hook! org-mode :append
;; #'visual-line-mode)
;; fish fish ;; fish fish
(setq vterm-shell 'fish) (setq vterm-shell 'fish)
@ -162,6 +157,11 @@
(setq avy-all-windows 't) (setq avy-all-windows 't)
;; Disables lsp-signature-auto-activate globally
(after! lsp-mode
(setq lsp-signature-auto-activate nil))
(lsp-treemacs-sync-mode 1) (lsp-treemacs-sync-mode 1)
(setq highlight-indent-guides-method 'bitmap) (setq highlight-indent-guides-method 'bitmap)

View File

@ -4,6 +4,7 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(TeX-command-BibTeX "Biber")
'(custom-safe-themes '(custom-safe-themes
'("7eea50883f10e5c6ad6f81e153c640b3a288cd8dc1d26e4696f7d40f754cc703" "5784d048e5a985627520beb8a101561b502a191b52fa401139f4dd20acb07607" "e3b2bad7b781a968692759ad12cb6552bc39d7057762eefaf168dbe604ce3a4b" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" default)) '("7eea50883f10e5c6ad6f81e153c640b3a288cd8dc1d26e4696f7d40f754cc703" "5784d048e5a985627520beb8a101561b502a191b52fa401139f4dd20acb07607" "e3b2bad7b781a968692759ad12cb6552bc39d7057762eefaf168dbe604ce3a4b" "1704976a1797342a1b4ea7a75bdbb3be1569f4619134341bd5a4c1cfb16abad4" "d268b67e0935b9ebc427cad88ded41e875abfcc27abd409726a92e55459e0d01" default))
'(git-gutter:update-interval 1) '(git-gutter:update-interval 1)

View File

@ -10,6 +10,16 @@ alias qutebrowser 'qutebrowser --qt-flag ignore-gpu-blocklist --qt-flag enable-g
export GPG_TTY=(tty) export GPG_TTY=(tty)
gpgconf --launch gpg-agent
# config.fish
if test -z (pgrep ssh-agent)
eval (ssh-agent -c)
set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK
set -Ux SSH_AGENT_PID $SSH_AGENT_PID
set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK
end
set -gx MOZ_WEBRENDER 1 set -gx MOZ_WEBRENDER 1
set -gx XDG_SESSION_TYPE wayland set -gx XDG_SESSION_TYPE wayland
set -gx XDG_CURRENT_DESKTOP sway set -gx XDG_CURRENT_DESKTOP sway
@ -24,7 +34,7 @@ set -Ux XMODIFIERS @im=ibus
set -gx EDITOR lvim set -gx EDITOR lvim
set -gx NVIM_LISTEN_ADDRESS /tmp/nvimsocket set -gx NVIM_LISTEN_ADDRESS /tmp/nvimsocket
set -gx MANPAGER "lvim +Man!"
set -gx LC_ALL en_US.UTF-8 set -gx LC_ALL en_US.UTF-8
set -gx _JAVA_AWT_WM_NONREPARENTING 1 set -gx _JAVA_AWT_WM_NONREPARENTING 1

View File

@ -26,3 +26,9 @@
diffFilter = delta --color-only diffFilter = delta --color-only
[github] [github]
user = minhtrannhat user = minhtrannhat
[merge]
conflictstyle = diff3
[diff]
colorMoved = default

View File

@ -13,12 +13,11 @@ lvim.shell = "/bin/fish"
-- keymappings [view all the defaults by pressing <leader>Lk] -- keymappings [view all the defaults by pressing <leader>Lk]
lvim.leader = "space" lvim.leader = "space"
lvim.builtin.dashboard.active = true lvim.builtin.dashboard.active = true
lvim.builtin.terminal.active = true lvim.builtin.terminal.active = true
lvim.builtin.autopairs.active = true lvim.builtin.autopairs.active = true
lvim.builtin.gitsigns.active = true lvim.builtin.gitsigns.active = true
lvim.builtin.dap.active = false lvim.builtin.dap.active = true
vim.opt.relativenumber = true vim.opt.relativenumber = true
lvim.builtin.nvimtree.side = "left" lvim.builtin.nvimtree.side = "left"
@ -67,16 +66,42 @@ lvim.plugins = {
end, end,
event = "InsertEnter", event = "InsertEnter",
}, },
{ "machakann/vim-sandwich" },
{ "tpope/vim-fugitive" }, { "tpope/vim-fugitive" },
{ "TimUntersberger/neogit", requires = "nvim-lua/plenary.nvim" },
} }
-- Neogit - A emacs magit clone -- Changes to clangd
local neogit = require("neogit") vim.list_extend(lvim.lsp.override, { "clangd" })
neogit.setup({}) -- some settings can only passed as commandline flags `clangd --help`
local clangd_flags = {
lvim.builtin.which_key.mappings["gg"] = { "--all-scopes-completion",
"<cmd>Neogit kind=split<CR>", "--suggest-missing-includes",
"Neogit", "--background-index",
"--pch-storage=disk",
"--cross-file-rename",
"--log=info",
"--completion-style=detailed",
"--enable-config", -- clangd 11+ supports reading from .clangd configuration file
"--clang-tidy",
"--offset-encoding=utf-16",
"--clang-tidy-checks=-*,llvm-*,clang-analyzer-*,modernize-*,-modernize-use-trailing-return-type",
"--fallback-style=Google",
-- "--header-insertion=never",
-- "--query-driver=<list-of-white-listed-complers>"
} }
local clangd_bin = "clangd"
local custom_on_attach = function(client, bufnr)
require("lvim.lsp").common_on_attach(client, bufnr)
local opts = { noremap = true, silent = true }
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>lh", "<Cmd>ClangdSwitchSourceHeader<CR>", opts)
end
local opts = {
cmd = { clangd_bin, unpack(clangd_flags) },
on_attach = custom_on_attach,
}
require("lvim.lsp.manager").setup("clangd", opts)

View File

@ -14,9 +14,6 @@ exec mako
# mounting external hard drives # mounting external hard drives
exec udiskie exec udiskie
# ssh-agent yayy no password
exec fish_ssh_agent
# night light and some gamma decrease # night light and some gamma decrease
exec wlsunset -l 45.6 -L -73.5 -g 0.8 exec wlsunset -l 45.6 -L -73.5 -g 0.8
@ -26,9 +23,6 @@ exec autotiling
# window manager # window manager
exec env RUST_BACKTRACE=1 swayrd > /tmp/swayrd.log 2>&1 exec env RUST_BACKTRACE=1 swayrd > /tmp/swayrd.log 2>&1
# gpg-agent
exec eval (gpg-agent -c)
### Variables ### Variables
# #
# Logo key. Use Mod1 for Alt. # Logo key. Use Mod1 for Alt.
@ -86,7 +80,10 @@ exec swayidle -w \
for_window [title="Firefox — Sharing Indicator"] floating enable for_window [title="Firefox — Sharing Indicator"] floating enable
for_window [title="Firefox — Sharing Indicator"] nofocus for_window [title="Firefox — Sharing Indicator"] nofocus
# for_window [app_id="mpv"] inhibit_idle visible; border none; max_render_time off
for_window [class="firefox"] inhibit_idle fullscreen; max_render_time off
for_window [app_id="firefox"] inhibit_idle fullscreen; max_render_time off
# This will lock your screen after 300 seconds of inactivity, then turn off # This will lock your screen after 300 seconds of inactivity, then turn off
# your displays after another 300 seconds, and turn your screens back on when # your displays after another 300 seconds, and turn your screens back on when
# resumed. It will also lock your screen before your computer goes to sleep. # resumed. It will also lock your screen before your computer goes to sleep.

View File

@ -21,7 +21,7 @@ bind-key -T copy-mode-vi v send-keys begin-selection
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'wl-copy' bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'wl-copy'
# reload config file (change file location to your the tmux.conf you want to use) # reload config file (change file location to your the tmux.conf you want to use)
bind r source-file /etc/tmux.conf bind r source-file /home/minhradz/.tmux.conf
# switch panes using Alt-arrow without prefix # switch panes using Alt-arrow without prefix
bind -n M-Left select-pane -L bind -n M-Left select-pane -L