darwin configuration and improvements to ruby lsp setup
This commit is contained in:
parent
99307054bf
commit
d9c2e63e22
2 changed files with 42 additions and 11 deletions
27
nix/home.nix
27
nix/home.nix
|
|
@ -59,7 +59,6 @@ in {
|
|||
nnn
|
||||
tree
|
||||
ripgrep
|
||||
vlc
|
||||
zsh-autosuggestions
|
||||
zsh-history-substring-search
|
||||
zsh-syntax-highlighting
|
||||
|
|
@ -68,6 +67,7 @@ in {
|
|||
] else [
|
||||
calibre
|
||||
slack
|
||||
vlc
|
||||
]);
|
||||
|
||||
programs.direnv = {
|
||||
|
|
@ -121,7 +121,7 @@ in {
|
|||
|
||||
initExtra = mkForce (''
|
||||
export LOCALE_ARCHIVE="/usr/lib/locale/locale-archive"
|
||||
export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH
|
||||
export NIX_PATH=darwin-config=$HOME/.nixpkgs/darwin-configuration.nix:$HOME/.nix-defexpr/channels:$NIX_PATH
|
||||
export EDITOR=vim
|
||||
|
||||
source $HOME/.nix-profile/etc/profile.d/nix.sh
|
||||
|
|
@ -154,11 +154,6 @@ in {
|
|||
eval "$(direnv hook zsh)"
|
||||
'');
|
||||
|
||||
shellAliases = {
|
||||
n = "neuron new";
|
||||
ns = "neuron search -a";
|
||||
};
|
||||
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
theme = "typewritten";
|
||||
|
|
@ -204,11 +199,16 @@ in {
|
|||
plugins = with pkgs.vimPlugins; [
|
||||
vim-sensible
|
||||
vim-startify
|
||||
|
||||
vim-elixir
|
||||
alchemist-vim
|
||||
vimtex
|
||||
vim-elixir
|
||||
vim-elm-syntax
|
||||
vim-nix
|
||||
vim-javascript
|
||||
vim-json
|
||||
vim-jsx-pretty
|
||||
|
||||
vim-airline
|
||||
rainbow
|
||||
vim-signify
|
||||
|
|
@ -216,7 +216,6 @@ in {
|
|||
vim-surround
|
||||
fugitive
|
||||
easymotion
|
||||
tagbar
|
||||
vinegar
|
||||
undotree
|
||||
vim-test
|
||||
|
|
@ -244,10 +243,14 @@ in {
|
|||
\ 'javascript.jsx': ['prettier'],
|
||||
\ 'javascriptreact': ['prettier'],
|
||||
\ 'typescriptreact': ['prettier'],
|
||||
\ 'ruby': [],
|
||||
\ 'ruby': ['sorbet'],
|
||||
\ 'rust': ['rustfmt'],
|
||||
\ 'elixir': ['mix_format']
|
||||
\}
|
||||
let g:ale_linters_ignore = {
|
||||
\ 'javascript': ['tsserver'],
|
||||
\ 'javascriptreact': ['tsserver'],
|
||||
\}
|
||||
|
||||
" Easymotion
|
||||
map / <Plug>(easymotion-sn)
|
||||
|
|
@ -282,11 +285,13 @@ in {
|
|||
\ 'javascript.jsx': ['flow', 'lsp'],
|
||||
\ 'javascriptreact': ['flow', 'lsp'],
|
||||
\ 'rust': ['rustup', 'run', 'stable', 'rls'],
|
||||
\ 'ruby': ['bundle', 'exec', 'srb', 'tc', '--lsp', '.'],
|
||||
\ }
|
||||
|
||||
let g:LanguageClient_rootMarkers = {
|
||||
\ 'elm': ['elm.json'],
|
||||
\ 'typescriptreact': ['tsconfig.json'],
|
||||
\ 'ruby': ['Gemfile'],
|
||||
\ }
|
||||
|
||||
let g:LanguageClient_loggingFile = expand('~/.local/share/nvim/LanguageClient.log')
|
||||
|
|
@ -398,7 +403,7 @@ in {
|
|||
defaultCommand = "rg --no-ignore --follow --files --hidden --smart-case --glob \\\"!.git/*\\\"";
|
||||
};
|
||||
|
||||
services.lorri.enable = !pkgs.stdenv.isDarwin;
|
||||
# services.lorri.enable = !pkgs.stdenv.isDarwin;
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue