summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-04-2830-96/+1249
|\
| * Merge remote-tracking branch 'ni/master'lassulus2019-04-2815-87/+325
| |\
| | * tv: add sxiv config moduletv2019-04-252-1/+13
| | * tv: add urxvt config moduletv2019-04-252-18/+17
| | * tv Xresources: URxvt*modifier = mod1tv2019-04-251-0/+1
| | * tv Xresources: simplify URxvt*charClasstv2019-04-251-1/+1
| | * tv Xresources: fix URxvt*url-select.launcher pathtv2019-04-251-1/+1
| | * tv man: add xorg-docstv2019-04-241-0/+1
| | * tv: add Xresources moduletv2019-04-244-58/+103
| | * tv pki: generate global nssdbtv2019-04-231-1/+49
| | * flameshot-once: make timeout configurabletv2019-04-231-0/+9
| | * flameshot-once: fix _file in profile moduletv2019-04-231-1/+1
| | * flameshot-once: 1.1.0 -> 1.2.0tv2019-04-231-3/+3
| | * tv pki: add tv Root CAtv2019-04-211-0/+31
| | * tv pki: import custom certificatestv2019-04-211-0/+6
| | * tv pki: immigrate certificate environmenttv2019-04-202-9/+15
| | * Merge remote-tracking branch 'prism/master'tv2019-04-1913-139/+116
| | |\
| | * | krebs.shadow: inittv2019-04-192-0/+80
| | * | krebs.permown: fix typo in PrivateTmptv2019-04-191-1/+1
| * | | mb p1nk: fix tinc pubkeylassulus2019-04-281-1/+1
| * | | Merge branch 'mb'lassulus2019-04-2814-0/+918
| |\ \ \
| | * | | mb: add p1nk.rmblassulus2019-04-263-0/+278
| | * | | mb orange: add more aliaseslassulus2019-04-261-0/+2
| | * | | init mblassulus2019-04-2612-0/+638
| * | | | nixpkgs: 8ea36d7 -> cf3e277lassulus2019-04-271-3/+3
| |/ / /
| * | | l usershadow: use wrappers for ssh loginlassulus2019-04-261-2/+2
| * | | Revert "l 3 usershadow: user passwd passwords for sshd"lassulus2019-04-251-5/+2
* | | | j enklave: allowed port 8001jeschli2019-04-281-1/+1
* | | | j brauerei: +user blafoojeschli2019-04-271-0/+5
* | | | j brauerei: configs/vim.nix (broken) -> standard vimjeschli2019-04-251-2/+2
* | | | j brauerei: +gnupgjeschli2019-04-251-0/+1
* | | | j brauerei: -steam (broken?)jeschli2019-04-251-1/+1
* | | | Merge branch 'master' of prism.r:stockholmjeschli2019-04-2382-277/+844
|\| | |
| * | | reaktor2: add userlassulus2019-04-231-0/+5
| * | | nixpkgs: 5c52b25 -> 8ea36d7lassulus2019-04-231-3/+3
| | |/ | |/|
| * | Merge remote-tracking branch 'ni/master'lassulus2019-04-181-2/+15
| |\|
| | * krebs.permown: use named pipetv2019-04-181-2/+15
| * | Merge remote-tracking branch 'gum/master'lassulus2019-04-181-7/+7
| |\ \
| | * | ma sdev.r: re-enable filesystemmakefu2019-04-181-6/+6
| | * | ma sdev.r: do not build with virtualbox extensionsmakefu2019-04-181-1/+1
| * | | l radio: grant mpd access to music dirlassulus2019-04-181-1/+1
| * | | l radio: set new music directorylassulus2019-04-181-2/+2
| * | | Merge remote-tracking branch 'ni/master'lassulus2019-04-181-4/+6
| |\ \ \ | | | |/ | | |/|
| | * | krebs.permown: admit symlinkstv2019-04-181-3/+5
| | * | Revert "krebs.permown: [] -> {}"tv2019-04-181-1/+1
| * | | Merge remote-tracking branch 'gum/master'lassulus2019-04-183-18/+53
| |\ \ \ | | | |/ | | |/|
| | * | ma binary-cache: add gummakefu2019-04-182-3/+17
| | * | ma x.r: clean up imports, remove pyloadmakefu2019-04-181-15/+36
| * | | l syncs: use permown, use attrslassulus2019-04-186-41/+49
| * | | syncthing: listOf -> attrsOflassulus2019-04-181-4/+5