diff --git a/backgrounds/blue-black-lines.jpg b/backgrounds/blue-black-lines.jpg new file mode 100644 index 0000000..06cf802 Binary files /dev/null and b/backgrounds/blue-black-lines.jpg differ diff --git a/backgrounds/dark-forest.jpg b/backgrounds/dark-forest.jpg new file mode 100644 index 0000000..af7af82 Binary files /dev/null and b/backgrounds/dark-forest.jpg differ diff --git a/backgrounds/dark-mesh.jpg b/backgrounds/dark-mesh.jpg new file mode 100644 index 0000000..142d3ee Binary files /dev/null and b/backgrounds/dark-mesh.jpg differ diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc index f7f8bb2..694c971 100644 --- a/dotfiles/xinitrc +++ b/dotfiles/xinitrc @@ -1,10 +1,8 @@ #!/bin/sh xrdb ~/.Xresources -# zsh ~/.fehbg & -# exec ~/essentials/scripts/sysinit/xmonad_start.sh -# exec awesome -feh --bg-scale ~/essentials/backgrounds/glass-blue-bg.jpg +compton --config ~/.compton.conf +feh --bg-scale ~/essentials/backgrounds/dark-forest.jpg xmodmap -e 'clear Lock' xmodmap -e 'keycode 0x42=Escape' -exec i3 +exec ~/essentials/scripts/sysinit/xmonad_start.sh diff --git a/dotfiles/xmonad/lib/Bar.o b/dotfiles/xmonad/lib/Bar.o index facd0b4..05aac77 100644 Binary files a/dotfiles/xmonad/lib/Bar.o and b/dotfiles/xmonad/lib/Bar.o differ diff --git a/dotfiles/xmonad/lib/PerWorkspaceDirs.hi b/dotfiles/xmonad/lib/PerWorkspaceDirs.hi index 4167b8d..2174910 100644 Binary files a/dotfiles/xmonad/lib/PerWorkspaceDirs.hi and b/dotfiles/xmonad/lib/PerWorkspaceDirs.hi differ diff --git a/dotfiles/xmonad/lib/PerWorkspaceDirs.o b/dotfiles/xmonad/lib/PerWorkspaceDirs.o index 5e13496..8079a31 100644 Binary files a/dotfiles/xmonad/lib/PerWorkspaceDirs.o and b/dotfiles/xmonad/lib/PerWorkspaceDirs.o differ diff --git a/dotfiles/xmonad/lib/Spacing.hi b/dotfiles/xmonad/lib/Spacing.hi index ff51f6f..6dd5beb 100644 Binary files a/dotfiles/xmonad/lib/Spacing.hi and b/dotfiles/xmonad/lib/Spacing.hi differ diff --git a/dotfiles/xmonad/lib/Spacing.o b/dotfiles/xmonad/lib/Spacing.o index 13853d2..291490c 100644 Binary files a/dotfiles/xmonad/lib/Spacing.o and b/dotfiles/xmonad/lib/Spacing.o differ diff --git a/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.hi b/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.hi index 8ab64ae..e8bffa1 100644 Binary files a/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.hi and b/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.hi differ diff --git a/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o b/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o index 4d5326a..324aa3a 100644 Binary files a/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o and b/dotfiles/xmonad/lib/XMonad/Layout/BinarySpacePartition.o differ diff --git a/dotfiles/xmonad/xmonad-x86_64-linux b/dotfiles/xmonad/xmonad-x86_64-linux index de46903..695f574 100755 Binary files a/dotfiles/xmonad/xmonad-x86_64-linux and b/dotfiles/xmonad/xmonad-x86_64-linux differ diff --git a/dotfiles/xmonad/xmonad.hi b/dotfiles/xmonad/xmonad.hi index 7c92a4a..48fb64f 100644 Binary files a/dotfiles/xmonad/xmonad.hi and b/dotfiles/xmonad/xmonad.hi differ diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 2ad7570..46e0922 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -161,7 +161,7 @@ scratchpads = [ NS "htop" "urxvt -name htop -e htop" (resource =? "htop") defaul -- Spawn pipes and menus on boot, set default settings -------------------------------------------------------------------------------------------------------------------- myXmonadBar :: String -myXmonadBar = "lemonbar -f \"Inconsolata:medium:pixelsize=12\" -B \"black\" | bash" +myXmonadBar = "lemonbar -f \"inconsolata 12\" -B \"#1f1f1f\" | bash" restartXmonad = "killall lemonbar; cd ~/.xmonad; ghc -threaded xmonad.hs; mv xmonad xmonad-x86_64-linux; xmonad --restart;" diff --git a/dotfiles/xmonad/xmonad.o b/dotfiles/xmonad/xmonad.o index aefc3a7..64c2f81 100644 Binary files a/dotfiles/xmonad/xmonad.o and b/dotfiles/xmonad/xmonad.o differ diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 328b5b3..6363a7b 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,5 +1,4 @@ #Portable across both mac and linux now -export ZSH=~/.oh-my-zsh export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 if [[ "$OSTYPE" == "linux-gnu" ]]; then @@ -13,19 +12,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then fi export EDITOR="$VISUAL" export ITERM_24BIT=1 -export TERM=rxvt-256color - -# Colors get weird with Emacs in urxvt. I use urxvt on Linux -# so I need to export rxvt-256color and copy the rxvt-256color terminfo -# to the right location (see package installer for details). -# This will need to be changed if you use a different terminal emulator. -# -# Currently disabled to test automatic terminal detection -#if [[ "$OSTYPE" == "linux-gnu" ]]; then -# export TERM=rxvt-256color -#else -# export TERM=xterm-256color -#fi +export TERM=xterm-256color alias emacs='emacs -nw' alias irssi='TERM=screen-256color irssi' diff --git a/scripts/lemonbar/bar_start.sh b/scripts/lemonbar/bar_start.sh index 2ea7569..2f5bd24 100755 --- a/scripts/lemonbar/bar_start.sh +++ b/scripts/lemonbar/bar_start.sh @@ -1,2 +1,4 @@ +#!/bin/bash + sleep 1 ~/essentials/scripts/lemonbar/final_bar.sh | ~/essentials/scripts/lemonbar/my_bar.sh | bash diff --git a/scripts/lemonbar/final_bar.sh b/scripts/lemonbar/final_bar.sh index 9a0cf2b..8373aa8 100755 --- a/scripts/lemonbar/final_bar.sh +++ b/scripts/lemonbar/final_bar.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # z3bra - (c) wtfpl 2014 # Fetch infos on your computer, and print them to stdout every second. diff --git a/scripts/lemonbar/my_bar.sh b/scripts/lemonbar/my_bar.sh index da433ea..fcb743c 100755 --- a/scripts/lemonbar/my_bar.sh +++ b/scripts/lemonbar/my_bar.sh @@ -1,2 +1 @@ -back="#00000000" -lemonbar -f "Inconsolata:medium:pixelsize=12" -B "black" -g "800x14+1118+1" +lemonbar -B "#1f1f1f" -g "800x14+1118+1" diff --git a/scripts/sysinit/xmonad_start.sh b/scripts/sysinit/xmonad_start.sh index 8b73f05..d3e39bb 100755 --- a/scripts/sysinit/xmonad_start.sh +++ b/scripts/sysinit/xmonad_start.sh @@ -17,5 +17,5 @@ xset r rate 300 30 unclutter -grab & tmux start-server pulseaudio -D -wmname LG3D +wmname compton xmonad diff --git a/ubuntu/installer.sh b/ubuntu/installer.sh index 58ac254..dbf82e9 100644 --- a/ubuntu/installer.sh +++ b/ubuntu/installer.sh @@ -6,6 +6,7 @@ echo "======== UBUNTU AUTO-INSTALL SCRIPT ========" echo "Running pre-setup..." sudo add-apt-repository ppa:neovim-ppa/unstable sudo apt-add-repository -y "deb http://repository.spotify.com stable non-free" +sudo apt-add-repository -y ppa:richardgv/compton sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2C19886 sudo apt-get -qq -y update sudo apt-get -qq -y upgrade @@ -13,7 +14,23 @@ sudo apt-get -qq -y upgrade # Window Manager echo "Installing window manager..." sudo apt-get -qq -y install xmonad +sudo apt-get -qq -y install compton sudo apt-get -qq -y install libghc-xmonad-contrib-dev +sudo apt-get -qq -y install xorg +sudo apt-get -qq -y install xinit +sudo apt-get -qq -y install wmname +sudo apt-get -qq -y install libxcb-xinerama0-dev +sudo apt-get -qq -y install libxcb-randr0-dev + +# Build and install lemonbar from source +echo "Installing lemonbar from source" +pushd +cd ~ +git clone https://github.com/LemonBoy/bar.git +cd bar/ +make +sudo make install +popd # Dmenu echo "Installing Dmenu..." @@ -21,9 +38,9 @@ sudo apt-get -qq -y install suckless-tools # Languages echo "Installing languages..." -sudo apt-get -qq -y install python-dev -sudo apt-get -qq -y install python-pip -sudo apt-get -qq -y install python3-dev +sudo apt-get -qq -y install python-dev +sudo apt-get -qq -y install python-pip +sudo apt-get -qq -y install python3-dev sudo apt-get -qq -y install python3-pip # Editors @@ -31,6 +48,17 @@ echo "Installing editors..." sudo apt-get -qq -y install vim sudo apt-get -qq -y install neovim +# Terminals +echo "Installing terminal..." +sudo apt-get -qq -y rxvt-unicode + +# Shell +echo "Installing shells..." +sudo apt-get -qq -y install zsh + +echo "Changing shell to zsh..." +chsh -s $(which zsh) + # Source Control echo "Installing source control..." sudo apt-get -qq -y install git @@ -50,11 +78,28 @@ echo "Installing tools..." sudo apt-get -qq -y install transmission sudo apt-get -qq -y install htop sudo apt-get -qq -y install scrot +sudo apt-get -qq -y install tmux +sudo apt-get -qq -y install feh +sudo apt-get -qq -y install unclutter +sudo apt-get -qq -y install xdotool +sudo apt-get -qq -y install cmake +sudo apt-get -qq -y install gsimplecal +sudo apt-get -qq -y install xclip + +# Comms +echo "Installing comms..." +sudo apt-get -qq -y install irssi +sudo apt-get -qq -y install skype # Browsers echo "Installing browsers..." sudo apt-get -qq -y install chromium-browser +# Fonts +echo "Installing fonts..." +sudo apt-get -qq -y install fonts-inconsolata +fc-cache --really-force -v + # Cleanup echo "Cleaning up unneccessary programs..." sudo apt-get -qq -y purge firefox @@ -70,6 +115,9 @@ sudo apt-get -qq -y purge mahjongg sudo apt-get -qq -y purge gnomine sudo apt-get -qq -y purge ace-of-penguins sudo apt-get -qq -y purge onboard +sudo apt-get -qq -y purge lightdm +sudo apt-get -qq -y purge gnome-terminal +sudo apt-get -qq -y purge gnome-terminal-data sudo apt -qq -y autoremove echo "!!! DONE INSTALLING !!!"