summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mb sunshine.r: disable cimagenbluten2019-05-212-1/+1
* Merge remote-tracking branch 'origin/master'magenbluten2019-05-2116-16/+83
|\
| * l vim lsp: show errors in ASCIIlassulus2019-05-201-1/+4
| * nixpkgs: 04954e3 -> 705986flassulus2019-05-201-3/+3
| * 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
| | |_|/ / / | |/| | | |
| * | | | | allow multiple hostKeyslassulus2019-04-301-1/+1
| * | | | | irc-announce: add _ to nick, for filteringirclassulus2019-04-281-1/+1
| | |/ / / | |/| | |
* | | | | 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 '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
| * | | | tv Xresources: URxvt*modifier = mod1tv2019-04-251-0/+1
| * | | | tv Xresources: simplify URxvt*charClasstv2019-04-251-1/+1
| * | | | tv Xresources: fix URxvt*url-select.launcher pathtv2019-04-251-1/+1
| * | | | tv man: add xorg-docstv2019-04-241-0/+1
| * | | | tv: add Xresources moduletv2019-04-244-58/+103
| * | | | tv pki: generate global nssdbtv2019-04-231-1/+49
| * | | | flameshot-once: make timeout configurabletv2019-04-231-0/+9
| * | | | flameshot-once: fix _file in profile moduletv2019-04-231-1/+1
| * | | | flameshot-once: 1.1.0 -> 1.2.0tv2019-04-231-3/+3
| * | | | tv pki: add tv Root CAtv2019-04-211-0/+31
| * | | | tv pki: import custom certificatestv2019-04-211-0/+6
| * | | | tv pki: immigrate certificate environmenttv2019-04-202-9/+15
| * | | | Merge remote-tracking branch 'prism/master'tv2019-04-1913-139/+116
| |\ \ \ \
| * | | | | krebs.shadow: inittv2019-04-192-0/+80
| * | | | | krebs.permown: fix typo in PrivateTmptv2019-04-191-1/+1
* | | | | | mb p1nk: fix tinc pubkeylassulus2019-04-281-1/+1
* | | | | | Merge branch 'mb'lassulus2019-04-2814-0/+918
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mb: add p1nk.rmblassulus2019-04-263-0/+278