insects/home
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
liv 2023-10-02 09:54:16 +02:00
parent 9eca2a7fad
commit eb1d9bfedb
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dot_config/fish/config.fish
View file

@ -69,6 +69,7 @@ alias j "z"
alias c "cargo" alias c "cargo"
alias cr "cargo run" alias cr "cargo run"
alias cb "cargo build" alias cb "cargo build"
alias ct "cargo test"
alias cwr "cargo watch -x run" alias cwr "cargo watch -x run"
alias ct "cargo test" alias ct "cargo test"
alias rp "rustup" alias rp "rustup"
@ -105,8 +106,6 @@ if test -e /nix
set -x NIX_PATH "$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels" set -x NIX_PATH "$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels"
end end
# Load keychain if installed # proto
if command --search keychain > /dev/null set -gx PROTO_HOME "$HOME/.proto"
keychain -q --nogui $HOME/.ssh/id_ed25519 set -gx PATH "$PROTO_HOME/bin" $PATH
. $HOME/.keychain/$hostname-fish
end

2
dot_doom.d/init.el
View file

@ -39,7 +39,7 @@
minimap ; show a map of the code on the side minimap ; show a map of the code on the side
(modeline +light) ; snazzy, Atom-inspired modeline, plus API (modeline +light) ; snazzy, Atom-inspired modeline, plus API
;;nav-flash ; blink cursor line after big motions ;;nav-flash ; blink cursor line after big motions
;;neotree ; a project drawer, like NERDTree for vim neotree ; a project drawer, like NERDTree for vim
ophints ; highlight the region an operation acts on ophints ; highlight the region an operation acts on
(popup +defaults) ; tame sudden yet inevitable temporary windows (popup +defaults) ; tame sudden yet inevitable temporary windows
;;tabs ; a tab bar for Emacs ;;tabs ; a tab bar for Emacs

4
dot_gitconfig
View file

@ -4,9 +4,13 @@
signingkey = 0x6F33B647A7AC80CE signingkey = 0x6F33B647A7AC80CE
[core] [core]
editor = vim editor = vim
<<<<<<< Updated upstream
autocrlf = input autocrlf = input
=======
>>>>>>> Stashed changes
[push] [push]
default = simple default = simple
autoSetupRemote = true
[pull] [pull]
rebase = true rebase = true
[rebase] [rebase]