summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'jeschli2018-06-1910-9/+36
|\
| * 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
| * | | tv nixpkgs: 53e6d67 -> 7cbf6catv2018-05-081-2/+1
| | |/ | |/|
| * | tv gitrepos: kops -> kropstv2018-05-031-1/+1
* | | 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: 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
| |\ \ \ | | | |/ | | |/|
| | * | font-size: init from tvtv2018-04-171-26/+0
| | * | Merge remote-tracking branch 'prism/master'tv2018-04-101-2/+2
| | |\ \
| | * | | pass{,-otp}: init from tvtv2018-04-105-286/+0
| | * | | tv: make pass and pass-otp work togethertv2018-04-102-3/+13
| | * | | tv pass-otp: init at 1.1.0tv2018-04-101-0/+30
| | * | | tv pass: init at 1.7.1tv2018-04-104-0/+246
| * | | | j brauerei: first step for tv xmonadjeschli2018-04-172-11/+12
| * | | | emacs file sortingjeschli2018-04-171-1/+1
| * | | | j brauerei: +hardware.trackpoint configurationjeschli2018-04-171-0/+7
| * | | | Merge branch 'master' of prism.r:stockholmjeschli2018-04-105-7/+31
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | j brauerei: +rust, +exercism, *minor cosmeticsjeschli2018-04-101-1/+4
* | | | | Merge branch 'master' of prism.r:stockholmjeschli2018-04-185-7/+31
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * / / RIP zandronumlassulus2018-04-061-2/+2
| |/ /
| * | Merge remote-tracking branch 'ni/nixpkgs-18.03-fix-strip' into staging/18.03lassulus2018-03-274-5/+29
| |\ \
| | * | haskellPackages.nix-diff: RIPtv2018-03-271-5/+0
| | * | tv xserver: systemPackages += font-sizetv2018-03-271-0/+1
| | * | tv pkgs: init font-sizetv2018-03-271-0/+26
| | * | tv xmonad: add passmenutv2018-03-261-0/+2
* | | | j emacs: cosmetics; +recentFiles modejeschli2018-03-261-15/+11
* | | | j emacs: default-wdith=2jeschli2018-03-261-0/+1
|/ / /
* | | j nixpkgs: follow krebsjeschli2018-03-241-4/+1
* | | j emacs: +go-mode -evil-modejeschli2018-03-241-1/+1