diff --git a/README.md b/README.md index 90bdbc2..56b450b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ # dotfiles -my dotfiles +This repository holds my Linux config files. + +## Mandatory unixporn screenshot + +[![dotfiles](dotfiles.png)](https://raw.githubusercontent.com/Mastermindzh/dotfiles/master/dotfiles.png) + +## Tools + +| Purpose | Tool | +|-------------|--------------------------------------| +| WM | i3 (i3-gaps) | +| App launcher| rofi | +| Shell | Bash | +| OS | Arch Linux (or Antergos if I'm lazy) | +| Terminal | xfce4-terminal | +| Editor | nano | +| Code editor | vscode / jetbrains stuff | +| Browser | Chromium | +| File manager| If I have to use one ... Nautilus | +| Music | Google Play Music Desktop Player | +| | | + diff --git a/bash/.bashrc b/bash/.bashrc index 4394492..3f53fd0 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -2,16 +2,20 @@ # ~/.bashrc # +function _update_ps1() { + PS1=$(powerline-shell $?) +} + source ~/.alias # If not running interactively, don't do anything [[ $- != *i* ]] && return - -alias ls='ls --color=auto' - eval $(thefuck --alias) #... :P fancy stuffs screenfetch -t -A "UBUNTU" PS1='[\u@\h \W]\$ ' +if [[ $TERM != linux && ! $PROMPT_COMMAND =~ _update_ps1 ]]; then + PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" +fi diff --git a/dependencies/aur.txt b/dependencies/aur.txt index 6668ca1..e22f2ec 100644 --- a/dependencies/aur.txt +++ b/dependencies/aur.txt @@ -1,4 +1,7 @@ notify-osd-customizable notifyconf enpass-bin -insync \ No newline at end of file +insync +visual-studio-code-insiders +gpmdp +ttf-font-awesome-4 \ No newline at end of file diff --git a/dependencies/pacman.txt b/dependencies/pacman.txt index 5c4a336..7ff9691 100644 --- a/dependencies/pacman.txt +++ b/dependencies/pacman.txt @@ -23,3 +23,6 @@ eog yaourt thefuck screenfetch +python +python-pip +gdm \ No newline at end of file diff --git a/dependencies/pip.txt b/dependencies/pip.txt new file mode 100644 index 0000000..48d0a7f --- /dev/null +++ b/dependencies/pip.txt @@ -0,0 +1 @@ +powerline-shell \ No newline at end of file diff --git a/dotfiles.png b/dotfiles.png new file mode 100644 index 0000000..b86274e Binary files /dev/null and b/dotfiles.png differ diff --git a/fonts/font-awesome.ttf b/fonts/font-awesome.ttf new file mode 100644 index 0000000..7ab3e61 Binary files /dev/null and b/fonts/font-awesome.ttf differ diff --git a/i3/i3blocks.conf b/i3/i3blocks.conf index 0a54aa7..8edba5c 100644 --- a/i3/i3blocks.conf +++ b/i3/i3blocks.conf @@ -35,15 +35,6 @@ separator_block_width=13 interval=1 color=#e29e0b -# CPU usage -# -# The script may be called with -w and -c switches to specify thresholds, -# see the script for details. -[cpu_usage] -label= -interval=10 -separator=true - # Temperature # # Support multiple chips, though lm-sensors. @@ -54,6 +45,11 @@ command=bash ~/.config/i3/scripts/blocks/temp.sh label= interval=1 +[load_average] +label= +interval=10 +separator=true + # Memory usage # # The type defaults to "mem" if the instance is not specified. @@ -72,31 +68,38 @@ instance=/ interval=5 separator=true +# Updates +[updates] +label= +command=pacman -Qu | wc -l +interval=60 +separator=true + # Network interface monitoring # # If the instance is not specified, use the interface used for default route. # The address can be forced to IPv4 or IPv6 with -4 or -6 switches. [iface] #instance=wlan0 +label= color=#0fad3c interval=10 separator=true -[wifi] -#instance=wlp3s0 -interval=10 +# ping +[ping] +label= +command=ping -c 2 8.8.8.8 | tail -1| awk '{print $4}' | cut -d '/' -f 2 | cut -f1 -d"." +interval=60 separator=true -#[load_average] -#interval=10 - # Volume indicator # # The first parameter sets the step (and units to display) # The second parameter overrides the mixer selection # See the script for details. [volume] -label= +label= instance=Master interval=1 command=/usr/lib/i3blocks/volume 5 pulse @@ -114,6 +117,7 @@ separator=true # Date Time [time] +label= command=date '+%Y-%m-%d %H:%M:%S' interval=1 separator=true diff --git a/install.sh b/install.sh index 8013b0b..ae07ac9 100644 --- a/install.sh +++ b/install.sh @@ -15,39 +15,42 @@ function yes_or_no { done } -# moves all fonts into the fonts directory (overwriting existing files) +# moves all fonts into the fonts directories (overwriting existing files) function install_fonts { mkdir -p ~/.fonts - yes | cp -rf ./fonts/*.ttf ~/.fonts + mkdir -p ~/.local/share/fonts + yes | cp -rf ./fonts/* ~/.fonts + yes | cp -rf ./fonts/* ~/.local/share/fonts } -# install basic rice files +# Link basic rice files function install_rice { - mkdir -p ~/.config/i3 mkdir -p ~/Pictures/Wallpapers - cp wallpapers/wallpaper.jpeg ~/Pictures/Wallpapers/wallpaper.jpg - yes | cp -rf i3/* ~/.config/i3 + ln -sf "$PWD"/wallpapers/wallpaper.jpeg ~/Pictures/Wallpapers/wallpaper.jpg + ln -sf "$PWD"/i3/ ~/.config/i3 } # install other configs function install_config { rm ~/.notify-osd - cp -f notify-osd/notify-osd ~/.notify-osd - cp -f ./bash/.alias.sh ~/.alias - cp -f ./bash/.bashrc ~/ - cp -f ./nano/.nanorc ~/ - cp -rf ./config ~/.config + ln -sf "$PWD"/notify-osd/notify-osd ~/.notify-osd + ln -sf "$PWD"/bash/.bashrc ~/.bashrc + ln -sf "$PWD"/bash/.alias.sh ~/.alias + ln -sf "$PWD"/nano/.nanorc ~/.nanorc + mkdir -p ~/.config/gtk-3.0 + ln -sf "$PWD"/config/gtk-3.0/settings.ini ~/.config/gtk-3.0/.config } -# Installs the file templates in the ~/Templates directory. +# Symlinks the file templates in the ~/Templates directory. function install_file_templates { - cp -rf ./templates/* ~/Templates + ln -sf "$PWD"/templates ~/Templates } # Installs the dependencies on Arch Linux function install_dependencies { sudo pacman --force -S $(cat dependencies/pacman.txt | sed ':a;N;$!ba;s/\n/ /g') yaourt --force -S --noconfirm $(cat dependencies/aur.txt | sed ':a;N;$!ba;s/\n/ /g') + sudo pip install $(cat dependencies/pip.txt | sed ':a;N;$!ba;s/\n/ /g') } # list the dependencies file @@ -57,6 +60,7 @@ function list_dependencies { echo "" cat dependencies/pacman.txt cat dependencies/aur.txt + cat dependencies/pip.txt echo "" echo "==========================" echo "" @@ -92,3 +96,8 @@ yes_or_no "Do you want to install the file templates? (~/Templates)" && install_ # Ask the user whether it wants to continue yes_or_no "Are you sure you want to install my i3 rice?" && install_rice + +# ask to enable gdm +yes_or_no "Do you want to enable GDM?" && sudo systemctl enable gdm.service + +echo "Enjoy using my ricing! Do not forget to select \"i3\" in GDM :)" \ No newline at end of file diff --git a/wallpapers/wallpaper.jpg b/wallpapers/wallpaper.jpg new file mode 100644 index 0000000..6f840c3 Binary files /dev/null and b/wallpapers/wallpaper.jpg differ