From 6aa0e3a61abc63a0b657da19c40014af4e3e376c Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sat, 1 Apr 2023 19:27:49 +0200 Subject: [PATCH] Stuff --- doomemacs/.doom.d/custom.el | 4 +++- doomemacs/.doom.d/init.el | 36 ++++++++++++++++++++---------------- nvim/.config/nvim/init.vim | 25 +++++++++++++------------ 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/doomemacs/.doom.d/custom.el b/doomemacs/.doom.d/custom.el index 12acc10..758e730 100644 --- a/doomemacs/.doom.d/custom.el +++ b/doomemacs/.doom.d/custom.el @@ -3,6 +3,8 @@ ;; 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 + '("2dd4951e967990396142ec54d376cced3f135810b2b69920e77103e0bcedfba9" default)) '(elcord-display-buffer-details nil) '(elcord-display-elapsed t) '(elcord-display-line-numbers nil) @@ -13,7 +15,7 @@ '(elcord-mode t nil (elcord)) '(elcord-quiet t) '(package-selected-packages - '(scala-mode thrift lsp-pyright elcord quelpa eldoc-cmake cpputils-cmake)) + '(elcord quelpa eldoc-cmake cpputils-cmake)) '(warning-suppress-types '((initialization) (defvaralias)))) (custom-set-faces ;; custom-set-faces was added by Custom. diff --git a/doomemacs/.doom.d/init.el b/doomemacs/.doom.d/init.el index 8279616..b710d50 100644 --- a/doomemacs/.doom.d/init.el +++ b/doomemacs/.doom.d/init.el @@ -37,8 +37,8 @@ ;;hydra ;;indent-guides ; highlighted indent columns ligatures ; ligatures and symbols to make your code pretty again - ;; minimap ; show a map of the code on the side - ;; modeline ; snazzy, Atom-inspired modeline, plus API + minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on @@ -121,7 +121,7 @@ ;;common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs ;;crystal ; ruby at the speed of c - csharp ; unity, .NET, and mono shenanigans + (csharp +lsp) ; unity, .NET, and mono shenanigans ;;data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;dhall @@ -144,38 +144,38 @@ json ; At least it ain't XML (java +lsp) ; the poster child for carpal tunnel syndrome javascript ; all(hope(abandon(ye(who(enter(here)))))) - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) + julia ; a better, faster MATLAB + kotlin ; a better, slicker Java(Script) latex ; writing papers in Emacs has never been so fun ;;lean ; for folks with too much to prove ;;ledger ; be audit you can be - lua ; one-based indices? one-based indices + (lua +lsp) ; one-based indices? one-based indices markdown ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - ;;nix ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel + nim ; python + lisp at the speed of c + nix ; I hereby declare "nix geht mehr!" + ocaml ; an objective camel org ; organize your plain life in plain text - ;;php ; perl's insecure younger brother + php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;; purescript ; javascript, but functional - python ; beautiful is better than ugly + (python +lsp) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 ;;rest ; Emacs as a REST client ;;rst ; ReST in peace (ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (scala +lsp) ; java, but good ;;(scheme +guile) ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor ;;sml ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? + (swift +lsp) ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - ;;web ; the tubes + web ; the tubes yaml ; JSON, but readable - ;;zig ; C, but simpler + (zig +lsp) ; C, but simpler :email ;;(mu4e +org +gmail) @@ -193,3 +193,7 @@ :config ;;literate (default +bindings +smartparens)) + + +(after! lsp-pyls + (setq lsp-pyls-plugins-pycodestyle-ignore '("E501"))) diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 423ddff..5b04419 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -28,6 +28,7 @@ call plug#begin('~/.config/nvim/plugged') Plug 'ellisonleao/gruvbox.nvim' Plug 'sainnhe/gruvbox-material' Plug 'projekt0n/github-nvim-theme' + Plug 'chriskempson/base16-vim' " Lua Line Plug 'nvim-lualine/lualine.nvim' Plug 'kyazdani42/nvim-web-devicons' @@ -56,27 +57,27 @@ set shiftwidth=4 let g:ruby_recommended_style = 0 " Binds - " Tabs - vmap >gv - vmap >gv +vmap :NERDTreeToggle +" NERDTree +nmap :NERDTreeToggle set clipboard+=unnamedplus " Theme " set background=dark -colorscheme github_dark +colorscheme base16-tomorrow-night let &showbreak = '↳ ' set laststatus=0 ruler -" set rnu nu +set nu -hi Normal guibg=NONE ctermbg=NONE -hi EndOfBuffer guibg=NONE ctermbg=NONE -hi TabLine guibg=NONE ctermbg=NONE -" hi TabLineSel ctermfg=223 guibg=NONE ctermbg=NONE -hi TabLineFill guibg=NONE ctermbg=NONE +" hi Normal guibg=NONE ctermbg=NONE +" hi EndOfBuffer guibg=NONE ctermbg=NONE +" hi TabLine guibg=NONE ctermbg=NONE +" " hi TabLineSel ctermfg=223 guibg=NONE ctermbg=NONE +" hi TabLineFill guibg=NONE ctermbg=NONE hi StatusLine ctermbg=NONE guibg=NONE