summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-195-8/+8
|\
| * j: remove trailing whitespacesjeschli2018-07-175-8/+8
* | Merge remote-tracking branch 'prism/master'tv2018-07-176-68/+142
|\|
| * Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-098-4/+13
| |\
| | * Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-06-286-68/+140
| | |\
| | * \ Merge branch 'master' of prism:stockholmmakefu2018-06-249-6/+26
| | |\ \
| * | | | j bln: enable redisjeschli2018-07-091-0/+2
| | |_|/ | |/| |
| * | | j bln: fix xserver servicejeschli2018-06-271-8/+17
| * | | j: services.xserver removed from 2configjeschli2018-06-271-20/+0
| * | | j vim: +fileline ; cosmeticsjeschli2018-06-271-12/+22
| * | | j brauerei: xserverjeschli2018-06-271-21/+16
| * | | j brauerei: vagrant fixjeschli2018-06-271-2/+12
| * | | j brauerei: +vagrantjeschli2018-06-191-0/+1
| * | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-06-1918-35/+141
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master'jeschli2018-06-1910-9/+36
| | |\ \ \
| | * | | | j bln: -hipchatjeschli2018-06-191-1/+0
| | * | | | j bln: +debian efi bootentryjeschli2018-06-191-1/+15
| | * | | | j bln: +dcso-vpnjeschli2018-06-191-0/+44
| * | | | | j brauerei: +evincejeschli2018-06-191-0/+1
| * | | | | j xmonad: +dmenujeschli2018-06-191-2/+5
| * | | | | j xmonad: setWMName "LG3D"jeschli2018-06-191-1/+2
| * | | | | j brauerei: +elixir +elmjeschli2018-06-191-0/+2
| * | | | | j brauerei: wpa_supplicant -> networkmanagerjeschli2018-06-191-2/+3
| * | | | | j brauerei: +virtualboxjeschli2018-06-191-0/+2
| * | | | | j bln: +vagrantjeschli2018-06-191-0/+1
* | | | | | tv gitrepos: add diskotv2018-07-131-0/+3
* | | | | | tv wu: rebuild with ext4tv2018-07-091-6/+3
| |_|_|_|/ |/| | | |
* | | | | nix-writers: init submoduletv2018-06-198-4/+13
| |_|/ / |/| | |
* | | | nin axon: add login manager & some programsnin2018-06-141-2/+13
| |_|/ |/| |
* | | tv gitrepos: add nix-writerstv2018-06-121-0/+1
* | | tv urlwatch nixos: 17.09 -> 18.03tv2018-05-121-1/+1
* | | tv xmonad: add otpmenutv2018-05-091-0/+1
* | | tv otpmenu: inittv2018-05-091-0/+15
* | | krebs: 6tests -> 0teststv2018-05-093-1/+1
* | | Merge remote-tracking branch 'prism/master' (despite bad style)tv2018-05-0916-50/+685
|\ \ \
| * \ \ Merge remote-tracking branch 'ni/master'lassulus2018-05-041-1/+1
| |\ \ \
| * | | | j zsh: pin LS_COLORS revlassulus2018-05-041-2/+2
| | |_|/ | |/| |
| * | | j: changed cert hashesjeschli2018-05-041-7/+9
| * | | Merge remote-tracking branch 'origin/master'jeschli2018-05-045-3/+21
| |\ \ \
| | * \ \ Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-05-033-15/+22
| | |\ \ \
| | | * | | j: experimental bln focused rombus setupjeschli2018-04-243-15/+22
| | * | | | Merge branch 'master' of prism:stockholmnin2018-05-0221-134/+759
| | |\ \ \ \
| | | * | | | types host: add monitoring boollassulus2018-04-271-0/+8
| | | | |_|/ | | | |/| |
| | * | | | nin vim: modify vimrcnin2018-05-021-0/+1
| * | | | | j conflicts resolve. dirty commitjeschli2018-05-044-15/+18
| | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-04-183-0/+329
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | j 5pkgs: add missing tvs xmonad filesjeschli2018-04-183-0/+329
| * | | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-04-189-39/+299
| |\| | |
| | * | | j: xserver, xdg from tv; updated brauereijeschli2018-04-186-0/+275
| | * | | Merge remote-tracking branch 'ni/master'jeschli2018-04-171-26/+0
| | |\ \ \