Browse Source

Merge branch 'master' of git.juliobiason.me:dotfiles

master
Julio Biason 3 years ago
parent
commit
0a71d8be2a
  1. 3
      .gitmodules
  2. 24
      emacs.d/init.el
  3. 2
      fish/conf.d/aliases.fish
  4. 1
      nvim/pack/colors/start/onedark.vim

3
.gitmodules vendored

@ -25,3 +25,6 @@
[submodule "nvim/pack/syntaxes/start/emmet-vim"] [submodule "nvim/pack/syntaxes/start/emmet-vim"]
path = nvim/pack/syntaxes/start/emmet-vim path = nvim/pack/syntaxes/start/emmet-vim
url = https://github.com/mattn/emmet-vim.git url = https://github.com/mattn/emmet-vim.git
[submodule "nvim/pack/colors/start/onedark.vim"]
path = nvim/pack/colors/start/onedark.vim
url = https://github.com/joshdick/onedark.vim.git

24
emacs.d/init.el

@ -94,7 +94,6 @@
doom-themes-enable-italic t) doom-themes-enable-italic t)
(load-theme 'doom-monokai-spectrum t)) (load-theme 'doom-monokai-spectrum t))
;; highlights the current line ;; highlights the current line
(use-package hlinum (use-package hlinum
:ensure t :ensure t
@ -137,8 +136,25 @@
(use-package helm (use-package helm
:ensure t :ensure t
:config :config
(setq helm-M-x-fuzzy-match t)
(setq helm-buffers-fuzzy-matching t
helm-recent-fuzzy-match t)
(global-set-key (kbd "M-x") 'helm-M-x) (global-set-key (kbd "M-x") 'helm-M-x)
(global-set-key (kbd "C-x C-f") 'helm-find-files)) (global-set-key (kbd "C-x C-f") 'helm-find-files)
)
;; Project management
(use-package projectile
:ensure t
:init
(projectile-mode +1)
:bind (:map projectile-mode-map
("s-p" . projectile-command-map)
("C-c p" . projectile-command-map))
)
(use-package helm-projectile
:ensure t)
;; auto-pairs ;; auto-pairs
(electric-pair-mode 1) (electric-pair-mode 1)
@ -178,8 +194,10 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(custom-safe-themes
'("835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" default))
'(package-selected-packages '(package-selected-packages
'(editorconfig diff-hl hlinum use-package rust-mode doom-themes auto-package-update))) '(helm-projectile projectile editorconfig diff-hl hlinum use-package rust-mode doom-themes auto-package-update)))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

2
fish/conf.d/aliases.fish

@ -1,7 +1,5 @@
alias vim nvim
alias open xdg-open alias open xdg-open
alias cat 'bat --paging=never' alias cat 'bat --paging=never'
alias less 'bat --paging=always' alias less 'bat --paging=always'
alias ls exa alias ls exa
alias rcp 'rsync -rclh --progress --' alias rcp 'rsync -rclh --progress --'

1
nvim/pack/colors/start/onedark.vim

@ -0,0 +1 @@
Subproject commit ee4b22cbae8a3a434fad832bd89a6981c7c061af
Loading…
Cancel
Save