Added nvim

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
This commit is contained in:
2021-04-04 17:35:42 +02:00
parent c454e0d00a
commit fee8caf4da
11 changed files with 286 additions and 207 deletions

View File

@ -3,11 +3,9 @@
;; 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
'("2dff5f0b44a9e6c8644b2159414af72261e38686072e063aa66ee98a2faecf0e" default))
'(markdown-command "/usr/bin/pandoc")
'(package-selected-packages
'(company-jedi yaml-mode use-package treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil switch-window smex robe ox-reveal multiple-cursors move-text lsp-java jedi-core htmlize helm flymake-yaml flymake-shellcheck flymake-shell flymake-ruby flycheck-haskell flycheck-bashate dracula-theme dockerfile-mode dired-sidebar company-tabnine company-c-headers company-ansible auto-complete-clang apache-mode ansible-doc ansible)))
'(zenburn-theme yaml-mode use-package treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil switch-window smex robe ox-reveal multiple-cursors move-text lsp-java htmlize helm flymake-yaml flymake-shellcheck flymake-shell flymake-ruby flycheck-haskell flycheck-bashate dracula-theme dockerfile-mode dired-sidebar company-tabnine company-jedi company-c-headers company-ansible auto-complete-clang apache-mode ansible-doc ansible)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.

View File

