Commit graph

89 commits

Author SHA1 Message Date
Howland Owl
ef5edd28ca Merge branch 'home' into 'master'
Home

See merge request !11
2017-05-18 19:48:19 +03:00
Sir Garbagetruck (systemd sucks)
be46b812d4 gitconfig was only in the server side.
- remember to edit the name / email before committing!
2017-05-18 19:43:23 +03:00
Andrew Holland
a432309f54 nerd font list got a bit messed up 2017-05-10 17:56:54 +03:00
Andrew Holland
a78bfce235 Merge branch 'aliasfix' into home 2017-05-10 17:54:30 +03:00
Andrew Holland
3c14538ef7 and the powerline setup cleanup 2017-05-10 17:53:07 +03:00
Andrew Holland
d9a9927cb7 let's just make it not depend on the 'andrew' login 2017-05-10 17:52:28 +03:00
Andrew Holland
08908faceb some local changes for scripts that fixed some things 2017-05-10 17:51:30 +03:00
Andrew Holland
b51978af5c change the randmac alias 2017-05-10 17:50:25 +03:00
Andrew Holland
b95e87b636 Merge branch 'home' of http://gitlabrador.amigadns.com/truck/mahbinstuff into home 2017-03-23 14:14:18 +02:00
Sir Garbagetruck
0581c3b444 Merge branch 'home' of gitlabrador.amigadns.com:truck/mahbinstuff into home 2017-03-17 18:15:43 +02:00
Sir Garbagetruck
347e22f4e5 Resort the nflist to put 'normal' at top, then thin, 2y, and book. 2017-03-17 18:14:48 +02:00
Howland Owl
0610e7d276 Merge branch 'gitlabrador/home' into 'home'
set up for autocorrect of bs/del confusion and put helphelp on ^h+h

See merge request !10
2017-03-17 17:49:40 +02:00
Sir Garbagetruck
c5daf31062 set up for autocorrect of bs/del confusion and put helphelp on ^h+h 2017-03-17 17:47:07 +02:00
Howland Owl
9f1e82dcbf Merge branch 'gitlabrador/home' into 'home'
Gitlabrador/home

See merge request !8
2017-03-17 17:37:18 +02:00
Sir Garbagetruck
f106b8bac5 add the mg dotfile. this fixes issues with st's backspace. 2017-03-17 17:35:08 +02:00
Sir Garbagetruck
7d568f7398 Merge branch 'home' of gitlabrador.amigadns.com:truck/mahbinstuff into gitlabrador/home 2017-03-16 22:07:15 +02:00
Andrew Holland
50de5332aa local changes to powerline bit 2017-02-28 13:32:08 +02:00
Andrew Holland
9dda19c629 Merge remote-tracking branch 'refs/remotes/origin/home' into home 2017-02-28 13:31:45 +02:00
Andrew Holland
3843a32436 Local changes to nf picking st things 2017-02-28 13:15:53 +02:00
Howland Owl
a78f80b97e Powerline-shell, as I'm always adding it. Not configured. 2017-02-27 19:31:33 +02:00
Howland Owl
be3e02ca73 Nerd font picking for st with colors 2017-02-27 19:30:30 +02:00
Howland Owl
0f7f77f4f8 ok those were already added 2017-02-27 19:30:06 +02:00
Howland Owl
d4d9c0eef8 worssh as an alias, allowing scp and rsync 2017-02-27 19:27:25 +02:00
Howland Owl
35da488ca6 DMG Amiga fonts, patched for nerd fonts 2017-02-27 19:26:58 +02:00
Howland Owl
b57f2022f1 Envy code R fonts 2017-02-27 19:25:54 +02:00
Howland Owl
7bc3bb276b some path changes for st 2016-12-10 00:57:26 +02:00
Howland Owl
0b88810761 Merge branch 'home' into 'master'
bash has -v, zsh just checks the variable.

really should have done full testing before all these merges.

See merge request !7
2016-12-09 21:33:51 +02:00
Howland Owl
9471accaec bash has -v, zsh just checks the variable. 2016-12-09 21:30:58 +02:00
Howland Owl
0b84b63f40 Merge branch 'home' into 'master'
Home

small bugs. patched.

See merge request !6
2016-12-09 21:29:52 +02:00
Howland Owl
373f32d1cb grr 2016-12-09 21:27:35 +02:00
Howland Owl
b128319656 well these should be gone too 2016-12-09 21:26:32 +02:00
Howland Owl
4fd1f6b2b8 Merge branch 'home' into 'master'
Home

I hope this is all sensible now. that commit mess was a disaster.

See merge request !5
2016-12-09 21:26:13 +02:00
Howland Owl
a92c39c710 Revert "Merge branch 'home' into 'fixthatshit'"
This reverts commit 1639a576f4, reversing
changes made to cc75e76c65.
2016-12-09 21:22:01 +02:00
Howland Owl
2434c12586 Revert "Revert "shell bits that needed to be fixed.""
This reverts commit 6951b01f08.
2016-12-09 21:19:24 +02:00
Howland Owl
6951b01f08 Revert "shell bits that needed to be fixed."
This reverts commit cc75e76c65.
2016-12-09 21:19:05 +02:00
Howland Owl
aa802af016 Merge branch 'fixthatshit' into 'home'
shell bits that needed to be fixed.

we lost some of the things with the merge request, not sure how.

See merge request !4
2016-12-09 21:06:37 +02:00
Howland Owl
1639a576f4 Merge branch 'home' into 'fixthatshit'
# Conflicts:
#   powerline-shell-init
#   zshrc
2016-12-09 21:06:18 +02:00
Howland Owl
cc75e76c65 shell bits that needed to be fixed. 2016-12-09 21:01:33 +02:00
Howland Owl
60e2cda632 Merge branch 'home' into 'master'
Home

bring the updates into master.

See merge request !3
2016-12-09 20:16:03 +02:00
Howland Owl
512c3ac67c updates to the prompt 2016-12-09 20:12:01 +02:00
Howland Owl
d7ce32a0e6 Merge branch 'home' of gitlabrador.amigadns.com:truck/mahbinstuff into home 2016-12-09 19:50:31 +02:00
Howland Owl
c1582d93fd some nerd font variations 2016-12-09 19:08:15 +02:00
Howland Owl
5b9da06963 add the nerd font versions of the PX series (monospaced and windows compat named) 2016-12-09 18:28:45 +02:00
Howland Owl
76bf54bfc4 Fantasque nerd font 2016-12-09 18:27:46 +02:00
Howland Owl
974a5b8ac2 nerdfonts versions of DMG's fonts 2016-12-09 18:27:29 +02:00
Howland Owl
f80131bd7b add some usable fonts from the Px series 2016-12-09 18:26:48 +02:00
Howland Owl
636289b00c and now committed 2016-12-09 18:26:07 +02:00
Howland Owl
c499a3ee83 the aliases file is now versioned 2016-12-09 18:25:53 +02:00
Howland Owl
e49e00d0c5 Add ssh+tunnel worssh, geturl + urllist 2016-12-09 18:24:58 +02:00
Sir Garbagetruck
4b03be6f49 merge the two font lists 2016-11-20 00:43:41 +02:00