summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-05-287-9/+232
|\
| * mb sunshine.r: disable cimagenbluten2019-05-212-1/+1
| * Merge remote-tracking branch 'origin/master'magenbluten2019-05-2116-16/+83
| |\
| * | mb: add new machinesmagenbluten2019-05-215-0/+222
| * | mb orange: no wiresharkmagenbluten2019-04-281-1/+0
| * | mb: mutableUsers = truemagenbluten2019-04-281-1/+1
| * | Merge branch 'master' of github.com:magenbluten/stockholmmagenbluten2019-04-283-6/+8
| |\ \
| | * | mb: update configsmb2019-04-283-6/+8
* | | | Merge remote-tracking branch 'prism/master'jeschli2019-05-212-4/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | l vim lsp: show errors in ASCIIlassulus2019-05-201-1/+4
| * | | nixpkgs: 04954e3 -> 705986flassulus2019-05-201-3/+3
* | | | j bolide: add i3 to home.nixjeschli2019-05-181-0/+153
* | | | j bolide: add home.nixjeschli2019-05-181-0/+18
* | | | j bolide: home-manager binaryjeschli2019-05-181-3/+20
* | | | j: add home-manager configjeschli2019-05-181-0/+9
* | | | Merge branch 'master' of enklave.r:stockholmjeschli2019-05-182-23/+27
|\ \ \ \
| * | | | j bolide: update to i3jeschli2019-05-182-23/+27
* | | | | j enklave: add jeschli-bolide to writejeschli2019-05-181-1/+1
* | | | | j brauerei: add home-managerjeschli2019-05-182-2/+26
|/ / / /
* | | | Merge branch 'master' of prism.r:stockholmjeschli2019-05-1414-13/+77
|\| | |
| * | | l vim: add more python lsp toolslassulus2019-05-141-0/+2
| * | | l vim: remove syntastic (flake8 works over lsp)lassulus2019-05-141-5/+0
| * | | l vim: reactivate flake8lassulus2019-05-141-3/+4
| * | | Merge remote-tracking branch 'gum/master'lassulus2019-05-054-0/+5
| |\ \ \
| | * | | ma network-manager: add prison-breakmakefu2019-04-261-0/+3
| | * | | Merge branch 'master' of prism:stockholmmakefu2019-04-2613-155/+157
| | |\ \ \
| | * | | | prison-break: move to krebsmakefu2019-04-262-0/+0
| | * | | | ma x.r: use stable kernel due to wifi issuesmakefu2019-04-201-0/+2
| * | | | | Merge remote-tracking branch 'ni/master'lassulus2019-05-058-5/+66
| |\ \ \ \ \
| | * | | | | treewide: nixpkgsVersion -> versiontv2019-04-303-3/+3
| | * | | | | tv urlwatch: add ssh-audittv2019-04-301-0/+3
| | * | | | | ssh-audit: init at 1.7.0tv2019-04-301-0/+55
| | * | | | | Merge remote-tracking branch 'prism/master'tv2019-04-302-2/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'prism/master'tv2019-04-2817-9/+929
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | krops: 1.11.1 -> 1.14.0tv2019-04-281-0/+0
| | * | | | | | tv Xresources: start after xmonadtv2019-04-251-2/+1
| | * | | | | | tv xmonad: Type = notifytv2019-04-251-0/+4
| * | | | | | | nixpkgs: cf3e277 -> 04954e3lassulus2019-05-051-3/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | j brauerei: add xdotool for select last window hack in i3jeschli2019-05-081-0/+1
* | | | | | | j configs: remove window-manager.nixjeschli2019-05-041-1078/+0
* | | | | | | j brauerei: add rofijeschli2019-05-041-0/+1
* | | | | | | j brauerei: remove dead codejeschli2019-05-041-4/+2
* | | | | | | j config: add qubasa's i3 configjeschli2019-05-011-0/+1078
* | | | | | | Merge branch 'master' of prism.r:stockholmjeschli2019-04-302-2/+2
|\| | | | | |
| * | | | | | allow multiple hostKeyslassulus2019-04-301-1/+1
| * | | | | | irc-announce: add _ to nick, for filteringirclassulus2019-04-281-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of prism.r:stockholmjeschli2019-04-2830-96/+1249
|\| | | | |
| * | | | | Merge remote-tracking branch 'ni/master'lassulus2019-04-2815-87/+325
| |\| | | |
| | * | | | tv: add sxiv config moduletv2019-04-252-1/+13
| | * | | | tv: add urxvt config moduletv2019-04-252-18/+17