Browse Source

install script updated, some bugs fixed

main
Yigit Colakoglu 4 years ago
parent
commit
384540cebf
9 changed files with 30 additions and 22 deletions
  1. +12
    -1
      arch-setup/chroot.sh
  2. +0
    -1
      config/.gitignore
  3. +1
    -0
      config/mpd/.gitignore
  4. +2
    -1
      config/mpd/mpd.conf
  5. +7
    -16
      config/ncmpcpp/bindings
  6. +2
    -0
      config/ncmpcpp/config
  7. +4
    -2
      install.sh
  8. +1
    -0
      local/bin/nextcloud-sync
  9. +1
    -1
      profile

+ 12
- 1
arch-setup/chroot.sh View File

@ -51,6 +51,17 @@ if [ ! -f "/tmp/.blackarch" ]; then
pacman -Syy pacman -Syy
touch /tmp/.blackarch touch /tmp/.blackarch
echo -n "Are you going to use a flexo server?(y/N): "
read flexo
while [ "$flex" = "y" ]; do
echo -n "Please enter ip address of flexo server: "
read flexo_ip
echo "\nServer = http://$flexo_ip:7878/\$repo/os/\$arch\n" >> /etc/pacman.d/mirrorlist
done
pacman -Syy
echo -n "Did any errors occur?(y/N): " echo -n "Did any errors occur?(y/N): "
read errors read errors
@ -184,9 +195,9 @@ EOF
fi fi
mkdir -p /etc/sudoers.d mkdir -p /etc/sudoers.d
echo "$username $hostname =NOPASSWD: /usr/bin/systemctl poweroff,/usr/bin/systemctl halt,/usr/bin/systemctl reboot,/usr/bin/systemctl hibernate" > /etc/sudoers.d/wheel
echo "Defaults env_reset,pwfeedback" >> /etc/sudoers.d/wheel echo "Defaults env_reset,pwfeedback" >> /etc/sudoers.d/wheel
echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/nopwd echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/nopwd
echo "$username $hostname =NOPASSWD: /usr/bin/systemctl poweroff,/usr/bin/systemctl halt,/usr/bin/systemctl reboot,/usr/bin/systemctl hibernate,/bin/pacman -Syyuw --noconfirm" > /etc/sudoers.d/wheel
sudo -u $username bash -c "git clone https://aur.archlinux.org/yay.git /tmp/yay" sudo -u $username bash -c "git clone https://aur.archlinux.org/yay.git /tmp/yay"


+ 0
- 1
config/.gitignore View File

