diff --git a/.gitignore b/.gitignore index 44c1071..848e7f5 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,3 @@ vim/backup/ zsh/cache/ Ansible/*.retry - -Fortune/*.dat diff --git a/Ansible/roles/eryn/tasks/vim.yml b/Ansible/roles/eryn/tasks/vim.yml index 42346a3..2763070 100644 --- a/Ansible/roles/eryn/tasks/vim.yml +++ b/Ansible/roles/eryn/tasks/vim.yml @@ -19,7 +19,7 @@ ansible.builtin.file: path: "{{ ansible_local.xdg.state_home }}/vim" owner: "{{ ansible_user_id }}" - mode: "0750" + mode: 0750 state: directory - name: "vim : Symlink runtime directory" diff --git a/Fortune/Makefile b/Fortune/Makefile deleted file mode 100644 index 9a1c213..0000000 --- a/Fortune/Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -STRFILE=strfile - -DATFILES=eryn.dat - -.PHONY: all clean - -%.dat: % - $(STRFILE) $^ $@ - -.PHONY: all -all: $(DATFILES) - -.PHONY: clean -clean: - rm -f $(DATFILES) diff --git a/Fortune/eryn b/Fortune/eryn deleted file mode 100644 index 87f0bc2..0000000 --- a/Fortune/eryn +++ /dev/null @@ -1,16 +0,0 @@ -Please practice this until you can easily do it. - -- Andrej Diamantstein -% -Easy, isn't it? - -- Andrej Diamantstein -% -TWENTY THREE NINETEEN!!!! -% -You only have to let the soft animal of your body -love what it loves. - -- Mary Oliver, Wild Geese -% -Be a lamp, or a lifeboat, or a ladder -help someone’s soul to heal -Walk out of your house like a shepherd. - -- Rumi, Ode 3090 diff --git a/config/nvim/UltiSnips/rust.snippets b/config/nvim/UltiSnips/rust.snippets deleted file mode 100644 index da88543..0000000 --- a/config/nvim/UltiSnips/rust.snippets +++ /dev/null @@ -1,38 +0,0 @@ -# rust.snippets -# vim: set ts=8 sw=8 sts=8 noet list: -# Eryn Wells - -snippet nnapp -// Eryn Wells - -use nannou::prelude::*; - -struct Model { - _window: window::Id, -} - -impl Model { - fn new(app: &App) -> Self { - let window = app.new_window().view(view).build().unwrap(); - Self { - _window: window, - } - } - - fn update(app: &App, model: &mut Model, update: Update) { - model.update(app, update) - } - - fn update(&mut self, app: &App, update: Update) { - // TODO: Update the model here. - } -} - -fn view(app: &App, model: &Model, frame: Frame) { - // TODO: Draw the view here. -} - -fn main() { - nannou::app(Model::new).update(update).run(); -} -endsnippet diff --git a/config/nvim/lua/keys.lua b/config/nvim/lua/keys.lua index d83fb21..4eaebbb 100644 --- a/config/nvim/lua/keys.lua +++ b/config/nvim/lua/keys.lua @@ -6,7 +6,7 @@ local function init_key_options() vim.g.mapleader = "," end -local function text_navigation_mappings() +local function navigation_mappings() local options = { noremap = true } -- Navigate by soft-wrapped lines using Alt/Option/Meta + jk @@ -87,22 +87,17 @@ end local function telescope_mappings() local builtin = require('telescope.builtin') - map('n', 'ff', builtin.find_files, { desc = 'Telescope find files' }) map('n', 'fg', builtin.live_grep, { desc = 'Telescope live grep' }) map('n', 'fb', builtin.buffers, { desc = 'Telescope buffers' }) map('n', 'fh', builtin.help_tags, { desc = 'Telescope help tags' }) - - if vim.fn.has('gui_running') then - map('n', 'D-O', builtin.buffers, { desc = 'Open existing' }) - end end local function init_all_global_keybindings() init_key_options() clipboard_mappings() window_key_mappings() - text_navigation_mappings() + navigation_mappings() diagnostic_mappings() telescope_mappings() end diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua index 8c6f913..87f964f 100644 --- a/config/nvim/lua/lsp.lua +++ b/config/nvim/lua/lsp.lua @@ -76,11 +76,6 @@ lspconfig.eslint.setup { capabilities = cmp_capabilities, } -lspconfig.ts_ls.setup { - on_attach = on_attach, - capabilities = cmp_capabilities, -} - lspconfig.html.setup { on_attach = on_attach, capabilities = cmp_capabilities, @@ -120,8 +115,7 @@ lspconfig.rust_analyzer.setup { enable = true, }, }, - checkOnSave = true, - check = { + checkOnSave = { command = 'clippy', extraArgs = { "--", diff --git a/setup.sh b/setup.sh index 758c4bf..f2275ba 100755 --- a/setup.sh +++ b/setup.sh @@ -3,23 +3,7 @@ dotfiles_dir=$(cd "$(dirname "$0")" && pwd) sys=`uname -s | tr A-Z a-z` -skipitems=( \ - '.*\.orig' \ - '.*~' \ - Alfred \ - Ansible \ - bin \ - Colors \ - Dotfiles \ - Fortune \ - LaunchAgents \ - py \ - Python \ - README.md \ - setup.sh \ - Web \ - Xcode \ -) +skipitems=(setup.sh README.md py bin Alfred Colors Dotfiles LaunchAgents Python '.*\.orig' '.*~') function link { local action @@ -54,11 +38,6 @@ function matches_skip_item { return 1 } -function build_fortunes { - echo "Building fortunes file" - (cd Fortune && make) -} - print -P " %BHome:%b $HOME" print -P " %BDotfiles:%b $dotfiles_dir" print -P "%BSkip Items:%b $skipitems\n" @@ -168,6 +147,4 @@ if (( $configure_vim )); then $VIM +PlugInstall +qall fi -build_fortunes - exit 0 diff --git a/zsh/func/bool b/zsh/func/bool deleted file mode 100644 index 1fe2567..0000000 --- a/zsh/func/bool +++ /dev/null @@ -1,31 +0,0 @@ -# Eryn Wells -# vim: set ft=zsh: - -function bool { - if [[ "$1" =~ '^-?[0-9]+$' ]]; then - if (( $1 == 0 )); then - echo "no" - return 1 - else - echo "yes" - return 0 - fi - fi - - local lowercase_value=${(L)1} - - if [[ "$lowercase_value" == "yes" || "$lowercase_value" == "true" ]]; then - echo "yes" - return 0 - fi - - if [[ "$lowercase_value" == "no" || "$lowercase_value" == "false" ]]; then - echo "no" - return 1 - fi - - echo "no" - return 1 -} - -bool "$@" diff --git a/zsh/func/update-path b/zsh/func/update-path index 624258a..4172df4 100644 --- a/zsh/func/update-path +++ b/zsh/func/update-path @@ -20,8 +20,7 @@ Arguments --------- %B-e%b | %B--export%b | %B--no-export%b - Export the variable after modification. The default is to export if the - variable is modified. + Export the variable after modification. %B-f%b | %B--force%b Unconditionally add the path, even if it doesn't exist. diff --git a/zshrc b/zshrc index da1297d..8f70595 100644 --- a/zshrc +++ b/zshrc @@ -21,7 +21,6 @@ fi do_init_functions zsh_init_rc_functions -autoload -Uz bool autoload -Uz g autoload -Uz nethack autoload -Uz pw