From f4a3b65189420f5fe16e8d512bb6080756e87213 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 13 Feb 2022 11:07:53 -0700 Subject: [PATCH] wslg updates --- README.md | 24 +++++++++++++++ install.conf.yaml | 7 ----- nvim/plugins.lua | 6 ++++ personal.toml | 65 ++++++++++++++++++++++++++++++++++++++++ repos.toml => work.toml | 66 ----------------------------------------- zsh/zshrc | 4 +++ 6 files changed, 99 insertions(+), 73 deletions(-) create mode 100644 personal.toml rename repos.toml => work.toml (76%) diff --git a/README.md b/README.md index 07f4dcb..b100cb2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,29 @@ # dotfiles +## wslg ubuntu + +```bash +sudo apt update +sudo apt upgrade +sudo apt install nvim tmux ripgrep zsh tree git build-essential libssl-dev pkg-config +sudo hostname $HOSTNAME +chsh -s $(which zsh) +sudo echo "[interop]\nappendWindowsPath = false" > /etc/wsl.conf +git clone --origin pingo ssh://git@pingo.thermokar.st/dotfiles ~/.dotfiles +git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell +git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto" +cd ~/.dotfiles +./install +source ~/.zshrc +base16_ashes +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh +git clone ssh://git@pingo.thermokar.st/gwar ~/gwar +cd ~/gwar +cargo --build --release +./target/release/gwar ~/.dotfiles/$REPOS.toml +cd ~/ && rm -rf ~/gwar +``` + ## opensuse tumbleweed ```bash diff --git a/install.conf.yaml b/install.conf.yaml index e5a3023..372181a 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -15,7 +15,6 @@ path: git/gitignore_global ~/.npmrc: npmrc ~/.psqlrc: psqlrc - ~/.vimrc: vimrc ~/.zpreztorc: zsh/zpreztorc ~/.zlogin: zsh/zlogin ~/.zlogout: zsh/zlogout @@ -31,12 +30,6 @@ ~/Library/Application Support/Code/User/tasks.json: create: true path: vscode/tasks.json - ~/.config/kak/kakrc: - create: true - path: kakrc - ~/.config/nvim/init.vim: - create: true - path: nvim/init.vim ~/.config/nvim/init.vim: create: true path: nvim/init.vim diff --git a/nvim/plugins.lua b/nvim/plugins.lua index 894e486..f88c829 100644 --- a/nvim/plugins.lua +++ b/nvim/plugins.lua @@ -134,6 +134,12 @@ return require('packer').startup(function() end, } + ----------------------------------------------------------------------------- + use { 'SuneelFreimuth/vim-gemtext' } + + ----------------------------------------------------------------------------- + use { 'junegunn/goyo.vim' } + ----------------------------------------------------------------------------- if packer_bootstrap then require('packer').sync() diff --git a/personal.toml b/personal.toml new file mode 100644 index 0000000..7c9f69e --- /dev/null +++ b/personal.toml @@ -0,0 +1,65 @@ +# personal +[[workspace]] +path = "$HOME/projects/personal" +ssh_key_path = "$HOME/.ssh/id_ecdsa" +origin.base_addr = "ssh://git@pingo.thermokar.st" +origin.name = "pingo" +repos = [ + "cs685", + "dot_ssh", + "dotfiles", + "elixir-class", + "gitolite-admin", + "gpx-web-utils", + "gwar", + "notes", + "pingo", +] +remotes = [] + +# personal-dokku +[[workspace]] +path = "$HOME/projects/personal" +ssh_key_path = "$HOME/.ssh/id_ecdsa" +origin.base_addr = "ssh://git@pingo.thermokar.st" +origin.name = "pingo" +repos = [ + "akdillon", + "planner", + "thermokar.st", + "zettel", +] +remotes = [ + { name = "dokku", base_addr = "ssh://dokku@pingo.thermokar.st" }, +] + +# mds +[[workspace]] +path = "$HOME/projects/mds" +ssh_key_path = "$HOME/.ssh/id_ecdsa" +origin.base_addr = "ssh://git@pingo.thermokar.st" +origin.name = "pingo" +repos = [ + "arctic_hibernators_schema", + "bactdb", + "bactdb_data", + "ccdb-api", + "ccdb-old", + "ccdb-web", + "drf_ember_pagination", + "hibernators", + "hibernators-web", + "hymenobacterdotinfo", +] +remotes = [] + +# github-thermokarst-personal +[[workspace]] +path = "$HOME/projects/personal" +ssh_key_path = "$HOME/.ssh/id_ecdsa" +origin.base_addr = "ssh://git@github.com/thermokarst" +origin.name = "thermokarst" +repos = [ + "thermokarst", +] +remotes = [] diff --git a/repos.toml b/work.toml similarity index 76% rename from repos.toml rename to work.toml index ef47db9..0bf7381 100644 --- a/repos.toml +++ b/work.toml @@ -1,69 +1,3 @@ -# personal -[[workspace]] -path = "$HOME/projects/personal" -ssh_key_path = "$HOME/.ssh/id_ecdsa" -origin.base_addr = "ssh://git@pingo.thermokar.st" -origin.name = "pingo" -repos = [ - "cs685", - "dot_ssh", - "dotfiles", - "elixir-class", - "gitolite-admin", - "gpx-web-utils", - "gwar", - "notes", - "pingo", -] -remotes = [] - -# personal-dokku -[[workspace]] -path = "$HOME/projects/personal" -ssh_key_path = "$HOME/.ssh/id_ecdsa" -origin.base_addr = "ssh://git@pingo.thermokar.st" -origin.name = "pingo" -repos = [ - "akdillon", - "planner", - "thermokar.st", - "zettel", -] -remotes = [ - { name = "dokku", base_addr = "ssh://dokku@pingo.thermokar.st" }, -] - -# mds -[[workspace]] -path = "$HOME/projects/mds" -ssh_key_path = "$HOME/.ssh/id_ecdsa" -origin.base_addr = "ssh://git@pingo.thermokar.st" -origin.name = "pingo" -repos = [ - "arctic_hibernators_schema", - "bactdb", - "bactdb_data", - "ccdb-api", - "ccdb-old", - "ccdb-web", - "drf_ember_pagination", - "hibernators", - "hibernators-web", - "hymenobacterdotinfo", -] -remotes = [] - -# github-thermokarst-personal -[[workspace]] -path = "$HOME/projects/personal" -ssh_key_path = "$HOME/.ssh/id_ecdsa" -origin.base_addr = "ssh://git@github.com/thermokarst" -origin.name = "thermokarst" -repos = [ - "thermokarst", -] -remotes = [] - # github-thermokarst-qiime2 [[workspace]] path = "$HOME/projects/qiime2" diff --git a/zsh/zshrc b/zsh/zshrc index 581c416..33d6faf 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -64,3 +64,7 @@ function back_things_up() { ln -s $dest_root/$date $dest_root/latest # TODO: once confident pruning is working well, add that in here } + +function devlog() { + vim -c 'Goyo' '+normal Go' +startinsert ~/projects/personal/devlog/logs/$(date '+%Y-%m-%d').gmi +}