diff --git a/README.md b/README.md index 784996d..e06287a 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,12 @@ by my install script. ### `.config/autokey` This folder contains my phrases and scripts for [AutoKey](https://github.com/autokey/autokey). +### `.config/compton` +This folder contains my [compton](https://github.com/yshui/compton/releases) configuration. + +### `.config/cron` +This folder contains my crontab file. + ### `.config/dconf` This folder contains my configurations that are stored in dconf by applications. These are getting loaded on boot in `.bash_profile`. @@ -53,9 +59,6 @@ This folder contains my [Streamlink](https://streamlink.github.io/) configuratio This folder contains my configuration for my terminal emulator [Termite](https://github.com/thestinger/termite). -### `.config/compton` -This folder contains my [compton](https://github.com/yshui/compton/releases) configuration. - ### `.config/Trolltech.conf` This file contains my QT4 configuration. diff --git a/install.sh b/install.sh index 8fa2c95..772ad25 100755 --- a/install.sh +++ b/install.sh @@ -36,6 +36,7 @@ LINKED_FILES_HOME=( ".bashrc" ".config/autokey" ".config/compton" + ".config/cron/crontab" ".config/dconf" ".config/dunst" ".config/git" @@ -47,7 +48,6 @@ LINKED_FILES_HOME=( ".config/streamlink" ".config/termite" ".config/Trolltech.conf" - ".crontab" ".dircolors" ".env" ".gtkrc-2.0.mine" @@ -83,7 +83,6 @@ do create_directory "${dir}" done -# Install base-devel for building aur packages print_header "Installing packages" #sudo pacman -S git base-devel --noconfirm @@ -96,7 +95,6 @@ print_header "Installing packages" # Install packages #yay -S --noconfirm $(cat "${PACKAGES_DIR}/packages.list") -#yay -S --noconfirm $(cat "${PACKAGES_DIR}/packages2.list") print_header "Creating symlinks" for file in "${LINKED_FILES_HOME[@]}"; diff --git a/packages/packages.list b/packages/packages.list index 28c3fb3..3e62e13 100644 --- a/packages/packages.list +++ b/packages/packages.list @@ -1,74 +1,256 @@ adapta-gtk-theme +adapta-kde +adobe-source-code-pro-fonts +adobe-source-sans-pro-fonts alsa-utils arandr +autoconf +autokey-py3 +automake +autopep8 +bash +bash-completion +bbswitch +biber +binutils +bison +bless blueman bluez-utils bumblebee -compton +bzip2 +citra-git +citra-qt-git +cmus +composer +compton-git +coreutils +cpupower cronie +cryptsetup cups +cups-pdf +cutentr-git deluge +desmume +device-mapper +dhcpcd +diffutils discord +docker +dolphin-emu-git dunst +e2fsprogs +efibootmgr exa +exfat-utils fakeroot feh +file +filemanager-actions +filesystem filezilla -wqy-zenhei -steam -nvidia -lib32-mesa -nvidia-utils -lib32-primus -primus -lib32-nvidia-utils +findutils +firefox +flex +flips-git +fuseiso +g810-led-git +gawk +gcc +gcc-libs +gettext gimp git +gksu +glibc google-chrome-beta +gparted +gpicview-gtk3 +grep grive-git +grub +gscreenshot +gtk-engine-murrine +gtk-engines +gucharmap +guvcview +gzip hplip htop i3-gaps +i3lock i3lock-fancy-git ibus +ibus-anthy +ibus-qt +inetutils +inotify-tools +intellij-idea-ultimate-edition +iproute2 +iputils +jdk8 +jfsutils +jrommanager +jstest-gtk-git keepassxc +kvantum-theme-adapta +less +lib32-mesa +lib32-nvidia-utils +lib32-primus +lib32-virtualgl +libreoffice-fresh +licenses light +linux +linux-firmware +logrotate +lutris-git +lvm2 lxappearance +ly-git +m4 +make +man-db +man-pages +mariadb +mdadm +melonds-git mesa mesa-demos +mkcert +mono +mplayer mpv +mtpfs +mupen64plus +mupen64plus-qt +nano nemo +nemo-fileroller +nemo-share +netctl +network-manager-applet +networkmanager +nmap nodejs +noto-fonts +noto-fonts-cjk +noto-fonts-emoji +npm +nvidia +nvidia-settings +obs-studio +openssh +p7zip +pacman pamixer +pandoc +pandoc-citeproc paper-icon-theme +patch pavucontrol +pciutils +perl +perl-archive-zip +phonon-qt4 +polybar +primus +procps-ng +psmisc pulseaudio pulseaudio-alsa +pyside2 +python-atspi +python-black +python-gspread-git +python-oauth2client +python-pycodestyle +python-pylint +python-pyqt5 +python-pyusb +python-reportlab +python2-notify +qt5-styleplugins +qt5ct +qutebrowser +redshift +reiserfsprogs ripgrep rofi +rpcs3-git ruby -scrot +rust-racer +rustup +s-nail +sed +shadow +shellcheck simple-scan +steam streamlink-git sudo -termite +sysfsutils +systemd-sysvcompat +tar +termite +texinfo +texlive-bibtexextra +texlive-core +texlive-fontsextra +texlive-formatsextra +texlive-games +texlive-humanities +texlive-langchinese +texlive-langcyrillic +texlive-langextra +texlive-langgreek +texlive-langjapanese +texlive-langkorean +texlive-latexextra +texlive-music +texlive-pictures +texlive-pstricks +texlive-publishers +texlive-science tk -ttf-arphic-uming -ttf-baekmuk +tldr +ttf-croscore +ttf-dejavu +ttf-droid +ttf-fira-sans ttf-font-awesome -ttf-freefont +ttf-hack +ttf-liberation ttf-mac-fonts ttf-ms-fonts ttf-roboto -unzip +ttf-ubuntu-font-family +unrar +usbutils +util-linux +vagrant +vi vim +virtualbox +virtualbox-host-modules-arch visual-studio-code-bin vlc +which +wine +winetricks +wqy-zenhei +xdelta3 +xf86-video-intel +xfsprogs xorg-server -xorg-utils xorg-xbacklight xorg-xev xorg-xinit -xorg-xkill xorg-xprop -xorg-xrandr \ No newline at end of file +xorg-xrandr +xpad +xreader +xwiimote-git +yay diff --git a/packages/packages2.list b/packages/packages2.list deleted file mode 100644 index cbbb6a1..0000000 --- a/packages/packages2.list +++ /dev/null @@ -1 +0,0 @@ -polybar \ No newline at end of file diff --git a/system/.bash_profile b/system/.bash_profile index 15bdaa1..03f024c 100644 --- a/system/.bash_profile +++ b/system/.bash_profile @@ -23,7 +23,7 @@ fi dconf load / < "${HOME}/.config/dconf/root.conf" # Activate correct crontab file -crontab "${HOME}/.crontab" +crontab "${$XDG_CONFIG_HOME}/cron/crontab" # If we are on tty1 we start the x-server if [ "$(tty)" = "/dev/tty1" ]; then diff --git a/system/.bashrc b/system/.bashrc index 3b2b0de..52f0b2a 100644 --- a/system/.bashrc +++ b/system/.bashrc @@ -17,6 +17,11 @@ shopt -s histappend shopt -s checkwinsize shopt -s globstar +# Sourcing environment variables +if [ -f "${HOME}/.env" ]; then + . "${HOME}/.env" +fi + # Enable color support of ls if [ -f "${HOME}/.dircolors" ]; then dircolors -b "${HOME}/.dircolors" > /dev/null 2>&1 @@ -36,9 +41,4 @@ fi if [ -f "/usr/share/bash-completion/bash_completion" ]; then . /usr/share/bash-completion/bash_completion fi -complete -cf sudo - -# Sourcing alias definitions -if [ -f "${HOME}/.env" ]; then - . "${HOME}/.env" -fi \ No newline at end of file +complete -cf sudo \ No newline at end of file diff --git a/system/.crontab b/system/.config/cron/crontab similarity index 92% rename from system/.crontab rename to system/.config/cron/crontab index 53dfb5f..dbf6528 100644 --- a/system/.crontab +++ b/system/.config/cron/crontab @@ -1,5 +1,5 @@ # SCRIPT NAME: -# .crontab +# .config/cron/crontab # # AUTHOR: # Severin Kaderli diff --git a/system/.env b/system/.env index dba9a6e..ac757ed 100644 --- a/system/.env +++ b/system/.env @@ -13,6 +13,11 @@ # This script is sourced by .bashrc . "${HOME}/bin/utils.sh" +# XDG_Base_Directories +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_DATA_HOME="$HOME/.local/share" + # Bash export HISTCONTROL=ignoreboth export HISTSIZE=1000