From cc9022df39bf7e981e58a1bc0775e5222755335e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sat, 12 Dec 2020 17:56:13 +0100 Subject: [PATCH] Updated --- .emacs.d/emacs-custom.el | 17 ---------- .emacs.d/init.el | 61 ++++++++++++++++++++++++++++++----- .emacs.d/transient/history.el | 1 - .gitignore | 15 +++++++++ .local/bin/saver-off | 4 +++ 5 files changed, 72 insertions(+), 26 deletions(-) delete mode 100644 .emacs.d/emacs-custom.el delete mode 100644 .emacs.d/transient/history.el create mode 100755 .local/bin/saver-off diff --git a/.emacs.d/emacs-custom.el b/.emacs.d/emacs-custom.el deleted file mode 100644 index 0230f4b..0000000 --- a/.emacs.d/emacs-custom.el +++ /dev/null @@ -1,17 +0,0 @@ -(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. - '(livedown-autostart nil) - '(livedown-browser nil) - '(livedown-open t) - '(livedown-port 1337) - '(package-selected-packages - '(markdown-mode magit dired-sidebar dracula-theme auto-complete ox-reveal htmlize switch-window use-package))) -(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. - ) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index b84f7e8..1398962 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -13,6 +13,10 @@ ) (package-initialize) +;; Remove working cl +(require 'cl-lib) +(setq byte-compile-warnings '(cl-functions)) + ;; install use-package (unless (package-installed-p 'use-package) (package-refresh-contents) @@ -36,7 +40,7 @@ (global-set-key (kbd "C-x j") 'awesome-tab-backward-tab) (global-set-key (kbd "C-x k") 'awesome-tab-forward-tab) -;; 80-charaters mode +;; 80-charaters mode (add-hook 'text-mode-hook 'auto-fill-mode) (setq-default fill-column 80) @@ -80,20 +84,38 @@ (setq org-reveal-root "https://cdn.jsdelivr.net/npm/reveal.js") ) -;; Org-Jira -;(use-package org-jira -; :ensure t -; ) -;(setq jiralib-url "https://localhost/") +;; moveline +(use-package move-text + :ensure t + :config) +(global-set-key (kbd "M-") 'move-text-up) +(global-set-key (kbd "M-") 'move-text-down) + ;; AutoComlete -(use-package auto-complete +(use-package auto-complete :ensure t ) (ac-config-default) (global-auto-complete-mode t) +;; Company +(eval-after-load 'company + '(push 'company-robe company-backends)) + +;; Ruby +(eval-after-load 'auto-complete + '(add-to-list 'ac-modes 'inf-ruby-mode)) +(add-hook 'inf-ruby-mode-hook 'ac-inf-ruby-enable) +(eval-after-load 'inf-ruby ' + '(define-key inf-ruby-mode-map (kbd "TAB") 'auto-complete)) + ;; Theme +;(use-package gruber-darker-theme +; :ensure t +; :config +; (load-theme 'gruber-darker-theme t)) + (use-package dracula-theme :ensure t :config @@ -113,6 +135,29 @@ :config ) +;; ruby sorce code +(use-package flymake-ruby + :ensure t + :config + ) + +(use-package flymake-easy + :ensure t + :config + ) + +;; Error list +(define-key flymake-mode-map (kbd "M-n") 'flymake-goto-next-error) +(define-key flymake-mode-map (kbd "M-p") 'flymake-goto-prev-error) + +(require 'robe) +(add-hook 'ruby-mode-hook 'robe-mode) +(add-hook 'robe-mode-hook 'ac-robe-setup) + +(require 'flymake-ruby) +(add-hook 'ruby-mode-hook 'flymake-ruby-load) + +;; Git (global-set-key (kbd "C-x g") 'magit-status) ;; Markdown-mode @@ -148,7 +193,7 @@ (setq ring-bell-function 'ignore) ;; highlight: -(global-hl-line-mode 1) +;(global-hl-line-mode 1) ;; auto reloading (reverting) buffers (global-auto-revert-mode 1) diff --git a/.emacs.d/transient/history.el b/.emacs.d/transient/history.el deleted file mode 100644 index 90b5a84..0000000 --- a/.emacs.d/transient/history.el +++ /dev/null @@ -1 +0,0 @@ -nil \ No newline at end of file diff --git a/.gitignore b/.gitignore index cad05ef..66d8539 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,18 @@ +.config/Microsoft/ +.config/autostart/ +.config/keepassxc/ +.config/mimeapps.list +.config/teams/ +.local/bin/epylint +.local/bin/haruhi-dl +.local/bin/isort +.local/bin/pylint +.local/bin/pyreverse +.local/bin/symilar +.local/bin/wheel +.logSynology +.vscode/ +.yarnrc .emacs.d/elpa/ .fltk/ .local/bin/vpnst diff --git a/.local/bin/saver-off b/.local/bin/saver-off new file mode 100755 index 0000000..2e719df --- /dev/null +++ b/.local/bin/saver-off @@ -0,0 +1,4 @@ +#!/bin/bash +xset s off +xset -dpms +pkill -9 xautolock