Compare commits
10 Commits
32f984e25a
...
9851b0ff7a
| Author | SHA1 | Date | |
|---|---|---|---|
| 9851b0ff7a | |||
| eac33345be | |||
|
|
069911e7cf | ||
|
|
cd59aec420 | ||
|
|
7a8ecc84b7 | ||
|
|
9b74ff46f9 | ||
|
|
376b0d6ca6 | ||
|
|
002240d8fb | ||
|
|
e4f6e7c571 | ||
|
|
2b718ede6d |
32
README.md
32
README.md
@ -5,26 +5,28 @@ Clone this repo:
|
|||||||
$ git clone --recurse-submodules https://git.sr.ht/~jswank/dotfiles
|
$ git clone --recurse-submodules https://git.sr.ht/~jswank/dotfiles
|
||||||
```
|
```
|
||||||
|
|
||||||
Install my dotfiles:
|
But since you forgot to grab the submodules, get them now:
|
||||||
```console
|
```
|
||||||
$ ./install
|
$ git submodule update --init --recursive
|
||||||
```
|
```
|
||||||
|
|
||||||
(which just runs: `ls -d */ | tr -d / | xargs stow -R`)
|
Install my dotfiles:
|
||||||
|
```console
|
||||||
|
$ ./install.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
This will install most common dotfiles: if you want to install a set, provide
|
||||||
|
that as an argument:
|
||||||
|
```console
|
||||||
|
$ ./install.sh i3 # installed i3 dotfiles
|
||||||
|
```
|
||||||
|
|
||||||
There are two potential gotchas:
|
There are two potential gotchas:
|
||||||
|
|
||||||
1. `stow` is not installed on the system. Be sure to install it.
|
1. `stow` is not installed on the system. There is a bash equivalent that is
|
||||||
|
close enough for most purposes in this repo that the install script will
|
||||||
|
use.
|
||||||
|
|
||||||
2. There submodules in this repo (mostly neovim plugins) and they didn't get
|
2. There submodules in this repo (mostly neovim plugins) and they didn't get
|
||||||
populated when you cloned the repo.
|
populated when you cloned the repo. See above.
|
||||||
|
|
||||||
This repo should have been cloned using the --recurse-submodules flag, i.e.
|
|
||||||
```console
|
|
||||||
$ git clone --recurse-submodules https://git.sr.ht/~jswank/dotfiles
|
|
||||||
```
|
|
||||||
|
|
||||||
But, since you forgot, fix this by running:
|
|
||||||
```console
|
|
||||||
$ git submodule update --init --recursive
|
|
||||||
```
|
|
||||||
|
|||||||
12
install.sh
12
install.sh
@ -3,7 +3,7 @@
|
|||||||
# Install my dotfiles.
|
# Install my dotfiles.
|
||||||
#
|
#
|
||||||
|
|
||||||
STOW=$(which stow)
|
STOW=$(which stow || echo -n "")
|
||||||
if [ -z "$STOW" ]; then
|
if [ -z "$STOW" ]; then
|
||||||
STOW=./stow.sh
|
STOW=./stow.sh
|
||||||
fi
|
fi
|
||||||
@ -12,11 +12,15 @@ git submodule update --init --recursive
|
|||||||
|
|
||||||
# if these aren't links, move them out of the way?
|
# if these aren't links, move them out of the way?
|
||||||
for f in ~/.zshrc ~/.profile; do
|
for f in ~/.zshrc ~/.profile; do
|
||||||
if [ -f $f ]; then
|
if [ -f "$f" ]; then
|
||||||
mv $f $f.orig
|
mv "$f" "$f.orig"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ -n "$1" ]; then
|
||||||
|
$STOW -t $HOME "$1"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# rm -f $HOME/.zshrc $HOME/.profile >/dev/null 2>&1
|
# rm -f $HOME/.zshrc $HOME/.profile >/dev/null 2>&1
|
||||||
|
|
||||||
@ -32,6 +36,6 @@ for dir in \
|
|||||||
tmux \
|
tmux \
|
||||||
zsh
|
zsh
|
||||||
do
|
do
|
||||||
$STOW -t ~/ $dir
|
$STOW -t $HOME $dir
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
1
mpd/.mpd/.gitignore
vendored
1
mpd/.mpd/.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
socket
|
socket
|
||||||
mpdstate
|
mpdstate
|
||||||
mpd.pid
|
mpd.pid
|
||||||
|
mpd.db
|
||||||
|
|||||||
BIN
mpd/.mpd/mpd.db
BIN
mpd/.mpd/mpd.db
Binary file not shown.
@ -1 +1 @@
|
|||||||
http://216.246.37.218:80/kexp128.mp3
|
https://kexp-mp3-128.streamguys1.com/kexp128.mp3
|
||||||
|
|||||||
@ -1,6 +1,12 @@
|
|||||||
Host nyyrikki-vpn
|
Host nyyrikki-vpn
|
||||||
Hostname 10.147.19.238
|
Hostname 10.147.19.238
|
||||||
|
|
||||||
|
Host tuulikki-vpn
|
||||||
|
Hostname 10.147.19.243
|
||||||
|
|
||||||
|
Host tonttu-vpn
|
||||||
|
Hostname 10.147.19.60
|
||||||
|
|
||||||
Host nyyrikki
|
Host nyyrikki
|
||||||
Hostname 192.168.101.110
|
Hostname 192.168.101.110
|
||||||
|
|
||||||
@ -16,3 +22,6 @@ Host www.scalene.net
|
|||||||
|
|
||||||
Host tilde.club
|
Host tilde.club
|
||||||
User eke
|
User eke
|
||||||
|
|
||||||
|
Match host git.scalene.net exec "ip route |grep -q ^192.168.101.0/24"
|
||||||
|
Hostname tonttu.scalene.net
|
||||||
|
|||||||
45
vim/.vimrc
Normal file
45
vim/.vimrc
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
syntax on
|
||||||
|
set smarttab ts=2 sw=2
|
||||||
|
set softtabstop=2
|
||||||
|
set expandtab
|
||||||
|
set autoindent
|
||||||
|
|
||||||
|
set backspace=indent,eol,start
|
||||||
|
|
||||||
|
set t_Co=16
|
||||||
|
|
||||||
|
"use semicolon as colon for commands
|
||||||
|
nmap ; :
|
||||||
|
|
||||||
|
filetype plugin on
|
||||||
|
filetype indent on
|
||||||
|
set ofu=syntaxcomplete#Complete#
|
||||||
|
|
||||||
|
au FileType python setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4
|
||||||
|
|
||||||
|
" typing idate inserts the current date
|
||||||
|
iab idate <c-r>=strftime("%Y-%m-%d")<cr>
|
||||||
|
|
||||||
|
set lazyredraw " redraw only when req'd
|
||||||
|
set wildmenu " visual auto-complete
|
||||||
|
set showmatch
|
||||||
|
"set cursorline
|
||||||
|
|
||||||
|
" Search down into subfolders
|
||||||
|
" Provides tab-completion for all file-related tasks
|
||||||
|
set path+=**
|
||||||
|
|
||||||
|
" netrw config
|
||||||
|
let g:netrw_banner=0 " disable annoying banner
|
||||||
|
let g:netrw_browse_split=0 " open in prior window
|
||||||
|
let g:netrw_altv=1 " open splits to the right
|
||||||
|
let g:netrw_liststyle=3 " tree view
|
||||||
|
let g:netrw_list_hide=netrw_gitignore#Hide()
|
||||||
|
let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
|
||||||
|
|
||||||
|
" NOW WE CAN:
|
||||||
|
" - :edit a folder to open a file browser
|
||||||
|
" - <CR>/v/t to open in an h-split/v-split/tab
|
||||||
|
" - check |netrw-browse-maps| for more mappings
|
||||||
|
|
||||||
|
|
||||||
@ -1,3 +1,4 @@
|
|||||||
if [ $(tty) = "/dev/tty1" ]; then
|
if [[ ! $DISPLAY && $(tty) = "/dev/tty1" ]]; then
|
||||||
startx
|
startx
|
||||||
|
exit
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -24,6 +24,13 @@ case $TERM in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if [ -n "$SSH_AUTH_SOCK" ]; then
|
||||||
|
if [ "$SSH_AUTH_SOCK" != ~/.ssh/ssh_auth_sock ]; then
|
||||||
|
ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
|
||||||
|
export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -e /usr/bin/keychain ]; then
|
if [ -e /usr/bin/keychain ]; then
|
||||||
eval $(/usr/bin/keychain --eval --agents ssh -Q --quiet id_ed25519)
|
eval $(/usr/bin/keychain --eval --agents ssh -Q --quiet id_ed25519)
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user