Anri/confOS
1
0
Fork 0
Code Issues 26 Pull requests Projects Releases Wiki Activity

fix minor issues

Browse source
This commit is contained in:
Mylloon 2024-03-30 17:50:32 +01:00
parent d8e489958b
commit ecef03197a
Signed by: Anri
GPG key ID: A82D63DFF8D1317F
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch.sh
View file

@ -11,7 +11,7 @@ fi
cd "$(dirname "$0")" # change script directory cd "$(dirname "$0")" # change script directory
main() { function main {
# === Variables == # === Variables ==
local repo local repo
repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main
@ -30,7 +30,7 @@ main() {
# === Global OS configuration set-up == # === Global OS configuration set-up ==
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source meta.sh source meta.sh ${repo}
# === AUR packages == # === AUR packages ==
@ -61,7 +61,6 @@ main() {
# === Fish == # === Fish ==
# Custom Arch configuration # Custom Arch configuration
wget -q ${repo}/.config/fish/config_arch.fish -O "$HOME"/.config/fish/config.fish
curl -s ${repo}/.config/fish/conf.d/abbr_arch.fish >> "$HOME"/.config/fish/conf.d/abbr.fish curl -s ${repo}/.config/fish/conf.d/abbr_arch.fish >> "$HOME"/.config/fish/conf.d/abbr.fish
curl -s ${repo}/.config/fish/conf.d/alias_arch.fish >> "$HOME"/.config/fish/conf.d/alias.fish curl -s ${repo}/.config/fish/conf.d/alias_arch.fish >> "$HOME"/.config/fish/conf.d/alias.fish

6
arch_wsl.sh
View file

@ -11,7 +11,7 @@ fi
cd "$(dirname "$0")" # change script directory cd "$(dirname "$0")" # change script directory
main() { function main {
# === Variables == # === Variables ==
local repo local repo
repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main
@ -43,7 +43,7 @@ main() {
# === Global OS configuration set-up == # === Global OS configuration set-up ==
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source meta.sh source meta.sh ${repo}
# === Remove SU password == # === Remove SU password ==
@ -77,7 +77,7 @@ main() {
# === Fish == # === Fish ==
# Custom WSL configuration # Custom WSL configuration
wget -q ${repo}/.config/fish/config_wsl.fish -O "$HOME"/.config/fish/config.fish curl -s ${repo}/.config/fish/config_wsl.fish >> "$HOME"/.config/fish/config.fish
curl -s ${repo}/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish curl -s ${repo}/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish
curl -s ${repo}/.config/fish/conf.d/alias_wsl.fish >> "$HOME"/.config/fish/conf.d/alias.fish curl -s ${repo}/.config/fish/conf.d/alias_wsl.fish >> "$HOME"/.config/fish/conf.d/alias.fish

24
meta.sh
View file

@ -11,10 +11,10 @@ fi
cd "$(dirname "$0")" # change script directory cd "$(dirname "$0")" # change script directory
main() { function main {
# === Variables == # === Variables ==
local repo local repo
repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main repo=$1
# === Package manager == # === Package manager ==
@ -74,13 +74,15 @@ main() {
fish -c "set fish_color_comment 5c6773" # custom comment color fish -c "set fish_color_comment 5c6773" # custom comment color
# Fish prompt # Fish prompt
rm "$HOME"/.config/fish/functions/fish_prompt.fish 2> /dev/null ||: rm "$HOME"/.config/fish/functions/fish_prompt.fish 2> /dev/null ||:
wget -q ${repo}/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/ wget -q "${repo}"/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/
# EZA colors # EZA colors
fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'" fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'"
# Add configuration
wget -q "${repo}"/.config/fish/config.fish -O "$HOME"/.config/fish/config.fish
# Add abbreviations # Add abbreviations
wget -q ${repo}/.config/fish/conf.d/abbr.fish -O "$HOME"/.config/fish/conf.d/abbr.fish wget -q "${repo}"/.config/fish/conf.d/abbr.fish -O "$HOME"/.config/fish/conf.d/abbr.fish
# Add aliases # Add aliases
wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish wget -q "${repo}"/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish
# === Default editor == # === Default editor ==
@ -89,7 +91,7 @@ main() {
# === Micro configuration == # === Micro configuration ==
mkdir -p "$HOME"/.config/micro mkdir -p "$HOME"/.config/micro
wget -q --show-progress ${repo}/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json wget -q --show-progress "${repo}"/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json
micro -plugin install detectindent micro -plugin install detectindent
@ -108,6 +110,7 @@ main() {
# # Add to path # # Add to path
# fish -c "set -Uax LD_LIBRARY_PATH /usr/local/lib" # fish -c "set -Uax LD_LIBRARY_PATH /usr/local/lib"
# === tldr == # === tldr ==
fish -c "tldr --update" fish -c "tldr --update"
# Fish completion # Fish completion
@ -127,11 +130,11 @@ main() {
# === Bat config == # === Bat config ==
mkdir -p "$HOME"/.config/bat mkdir -p "$HOME"/.config/bat
wget -q --show-progress ${repo}/.config/bat/config -O "$HOME"/.config/bat/config wget -q --show-progress "${repo}"/.config/bat/config -O "$HOME"/.config/bat/config
# === Git == # === Git ==
wget -q ${repo}/dotfiles/.gitconfig -O "$HOME"/.gitconfig wget -q "${repo}"/dotfiles/.gitconfig -O "$HOME"/.gitconfig
# === Python == # === Python ==
@ -147,14 +150,15 @@ main() {
opam install -y \ opam install -y \
utop ocaml-lsp-server ocamlformat core menhir pprint sexplib \ utop ocaml-lsp-server ocamlformat core menhir pprint sexplib \
ppx_sexp_conv cohttp-lwt-unix dotenv twostep lwt_ssl alcotest ppx_deriving ppx_sexp_conv cohttp-lwt-unix dotenv twostep lwt_ssl alcotest ppx_deriving
wget -q ${repo}/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat wget -q "${repo}"/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat
# Add Opam packages from OCaml # Add Opam packages from OCaml
mkdir -p "$HOME"/.opam/default/bin mkdir -p "$HOME"/.opam/default/bin
fish -c "fish_add_path $HOME/.opam/default/bin ||:" fish -c "fish_add_path $HOME/.opam/default/bin ||:"
# === Clangd == # === Clangd ==
wget -q ${repo}/dotfiles/.clang-format -O "$HOME"/.clang-format wget -q "${repo}"/dotfiles/.clang-format -O "$HOME"/.clang-format
# === Perl == # === Perl ==
# Add perl packages to path # Add perl packages to path