summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | l: merge bitlbee and weechat into IM.nixlassulus2017-12-313-16/+1
| * | | | | | l reaktor-coders: add sed-pluginlassulus2017-12-311-0/+1
| * | | | | | l vim: save x-ed text in clipboard againlassulus2017-12-311-1/+0
| * | | | | | l xmonad: float pinentrylassulus2017-12-311-1/+9
| * | | | | | l mails: add more aliaseslassulus2017-12-311-0/+5
| * | | | | | l: enable ssh-agentlassulus2017-12-312-3/+1
| * | | | | | l: force timesyncd offlassulus2017-12-311-2/+2
| * | | | | | l news: default ircServer is localhostlassulus2017-12-311-1/+1
| * | | | | | l weechat: add servicelassulus2017-12-311-21/+31
| * | | | | | l bitlbee: add more pluginslassulus2017-12-311-0/+2
| * | | | | | init bitlbee-discordlassulus2017-12-311-0/+29
| * | | | | | hw x220: force rngd offlassulus2017-12-311-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'gum/master'lassulus2017-12-3013-36/+154
| |\| | | |
| | * | | | ma source: use official nixos-hardwaremakefu2017-12-281-2/+2
| | * | | | hw/exfat-nofuse -> tools/mobilitymakefu2017-12-274-5/+11
| | * | | | x: use nixos-hardwaremakefu2017-12-264-28/+24
| | * | | | ma remote-build: update to only use hotdogmakefu2017-12-181-3/+3
| | * | | | ma vpn: add vpnws client and servermakefu2017-12-182-5/+21
| | * | | | ma stats: add bamstatsmakefu2017-12-181-0/+35
| | * | | | ma nginx: add vpn-ws prototypemakefu2017-12-181-0/+35
| | * | | | Merge branch 'master' of prism:stockholmmakefu2017-12-1860-132/+1409
| | |\ \ \ \
| | * | | | | ma pkgs.vpn-ws: init at 0.2makefu2017-12-141-0/+30
| * | | | | | l nixpkgs: 53e6d67 -> 3aec59classulus2017-12-291-1/+1
* | | | | | | tv source: turn dummy_secrets into an argumenttv2018-01-021-4/+6
|/ / / / / /
* | | | | | Merge remote-tracking branch 'prism/staging/test'tv2017-12-2733-568/+990
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'ni/master' into staging/testlassulus2017-12-254-0/+37
| |\ \ \ \ \ \
| * | | | | | | l nixpkgs: ed3b1bc -> 53e6d67lassulus2017-12-251-1/+1
| * | | | | | | l nixpkgs: af7e479 -> ed3b1bclassulus2017-12-201-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | add populate testlassulus2017-12-193-0/+144
| | |_|/ / / | |/| | | |
| * | | | | l: hledger -> banklassulus2017-12-182-1/+12
| * | | | | l helios.r: ignore lidswitchlassulus2017-12-182-1/+4
| * | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2017-12-182-1/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | jeschli brauerei: +user.jamiejeschli2017-12-161-0/+4
| | * | | | jeschli urxvt: *font-sizejeschli2017-12-161-1/+1
| | * | | | jeschli brauerei: +jetbrainsjeschli2017-12-161-0/+3
| * | | | | l nixpkgs: cb751f9 -> af7e479lassulus2017-12-181-1/+1
| * | | | | l: get secrets from passlassulus2017-12-181-3/+6
| * | | | | l prism.r: add git to containerslassulus2017-12-181-0/+3
| * | | | | l domsen: cleanup websiteslassulus2017-12-151-19/+4
| * | | | | l dcso-dev: add roblassulus2017-12-151-1/+2
| * | | | | l helios.r: add /tmplassulus2017-12-151-14/+20
| * | | | | l prism.r: enable git for all jeschlislassulus2017-12-151-1/+5
| |/ / / /
| * | | | Merge branch 'staging/jeschli' of https://cgit.lassul.us/stockholmjeschli2017-12-150-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | jeschli:+brauereiMarkus Hihn2017-12-151-0/+3
| * | | | jeschli: add jeschli-brauerei userjeschli2017-12-151-0/+3
| * | | | jeschli urxvt: enable xressourcesjeschli2017-12-151-1/+1
| * | | | jeschli brauerei.r: bootstrapjeschli2017-12-151-36/+62
| |/ / /
| * | | jeschli:+urxvtMarkus Hihn2017-12-151-0/+34
| * | | xresources: fix api namelassulus2017-12-151-3/+3
| * | | Merge branch 'master' of prism.r:stockholmMarkus Hihn2017-12-1540-87/+462
| |\ \ \