summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'magenbluten2019-05-214-3/+9
|\
| * Merge remote-tracking branch 'ni/master'lassulus2019-05-054-3/+9
| |\
| | * treewide: nixpkgsVersion -> versiontv2019-04-301-1/+1
| | * tv urlwatch: add ssh-audittv2019-04-301-0/+3
| | * Merge remote-tracking branch 'prism/master'tv2019-04-2812-0/+844
| | |\ | | |/ | |/|
| | * tv Xresources: start after xmonadtv2019-04-251-2/+1
| | * tv xmonad: Type = notifytv2019-04-251-0/+4
* | | mb: add new machinesmagenbluten2019-05-214-0/+170
* | | mb orange: no wiresharkmagenbluten2019-04-281-1/+0
* | | mb: mutableUsers = truemagenbluten2019-04-281-1/+1
* | | Merge branch 'master' of github.com:magenbluten/stockholmmagenbluten2019-04-283-6/+8
|\ \ \ | |/ / |/| |
| * | mb: update configsmb2019-04-283-6/+8
* | | Merge remote-tracking branch 'ni/master'lassulus2019-04-2810-82/+231
|\ \ \ | |/ / |/| / | |/
| * 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
| * 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
* | mb: add p1nk.rlassulus2019-04-262-0/+252
* | init mblassulus2019-04-2610-0/+592
|/
* lib: add POSIX.1‐2017, 3.190 Group Nametv2019-04-171-0/+7
* lib: POSIX.1‐2013 -> POSIX.1‐2017tv2019-04-171-6/+6
* Merge remote-tracking branch 'gum/master'lassulus2019-04-130-0/+0
|\
| * Merge remote-tracking branch 'tv/master'makefu2019-04-121-2/+1
| |\
| * \ Merge remote-tracking branch 'lass/master'makefu2019-04-125-129/+12
| |\ \
* | \ \ Merge remote-tracking branch 'prism/master'tv2019-04-138-225/+108
|\ \ \ \
| * | | | types.syncthing.id: string -> strlassulus2019-04-131-1/+1
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'ni/master' into 19.03lassulus2019-04-091-1/+0
| |\ \ \
| * | | | tv pulse: use pkgs.pkgsi686Linuxtv2019-04-081-1/+3
| * | | | Merge remote-tracking branch 'ni/master'lassulus2019-04-081-126/+1
| |\ \ \ \
| * | | | | types host: add syncthing.idlassulus2019-03-221-0/+6
| * | | | | Merge remote-tracking branch 'enklave/master'lassulus2019-03-221-1/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of prism.r:stockholm into new-masterjeschli2019-03-2113-35/+350
| | |\ \ \ \ \
| | * | | | | | j brauerei: now on i3jeschli2019-03-211-1/+2
| * | | | | | | Merge remote-tracking branch 'gum/master'lassulus2019-03-220-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge remote-tracking branch 'tv/master'makefu2019-03-131-2/+3
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge remote-tracking branch 'ni/master'lassulus2019-03-221-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| * | | | | | Merge remote-tracking branch 'enklave/master'lassulus2019-03-127-225/+101
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | j brauerei: -xmomad (is part of windowManager sessionnow )jeschli2019-02-261-9/+0
| | * | | | | j brauerei: -rustc (provoided by rustup)jeschli2019-02-261-1/+3
| | * | | | | j xserver: add dbus magic for xserver (xserver/default.nix not working curren...jeschli2019-02-091-0/+6
| | * | | | | j brauerei: remove not working tokei overridejeschli2019-02-091-8/+1
| | * | | | | j brauerei: remove commented dead codejeschli2019-02-091-1/+13
| | * | | | | j krops: fix directoryjeschli2019-02-091-4/+1