summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of http://cgit.lassul.us/stockholm into klauen-von-lassjeschli2017-12-061-0/+39
|\
| * l: adopt reagenzglas (for now)lassulus2017-12-061-0/+39
* | Merge branch 'master' of http://cgit.lassul.us/stockholm into klauen-von-lassjeschli2017-12-066-242/+347
|\|
| * Merge remote-tracking branch 'ni/master'lassulus2017-12-062-6/+1
| |\
| | * stockholm: drop OLD_PATHtv2017-12-062-6/+1
| * | krebs ci: stockholm=.lassulus2017-12-061-1/+1
| * | krebs.hosts: set defaultlassulus2017-12-051-0/+1
| * | Merge remote-tracking branch 'ni/master' into HEADlassulus2017-12-052-13/+14
| |\|
| | * stockholm: export HOSTNAME and STOCKHOLM_VERSIONtv2017-12-052-13/+14
| * | Merge remote-tracking branch 'ni/master'lassulus2017-12-051-2/+4
| |\|
| | * stockholm: interpolate cmds.*tv2017-12-051-2/+4
| * | Merge remote-tracking branch 'ni/master'lassulus2017-12-052-275/+282
| |\|
| | * stockholm: inittv2017-12-052-275/+282
| * | Merge remote-tracking branch 'ni/master'lassulus2017-12-051-0/+22
| |\|
| | * haskellPackages.nix-diff: init at 1.0.0tv2017-12-051-0/+22
| * | Merge remote-tracking branch 'ni/master'lassulus2017-12-051-0/+60
| |\|
| | * shell deploy: add --difftv2017-12-051-0/+60
| * | l browsers: add precedencelassulus2017-12-051-13/+30
| |/
* / boomjeschli2017-12-057-0/+306
|/
* Merge branch 'prism/master' into HEADlassulus2017-12-0521-174/+308
|\
| * l repo-sync: add public ssh accesslassulus2017-12-051-9/+16
| * l xserver: add dpi supportlassulus2017-12-041-5/+10
| * l xresources: add updateXresources cmdlassulus2017-12-041-0/+5
| * ircd: add motdlassulus2017-12-041-0/+3
| * fetchWallpaper: display should be stringlassulus2017-12-031-3/+3
| * l xmonad: cleanuplassulus2017-12-031-28/+13
| * l xresources: fix xrdb pathlassulus2017-12-031-1/+1
| * l sreenlock: get DISPLAY from xserver.displaylassulus2017-12-031-1/+1
| * l dsco-dev: add more pubkeyslassulus2017-12-031-0/+2
| * l copyq: get DISPLAY from xserver.displaylassulus2017-12-031-2/+2
| * l baseX: use xserver modulelassulus2017-12-031-25/+1
| * l: add xserver modulelassulus2017-12-033-0/+137
| * l prism.r: import dsco-devlassulus2017-12-031-0/+1
| * l baseX: use urxvt with pluginslassulus2017-12-031-1/+1
| * l helios.r: add games related stufflassulus2017-12-031-1/+8
| * fetchWallpaper: get DISPLAY from xserver.displaylassulus2017-12-031-3/+3
| * l nixpkgs: 7f6f0c4 -> f9390d6lassulus2017-11-301-1/+1
| * l pkgs.screengrab: get resolution from xrandrlassulus2017-11-291-1/+4
| * l helios.r: add dcso coop envlassulus2017-11-292-0/+47
| * l wine: add wine64lassulus2017-11-291-4/+18
| * l baseX: more pkgslassulus2017-11-291-1/+3
| * tv backup: add nomic-pull-querel-hometv2017-11-291-0/+6
| * l: refactor xresourceslassulus2017-11-294-96/+27
| * types: use cidr only in tinc.subnetslassulus2017-11-292-3/+12
| * l mail: don't show security mailslassulus2017-11-291-0/+1
| * l helios.r: import virtualboxlassulus2017-11-291-0/+1
| * l prism.r: import reaktor-krebslassulus2017-11-291-0/+1
| * hotdog.r: remove krebs reaktorlassulus2017-11-291-1/+0
| * l nixpkgs: 0c5a587 -> 7f6f0c4lassulus2017-11-291-1/+1
* | Merge remote-tracking branch 'gum/master'tv2017-12-055-5/+11
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 14:08:25 +0000