diff --git a/defaults/bash/shell b/defaults/bash/shell index 9cca8ac..08aa588 100644 --- a/defaults/bash/shell +++ b/defaults/bash/shell @@ -10,3 +10,5 @@ source /usr/share/bash-completion/bash_completion # Set complete path export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omakub/bin:$HOME/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin" set +h + +export OMAKUB_PATH="/home/$USER/.local/share/omakub" diff --git a/install/alacritty.sh b/install/alacritty.sh index 15aa4d0..859b4b6 100644 --- a/install/alacritty.sh +++ b/install/alacritty.sh @@ -1,7 +1,7 @@ if ! command -v alacritty &>/dev/null; then sudo apt install -y alacritty mkdir -p ~/.config/alacritty - cp ~/.local/share/omakub/configs/alacritty.toml ~/.config/alacritty/alacritty.toml - cp ~/.local/share/omakub/configs/alacritty/theme.toml ~/.config/alacritty/theme.toml - cp ~/.local/share/omakub/configs/alacritty/font.toml ~/.config/alacritty/font.toml + cp $OMAKUB_PATH/configs/alacritty.toml ~/.config/alacritty/alacritty.toml + cp $OMAKUB_PATH/configs/alacritty/theme.toml ~/.config/alacritty/theme.toml + cp $OMAKUB_PATH/configs/alacritty/font.toml ~/.config/alacritty/font.toml fi diff --git a/install/emojis.sh b/install/emojis.sh index b7a650f..b001ff4 100644 --- a/install/emojis.sh +++ b/install/emojis.sh @@ -1,5 +1,5 @@ if [ ! -f "~/.XCompose" ]; then - cp ~/.local/share/omakub/configs/xcompose ~/.XCompose + cp $OMAKUB_PATH/configs/xcompose ~/.XCompose ibus restart gsettings set org.gnome.desktop.input-sources xkb-options "['compose:caps']" fi diff --git a/install/neovim.sh b/install/neovim.sh index 3f81340..98f8e33 100644 --- a/install/neovim.sh +++ b/install/neovim.sh @@ -3,5 +3,5 @@ if ! command -v neovim &>/dev/null; then sudo apt update -y sudo apt install -y neovim git clone https://github.com/LazyVim/starter ~/.config/nvim - cp ~/.local/share/omakub/themes/neovim/tokyo-night.lua ~/.config/nvim/lua/plugins/theme.lua + cp $OMAKUB_PATH/themes/neovim/tokyo-night.lua ~/.config/nvim/lua/plugins/theme.lua fi diff --git a/install/theme.sh b/install/theme.sh index 2243828..3992aa4 100644 --- a/install/theme.sh +++ b/install/theme.sh @@ -1,2 +1,2 @@ # Setup default theme -source ~/.local/share/omakub/themes/gnome/yaru.sh +source $OMAKUB_PATH/themes/gnome/tokyo-night.sh diff --git a/install/ulauncher.sh b/install/ulauncher.sh index 2811549..a27f1d6 100644 --- a/install/ulauncher.sh +++ b/install/ulauncher.sh @@ -6,8 +6,8 @@ if ! command -v ulauncher &>/dev/null; then # Start ulauncher to have it populate config before we overwrite mkdir -p ~/.config/autostart/ - cp ~/.local/share/omakub/configs/ulauncher.desktop ~/.config/autostart/ulauncher.desktop + cp $OMAKUB_PATH/configs/ulauncher.desktop ~/.config/autostart/ulauncher.desktop gtk-launch ulauncher.desktop sleep 2 # ensure enough time for ulauncher to set defaults - cp ~/.local/share/omakub/configs/ulauncher.json ~/.config/ulauncher/settings.json + cp $OMAKUB_PATH/configs/ulauncher.json ~/.config/ulauncher/settings.json fi diff --git a/install/vscode.sh b/install/vscode.sh index 1078dec..9e4e303 100644 --- a/install/vscode.sh +++ b/install/vscode.sh @@ -1,6 +1,6 @@ if ! command -v code &>/dev/null; then sudo snap install code --classic mkdir -p ~/.config/Code/User - cp ~/.local/share/omakub/configs/vscode.json ~/.config/Code/User/settings.json + cp $OMAKUB_PATH/configs/vscode.json ~/.config/Code/User/settings.json code --install-extension enkia.tokyo-night fi diff --git a/install/zellij.sh b/install/zellij.sh index 3f038a8..6df21a9 100644 --- a/install/zellij.sh +++ b/install/zellij.sh @@ -1,6 +1,6 @@ if ! command -v zellij &>/dev/null; then sudo snap install zellij --classic mkdir -p ~/.config/zellij/ - cp ~/.local/share/omakub/configs/zellij.kdl ~/.config/zellij/config.kdl - ln -s ~/.local/share/omakub/themes/zellij ~/.config/zellij/themes + cp $OMAKUB_PATH/configs/zellij.kdl ~/.config/zellij/config.kdl + ln -s $OMAKUB_PATH/themes/zellij ~/.config/zellij/themes fi