Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

home-manager/modules/programs/emacs/default.nix

@@ -35,6 +35,7 @@ in {
           epkgs.cfrs
           epkgs.citeproc
           epkgs.company
+          epkgs.company-org-block
           epkgs.company-restclient
           epkgs.company-web
           epkgs.counsel

home-manager/modules/programs/emacs/emacs.d/lib/az_company.el

@@ -18,3 +18,8 @@
       (append (if (consp backend) backend (list backend))
               '(:with company-yasnippet))))
   (setq company-backends (mapcar #'company-mode/backend-with-yas company-backends)))
+
+(use-package company-org-block
+  :hook ((org-mode . (lambda ()
+                       (setq-local company-backends '(company-org-block))
+                       (company-mode +1)))))

home-manager/modules/programs/emacs/emacs.d/lib/az_various.el

@@ -43,6 +43,9 @@
 
 (setq history-delete-duplicates t)
 
+;; disbale the bell
+(setq ring-bell-function 'ignore)
+
 ;; enable mouse support in the terminal
 (xterm-mouse-mode 1)