From da3c196028a6dfe253f944eb4f2a5e136b8e8b6d Mon Sep 17 00:00:00 2001 From: adbagio Date: Wed, 15 May 2024 21:38:54 -0400 Subject: [PATCH] updates config files --- .bashrc | 4 ++-- .config/nushell/custom.nu | 11 ++++++++++- .config/nvim/init.lua | 22 +++++----------------- .config/nvim/init.vim | 4 ++++ .gitconfig | 18 ++++++++++++++---- 5 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.bashrc b/.bashrc index 4d7ffa5..fa78161 100644 --- a/.bashrc +++ b/.bashrc @@ -126,9 +126,9 @@ __main() { local minor="${BASH_VERSINFO[1]}" if ((major > 4)) || { ((major == 4)) && ((minor >= 1)); }; then - source <(/home/oliver/.cargo/bin/starship init bash --print-full-init) + source <(/home/$USER/.cargo/bin/starship init bash --print-full-init) else - source /dev/stdin <<<"$(/home/oliver/.cargo/bin/starship init bash --print-full-init)" + source /dev/stdin <<<"$(/home/$USER/.cargo/bin/starship init bash --print-full-init)" fi } __main diff --git a/.config/nushell/custom.nu b/.config/nushell/custom.nu index 5e1fa82..eda4292 100644 --- a/.config/nushell/custom.nu +++ b/.config/nushell/custom.nu @@ -11,7 +11,16 @@ alias clc = cargo-install-update install-update -l alias cua = cargo-install-update install-update --all # update functions -def gdup [] { ls | get name | each { |dir| cd $dir; git pull; cd .. } } +def gdup [] { + ls | get name | each { |dir| + cd $dir + print (pwd) + git pull + cd .. + print "\n" + } +} + def upin [] { echo "Start apt, cargo and rustup upgrade:\n" sudo apt-get update diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index b12ad4b..dfa235c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,18 +1,6 @@ --- Set options -require("setopts") - --- Install plugins -require("lazy-init") - --- Custom keybindings -require("mappings") - --- Other custom settings -require("misc") - -indent_type = "Spaces" -indent_width = 4 -column_width = 100 -quote_style = "AutoPreferDouble" -call_parentheses = "NoSingleTable" +local opt = vim.opt +-- Config +opt.number = true +opt.relativenumber = true +opt.mouse = 'a' diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 675a390..84d5204 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1 +1,5 @@ +syntax on + +set number +set encoding=utf-8 set textwidth=80 diff --git a/.gitconfig b/.gitconfig index d1022be..f3399c4 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,14 +1,24 @@ [color] ui = true - [merge] tool = nvim - [mergetool "nvim"] cmd = nvim -f -c \"DiffviewOpen\" - [mergetool] prompt = true - [init] defaultBranch = main +[user] + signingkey = 9678EEC070B135AC5CD98ABD0AE37F9649850573 + name = adbagio + email = h759bkyo4@mozmail.com +[core] + editor = codium --wait +[pull] + rebase = true +[push] + autoSetupRemote = true +[format] + signoff = true +[commit] + gpgsign = true