From 377b078420c09c563d1f7f96628911e4437d56fc Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Fri, 3 Mar 2023 22:15:44 +0100 Subject: [PATCH 1/3] Tweaks --- emacs/.config/emacs/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index 7b554ac..70340df 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -172,6 +172,6 @@ (lsp-ui-doc-enable nil)) ;; Automatic shit -(global-aggressive-indent-mode 1) +(global-aggressive-indent-mode -1) (electric-pair-mode t) ;; (add-to-list 'aggressive-indent-excluded-modes 'html-mode) From b906691d241313e7059cf0d82cbac47d500dd31e Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sat, 11 Mar 2023 23:55:31 +0100 Subject: [PATCH 2/3] Editor tweaks --- emacs/.config/emacs/init.el | 2 +- nvim/.config/nvim/init.vim | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index 70340df..479080c 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -44,7 +44,7 @@ '(elcord-idle-message "Thinking...") '(elcord-idle-timer 300) '(elcord-quiet t) - '(elcord-use-major-mode-as-main-icon t) + '(elcord-use-major-mode-as-main-icon nil) '(evil-undo-system 'undo-redo) '(lsp-rust-server 'rust-analyzer) '(package-selected-packages diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 02f3eb1..423ddff 100644 --- a/nvim/.config/nvim/init.vim +++ b/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' From e1aa1327f88aefcebeb44d53317b927f767bdfb9 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Tue, 21 Mar 2023 13:28:15 +0100 Subject: [PATCH 3/3] Minor tweaks --- doomemacs/.doom.d/config.el | 21 +++++++++++++++++++++ doomemacs/.doom.d/custom.el | 13 ++++++++++++- leftwm/.config/leftwm/config.ron | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/doomemacs/.doom.d/config.el b/doomemacs/.doom.d/config.el index 1187d45..fbbe723 100644 --- a/doomemacs/.doom.d/config.el +++ b/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 "") 'ivy-resume) +(global-set-key (kbd "M-x") 'counsel-M-x) (global-set-key (kbd "M-f") 'counsel-find-file) +(global-set-key (kbd " f") 'counsel-describe-function) +(global-set-key (kbd " v") 'counsel-describe-variable) +(global-set-key (kbd " o") 'counsel-describe-symbol) +(global-set-key (kbd " l") 'counsel-find-library) +(global-set-key (kbd " i") 'counsel-info-lookup-symbol) +(global-set-key (kbd " 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) diff --git a/doomemacs/.doom.d/custom.el b/doomemacs/.doom.d/custom.el index 92e2540..c65db52 100644 --- a/doomemacs/.doom.d/custom.el +++ b/doomemacs/.doom.d/custom.el @@ -3,10 +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. - '(package-selected-packages '(cpputils-cmake eldoc-cmake quelpa elcord))) + '(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) diff --git a/leftwm/.config/leftwm/config.ron b/leftwm/.config/leftwm/config.ron index 356be92..e658b61 100644 --- a/leftwm/.config/leftwm/config.ron +++ b/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"),