From 6d52aa4f51a8adabe032ac926af66f90191dae75 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 20:33:30 +0100 Subject: [PATCH 01/13] stower.sh aktualisiert --- stower.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stower.sh b/stower.sh index 3b8b5b0..d33518a 100755 --- a/stower.sh +++ b/stower.sh @@ -38,13 +38,11 @@ function inst_paru { echo "${BOLD}paru ${NORMAL}already installed. Skipping..." else echo -n "${BOLD}Continue?${NORMAL} (Y/N) " - read confirm_paru 2>&1 | tee -a $LOG + read confirm_paru if [[ $confirm_paru == "Y" ]]; then sudo pacman -Syu --needed base-devel 2>&1 | tee -a $LOG - sudo pacman -Syu rustup 2>&1 | tee -a $LOG - rustup default stable 2>&1 | tee -a $LOG - rustup update + sudo pacman -Syu rust 2>&1 | tee -a $LOG rm -rf $HYPRMOONARCH_DIR/.cache/paru-git git clone https://aur.archlinux.org/paru.git $HYPRMOONARCH_DIR/.cache/paru-git From 6a1d36eace06a94ddd56110623694a618a43572e Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 20:43:50 +0100 Subject: [PATCH 02/13] stower.sh aktualisiert --- stower.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stower.sh b/stower.sh index d33518a..75b7e5a 100755 --- a/stower.sh +++ b/stower.sh @@ -111,8 +111,8 @@ function inst_pkgs { paru -S informant sudo informant read --all - $(getent group informant) ] || groupadd informant - sudo usermod -a -G informant $USER + #$(getent group informant) ] || groupadd informant + #sudo usermod -a -G informant $USER fi From bcd6488e92784d15bc2a7e59d44b469ebd836d77 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 20:54:33 +0100 Subject: [PATCH 03/13] stower.sh aktualisiert --- stower.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stower.sh b/stower.sh index 75b7e5a..00e6670 100755 --- a/stower.sh +++ b/stower.sh @@ -71,6 +71,8 @@ function inst_sddm { do pkg_inst $key done + sddm --example-config > $HYPRMOONARCH_DIR/.cache/sddm.conf + sudo mv $HYPRMOONARCH_DIR/.cache/sddm.conf /etc/sddm.conf echo "set default user image" sudo cp -f $HYPRMOONARCH_DIR/usr/share/sddm/faces/.face /usr/share/sddm/faces/.face @@ -79,6 +81,7 @@ function inst_sddm { cd $HYPRMOONARCH_DIR/.cache # wget --unlink https://github.com/catppuccin/sddm/releases/download/v1.0.0/catppuccin-mocha.zip # sudo unzip catppuccin-mocha.zip -d /usr/share/sddm/themes/ + rm -rf moonarch-sddm git clone https://gitea.moonarch.de/nevaforget/moonarch-sddm.git sudo cp -Rf moonarch-sddm /usr/share/sddm/themes/ sudo rm -rf /usr/share/sddm/themes/moonarch-sddm/.git @@ -109,7 +112,7 @@ function inst_pkgs { sudo cp -Rf $HYPRMOONARCH_DIR/usr/local/bin/* /usr/local/bin/ - paru -S informant + pkg_inst "informant" sudo informant read --all #$(getent group informant) ] || groupadd informant #sudo usermod -a -G informant $USER From 41fb5644e350f4f11676c92cc4863cc36be59c6a Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 20:58:13 +0100 Subject: [PATCH 04/13] stower.sh aktualisiert --- stower.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stower.sh b/stower.sh index 00e6670..75abc0c 100755 --- a/stower.sh +++ b/stower.sh @@ -103,7 +103,7 @@ function inst_pkgs { if [[ $confirm_basics == "Y" ]]; then - declare -a pkg_list=(wayland jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git) + declare -a pkg_list=(wayland jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) for key in "${pkg_list[@]}" do From c0bfdca6129136b25ada2f58c95148ef24013bd6 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 20:59:15 +0100 Subject: [PATCH 05/13] stower.sh aktualisiert --- stower.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stower.sh b/stower.sh index 75abc0c..5edd2a7 100755 --- a/stower.sh +++ b/stower.sh @@ -204,10 +204,13 @@ function rebooter { function setup { # ZSH log "Cloning ZSH Plugins..." + rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions sudo git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions log "Done... zsh-autosuggestions" + rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting sudo git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting log "Done... zsh-syntax-highlighting" + rm -rf ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k sudo git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k log "Done... powerlevel10k" chsh -s /usr/bin/zsh From 2b36a77ecc8d4204073b4e6949b1e1b6e8d4fe7e Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 21:00:45 +0100 Subject: [PATCH 06/13] stower.sh aktualisiert --- stower.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stower.sh b/stower.sh index 5edd2a7..3846b5c 100755 --- a/stower.sh +++ b/stower.sh @@ -204,13 +204,13 @@ function rebooter { function setup { # ZSH log "Cloning ZSH Plugins..." - rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions + sudo rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions sudo git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions log "Done... zsh-autosuggestions" - rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting + sudo rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting sudo git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting log "Done... zsh-syntax-highlighting" - rm -rf ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k + sudo rm -rf ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k sudo git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k log "Done... powerlevel10k" chsh -s /usr/bin/zsh From 4ea0d79be512962ee90ce4ceccbe66dae55b330a Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 21:01:22 +0100 Subject: [PATCH 07/13] README.md aktualisiert --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2b2f87..d679b0d 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ This is basically per user! ```bash $ sudo pacman -Syu git -$ git clone --depth 1 https://gitea.nevaforget.de/dom/monarchos ~/.monarchos +$ git clone --depth 1 https://gitea.moonarch.de/nevaforget/hyprmoonarch ~/.monarchos $ cd ~/.monarchos -$ ./setup.sh +$ ./stower.sh ``` ## Installation Stages From 067f9febf9c640d3915d93a2201d55c1d7c25d9b Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 21:09:02 +0100 Subject: [PATCH 08/13] stower.sh aktualisiert --- stower.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stower.sh b/stower.sh index 3846b5c..a4ad8ca 100755 --- a/stower.sh +++ b/stower.sh @@ -103,7 +103,7 @@ function inst_pkgs { if [[ $confirm_basics == "Y" ]]; then - declare -a pkg_list=(wayland jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) + declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) for key in "${pkg_list[@]}" do @@ -242,7 +242,8 @@ function setup { mkdir -p $WALLPAPER_DIR fi cp -Rf $HYPRMOONARCH_DIR/home/Pictures/Wallpaper/* $WALLPAPER_DIR/ - swww img $WALLPAPER_DIR/1586853771_daniel-leone-v7datklzzaw-unsplash-modded.jpg + + waypaper --wallpaper $WALLPAPER_DIR/1586853771_daniel-leone-v7datklzzaw-unsplash-modded.jpg # dotfiles log "Time stow things up" From 138cdc676b86bdfd1bfeb34e6ece9a5e8439d02b Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 21:11:53 +0100 Subject: [PATCH 09/13] stower.sh aktualisiert --- stower.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stower.sh b/stower.sh index a4ad8ca..9465ccf 100755 --- a/stower.sh +++ b/stower.sh @@ -252,7 +252,7 @@ function setup { cp -R $HYPRMOONARCH_DIR/home/.zshrc $HOME/.hyprm/.zshrc cp -R $HYPRMOONARCH_DIR/home/.p10k.zsh $HOME/.hyprm/.p10k.zsh cd $HOME/.hyprm/ - stow . + stow --verbose=0 . cd $HYPRMOONARCH_DIR } From b05596e7f71d813bfa13f333f5f32542601a50e7 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 21:16:55 +0100 Subject: [PATCH 10/13] stower.sh aktualisiert --- stower.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stower.sh b/stower.sh index 9465ccf..31e16ac 100755 --- a/stower.sh +++ b/stower.sh @@ -252,7 +252,7 @@ function setup { cp -R $HYPRMOONARCH_DIR/home/.zshrc $HOME/.hyprm/.zshrc cp -R $HYPRMOONARCH_DIR/home/.p10k.zsh $HOME/.hyprm/.p10k.zsh cd $HOME/.hyprm/ - stow --verbose=0 . + stow --adopt . cd $HYPRMOONARCH_DIR } From fcd38777a8c15bd829cede20a0b33f5791662983 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 26 Dec 2024 21:44:20 +0100 Subject: [PATCH 11/13] stower.sh aktualisiert --- stower.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stower.sh b/stower.sh index 31e16ac..c9d4b16 100755 --- a/stower.sh +++ b/stower.sh @@ -103,7 +103,7 @@ function inst_pkgs { if [[ $confirm_basics == "Y" ]]; then - declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) + declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) for key in "${pkg_list[@]}" do @@ -154,8 +154,10 @@ function inst_davfs { do pkg_inst $key done - - sudo usermod -a -G davfs2 $USER + + if [ $(getent group admin) ]; then + sudo usermod -a -G davfs2 $USER + fi fi cd $HYPRMOONARCH_DIR From b05dacbe212081bf195c21af29755cb379268203 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 16 Jan 2025 14:14:03 +0100 Subject: [PATCH 12/13] stower.sh aktualisiert --- stower.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stower.sh b/stower.sh index c9d4b16..4887d8b 100755 --- a/stower.sh +++ b/stower.sh @@ -103,7 +103,7 @@ function inst_pkgs { if [[ $confirm_basics == "Y" ]]; then - declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) + declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm-gtk3 flatery-icon-theme-git librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) for key in "${pkg_list[@]}" do From 73f62be250ca0cbe026242cad86b60337c516834 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 16 Jan 2025 14:28:24 +0100 Subject: [PATCH 13/13] stower.sh aktualisiert --- stower.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stower.sh b/stower.sh index 4887d8b..d440b9f 100755 --- a/stower.sh +++ b/stower.sh @@ -103,7 +103,7 @@ function inst_pkgs { if [[ $confirm_basics == "Y" ]]; then - declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm-gtk3 flatery-icon-theme-git librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) + declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet xarchiver man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm-gtk3 flatery-icon-theme-git librewolf-bin fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi-lbonn-wayland-git cmake meson cpio pkg-config) for key in "${pkg_list[@]}" do