From 0f30ca6199e07e2c3a0b039efc6c4507da72bdb5 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <anthonycicc@gmail.com>
Date: Mon, 19 Nov 2018 20:19:29 -0500
Subject: [PATCH] Changed zshrc slightly, fixed Kitty font, added rls to Rust
 setup, fixed vimrc for rls

---
 kitty/kitty.conf                      | 2 +-
 playbooks/roles/common/tasks/rust.yml | 4 ++++
 vim/vimrc                             | 2 +-
 zsh/zshrc                             | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 5b96c45..d4adeb3 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -10,7 +10,7 @@
 # bold/italic/bold-italic variants. By default they are derived automatically,
 # by the OSes font system. Setting them manually is useful for font families
 # that have many weight variants like Book, Medium, Thick, etc. For example:
-font_family Iosevka Custom Regular
+font_family Iosevka Custom Medium
 # bold_font Operator Mono Medium
 # italic_font Operator Mono Book Italic
 # bold_italic_font Operator Mono Medium Italic
diff --git a/playbooks/roles/common/tasks/rust.yml b/playbooks/roles/common/tasks/rust.yml
index 2a756f9..92d0904 100644
--- a/playbooks/roles/common/tasks/rust.yml
+++ b/playbooks/roles/common/tasks/rust.yml
@@ -24,3 +24,7 @@
   args:
     creates: ~/.cargo/bin/cargo-install-update
 
+- name: Install rls
+  shell: ~/.cargo/bin/rustup component add rls-preview rust-analysis rust-src
+  args:
+    creates: ~/.cargo/bin/rls
diff --git a/vim/vimrc b/vim/vimrc
index 35c689b..20edc90 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -66,7 +66,7 @@ endif
 if executable('rls')
     au User lsp_setup call lsp#register_server({
        \ 'name': 'rls',
-       \ 'cmd': {server_info->['rustup', 'run', 'nightly', 'rls']},
+       \ 'cmd': {server_info->['rustup', 'run', 'stable', 'rls']},
        \ 'whitelist': ['rust'],
        \ })
 endif
diff --git a/zsh/zshrc b/zsh/zshrc
index aa0ad59..55f5915 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -53,7 +53,7 @@ antigen apply
 alias 'onedrive-journal'="journalctl --user-unit onedrive -f"
 alias exa="exa -l --git"
 
-eval $(thefuck --alias oops)
+eval $($HOME/.anyenv/envs/pyenv/shims/thefuck --alias oops)
 # pip 10.0.1 zsh completion start
 function _pip_completion {
   local words cword