From 598a3d0ed351149817843dd0a7380f95f9be9dbc Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 09:16:18 +0200 Subject: [PATCH 01/13] add bitwarden --- archinstall/user_configuration.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json index b976685..e646953 100644 --- a/archinstall/user_configuration.json +++ b/archinstall/user_configuration.json @@ -127,7 +127,8 @@ "cups", "system-config-printer", "fwupd", - "mdcat" + "mdcat", + "bitwarden" ], "plugin": null, "profile": { From 908865df71b837041c6f83bf7372affb209a861b Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 09:31:25 +0200 Subject: [PATCH 02/13] use stable version of appindicator --- arch.sh | 5 ++--- archinstall/user_configuration.json | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch.sh b/arch.sh index d2a0bdc..4271ca5 100644 --- a/arch.sh +++ b/arch.sh @@ -52,15 +52,14 @@ main() { obsidian parsec-bin onlyoffice-bin evolution-etesync-git x11-emoji-picker \ gnome-shell-extension-dash-to-dock gnome-shell-extension-desktop-icons-ng \ dracula-gtk-theme dracula-icons-git vscodium-bin otf-symbola touchegg \ - gnome-shell-extension-appindicator-git spotify-launcher nerd-fonts-meslo \ + gnome-shell-extension-nightthemeswitcher spotify-launcher nerd-fonts-meslo \ gnome-shell-extension-x11gestures gnome-shell-extension-no-overview \ gnome-shell-extension-gsconnect gnome-shell-extension-tiling-assistant \ gnome-shell-extension-rounded-window-corners topgrade-bin ufw-docker \ gnome-shell-extension-alphabetical-grid-extension texlive-latexindent-meta \ gnome-shell-extension-quick-settings-tweaks-git \ epson-inkjet-printer-stylus-photo-px810fw-series \ - gnome-shell-extension-blur-my-shell \ - gnome-shell-extension-nightthemeswitcher + gnome-shell-extension-blur-my-shell # === Disable wayland == diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json index e646953..965cf41 100644 --- a/archinstall/user_configuration.json +++ b/archinstall/user_configuration.json @@ -128,7 +128,8 @@ "system-config-printer", "fwupd", "mdcat", - "bitwarden" + "bitwarden", + "gnome-shell-extension-appindicator" ], "plugin": null, "profile": { From 7cbf010d72f5544f28045d687cdbee0e907baf1b Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 09:57:12 +0200 Subject: [PATCH 03/13] change micro theme accordingly to the system theme --- .config/micro/settings.json | 3 ++- .config/update_theme.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.config/micro/settings.json b/.config/micro/settings.json index 0f1ad9a..d7e294a 100644 --- a/.config/micro/settings.json +++ b/.config/micro/settings.json @@ -4,5 +4,6 @@ "rmtrailingws": true, "scrollbar": true, "softwrap": true, - "wordwrap": true + "wordwrap": true, + "colorscheme": "default" } diff --git a/.config/update_theme.sh b/.config/update_theme.sh index d5aa661..de99f9d 100755 --- a/.config/update_theme.sh +++ b/.config/update_theme.sh @@ -28,6 +28,7 @@ main() { # Set the fish theme fish -c "fish_config theme choose 'Base16 Eighties' && yes | fish_config theme save" fish -c "set fish_color_comment 5c6773" # custom comment color + sed -i "s/bubblegum/default/g" "$HOME"/.config/micro/settings.json ;; "sunrise" ) # Go to light mode # Set the Terminal profile @@ -36,6 +37,7 @@ main() { gsettings set org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:"${GT_default}"/ background-color "rgb(253,246,227)" # Set the fish theme fish -c "fish_config theme choose 'Solarized Light' && yes | fish_config theme save" + sed -i "s/default/bubblegum/g" "$HOME"/.config/micro/settings.json ;; * ) echo "Can't interpret given argument" ;; From 6cd2271e8b284ec64afd2739c0a7be3810f29c95 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 10:03:14 +0200 Subject: [PATCH 04/13] fix formatting pbs --- arch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/arch.sh b/arch.sh index 4271ca5..a437809 100644 --- a/arch.sh +++ b/arch.sh @@ -342,6 +342,7 @@ main() { # === Manual color == fish -c "set -Ux MANPAGER \"sh -c 'col -bx | bat -l man -p'\"" + fish -c "set -Ux MANROFFOPT \"-c\"" # === Docker == systemctl enable docker.service From 6785277559536cc611f0b3e977e5945ce3487aa2 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 10:14:44 +0200 Subject: [PATCH 05/13] Add bat config --- .config/bat/config | 2 ++ arch.sh | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 .config/bat/config diff --git a/.config/bat/config b/.config/bat/config new file mode 100644 index 0000000..a49db04 --- /dev/null +++ b/.config/bat/config @@ -0,0 +1,2 @@ +# This theme works well in dark and light terminal theme +--theme="Solarized (light)" diff --git a/arch.sh b/arch.sh index a437809..02faf99 100644 --- a/arch.sh +++ b/arch.sh @@ -344,6 +344,10 @@ main() { fish -c "set -Ux MANPAGER \"sh -c 'col -bx | bat -l man -p'\"" fish -c "set -Ux MANROFFOPT \"-c\"" + # === Bat config == + mkdir "$HOME"/.config/bat + wget -q --show-progress ${repo}/.config/bat/config -O "$HOME"/.config/bat/config + # === Docker == systemctl enable docker.service systemctl start docker.service From abd1c2ffc9c87ed6c61cbd01cf019cd4a4e062a9 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 14:20:40 +0200 Subject: [PATCH 06/13] use monokai instead of default (its the same theme) --- .config/micro/settings.json | 8 ++++---- .config/update_theme.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/micro/settings.json b/.config/micro/settings.json index d7e294a..b753d84 100644 --- a/.config/micro/settings.json +++ b/.config/micro/settings.json @@ -1,9 +1,9 @@ { - "mkparents": true, "colorcolumn": 80, + "colorscheme": "monokai", + "mkparents": true, "rmtrailingws": true, "scrollbar": true, "softwrap": true, - "wordwrap": true, - "colorscheme": "default" -} + "wordwrap": true +} \ No newline at end of file diff --git a/.config/update_theme.sh b/.config/update_theme.sh index de99f9d..9fd8e0c 100755 --- a/.config/update_theme.sh +++ b/.config/update_theme.sh @@ -28,7 +28,7 @@ main() { # Set the fish theme fish -c "fish_config theme choose 'Base16 Eighties' && yes | fish_config theme save" fish -c "set fish_color_comment 5c6773" # custom comment color - sed -i "s/bubblegum/default/g" "$HOME"/.config/micro/settings.json + sed -i "s/bubblegum/monokai/g" "$HOME"/.config/micro/settings.json ;; "sunrise" ) # Go to light mode # Set the Terminal profile @@ -37,7 +37,7 @@ main() { gsettings set org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:"${GT_default}"/ background-color "rgb(253,246,227)" # Set the fish theme fish -c "fish_config theme choose 'Solarized Light' && yes | fish_config theme save" - sed -i "s/default/bubblegum/g" "$HOME"/.config/micro/settings.json + sed -i "s/monokai/bubblegum/g" "$HOME"/.config/micro/settings.json ;; * ) echo "Can't interpret given argument" ;; From 83752bf57d153cec4f47031851161ea5a93618b1 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 17:30:29 +0200 Subject: [PATCH 07/13] disable touchpad when mouse connected --- arch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/arch.sh b/arch.sh index 02faf99..4e37ab4 100644 --- a/arch.sh +++ b/arch.sh @@ -264,6 +264,7 @@ main() { gsettings set org.gnome.settings-daemon.plugins.color night-light-enabled true # mode "nuit" (lumière bleue) gsettings set org.gnome.desktop.peripherals.touchpad click-method areas # right click on laptop gsettings set org.gnome.desktop.peripherals.mouse speed -0.6 # mouse speed + gsettings set org.gnome.desktop.peripherals.touchpad send-events disabled-on-external-mouse # disable touchpad when mouse connected gsettings --schemadir /usr/share/gnome-shell/extensions/nightthemeswitcher@romainvigier.fr/schemas/ set org.gnome.shell.extensions.nightthemeswitcher.gtk-variants enabled true # enable GTK theme to change gsettings --schemadir /usr/share/gnome-shell/extensions/nightthemeswitcher@romainvigier.fr/schemas/ set org.gnome.shell.extensions.nightthemeswitcher.commands sunset "bash $HOME/.config/update_theme.sh sunset" # run script for the sunset gsettings --schemadir /usr/share/gnome-shell/extensions/nightthemeswitcher@romainvigier.fr/schemas/ set org.gnome.shell.extensions.nightthemeswitcher.commands sunrise "bash $HOME/.config/update_theme.sh sunrise" # run script for the sunrise From 6f3e2778f8028dba063b7d4bfda04d0201ab4e08 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 17:38:58 +0200 Subject: [PATCH 08/13] add XDG_CONFIG_HOME --- arch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/arch.sh b/arch.sh index 4e37ab4..2a73f97 100644 --- a/arch.sh +++ b/arch.sh @@ -94,6 +94,7 @@ main() { curl -s ${repo}/.config/fish/conf.d/abbr_arch.fish >> "$HOME"/.config/fish/conf.d/abbr.fish # Add aliases wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish + fish -c "set -Ux XDG_CONFIG_HOME '$HOME/.config'" # Themes in Gnome Terminal, the default one will be the dark one local GT_default From 5dcb6eb2013bc08b82b0b93162d11dbe2e19ba80 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 17:39:15 +0200 Subject: [PATCH 09/13] add XDG_CONFIG_HOME --- arch_wsl.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/arch_wsl.sh b/arch_wsl.sh index ae8877b..36127a4 100644 --- a/arch_wsl.sh +++ b/arch_wsl.sh @@ -119,6 +119,7 @@ main() { curl -s ${repo}/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish # Add aliases wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish + fish -c "set -Ux XDG_CONFIG_HOME '$HOME/.config'" # === Micro configuration == mkdir "$HOME"/.config/micro From e5db0dfd85fe5e194b741ff7dd2a25fa91aa0dcd Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 17:42:42 +0200 Subject: [PATCH 10/13] remove XDG_CONFIG_HOME --- arch.sh | 1 - arch_wsl.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/arch.sh b/arch.sh index 2a73f97..4e37ab4 100644 --- a/arch.sh +++ b/arch.sh @@ -94,7 +94,6 @@ main() { curl -s ${repo}/.config/fish/conf.d/abbr_arch.fish >> "$HOME"/.config/fish/conf.d/abbr.fish # Add aliases wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish - fish -c "set -Ux XDG_CONFIG_HOME '$HOME/.config'" # Themes in Gnome Terminal, the default one will be the dark one local GT_default diff --git a/arch_wsl.sh b/arch_wsl.sh index 36127a4..ae8877b 100644 --- a/arch_wsl.sh +++ b/arch_wsl.sh @@ -119,7 +119,6 @@ main() { curl -s ${repo}/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish # Add aliases wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish - fish -c "set -Ux XDG_CONFIG_HOME '$HOME/.config'" # === Micro configuration == mkdir "$HOME"/.config/micro From 5734636c268cf80e09e9d1db56b0f15590267450 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 17:44:37 +0200 Subject: [PATCH 11/13] Add :mfind --- .config/fish/conf.d/abbr.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish index 28b757b..d579aa4 100644 --- a/.config/fish/conf.d/abbr.fish +++ b/.config/fish/conf.d/abbr.fish @@ -26,3 +26,4 @@ abbr vgcc "clear; gcc -Wall -Wextra -Wshadow -Wcast-align -Wstrict-prototypes -f abbr vg++ "clear; g++ -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic -g -Wold-style-cast -Wsign-conversion main.cpp && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./a.out; rm a.out 2> /dev/null" abbr vmake "clear; make && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./main; make clean 2> /dev/null" abbr zip "zip -r 'archive.zip' dossier" +abbr mfind "find /* 2> /dev/null | grep 'android'" From 837b45ad12f9ac3288f5eed42609f39efee08953 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 17:45:08 +0200 Subject: [PATCH 12/13] oops --- .config/fish/conf.d/abbr.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish index d579aa4..ef1315f 100644 --- a/.config/fish/conf.d/abbr.fish +++ b/.config/fish/conf.d/abbr.fish @@ -26,4 +26,4 @@ abbr vgcc "clear; gcc -Wall -Wextra -Wshadow -Wcast-align -Wstrict-prototypes -f abbr vg++ "clear; g++ -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic -g -Wold-style-cast -Wsign-conversion main.cpp && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./a.out; rm a.out 2> /dev/null" abbr vmake "clear; make && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./main; make clean 2> /dev/null" abbr zip "zip -r 'archive.zip' dossier" -abbr mfind "find /* 2> /dev/null | grep 'android'" +abbr mfind "find /* 2> /dev/null | grep ''" From 9a5f1db808a3a6218688cf76984e86d809701c4f Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 18 Sep 2023 18:25:21 +0200 Subject: [PATCH 13/13] use libreoffice instead of onlyoffice --- arch.sh | 2 +- archinstall/user_configuration.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch.sh b/arch.sh index 4e37ab4..4e822a2 100644 --- a/arch.sh +++ b/arch.sh @@ -49,7 +49,7 @@ main() { # === AUR packages == paru -S --noconfirm \ - obsidian parsec-bin onlyoffice-bin evolution-etesync-git x11-emoji-picker \ + obsidian parsec-bin evolution-etesync-git x11-emoji-picker \ gnome-shell-extension-dash-to-dock gnome-shell-extension-desktop-icons-ng \ dracula-gtk-theme dracula-icons-git vscodium-bin otf-symbola touchegg \ gnome-shell-extension-nightthemeswitcher spotify-launcher nerd-fonts-meslo \ diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json index 965cf41..03be2d1 100644 --- a/archinstall/user_configuration.json +++ b/archinstall/user_configuration.json @@ -129,7 +129,8 @@ "fwupd", "mdcat", "bitwarden", - "gnome-shell-extension-appindicator" + "gnome-shell-extension-appindicator", + "libreoffice-fresh" ], "plugin": null, "profile": {