summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-06-2513-381/+426
|\
| * Merge remote-tracking branch 'prism/master'tv2019-06-2514-42/+445
| |\
| | * Merge remote-tracking branch 'enklave/master'lassulus2019-05-299-34/+266
| | |\
| | * \ Merge remote-tracking branch 'ni/master'lassulus2019-05-2912-381/+424
| | |\ \
| * | | | tv exim-retiolum: enable rspamd at nomictv2019-06-231-0/+1
| * | | | tv vim nix: add nested eximtv2019-06-221-0/+1
| | |/ / | |/| |
| * | | tv vim: move nix to overlaytv2019-05-212-217/+223
| * | | tv vim: move tv to overlaytv2019-05-212-51/+54
| * | | tv vim: move showsyntax to overlaytv2019-05-212-24/+27
| * | | tv vim: move vim to overlaytv2019-05-212-13/+17
| * | | tv vim: move hack to overlaytv2019-05-212-43/+47
| * | | tv vim: move file-line to overlaytv2019-05-212-8/+11
| * | | tv vim: move jq to overlaytv2019-05-212-8/+11
| * | | tv vim: move elixir to overlaytv2019-05-212-8/+10
| * | | tv vim: move fzf to overlaytv2019-05-212-9/+12
| * | | tv pkgs: add vim overlaytv2019-05-211-0/+7
| * | | tv x220: define all the lidSwitch* T_Ttv2019-05-201-0/+5
* | | | j brauerei: -python35 +python37jeschli2019-06-101-13/+3
* | | | Merge branch 'master' of prism.r:stockholmjeschli2019-05-285-8/+179
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/master'magenbluten2019-05-214-3/+9
| |\ \
| * | | 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
* | | | | j bolide: add i3 to home.nixjeschli2019-05-181-0/+153
* | | | | j bolide: add home.nixjeschli2019-05-181-0/+18
* | | | | j bolide: home-manager binaryjeschli2019-05-181-3/+20
* | | | | j: add home-manager configjeschli2019-05-181-0/+9
* | | | | Merge branch 'master' of enklave.r:stockholmjeschli2019-05-182-23/+27
|\ \ \ \ \
| * | | | | j bolide: update to i3jeschli2019-05-182-23/+27
* | | | | | j enklave: add jeschli-bolide to writejeschli2019-05-181-1/+1
* | | | | | j brauerei: add home-managerjeschli2019-05-182-2/+26
|/ / / / /
* | | | | Merge branch 'master' of prism.r:stockholmjeschli2019-05-144-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
* | | | j brauerei: add xdotool for select last window hack in i3jeschli2019-05-081-0/+1
* | | | j configs: remove window-manager.nixjeschli2019-05-041-1078/+0
* | | | j brauerei: add rofijeschli2019-05-041-0/+1
* | | | j brauerei: remove dead codejeschli2019-05-041-4/+2
* | | | j config: add qubasa's i3 configjeschli2019-05-011-0/+1078
* | | | Merge branch 'master' of prism.r:stockholmjeschli2019-04-2822-82/+1075
|\| | |
| * | | 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