Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: wikimatze/dotfiles
base: 390e04097b
...
head fork: wikimatze/dotfiles
compare: 2e7ca3239d
  • 5 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 29 additions and 8 deletions.
  1. +15 −6 ackrc
  2. +13 −1 bash_scripts/ubuntu_install.sh
  3. +1 −1  bashrc_directory_aliases
View
21 ackrc
@@ -1,12 +1,21 @@
---type-add
-html=.html.erb,.html.haml,.haml
---type-add
-css=.sass,.less,.scss
---type-set
-ignorables=.log,.tmp,.pdf
+# lexical sort files
+--sort-files
+
+# add templates to html type
+--type-add=html=.html.erb,.html.haml,.haml
+
+# add new css type
+--type-add=css=.sass,.less,.scss
+
+# ignore certain file types
+--type-set=ignorables=.log,.tmp,.pdf
+
+# ignore whole directories
--ignore-dir=vendor
--ignore-dir=log
--ignore-dir=tmp
--ignore-dir=doc
--ignore-dir=coverage
+# Markdown
+--type-set=markdown=.markdown,.md,.mkd
View
14 bash_scripts/ubuntu_install.sh
@@ -101,6 +101,7 @@ sudo apt-get install -y phpunit
sudo apt-get install -y php-codesniffer
sudo apt-get install -y powertop
sudo apt-get install -y python-gtkspell
+sudo apt-get install -y pv
sudo apt-get install -y tig
sudo apt-get install -y rar
sudo apt-get install -y ack-grep
@@ -110,6 +111,8 @@ sudo apt-get install -y sqlite3
sudo apt-get install -y scrot
sudo apt-get install -y shntool
sudo apt-get install -y skype
+sudo apt-get install -y smartmontools
+sudo apt-get install -y gsmartcontrol
sudo apt-get install -y soundconverter
sudo apt-get install -y sox
sudo apt-get install -y subversion
@@ -120,6 +123,7 @@ sudo apt-get install -y tetex-extra
sudo apt-get install -y tex-common
sudo apt-get install -y tex4ht
sudo apt-get install -y texlive
+sudo apt-get install -y virtualbox-ose
sudo apt-get install -y texlive-base
sudo apt-get install -y gstreamer0.10-plugins-good
sudo apt-get install -y gstreamer0.10-plugins-bad
@@ -135,10 +139,12 @@ sudo apt-get install -y zsnes
sudo apt-get install -y mercurial # enables hb command
# }}}
+
# Remove fancy stuff {{{
sudo apt-get remove -y ruby1.8-dev
sudo apt-get remove -y libruby1.8
+sudo apt-get remove -y abiword
# }}}
# Update and upgrade {{{
@@ -150,11 +156,17 @@ sudo apt-get upgrade -y
# Unimportant stuff {{{
#sudo apt-get install -y virtualbox-guest-additions
-#sudo apt-get install -y virtualbox-ose
#sudo apt-get install -y vorbis-tools
#sudo apt-get install -y sun-java6-jdk # not available in > 11.10
#sudo apt-get install -y sun-java6-jre
#sudo apt-get install -y phpmyadmin
#sudo apt-get install -y mysql-server
+# Puppet stuff {{{
+
+#sudo apt-get install -y puppet
+#sudo apt-get install -y puppetmaster
+#sudo apt-get install -y facter
+
+# }}}
# }}}
View
2  bashrc_directory_aliases
@@ -1,6 +1,5 @@
# Directories {{{
-alias dbashscripte='cd ~/Dropbox/bash_scripte'
alias dblog='cd ~/blog-wikimatze'
alias dcheck='cd ~/Desktop/check'
alias ddesktop='cd ~/Desktop'
@@ -15,6 +14,7 @@ alias dstudium='cd ~/studium'
alias dvim='cd ~/.vim/'
alias dnotes='cd ~/Dropbox/notes'
alias ddotfiles='cd ~/Dropbox/dotfiles'
+alias dbashscripts='cd ~/Dropbox/dotfiles/bash_scripts'
# }}}
# LaTeX project {{{

No commit comments for this range

Something went wrong with that request. Please try again.