Skip to content

Commit

Permalink
correct Void, add missing starship.
Browse files Browse the repository at this point in the history
  • Loading branch information
szorfein committed Sep 30, 2024
1 parent f6b92ba commit 7623e90
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 20 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ It will install firefox rather than brave-bin and modify a lot of things during

$ chezmoi apply

If /tmp is protected with `noexec`, you need to tell `chezmoi` to use another dir
[#1929](https://github.com/twpayne/chezmoi/issues/1929)

$ mkdir $HOME/tmp
$ TMPDIR=$HOME/tmp chezmoi apply

## Update
From time to time, start the update simply with:

Expand Down
19 changes: 10 additions & 9 deletions home/.chezmoiscripts/run_once_after_90-stow.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@ apply() {
}

apply_theme() {
echo ""
echo "Applying themes-m3/$LAST_THEME"
(cd themes-m3 \
&& stow -D "$1" -t "$DEST" \
&& stow "$1" -t "$DEST"
)
stow -D "$1" -t "$DEST"
stow "$1" -t "$DEST"
}

# Remove any previous stow links
echo "Removing old Stow links..."
for dir in ncmpcpp vifm .x tmux vim zsh awesomewm awm-m3 zsh; do
for dir in ncmpcpp vifm .x tmux vim zsh awesomewm awm-m3; do
cd "$DOTS"
[ -d "$dir" ] && stow -D "$dir" -t "$DEST"
done
Expand All @@ -42,6 +38,9 @@ if [ "$OLD_AWM_THEME" ] ; then
stow -D "$OLD_AWM_THEME" -t "$DEST"
fi

# Remove any existing inputrc
[ -f "$HOME/.inputrc" ] && rm "$HOME/.inputrc"

echo "Applying Stow links..."
(cd $DOTS \
&& apply ncmpcpp \
Expand All @@ -50,10 +49,12 @@ echo "Applying Stow links..."
&& apply tmux \
&& apply vim \
&& apply zsh \
&& apply awm-m3 \
&& apply_theme "$NEW_AWM_THEME"
&& apply awm-m3
)

echo "Applying theme "$NEW_AWM_THEME"
cd "$DOTS/themes-m3" && apply_theme "$NEW_AWM_THEME"
# wallpapers and vimcolor
(cd $DOTS \
&& ./install --images --fonts --vim
Expand Down
1 change: 0 additions & 1 deletion home/.chezmoiscripts/run_once_before_30-add-paths.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ add_dir ~/musics
add_dir ~/.config/mpd/playlists
add_dir ~/.mail/Personal
add_dir ~/.config/awesome/config
add_dir ~/.config/awesome/theme

chmod -R 700 ~/.mail

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@ if hash emerge 2>/dev/null ; then

[ -d $REPO/ninjatools ] || sudo mkdir -p $REPO/ninjatools

[ -d $CONF ] || sudo mkdir -p $CONF
sudo curl -L -o /etc/portage/repos.conf/ninjatools.conf https://raw.githubusercontent.com/szorfein/ninjatools/master/ninjatools.conf
sudo emaint sync -r ninjatools
[ -d "$CONF" ] || sudo mkdir -p "$CONF"
curl -L -o /tmp/ninjatools.conf https://raw.githubusercontent.com/szorfein/ninjatools/master/ninjatools.conf

# need also GURU for gentoo
[ -d $REPO/guru ] || sudo mkdir -p $REPO/guru
[ -d "$REPO/guru" ] || sudo mkdir -p "$REPO/guru"

cat <<EOF > "/etc/portage/repos.conf/guru.conf"
cat <<EOF > /tmp/guru.conf
[guru]
location = /var/db/repos/guru
sync-type = git
Expand All @@ -46,13 +45,16 @@ priority = 50
auto-sync = Yes
EOF

sudo mv /tmp/ninjatools.conf "$CONF"/ninjatools.conf
sudo mv /tmp/guru.conf "$CONF"/guru.conf
sudo emaint sync -r ninjatools
sudo emaint sync -r guru
fi

if hash systemctl 2>/dev/null ; then

# save the full path of systemctl
#SYSTEMCTL=$(whereis systemctl | awk '{print $2}')
echo "Next..."

fi
{{ end -}}
Empty file.
2 changes: 1 addition & 1 deletion home/scripts/archlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install_deps() {
neomutt imagemagick weechat rofi openssh ttf-iosevka-nerd yt-dlp
papirus-icon-theme mpc lightdm lightdm-gtk-greeter inotify-tools light stow
unzip arc-gtk-theme ffmpegthumbnailer tmux xss-lock ueberzug
xorg-xdpyinfo xorg-xrandr jq bc"
xorg-xdpyinfo xorg-xrandr jq bc starship"
}

install_pulse() {
Expand Down
2 changes: 1 addition & 1 deletion home/scripts/gentoo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install_deps() {
neomutt cava ueberzug weechat rofi youtube-dl
papirus-icon-theme media-sound/mpc lightdm inotify-tools light stow
arc-theme ffmpegthumbnailer tmux net-mail/isync xss-lock
app-misc/jq x11-misc/betterlockscreen"
app-misc/jq x11-misc/betterlockscreen app-shells/starship"
}

install_pulse() {
Expand Down
5 changes: 3 additions & 2 deletions home/scripts/void.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ build() {
:
}

# Remove nerd-fonts-ttf (package size ~= 7G)
install_deps() {
pkgs="xst nerd-fonts-ttf cava ueberzug betterlockscreen gnupg2 pass xclip zsh
pkgs="xst cava ueberzug betterlockscreen gnupg2 pass xclip zsh
curl awesome mpd ncmpcpp xinit xorg-apps xorg-minimal xorg-input-drivers
base-devel wget feh picom maim vifm mpv zathura zathura-pdf-mupdf isync
neomutt ImageMagick weechat youtube-dl papirus-icon-theme mpc
lightdm-gtk3-greeter inotify-tools light stow unzip arc-theme
ffmpegthumbnailer tmux firefox xss-lock jq xrdb gcc"
ffmpegthumbnailer tmux firefox xss-lock jq xrdb gcc starship"
}

install_pulse() {
Expand Down

0 comments on commit 7623e90

Please sign in to comment.