Merge fix

doomemacs/.doom.d/config.el

@@ -79,7 +79,28 @@
 ;; (setq-default tab-width 4)
 ;; (setq-default indent-tabs-mode t)
 
+;; Discord thing
 ;; (elcord-mode)
 
+;; (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
 ;; Find file
+(global-set-key "\C-s" 'swiper)
+(global-set-key (kbd "C-c C-r") 'ivy-resume)
+(global-set-key (kbd "<f6>") 'ivy-resume)
+(global-set-key (kbd "M-x") 'counsel-M-x)
 (global-set-key (kbd "M-f") 'counsel-find-file)
+(global-set-key (kbd "<f1> f") 'counsel-describe-function)
+(global-set-key (kbd "<f1> v") 'counsel-describe-variable)
+(global-set-key (kbd "<f1> o") 'counsel-describe-symbol)
+(global-set-key (kbd "<f1> l") 'counsel-find-library)
+(global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
+(global-set-key (kbd "<f2> u") 'counsel-unicode-char)
+(global-set-key (kbd "C-c g") 'counsel-git)
+(global-set-key (kbd "C-c j") 'counsel-git-grep)
+(global-set-key (kbd "C-c k") 'counsel-ag)
+(global-set-key (kbd "C-x l") 'counsel-locate)
+(global-set-key (kbd "C-S-o") 'counsel-rhythmbox)
+(define-key minibuffer-local-map (kbd "C-r") 'counsel-minibuffer-history)
+
+
+(global-set-key (kbd "M-g") 'format-all-buffer)

doomemacs/.doom.d/custom.el

@@ -3,11 +3,21 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(custom-safe-themes
-   '("7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "1a1ac598737d0fcdc4dfab3af3d6f46ab2d5048b8e72bc22f50271fd6d393a00" default)))
+ '(elcord-display-buffer-details nil)
+ '(elcord-display-elapsed t)
+ '(elcord-display-line-numbers nil)
+ '(elcord-editor-icon "emacs_material_icon")
+ '(elcord-icon-base
+   "https://raw.githubusercontent.com/Mstrodl/elcord/master/icons/")
+ '(elcord-idle-message "Thinking...")
+ '(elcord-mode t nil (elcord))
+ '(elcord-quiet t)
+ '(package-selected-packages '(elcord quelpa eldoc-cmake cpputils-cmake))
+ '(warning-suppress-types '((initialization) (defvaralias))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  )
+(put 'customize-group 'disabled nil)

emacs/.config/emacs/init.el

@@ -62,9 +62,25 @@
 ;; Melpa
 (require 'package)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-
-
-
+(package-initialize)
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(custom-safe-themes
+   '("aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" "251ed7ecd97af314cd77b07359a09da12dcd97be35e3ab761d4a92d8d8cf9a71" "631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b" "6945dadc749ac5cbd47012cad836f92aea9ebec9f504d32fe89a956260773ca4" "636b135e4b7c86ac41375da39ade929e2bd6439de8901f53f88fde7dd5ac3561" "467dc6fdebcf92f4d3e2a2016145ba15841987c71fbe675dcfe34ac47ffb9195" "e1f4f0158cd5a01a9d96f1f7cdcca8d6724d7d33267623cc433fe1c196848554" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "2dd4951e967990396142ec54d376cced3f135810b2b69920e77103e0bcedfba9" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "a44e2d1636a0114c5e407a748841f6723ed442dc3a0ed086542dc71b92a87aee" "7e377879cbd60c66b88e51fad480b3ab18d60847f31c435f15f5df18bdb18184" default))
+ '(elcord-display-buffer-details nil)
+ '(elcord-display-elapsed t)
+ '(elcord-editor-icon "emacs_material_icon")
+ '(elcord-idle-message "Thinking...")
+ '(elcord-idle-timer 300)
+ '(elcord-quiet t)
+ '(elcord-use-major-mode-as-main-icon nil)
+ '(evil-undo-system 'undo-redo)
+ '(lsp-rust-server 'rust-analyzer)
+ '(package-selected-packages
+   '(aggressive-indent lsp-ui company flycheck scss-mode yaml-mode ligature evil-smartparens smartparens web-mode sublimity typescript-mode glsl-mode format-all hl-todo elcord evil-tabs evil-commentary format-all auto-complete editorconfig haskell-mode counsel ivy go-mode rust-mode use-package treemacs-evil treemacs projectile doom-themes lsp-mode evil)))
 
 ;; LSP
 (require 'use-package)

leftwm/.config/leftwm/config.ron

@@ -78,6 +78,7 @@
         (command: SoftReload, value: "", modifier: ["modkey", "Shift"], key: "x"),
         // (command: Execute, value: "loginctl kill-session $XDG_SESSION_ID", modifier: ["modkey", "Shift"], key: "x"),
         (command: Execute, value: "betterlockscreen --lock", modifier: ["modkey", "Shift"], key: "l"),
+        (command: Execute, value: "emacs", modifier: ["modkey", "Shift"], key: "e"),
         (command: Execute, value: "flameshot gui", modifier: ["modkey"], key: "Print"),
         (command: MoveToLastWorkspace, value: "", modifier: ["modkey", "Shift"], key: "w"),
         (command: SwapTags, value: "", modifier: ["modkey"], key: "w"),

nvim/.config/nvim/init.vim

@@ -23,6 +23,7 @@ call plug#begin('~/.config/nvim/plugged')
 	Plug 'arakashic/chromatica.nvim'
 	Plug 'slim-template/vim-slim'
 	Plug 'OmniSharp/omnisharp-vim'
+	Plug 'ARM9/arm-syntax-vim'
 	" Themes
 	Plug 'ellisonleao/gruvbox.nvim'
 	Plug 'sainnhe/gruvbox-material'