summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md18
-rw-r--r--bashrc8
-rw-r--r--inputrc3
-rw-r--r--install.sh25
-rw-r--r--profile22
5 files changed, 44 insertions, 32 deletions
diff --git a/README.md b/README.md
index b7fa38e..f4d905a 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,14 @@ My configuration settings and config files for various programs.
# Files
```
-20-libinput.conf enable touchpad functionality
+profile sh config
+bashrc bash "run commands"
bash_aliases
-bashrc bash "run commands"
-fun.vim some vim functions
-inputrc vim input for bash
-newdebian my debian/KDE Pasma 5 conf
-qtcurvetestsettings.qtcurve
-slinks symlinks script
-vimrc vim "run commands"
-
+inputrc vim input for bash
+vim/fun.vim some vim functions
+vim/vimrc vim "run commands"
+extra/newdebian my debian/KDE Pasma 5 conf
+extra/qtcurvetestsettings.qtcurve
+extra/20-libinput.conf enable touchpad functionality
+ (x220 specific)
```
diff --git a/bashrc b/bashrc
index cafc93a..ba7ca01 100644
--- a/bashrc
+++ b/bashrc
@@ -112,14 +112,6 @@ if ! shopt -oq posix; then
fi
fi
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
- PATH="$HOME/bin:$PATH"
-fi
-
-if [ -d "$HOME/.local/bin" ] ; then
- PATH="$HOME/.local/bin:$PATH"
-fi
# My shit
# =======
diff --git a/inputrc b/inputrc
index bdaef95..f40f4a2 100644
--- a/inputrc
+++ b/inputrc
@@ -1,3 +1,5 @@
+# Set up "vi input mode" in bash
+
set editing-mode vi
$if mode=vi
@@ -6,4 +8,3 @@ Control-l: clear-screen
set keymap vi-insert
Control-l: clear-screen
-#endif
diff --git a/install.sh b/install.sh
index c5c69a9..1caf62c 100644
--- a/install.sh
+++ b/install.sh
@@ -1,22 +1,25 @@
-# Run this first
-
-source profile
-
+# Links configuration files to the ones listed here. Backup and remove your's
+# and then run this script (while inside repo directory).
+#
+# Note: This solution is lazy and causes some problems. Like not being able to
+# track vim pluggins.
# bash
-ln -sf ~/.dotfiles/profile ~/.profile
-ln -sf ~/.dotfiles/bash_aliases ~/.bash_aliases
-ln -sf ~/.dotfiles/bashrc ~/.bashrc
-ln -sf ~/.dotfiles/inputrc ~/.inputrc # allow Vim mode in bash
+ln -s ${PWD}/profile ~/.profile
+ln -s ${PWD}/bash_aliases ~/.bash_aliases
+ln -s ${PWD}/bashrc ~/.bashrc
+ln -s ${PWD}/inputrc ~/.inputrc
# vim
-[ -d "$XDG_DATA_HOME"/vim/ ] || mkdir -p "$XDG_DATA_HOME"/vim/{undo,swap,backup}
+# ~/.vimrc takes priority over ~/.vim/vimrc, so remove the former first
+
+[ -d ~/.vim/ ] || mkdir -p ~/.vim/{undo,swap,backup,plugin}
-ln -sf ~/.dotfiles/vimrc ~/.config/vim/vimrc
-ln -sf ~/.dotfiles/fun.vim ~/.config/vim/fun.vim
+ln -s ${PWD}/vim/vimrc ~/.vim/vimrc
+ln -s ${PWD}/vim/fun.vim ~/.vim/fun.vim
# done
diff --git a/profile b/profile
index eb10522..d47d1c6 100644
--- a/profile
+++ b/profile
@@ -1,11 +1,27 @@
-# On Debian this file is loaded when the user first logs in login(1)
-# If you want something that loads everytime a new terminal emulator is launched
-# then put it inside .bashrc
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if bash
if [ "$SHELL" = "/bin/bash" ]; then
. ~/.bashrc
fi
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+ PATH="$HOME/bin:$PATH"
+fi
+
+if [ -d "$HOME/.local/bin" ] ; then
+ PATH="$HOME/.local/bin:$PATH"
+fi
+
# Variables
# ======================================================================