summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ci: add tests optionlassulus2017-12-311-5/+43
* tests deploy: cleanuplassulus2017-12-311-10/+5
* tests deploy: get pkgs with overlayslassulus2017-12-311-1/+2
* tests: add default.nixlassulus2017-12-311-0/+6
* Merge remote-tracking branch 'gum/master'lassulus2017-12-3116-84/+157
|\
| * ma x.r: remove exfat-nofusemakefu2017-12-301-1/+0
| * Merge remote-tracking branch 'lass/master' into hydramakefu2017-12-309-2/+183
| |\
| * | ma tools: add tigmakefu2017-12-291-0/+2
| * | ma mosh: initmakefu2017-12-294-0/+6
| * | ma torrent: set workDir instead of downloadDirmakefu2017-12-281-7/+6
| * | ma stats.airsensor: generate Topic receivermakefu2017-12-281-3/+33
| * | ma wbob.r: receive bamstatsmakefu2017-12-281-0/+3
| * | ma vbob.source: do not deploy musnixmakefu2017-12-281-1/+1
| * | ma vbob.r: prepare pppdmakefu2017-12-281-23/+41
| * | ma gum.r: use wireguard, vpnwsmakefu2017-12-281-10/+16
| * | ma fileleech: retab, use torrentmakefu2017-12-281-35/+40
| * | forticlientsslvpn: use archive.orgmakefu2017-12-281-2/+2
| * | pkgs.Reaktor: add help for shack-correctmakefu2017-12-281-1/+1
| * | ma vpn-ws: fix sha256makefu2017-12-281-1/+1
| * | ma hw: add kvm-intelmakefu2017-12-281-0/+5
* | | 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
* | | 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