summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'enklave/master'lassulus2019-05-2910-36/+267
|\
| * Merge remote-tracking branch 'prism/master'jeschli2019-05-212-4/+7
| |\
| * | 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
| |\ \
| * | | 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
| |\ \ \
| * \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2019-04-2830-96/+1249
| |\ \ \ \
| * | | | | j enklave: allowed port 8001jeschli2019-04-281-1/+1
| * | | | | j brauerei: +user blafoojeschli2019-04-271-0/+5
| * | | | | j brauerei: configs/vim.nix (broken) -> standard vimjeschli2019-04-251-2/+2
| * | | | | j brauerei: +gnupgjeschli2019-04-251-0/+1
| * | | | | j brauerei: -steam (broken?)jeschli2019-04-251-1/+1
| * | | | | Merge branch 'master' of prism.r:stockholmjeschli2019-04-2382-277/+844
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2019-04-0965-599/+717
| |\ \ \ \ \ \
| * | | | | | | j brauerei: +clionjeschli2019-04-091-1/+2
| * | | | | | | :Merge branch 'master' of prism.r:stockholmjeschli2019-04-02119-1251/+2052
| |\ \ \ \ \ \ \
| * | | | | | | | j xserver: add dbus magic for xserver (xserver/default.nix not working curren...jeschli2019-02-051-0/+6
| * | | | | | | | j brauerei: remove not working tokei overridejeschli2019-02-051-8/+1
| * | | | | | | | j brauerei: remove commented dead codejeschli2019-02-051-1/+13
| * | | | | | | | j krops: fix directoryjeschli2019-01-291-4/+1
| * | | | | | | | xmonad-stockholm: arguments in one linejeschli2019-01-291-2/+1
* | | | | | | | | Merge remote-tracking branch 'ni/master'lassulus2019-05-2918-410/+506
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tv vim: move nix to overlaytv2019-05-212-217/+223
| * | | | | | | | | tv vim: move tv to overlaytv2019-05-212-51/+54
| * | | | | | | | | tv vim: move showsyntax to overlaytv2019-05-212-24/+27
| * | | | | | | | | tv vim: move vim to overlaytv2019-05-212-13/+17
| * | | | | | | | | tv vim: move hack to overlaytv2019-05-212-43/+47
| * | | | | | | | | tv vim: move file-line to overlaytv2019-05-212-8/+11
| * | | | | | | | | tv vim: move jq to overlaytv2019-05-212-8/+11
| * | | | | | | | | tv vim: move elixir to overlaytv2019-05-212-8/+10
| * | | | | | | | | tv vim: move fzf to overlaytv2019-05-212-9/+12
| * | | | | | | | | tv pkgs: add vim overlaytv2019-05-211-0/+7
| * | | | | | | | | github-known-hosts: add new hoststv2019-05-211-0/+10
| * | | | | | | | | tv x220: define all the lidSwitch* T_Ttv2019-05-201-0/+5
| * | | | | | | | | github-hosts-sync: make user name/mail overridabletv2019-05-172-2/+7
| * | | | | | | | | github-hosts-sync: add nettoolstv2019-05-171-0/+1
| * | | | | | | | | krebs: add dummy github-hosts-sync.ssh.id_ed25519tv2019-05-171-0/+0
| * | | | | | | | | github-hosts-sync: update default URLtv2019-05-172-2/+2
| * | | | | | | | | hotdog.r: enable github-hosts-synctv2019-05-171-0/+1