Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge remote-tracking branch 'gum/master' | lassulus | 2018-02-28 | 2 | -1/+1 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | .gitignore: add result | makefu | 2018-02-28 | 2 | -1/+1 | |
* | | | | | Merge remote-tracking branch 'gum/master' | lassulus | 2018-02-28 | 11 | -192/+50 | |
|\| | | | | ||||||
| * | | | | ma pkgs.qcma: fix broken build | makefu | 2018-02-27 | 1 | -22/+14 | |
| * | | | | ma pkgs.mcomix: disable tests | makefu | 2018-02-27 | 1 | -0/+4 | |
| * | | | | ma pkgs.dionaea: rip | makefu | 2018-02-27 | 1 | -50/+0 | |
| * | | | | ma pkgs.farpd: rip | makefu | 2018-02-27 | 1 | -63/+0 | |
| * | | | | ma pkgs: cleanup awesomecfg, custom, shackie | makefu | 2018-02-27 | 6 | -56/+30 | |
| * | | | | ma pkgs.opl-utils: remove license for now | makefu | 2018-02-26 | 1 | -1/+2 | |
* | | | | | Merge remote-tracking branch 'prism/staging/jeschli' | lassulus | 2018-02-28 | 1 | -0/+2 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge branch 'master' of prism.r:stockholm into staging/jeschli | jeschli | 2018-02-27 | 7 | -19/+55 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of prism.r:stockholm into staging/jeschli | jeschli | 2018-02-25 | 15 | -14/+150 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of prism.r:stockholm into staging/jeschli | jeschli | 2018-02-18 | 44 | -369/+686 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | brauerei: +backlight | jeschli | 2018-02-18 | 1 | -0/+2 | |
* | | | | | | | | Merge remote-tracking branch 'onondaga/master' | lassulus | 2018-02-27 | 1 | -0/+19 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | nin im: copy irc script from tv | nin | 2018-02-27 | 1 | -0/+19 | |
* | | | | | | | | | Merge remote-tracking branch 'onondaga/master' | lassulus | 2018-02-27 | 4 | -15/+25 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | nin git: remove irc announce | nin | 2018-02-27 | 1 | -11/+0 | |
| * | | | | | | | | nin: follow krebs nixpkgs | nin | 2018-02-27 | 1 | -4/+1 | |
| * | | | | | | | | Merge remote-tracking branch 'prism/master' | nin | 2018-02-27 | 45 | -195/+672 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of prism:stockholm | nin | 2018-02-11 | 27 | -323/+497 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'prism/master' | nin | 2018-01-30 | 42 | -216/+717 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of prism:stockholm | nin | 2018-01-11 | 59 | -151/+577 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | nin axon: add ableton | nin | 2018-01-03 | 2 | -0/+24 | |
| * | | | | | | | | | | | Merge branch 'master' of prism:stockholm | nin | 2018-01-03 | 2 | -0/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | nixpkgs: d09e425 -> c5bc83b | lassulus | 2018-02-27 | 1 | -1/+1 | |
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge remote-tracking branch 'gum/master' | lassulus | 2018-02-26 | 6 | -14/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | ma git: init hydra-stockholm | makefu | 2018-02-26 | 1 | -0/+1 | |
| * | | | | | | | | | | | ma programs-db: rip | makefu | 2018-02-26 | 2 | -13/+1 | |
| * | | | | | | | | | | | ma hydra.wbob.r: init | makefu | 2018-02-26 | 3 | -1/+40 | |
* | | | | | | | | | | | | l mail: add more mailboxes | lassulus | 2018-02-25 | 1 | -2/+5 | |
* | | | | | | | | | | | | l mail: use tags for mailboxes | lassulus | 2018-02-25 | 1 | -3/+8 | |
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | l: init dpdkm | lassulus | 2018-02-24 | 1 | -0/+26 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | nixpkgs: c831224 -> d09e425 | lassulus | 2018-02-22 | 1 | -1/+1 | |
* | | | | | | | | | | Merge remote-tracking branch 'prism/makefu' | lassulus | 2018-02-22 | 3 | -1/+40 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | ma 6tests/secrets: add auth.nix dummy | makefu | 2018-02-22 | 1 | -0/+1 | |
| * | | | | | | | | | | ma x.r: add bluetooth | makefu | 2018-02-21 | 1 | -0/+36 | |
| * | | | | | | | | | | ma urlwatch: taskwarrior is now on github | makefu | 2018-02-19 | 1 | -1/+3 | |
* | | | | | | | | | | | l baseX: run xmonad only in xmonad session | lassulus | 2018-02-22 | 1 | -1/+2 | |
* | | | | | | | | | | | l baseX: use network-manager | lassulus | 2018-02-22 | 2 | -0/+25 | |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge remote-tracking branch 'prism/tv' | lassulus | 2018-02-19 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | github: update known hosts | tv | 2018-02-19 | 1 | -1/+5 | |
* | | | | | | | | | | | l: php5 -> php7 | lassulus | 2018-02-19 | 1 | -1/+0 | |
* | | | | | | | | | | | l vim: run gometalinter | lassulus | 2018-02-19 | 1 | -0/+3 | |
* | | | | | | | | | | | l vim: add govet workaround | lassulus | 2018-02-19 | 1 | -0/+3 | |
* | | | | | | | | | | | l minecraft: open port for dynmap | lassulus | 2018-02-19 | 1 | -0/+1 | |
* | | | | | | | | | | | l shodan.r: ignore lidswitch | lassulus | 2018-02-19 | 1 | -0/+4 | |
* | | | | | | | | | | | l prism.r: add jeschli user | lassulus | 2018-02-19 | 1 | -0/+10 | |
* | | | | | | | | | | | l helios.r: add minio.cert | lassulus | 2018-02-19 | 1 | -8/+29 | |
* | | | | | | | | | | | l icarus.r: update ssh pubkey | lassulus | 2018-02-19 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | |