Removed alacritty, updated Emacs and GNU Screen

2 files changed, 8 insertions, 7 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 26305ac..28cd76a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -41,7 +41,7 @@
  '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95"))
  '(objed-cursor-color "#ff5370")
  '(package-selected-packages
-   '(evil-leader evil-search-highlight-persist undo-tree helm-etags-plus helm-xref treemacs-projectile treemacs-magit treemacs-evil treemacs ibuffer-vc ibuffer-projectile eyebrowse diff-hl difflib fzf helm-fuzzy helm-fuzzy-find helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
+   '(helm-flymake evil-leader evil-search-highlight-persist undo-tree helm-etags-plus helm-xref treemacs-projectile treemacs-magit treemacs-evil treemacs ibuffer-vc ibuffer-projectile eyebrowse diff-hl difflib fzf helm-fuzzy helm-fuzzy-find helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode))
  '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E"))
  '(pos-tip-background-color "#2E2A29")
  '(pos-tip-foreground-color "#d4d4d6")
diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org
index 3e31289..48fbbdf 100644
--- a/.config/emacs/org/config.org
+++ b/.config/emacs/org/config.org
@@ -159,13 +159,13 @@
   (setq evil-want-keybinding nil)
   (setq evil-want-C-u-scroll t)
   (require 'evil)
-  (require 'evil-magit)
   (require 'evil-collection)
   (require 'evil-leader)
   (require 'evil-search-highlight-persist)
   (evil-mode t)
   (evil-collection-init 'ibuffer)
-  (evil-collection-init 'flymake)
+  (evil-collection-init 'magit)
+  ;; (evil-collection-init 'flymake)
 
 
   (setq evil-emacs-state-cursor '("#b16286" box))
@@ -355,10 +355,11 @@
 
 *** Treemacs
 	#+BEGIN_SRC emacs-lisp
-(require 'treemacs)
-(require 'treemacs-evil)
-(require 'treemacs-magit)
-(require 'treemacs-projectile)
+	  (require 'treemacs)
+	  (require 'treemacs-evil)
+	  (require 'treemacs-magit)
+	  (require 'treemacs-projectile)
+	  (setq treemacs-python-executable "/usr/local/bin/python3.7")
 	#+END_SRC
 
 *** Helm, projectile