@ -23,7 +23,7 @@
;; Enable IDO mode
(setq ido-enable-flex-matching t)
;;(setq ido-everywhere t)
;;(ido-mode 1)
(ido-mode 1)
(global-set-key (kbd "C-x b") 'ido-switch-buffer)
;; Remove working cl
@ -77,6 +77,10 @@
(setq browse-url-browser-function 'browse-url-generic
browse-url-generic-program "browser-x")
;; Custom theme
(add-to-list 'custom-theme-load-path
"~/.emacs.d/plugins/")
;; Switch-window
(use-package switch-window
:ensure t
@ -163,10 +167,17 @@
(add-to-list 'default-frame-alist `(font . ,(rc/get-default-font)))
;; Theme
(use-package dracula-theme
;;(use-package dracula-theme
;; :ensure t
;; :config
;; (load-theme 'dracula t))
(use-package zenburn-theme
:ensure t
:config
(load-theme 'dracula t))
(load-theme 'zenburn t))
;; Sitebar dirred
(use-package dired-sidebar
@ -250,6 +261,11 @@
:config
)
;; pip install --user yamllint
(require 'flycheck-yamllint)
(eval-after-load 'flycheck
'(add-hook 'flycheck-mode-hook 'flycheck-yamllint-setup))
;; Ansible
(use-package ansible
:ensure t
@ -340,46 +356,46 @@
:config
(progn
(setq treemacs-collapse-dirs (if treemacs-python-executable 3 0)
treemacs-deferred-git-apply-delay 0.5
treemacs-directory-name-transformer #'identity
treemacs-display-in-side-window t
treemacs-eldoc-display t
treemacs-file-event-delay 5000
treemacs-file-extension-regex treemacs-last-period-regex-value
treemacs-file-follow-delay 0.2
treemacs-file-name-transformer #'identity
treemacs-follow-after-init t
treemacs-git-command-pipe ""
treemacs-goto-tag-strategy 'refetch-index
treemacs-indentation 2
treemacs-indentation-string " "
treemacs-is-never-other-window nil
treemacs-max-git-entries 5000
treemacs-missing-project-action 'ask
treemacs-move-forward-on-expand nil
treemacs-no-png-images nil
treemacs-no-delete-other-windows t
treemacs-project-follow-cleanup nil
treemacs-persist-file (expand-file-name ".cache/treemacs-persist" user-emacs-directory)
treemacs-position 'left
treemacs-read-string-input 'from-child-frame
treemacs-recenter-distance 0.1
treemacs-recenter-after-file-follow nil
treemacs-recenter-after-tag-follow nil
treemacs-recenter-after-project-jump 'always
treemacs-recenter-after-project-expand 'on-distance
treemacs-show-cursor nil
treemacs-show-hidden-files t
treemacs-silent-filewatch nil
treemacs-silent-refresh nil
treemacs-sorting 'alphabetic-asc
treemacs-space-between-root-nodes t
treemacs-tag-follow-cleanup t
treemacs-tag-follow-delay 1.5
treemacs-user-mode-line-format nil
treemacs-user-header-line-format nil
treemacs-width 35
treemacs-workspace-switch-cleanup nil)
treemacs-deferred-git-apply-delay 0.5
treemacs-directory-name-transformer #'identity
treemacs-display-in-side-window t
treemacs-eldoc-display t
treemacs-file-event-delay 5000
treemacs-file-extension-regex treemacs-last-period-regex-value
treemacs-file-follow-delay 0.2
treemacs-file-name-transformer #'identity
treemacs-follow-after-init t
treemacs-git-command-pipe ""
treemacs-goto-tag-strategy 'refetch-index
treemacs-indentation 2
treemacs-indentation-string " "
treemacs-is-never-other-window nil
treemacs-max-git-entries 5000
treemacs-missing-project-action 'ask
treemacs-move-forward-on-expand nil
treemacs-no-png-images nil
treemacs-no-delete-other-windows t
treemacs-project-follow-cleanup nil
treemacs-persist-file (expand-file-name ".cache/treemacs-persist" user-emacs-directory)
treemacs-position 'left
treemacs-read-string-input 'from-child-frame
treemacs-recenter-distance 0.1
treemacs-recenter-after-file-follow nil
treemacs-recenter-after-tag-follow nil
treemacs-recenter-after-project-jump 'always
treemacs-recenter-after-project-expand 'on-distance
treemacs-show-cursor nil
treemacs-show-hidden-files t
treemacs-silent-filewatch nil
treemacs-silent-refresh nil
treemacs-sorting 'alphabetic-asc
treemacs-space-between-root-nodes t
treemacs-tag-follow-cleanup t
treemacs-tag-follow-delay 1.5
treemacs-user-mode-line-format nil
treemacs-user-header-line-format nil
treemacs-width 35
treemacs-workspace-switch-cleanup nil)
;; The default width and height of the icons is 22 pixels. If you are
;; using a Hi-DPI display, uncomment this to double the icon size.
@ -389,19 +405,19 @@
(treemacs-filewatch-mode t)
(treemacs-fringe-indicator-mode 'always)
(pcase (cons (not (null (executable-find "git")))
(not (null treemacs-python-executable)))
(not (null treemacs-python-executable)))
(`(t . t)
(treemacs-git-mode 'deferred))
(`(t . _)
(treemacs-git-mode 'simple))))
:bind
(:map global-map
("M-0" . treemacs-select-window)
("C-x t 1" . treemacs-delete-other-windows)
("C-x t t" . treemacs)
("C-x t B" . treemacs-bookmark)
("C-x t C-t" . treemacs-find-file)
("C-x t M-t" . treemacs-find-tag)))
("M-0" . treemacs-select-window)
("C-x t 1" . treemacs-delete-other-windows)
("C-x t t" . treemacs)
("C-x t B" . treemacs-bookmark)
("C-x t C-t" . treemacs-find-file)
("C-x t M-t" . treemacs-find-tag)))
(use-package treemacs-evil
:after treemacs evil
@ -436,6 +452,21 @@
(add-hook 'python-mode-hook 'my/python-mode-hook)
(setq-default ebuild-mode-update-copyright nil)
(defun infer-indentation-style () (interactive)
(let ((space-count (how-many "^ " (point-min) (point-max)))
(tab-count (how-many "^\t" (point-min) (point-max))))
(if (> space-count tab-count) (setq indent-tabs-mode nil))
(if (> tab-count space-count) (setq indent-tabs-mode t))))
(add-hook 'python-mode-hook
(lambda ()
(if indent-tabs-mode
(setq tab-width 4
python-indent-offset 4))))
(add-hook 'python-mode-hook 'infer-indentation-style)
;;; --- Look & Feel ---
;; Helm
@ -445,7 +476,7 @@
)
(add-hook 'helm-minibuffer-set-up-hook
'helm-hide-minibuffer-maybe)
'helm-hide-minibuffer-maybe)
(setq helm-autoresize-max-height 0)
(setq helm-autoresize-min-height 20)

View File

@ -1,13 +1,13 @@
;; ----- smex-history -----
(
table-insert
table-insert-row
package-install
ido-mode
customize-themes
avy-isearch
load-theme
disable-theme
shell
package-refresh-contents
treemacs
delete-rectangle
kill-rectangle
)
;; ----- smex-data -----
@ -33,10 +33,10 @@
(inf-ruby-console-auto . 8)
(shell . 6)
(package-install-selected-packages . 1)
(package-install . 1)
(package-install . 2)
(compile . 2)
(lsp-mode . 2)
(load-theme . 15)
(load-theme . 16)
(overwrite-mode . 1)
(goto-line . 2)
(package-refresh-contents . 1)
@ -44,4 +44,9 @@
(disable-theme . 1)
(table-insert . 3)
(table-insert-row . 1)
(kill-rectangle . 1)
(delete-rectangle . 1)
(avy-isearch . 1)
(customize-themes . 1)
(ido-mode . 1)
)