Merge branch 'master' into arch-laptop

This commit is contained in:
Michael Chalupiak 2024-12-03 15:41:06 -05:00
commit c42b27a81a
2 changed files with 5 additions and 3 deletions

View File

@ -23,6 +23,8 @@ return require('packer').startup(function(use)
end end
} }
use "sindrets/diffview.nvim"
use({ use({
'rose-pine/neovim', 'rose-pine/neovim',
as = 'rose-pine', as = 'rose-pine',
@ -228,8 +230,8 @@ return require('packer').startup(function(use)
end end
} }
-- use 'Olical/conjure' use 'Olical/conjure'
-- use 'PaterJason/cmp-conjure' use 'PaterJason/cmp-conjure'
use { use {
'lukas-reineke/indent-blankline.nvim', 'lukas-reineke/indent-blankline.nvim',

View File

@ -147,7 +147,7 @@
(call-interactively 'mpc)) (call-interactively 'mpc))
;; (set-frame-parameter nil 'alpha-background 80) ; For current frame ;; (set-frame-parameter nil 'alpha-background 80) ; For current frame
(add-to-list 'default-frame-alist '(alpha-background . 80)) ; For all new frames henceforth ;; (add-to-list 'default-frame-alist '(alpha-background . 80)) ; For all new frames henceforth
(setq inhibit-x-resources t) (setq inhibit-x-resources t)
(require 'dime) (require 'dime)