aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bashrc2
-rw-r--r--.config/spicetify/config.ini27
-rw-r--r--.gitconfig2
-rwxr-xr-x.scripts/environment6
-rw-r--r--packages.txt4
5 files changed, 22 insertions, 19 deletions
diff --git a/.bashrc b/.bashrc
index c4ad2f8..41db4e6 100644
--- a/.bashrc
+++ b/.bashrc
@@ -68,7 +68,7 @@ export TERM='st'
export TERMINAL='st'
export DENO_INSTALL="$HOME/.deno"
export JAVA_HOME=/usr/lib/jvm/default
-export PATH=/bin/:/usr/bin/:/usr/local/sbin/:/usr/local/bin/:/usr/bin/site_perl/:/usr/bin/vendor_perl/:/usr/bin/core_perl/:$HOME/.scripts/:$HOME/.sailfish/bin/:$HOME/.gem/ruby/2.7.0/bin/:$HOME/.cargo/bin/:$HOME/.local/bin/:$HOME/go/bin/:$JAVA_HOME:/opt/android-sdk/tools/bin:/opt/android-sdk/tools/:$DENO_INSTALL/bin/
+export PATH=/usr/local/bin/:/usr/local/sbin/:/usr/local/bin/:/usr/bin/:/bin/:/usr/bin/site_perl/:/usr/bin/vendor_perl/:/usr/bin/core_perl/:$HOME/.scripts/:$HOME/.sailfish/bin/:$HOME/.gem/ruby/2.7.0/bin/:$HOME/.cargo/bin/:$HOME/.local/bin/:$HOME/go/bin/:$JAVA_HOME:/opt/android-sdk/tools/bin:/opt/android-sdk/tools/:$DENO_INSTALL/bin/
export ANDROID_SDK_ROOT=/opt/android-sdk
export ANDROID_HOME=/opt/android-sdk
export GITHUB_TOKEN="$(cat "$HOME"/.crypto/github)"
diff --git a/.config/spicetify/config.ini b/.config/spicetify/config.ini
index e52881d..b3dae0e 100644
--- a/.config/spicetify/config.ini
+++ b/.config/spicetify/config.ini
@@ -1,6 +1,6 @@
[AdditionalOptions]
made_for_you_hub = 0
-custom_apps =
+custom_apps =
lyric_always_show = 0
new_feedback_ui = 0
song_page = 0
@@ -16,19 +16,22 @@ home = 0
lyric_force_no_sync = 0
[Setting]
-current_theme = Dark
-color_scheme =
-inject_css = 1
-replace_colors = 1
-overwrite_assets = 0
-spotify_path = /opt/spotify
-prefs_path = /home/melvin/.config/spotify/prefs
+current_theme = Dark
+color_scheme =
+inject_css = 1
+replace_colors = 1
+overwrite_assets = 0
+spotify_path = /opt/spotify
+prefs_path = /home/melvin/.config/spotify/prefs
+spotify_launch_flags =
+check_spicetify_upgrade = 0
[Preprocesses]
-disable_sentry = 1
-disable_ui_logging = 1
-remove_rtl_rule = 1
-expose_apis = 1
+disable_sentry = 1
+disable_ui_logging = 1
+remove_rtl_rule = 1
+expose_apis = 1
+disable_upgrade_check = 1
; DO NOT CHANGE!
[Backup]
diff --git a/.gitconfig b/.gitconfig
index d582072..056e73c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,5 @@
ff = only
[commit]
gpgsign = true
+[merge]
+ tool = vimdiff
diff --git a/.scripts/environment b/.scripts/environment
index 0961b8a..8591c7d 100755
--- a/.scripts/environment
+++ b/.scripts/environment
@@ -1,7 +1,7 @@
#!/usr/bin/env sh
notify-send -t 10000 -i "dialog-xml-editor" "Waiting for internet connection..."
-while ! ping -qc1 8.8.8.8 ; do sleep 0.1 ; done
+while ! ping -qc1 8.8.8.8; do sleep 0.1; done
notify-send -t 2000 -i "dialog-yes" "Found network"
#notify-send -t 5000 -i "dialog-layers" "Starting programs"
@@ -17,5 +17,5 @@ exec thunderbird &
notify-send -t 10000 -i "im-user" "Welcome back, Melvin!"
# Musica! :)
-exec spotify &
-while ! dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Play ; do sleep 0.5 ; done
+exec /usr/local/bin/spotify & # Force spotifywm
+while ! dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Play; do sleep 0.5; done
diff --git a/packages.txt b/packages.txt
index f6eada1..2e0f6e4 100644
--- a/packages.txt
+++ b/packages.txt
@@ -127,7 +127,6 @@ lib32-giflib
lib32-glibc
lib32-gnutls
lib32-gst-plugins-base-libs
-lib32-gtk3
lib32-libgcrypt
lib32-libgpg-error
lib32-libjpeg-turbo
@@ -157,8 +156,8 @@ libva-mesa-driver
libva-vdpau-driver
libvirt
libxft-bgra
+linux
linux-firmware
-linux-zen
linux-zen-docs
linux-zen-headers
llvm
@@ -297,7 +296,6 @@ unrar
unrtf
unzip
usbutils
-v4l2loopback-dkms
valgrind
vi
vim