Merge branch 'master' into arch-laptop

config/.config/nvim/lua/config/packer.lua

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

config/.doom.d/config.el

@@ -147,7 +147,7 @@
        (call-interactively 'mpc))
 
 ;; (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)
 
 (require 'dime)