From b2efee2226cc04d56b403e5c02835196d359b89b Mon Sep 17 00:00:00 2001 From: Yigit Colakoglu Date: Sat, 3 Apr 2021 10:51:53 +0300 Subject: [PATCH] Updated config gitignore --- arch-setup/chroot.sh | 10 ++++++++-- config/.gitignore | 31 ++++++++++++++++++++++++++++++- config/npm/.gitignore | 3 +++ config/npm/npmrc | 4 ++++ config/nvim/coc-settings.json | 25 +++++++++++++++++++++++++ config/surf/cookies.txt | 3 --- config/surf/history.txt | 13 ------------- install.sh | 24 +++++++++++++++++------- local/bin/kbmap_toggle | 4 ++-- suckless/surf/config.h | 8 ++++---- 10 files changed, 93 insertions(+), 32 deletions(-) create mode 100644 config/npm/.gitignore create mode 100644 config/npm/npmrc create mode 100644 config/nvim/coc-settings.json delete mode 100644 config/surf/cookies.txt delete mode 100644 config/surf/history.txt diff --git a/arch-setup/chroot.sh b/arch-setup/chroot.sh index 3c1d2385..78391199 100755 --- a/arch-setup/chroot.sh +++ b/arch-setup/chroot.sh @@ -43,17 +43,23 @@ echo -e "en_US.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8" > /etc/locale.gen locale-gen echo "LANG=en_US.UTF-8" > /etc/locale.conf if [ ! -f "/tmp/.blackarch" ]; then + echo -e "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf curl https://blackarch.org/strap.sh > /tmp/strap.sh chmod +x /tmp/strap.sh /tmp/strap.sh touch /tmp/.blackarch clear fi + clear + echo "Please enter hostname: " read hostname echo $hostname > /etc/hostname +echo "Set password for root: " +passwd root + echo "Please enter name for regular user:" read username @@ -199,7 +205,6 @@ cp -r /tmp/pthemes/pack_4/sphere /usr/share/plymouth/themes clear - refind-install echo -e "/boot/EFI/refind\n2\n2" | sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/bobafetthotmail/refind-theme-regular/master/install.sh)" @@ -217,7 +222,7 @@ mkinitcpio -P if [ -f "/install/encrypted" ]; then vim /etc/fstab fi -pacman -R nano # uninstall nano, eww +pacman --noconfirm -R nano # uninstall nano, eww clear @@ -226,6 +231,7 @@ echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers.d/wheel rm -rf /bin/sh ln -sf /bin/dash /bin/sh +chsh -s $(which mksh) $username clear diff --git a/config/.gitignore b/config/.gitignore index 917648d6..daf71224 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -4,42 +4,71 @@ # Don't Ignore these files !.gitignore !antibody +!antibody/** !BetterDiscord -!Bitwarden +!BetterDiscord/** !calcurse +!calcurse/hooks !dunst +!dunst/** !fontconfig +!fontconfig/** !gtk-2.0 +!gtk-2.0/** !gtk-3.0 +!gtk-3.0/** !gtk-4.0 +!gtk-4.0/** !htop +!htop/** !isync !lf +!lf/** !mimeapps.list +!mimeapps.list/** !mpd +!mpd/** !mpv +!mpv/** !nvim +!nvim/** !msmtp !mutt +!mutt/** !ncmpcpp +!ncmpcpp/** !neofetch +!neofetch/** !newsboat +!newsboat/** !nextcloud +!nextcloud/** !notmuch +!notmuch/** !pulse !qt5ct +!qt5ct/** !ranger +!ranger/** !readline +!readline/** !spotifyd !surf !tmate +!tmate/** !tmux +!tmux/** !vdirsyncer +!vdirsyncer/** !vim !vim/** !wakatime !wgetrc +!wgetrc/** !X11 +!X11/** !zathura +!zathura/** !coc +!npm !zsh diff --git a/config/npm/.gitignore b/config/npm/.gitignore new file mode 100644 index 00000000..c1002951 --- /dev/null +++ b/config/npm/.gitignore @@ -0,0 +1,3 @@ +* +!npmrc +!.gitignore diff --git a/config/npm/npmrc b/config/npm/npmrc new file mode 100644 index 00000000..fc84b784 --- /dev/null +++ b/config/npm/npmrc @@ -0,0 +1,4 @@ +prefix=${XDG_DATA_HOME}/npm +cache=${XDG_CACHE_HOME}/npm +tmp=${XDG_RUNTIME_DIR}/npm +init-module=${XDG_CONFIG_HOME}/npm/config/npm-init.js diff --git a/config/nvim/coc-settings.json b/config/nvim/coc-settings.json new file mode 100644 index 00000000..e708ab4b --- /dev/null +++ b/config/nvim/coc-settings.json @@ -0,0 +1,25 @@ +{ + "languageserver": { + "ccls": { + "command": "ccls", + "filetypes": [ + "c", + "cpp", + "objc", + "objcpp" + ], + "rootPatterns": [ + ".ccls", + "compile_commands.json", + ".vim/", + ".git/", + ".hg/" + ], + "initializationOptions": { + "cache": { + "directory": "/tmp/ccls" + } + } + } + } +} diff --git a/config/surf/cookies.txt b/config/surf/cookies.txt deleted file mode 100644 index 0b16cbd7..00000000 --- a/config/surf/cookies.txt +++ /dev/null @@ -1,3 +0,0 @@ -#HttpOnly_.google.com TRUE / TRUE 1632862083 NID 212=KHX5zOKOsFZez_kS5jEAqSrltn3wEizkXDRGl9HflSUc9YR8xEGzQKxq6TBiqOvAzAo1MlT6kaEQqUKRfWfCERMc5okEiwhIya8Dti0_uiP99MDnEhXyKfyARUs2H9PK2R4ozvIwhPmUNEtkJX5OQoQzClfBETSRosTP8ThQP78 None -.google.com TRUE / TRUE 1619643092 1P_JAR 2021-03-29-20 None -.unsplash.com TRUE / TRUE 1648587996 ugid 7eaf846a16a77665ebcd81475279fff45390171 None diff --git a/config/surf/history.txt b/config/surf/history.txt deleted file mode 100644 index b3ff9af5..00000000 --- a/config/surf/history.txt +++ /dev/null @@ -1,13 +0,0 @@ -2021-03-29 23:47:52 http://localhost:9999/ -2021-03-29 23:47:52 http://localhost:9999/ http://localhost:9999/ -2021-03-29 23:47:58 https://www.google.com/?gws_rd=ssl Google -2021-03-29 23:48:04 https://www.google.com/ Google -2021-03-29 23:49:28 https://www.google.com/ Google -2021-03-29 23:51:32 https://www.google.com/ Google -2021-03-29 23:58:15 file:///usr/share/doc/arch-wiki/html/en/2bwm.html 2bwm - ArchWiki -2021-03-29 23:58:27 http://localhost:9999/ http://localhost:9999/ -2021-03-29 23:58:54 file:///usr/share/doc/arch-wiki/html/en/2bwm.html 2bwm - ArchWiki -2021-03-29 23:59:49 file:///usr/share/doc/arch-wiki/html/en/32-bit_package_guidelines.html 32-bit package guidelines - ArchWiki -2021-03-29 23:59:50 file:///usr/share/doc/arch-wiki/html/en/32-bit_package_guidelines.html 32-bit package guidelines - ArchWiki -2021-03-30 00:00:20 file:///usr/share/doc/arch-wiki/html/en/32-bit_package_guidelines.html 32-bit package guidelines - ArchWiki -2021-03-30 00:06:35 http://localhost:9999/ http://localhost:9999/ diff --git a/install.sh b/install.sh index 53c095c4..1f14d94a 100755 --- a/install.sh +++ b/install.sh @@ -65,6 +65,10 @@ for d in ~/.dotfiles_backup/local/backgrounds/* ; do mv $d ~/.local/backgrounds 2> /dev/null done +## Local/Src +mvie ~/.local/src ~/.dotfiles_backup/local/src +ln -s ~/.dotfiles/suckless ~/.local/src + ## Theme and Icon Folders mvie ~/.themes ~/.dotfiles_backup/themes ln -s ~/.dotfiles/local/share/themes ~/.themes @@ -103,6 +107,10 @@ if [ ! -f "/var/spool/cron/$username" ]; then sudo touch "/var/spool/cron/$username" sudo chown $username:$username "/var/spool/cron/$username" sudo chmod 755 "/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 "*/30 * * * * calcurse-caldav" >> /var/spool/cron/$username + echo "*/30 * * * * vdirsyncer sync" >> /var/spool/cron/$username else echo -n "An existing cron file is detected, would you like to overwrite it?(Y/n): " read cron @@ -130,6 +138,8 @@ mkdir -p "$JUPYTER_CONFIG_DIR" mkdir -p "$PYLINTHOME" mkdir -p "$HOME/.local/share/zsh" mkdir -p "$XDG_DATA_DIR/mail" +mkdir -p "$XDG_CONFIG_DIR/git" +mkdir -p "$XDG_CACHE_DIR/surf" chmod 700 "$GNUPGHOME" touch "$_Z_DATA" @@ -146,6 +156,13 @@ sudo systemctl daemon-reload sudo groupadd nogroup sudo systemctl enable quark +if [ "$username" = "yigit" ]; then + ~/.dotfiles/arch-setup/fetch_keys.sh # Fetch keys (For personal use, this is not for you) + mkdir -p "$XDG_DATA_DIR/mail/yigitcolakoglu@hotmail.com" + git config --global user.email "yigitcolakoglu@hotmail.com" + git config --global user.name "Yigit Colakoglu" +fi + # Build and Install Everything ## Suckless utilities echo "Installing suckless utilities" @@ -171,7 +188,6 @@ cd ~/.config/coc/extensions yarn cd $prev - # Install mconnect echo "Installing mconnect" git clone https://github.com/theFr1nge/mconnect.git /tmp/mconnect.git > /dev/null 2> /dev/null @@ -205,11 +221,5 @@ rm -rf ~/.fzf* rm -rf ~/.bash_profile sudo rm -rf /etc/urlview/system.urlview -if [ "$username" = "yigit" ]; then - ~/.dotfiles/arch-setup/fetch_keys.sh # Fetch keys (For personal use, this is not for you) - mkdir -p "$XDG_DATA_DIR/mail/yigitcolakoglu@hotmail.com" - git config --global user.email "yigitcolakoglu@hotmail.com" - git config --global user.name "Yigit Colakoglu" -fi sudo rm -rf /etc/sudoers.d/nopwd diff --git a/local/bin/kbmap_toggle b/local/bin/kbmap_toggle index 3671d07a..4ae21f6b 100755 --- a/local/bin/kbmap_toggle +++ b/local/bin/kbmap_toggle @@ -11,10 +11,10 @@ fi if [ "$layout" = "tr" ]; then xkb-switch -s "us" - notify-send "Keyboard layout switched to us" + dunstify -r 169 -a " Keyboard" "Layout switched to us" else xkb-switch -s "tr" - notify-send "Keyboard layout switched to tr" + dunstify -r 169 -a " Keyboard" "Layout switched to tr" fi kill -58 $(pidof dwmblocks) diff --git a/suckless/surf/config.h b/suckless/surf/config.h index 0236185b..a1e03a87 100644 --- a/suckless/surf/config.h +++ b/suckless/surf/config.h @@ -5,10 +5,10 @@ static char *scriptfiles[] = { "~/.config/surf/scripts/default.js", }; static char *styledir = "~/.config/surf/styles/"; -static char *certdir = "~/.config/surf/certificates/"; -static char *cachedir = "~/.config/surf/cache/"; -static char *historyfile = "~/.config/surf/history.txt"; -static char *cookiefile = "~/.config/surf/cookies.txt"; +static char *certdir = "~/.cache/surf/certificates/"; +static char *cachedir = "~/.cache/surf/cache/"; +static char *historyfile = "~/.cache/surf/history.txt"; +static char *cookiefile = "~/.cache/surf/cookies.txt"; static char *searchengine = "https://google.com/search?q="; static char **plugindirs = (char*[]){ "~/.config/surf/plugins/",