summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-1814-13/+585
|\|
| * j: xserver, xdg from tv; updated brauereijeschli2018-04-186-0/+275
| * Merge remote-tracking branch 'ni/master'jeschli2018-04-176-0/+286
| |\
| | * font-size: init from tvtv2018-04-171-0/+0
| | * Merge remote-tracking branch 'prism/master'tv2018-04-1025-1934/+1157
| | |\
| | * | pass{,-otp}: init from tvtv2018-04-105-0/+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-1055-2181/+1672
| |\ \ \ | | | |/ | | |/|
| * | | j brauerei: +rust, +exercism, *minor cosmeticsjeschli2018-04-101-1/+4
* | | | Merge branch 'master' of prism.r:stockholmjeschli2018-04-1855-2181/+1672
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | RIP zandronumlassulus2018-04-063-87/+4
| * | kops.nix: use relative path to stockholmlassulus2018-04-061-1/+1
| * | nixpkgs: 09bca91 -> 4b4bbcelassulus2018-04-062-5/+2
| * | add minimal working kops for stockholmlassulus2018-04-053-7/+100
| * | l: add generate-secretslassulus2018-04-052-0/+47
| * | l: remove deprecated rtl8814aulassulus2018-04-051-1/+0
| * | l xmonad: add insert commandlassulus2018-04-051-0/+4
| * | l repo-sync: sync staging brancheslassulus2018-04-051-0/+15
| * | l reaktor-coders: use correct ping pathlassulus2018-04-051-1/+1
| * | l network-manager: don't manager docker & virtualboxlassulus2018-04-051-1/+7
| * | l browsers: add cx- command for copy & pastelassulus2018-04-051-1/+6
| * | hashPassword: passthrough argumentslassulus2018-04-051-2/+2
| * | newsbot-js: fix build on 18.03lassulus2018-04-055-1768/+871
| * | go: fix build on 18.03lassulus2018-04-055-62/+99
| |/
| * Merge remote-tracking branch 'prism/master'tv2018-04-0362-444/+1010
| |\
| | * l virtualbox: enable usb passthroughlassulus2018-04-031-0/+2
| | * nixpkgs: b6ddb99 -> 09bca91lassulus2018-04-021-1/+1
| | * l browsers: use new xjail interfacelassulus2018-04-011-37/+13
| | * l xjail: add working GPU accelerationlassulus2018-04-011-22/+99
| | * nixpkgs: 48856a9 -> b6ddb99lassulus2018-04-011-1/+1
| | * Merge remote-tracking branch 'gum/master' into staging/18.03lassulus2018-03-294-4/+5
| | |\
| | | * buildbot: 0.8.15 -> 0.8.16makefu2018-03-291-2/+2
| | | * ma torrent-secrets: enable for drop and fileleechmakefu2018-03-293-2/+3
| | * | l mail: track neomutt name changelassulus2018-03-291-2/+2
| | * | writers writeC: 17.09 workaroundlassulus2018-03-291-1/+2
| | * | Merge remote-tracking branch 'gum/master' into staging/18.03lassulus2018-03-299-69/+123
| | |\|
| | | * buildbot: bump to 0.8.15makefu2018-03-291-4/+3
| | | * ma omo.r: enable arafetchmakefu2018-03-281-0/+1
| | | * ma arafetch: initmakefu2018-03-281-0/+36
| | | * ma photostore: expire -1makefu2018-03-281-0/+1
| | | * ma gum.r: disable vpnwsmakefu2018-03-281-1/+1
| | | * ma source: new signal-desktopmakefu2018-03-261-2/+2