Compare commits

..

No commits in common. "6b08decfb9724a0ba45bbb4490725fa6517651ec" and "03fe14895cb7caf9970384d7220b8194034f8b32" have entirely different histories.

11 changed files with 6 additions and 145 deletions

2
.gitignore vendored
View file

@ -32,5 +32,3 @@ vim/backup/
zsh/cache/
Ansible/*.retry
Fortune/*.dat

View file

@ -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"

View file

@ -1,16 +0,0 @@
STRFILE=strfile
DATFILES=eryn.dat
.PHONY: all clean
%.dat: %
$(STRFILE) $^ $@
.PHONY: all
all: $(DATFILES)
.PHONY: clean
clean:
rm -f $(DATFILES)

View file

@ -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 someones soul to heal
Walk out of your house like a shepherd.
-- Rumi, Ode 3090

View file

@ -1,38 +0,0 @@
# rust.snippets
# vim: set ts=8 sw=8 sts=8 noet list:
# Eryn Wells <eryn@erynwells.me>
snippet nnapp
// Eryn Wells <eryn@erynwells.me>
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

View file

@ -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', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
map('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
map('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
map('n', '<leader>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

View file

@ -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 = {
"--",

View file

@ -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

View file

@ -1,31 +0,0 @@
# Eryn Wells <eryn@erynwells.me>
# 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 "$@"

View file

@ -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.

1
zshrc
View file

@ -21,7 +21,6 @@ fi
do_init_functions zsh_init_rc_functions
autoload -Uz bool
autoload -Uz g
autoload -Uz nethack
autoload -Uz pw