@ -27,7 +27,6 @@
!mimeapps.list !mimeapps.list
!mimeapps.list/** !mimeapps.list/**
!mpd !mpd
!mpd/**
!mpv !mpv
!mpv/** !mpv/**
!nvim !nvim


+ 1
- 0
config/mpd/.gitignore View File

@ -1 +1,2 @@
database
playlists playlists

+ 2
- 1
config/mpd/mpd.conf View File

@ -1,5 +1,6 @@
music_directory "~/Music"
music_directory "~/Music"
playlist_directory "~/.config/mpd/playlists" playlist_directory "~/.config/mpd/playlists"
db_file "~/.config/mpd/database"
auto_update "yes" auto_update "yes"
bind_to_address "127.0.0.1" bind_to_address "127.0.0.1"


+ 7
- 16
config/ncmpcpp/bindings View File

@ -67,8 +67,6 @@
#def_key "space" #def_key "space"
# toggle_visualization_type # toggle_visualization_type
# #
#def_key "delete"
# delete_playlist_items
# #
#def_key "delete" #def_key "delete"
# delete_browser_items # delete_browser_items
@ -239,8 +237,6 @@
#def_key "/" #def_key "/"
# find # find
# #
#def_key "/"
# find_item_forward
# #
#def_key "?" #def_key "?"
# find # find
@ -388,30 +384,19 @@
# #
#def_key "q" #def_key "q"
# quit # quit
#
#
#def_key "f"
# find
#def_key "f"
# find_item_forward
def_key "j" def_key "j"
scroll_down scroll_down
def_key "k" def_key "k"
scroll_up scroll_up
#push_characters "jjjjjjjjjjjjjjj"
def_key "ctrl-u" def_key "ctrl-u"
page_up page_up
#push_characters "kkkkkkkkkkkkkkk" #push_characters "kkkkkkkkkkkkkkk"
def_key "ctrl-d" def_key "ctrl-d"
page_down page_down
#push_characters "jjjjjjjjjjjjjjj" #push_characters "jjjjjjjjjjjjjjj"
def_key "u"
page_up
#push_characters "kkkkkkkkkkkkkkk"
def_key "d"
page_down
#push_characters "jjjjjjjjjjjjjjj"
def_key "h" def_key "h"
previous_column previous_column
def_key "l" def_key "l"
@ -475,3 +460,9 @@ def_key "shift-up"
def_key "shift-down" def_key "shift-down"
select_item select_item
scroll_down scroll_down
def_key "d"
delete_playlist_items
def_key "/"
find_item_forward
def_key "space"
select_item

+ 2
- 0
config/ncmpcpp/config View File

@ -87,4 +87,6 @@ display_bitrate = "yes"
enable_window_title = "yes" enable_window_title = "yes"
empty_tag_marker = "" empty_tag_marker = ""
mpd_crossfade_time=3
execute_on_song_change="kill -63 $(pidof dwmblocks)" execute_on_song_change="kill -63 $(pidof dwmblocks)"

+ 4
- 2
install.sh View File

@ -108,7 +108,8 @@ if [ ! -f "/var/spool/cron/$username" ]; then
sudo chown $username:$username "/var/spool/cron/$username" sudo chown $username:$username "/var/spool/cron/$username"
sudo chmod 755 "/var/spool/cron/$username" sudo chmod 755 "/var/spool/cron/$username"
echo "*/8 * * * * /home/$username/.local/bin/mailsync" > /var/spool/cron/$username echo "*/8 * * * * /home/$username/.local/bin/mailsync" > /var/spool/cron/$username
echo "*/15 * * * * /home/$username/.local/bin/scripts/nextcloud-sync" >> /var/spool/cron/$username
echo "*/15 * * * * /home/$username/.local/bin/nextcloud-sync" >> /var/spool/cron/$username
echo "* */1 * * * /home/$username/.local/bin/check-updates" >> /var/spool/cron/$username
echo "*/30 * * * * calcurse-caldav" >> /var/spool/cron/$username echo "*/30 * * * * calcurse-caldav" >> /var/spool/cron/$username
echo "*/30 * * * * vdirsyncer sync" >> /var/spool/cron/$username echo "*/30 * * * * vdirsyncer sync" >> /var/spool/cron/$username
else else
@ -117,7 +118,8 @@ else
if [ ! "$cron" = "n" ]; then if [ ! "$cron" = "n" ]; then
cp /var/spool/cron/$username ~/.dotfiles_backup/crontab cp /var/spool/cron/$username ~/.dotfiles_backup/crontab
echo "*/8 * * * * /home/$username/.local/bin/mailsync" > /var/spool/cron/$username echo "*/8 * * * * /home/$username/.local/bin/mailsync" > /var/spool/cron/$username
echo "*/15 * * * * /home/$username/.local/bin/scripts/nextcloud-sync" >> /var/spool/cron/$username
echo "*/15 * * * * /home/$username/.local/bin/nextcloud-sync" >> /var/spool/cron/$username
echo "* */1 * * * /home/$username/.local/bin/check-updates" >> /var/spool/cron/$username
echo "*/30 * * * * calcurse-caldav" >> /var/spool/cron/$username echo "*/30 * * * * calcurse-caldav" >> /var/spool/cron/$username
echo "*/30 * * * * vdirsyncer sync" >> /var/spool/cron/$username echo "*/30 * * * * vdirsyncer sync" >> /var/spool/cron/$username
fi fi


+ 1
- 0
local/bin/nextcloud-sync View File

@ -7,6 +7,7 @@ rm -rf /tmp/nextcloud.err
for i in "${!mappings[@]}"; do for i in "${!mappings[@]}"; do
echo "Syncing: $i" echo "Syncing: $i"
mkdir -p "${mappings[$i]}"
nextcloudcmd -h -u "$NEXTCLOUD_USERNAME" -p "$NEXTCLOUD_PASSWORD" \ nextcloudcmd -h -u "$NEXTCLOUD_USERNAME" -p "$NEXTCLOUD_PASSWORD" \
"${mappings[$i]}" "$i" >> /tmp/nextcloud.out 2>> /tmp/nextcloud.err "${mappings[$i]}" "$i" >> /tmp/nextcloud.out 2>> /tmp/nextcloud.err
done done


+ 1
- 1
profile View File

@ -8,7 +8,7 @@ export SHELL=/bin/zsh
export TERMINAL=/usr/local/bin/st export TERMINAL=/usr/local/bin/st
export TMUX_PLUGIN_MANAGER_PATH=~/.tmux/plugins export TMUX_PLUGIN_MANAGER_PATH=~/.tmux/plugins
export BORG_KEYS_DIR=~/.keys/borg export BORG_KEYS_DIR=~/.keys/borg
export BROWSER="/home/yigit/.local/bin/brave-start"
export BROWSER=brave
export EDITOR=nvim export EDITOR=nvim
export OPENER=xdg-open export OPENER=xdg-open
export ANDROID_HOME=/home/yigit/Android export ANDROID_HOME=/home/yigit/Android


Loading…
Cancel
Save