From c75364cad46381a5b3ca424c3173267c7e1ce44e Mon Sep 17 00:00:00 2001 From: mokou Date: Mon, 6 Mar 2023 10:38:28 +0100 Subject: [PATCH] a fresh start, somewhat --- LICENSE | 2 +- README.md | 18 ++++++++++++++++++ .../{executable_config.fish => config.fish} | 19 ++++++++----------- dot_gitconfig | 4 ++-- dot_hgrc | 2 +- 5 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 README.md rename dot_config/fish/{executable_config.fish => config.fish} (90%) diff --git a/LICENSE b/LICENSE index f5bc672..f53c2c8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 mokou +Copyright (c) 2023 liv Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md new file mode 100644 index 0000000..b30848e --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +These are my dotfiles. There's many like them out there, but these ones are mind +blah blah blah something or other + +I manage these using [chezmoi](https://chezmoi.io). I've tried many methods over +the years, from manual symlinking (hell!) to using GNU `stow` (annoying) to using +Nix's `home-manager` (entirely different kind of hell), and chezmoi is what +works for me with the least amount of headache. + +So to install on a fresh laptop: + +```sh +# You also need rustup and Rust installed or else Fish will complain +$PACKAGEMANAGER install chezmoi zoxide fish +chezmoi init git@codeberg.org:shadows_withal/home.git # or HTTPS URL if you're not me hehe +chezmoi apply +source ~/.config/fish/config.fish +# from here on out, see what breaks and fix it! +``` diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/config.fish similarity index 90% rename from dot_config/fish/executable_config.fish rename to dot_config/fish/config.fish index 7eed1e6..073df53 100644 --- a/dot_config/fish/executable_config.fish +++ b/dot_config/fish/config.fish @@ -20,21 +20,13 @@ end setpath /opt/local/bin setpath /opt/homebrew/bin setpath ~/.rbenv/shims -setpath ~/.rbenv/bin setpath ~/.pyenv/shims setpath ~/.cargo/bin -setpath ~/.nimble/bin setpath ~/.local/bin setpath ~/.local/bin/elixir-ls -setpath ~/.bin -setpath ~/.cask/bin -setpath ~/.npm-packages/bin -setpath ~/.n/bin -setpath /snap/bin setpath ~/.emacs.d/bin setpath ~/.fly/bin setpath ~/.nimble/bin -setpath ~/Projects/go/bin setpath ~/.bun/bin setpath ~/go/bin @@ -63,23 +55,28 @@ set -x LANG "en_US.UTF-8" set -x TZ_LIST "Europe/Berlin;Berlin,America/New_York;US East,America/Los_Angeles;US West,Europe/London;London" # General Aliases +# Convenience for editing my shell config alias editconfig "chezmoi edit ~/.config/fish/config.fish; and chezmoi apply; and source ~/.config/fish/config.fish" -alias printsshkey "cat ~/.ssh/id_ed25519.pub -p --color never" +# Some other aliases alias doco "docker-compose" +alias czm "chezmoi" +# z is such a weird key to hit frequently, j is much better alias j "z" +# Cargoes and Rust-s alias c "cargo" alias cr "cargo run" alias cb "cargo build" alias cwr "cargo watch -x run" alias rp "rustup" +# Rubies alias be "bundle exec" +# cd into a temp directory, very useful! alias mkt "cd (mktemp -d)" -alias czm "chezmoi" -alias lsh "ls -lah" # Git Aliases alias g "git" alias gs "g status --short" alias gl "g log --color --graph --abbrev-commit --oneline" +# "git quick push" and "git quick commit". it makes sense in my head alias gqp "g add --all; and g commit; and g push" alias gqc "g add --all; and g commit" alias gpl "g pull" diff --git a/dot_gitconfig b/dot_gitconfig index 6ab836c..f749287 100644 --- a/dot_gitconfig +++ b/dot_gitconfig @@ -1,6 +1,6 @@ [user] - name = mokou - email = mokou@fastmail.com + name = liv + email = shadows_withal@fastmail.com signingkey = 0x6F33B647A7AC80CE [core] editor = vim diff --git a/dot_hgrc b/dot_hgrc index 83c7359..80dea64 100644 --- a/dot_hgrc +++ b/dot_hgrc @@ -2,7 +2,7 @@ [ui] # name and email, e.g. # username = Jane Doe -username = marisa +username = liv editor = vim tweakdefaults = True