Commit Graph

2386 Commits

Author SHA1 Message Date
lassulus
ad7800ecce nixpkgs: f01ed7b -> d77e3bd 2019-06-19 15:22:37 +02:00
lassulus
3dd3da513c nixpkgs: 1601f55 -> f01ed7b 2019-06-19 11:36:55 +02:00
makefu
9564a24c32
config collectd-base: send logs to wolf 2019-06-17 07:52:55 +02:00
makefu
c33078ddf6
ma wiregrill: rockit -> shackdev 2019-06-17 07:51:41 +02:00
lassulus
ff283af7b2 external: add wilde.r (kmein) 2019-06-15 18:24:06 +02:00
lassulus
3fa17455ef nixpkgs: e2883c3 -> 1601f55 2019-06-15 12:20:18 +02:00
lassulus
14954b9632 Merge remote-tracking branch 'gum/master' 2019-06-15 02:09:37 +02:00
makefu
cdd1c018ec
ma wiregrill: ipv4 for wiregrill
LOL!
2019-06-15 01:37:03 +02:00
lassulus
71ce7ab952 Merge remote-tracking branch 'gum/master' 2019-06-15 01:06:42 +02:00
makefu
eda35fc0a6
ma: add rockit, wiregrill for gum 2019-06-15 01:05:01 +02:00
lassulus
cb7fcd8efa Merge remote-tracking branch 'gum/master' 2019-06-15 00:53:40 +02:00
lassulus
ec93824f05 external: add rilke.w 2019-06-15 00:53:35 +02:00
makefu
df9b3fa1be
shack/gitlab-runner: remove trailing whitespace 2019-06-14 23:58:24 +02:00
makefu
b6caea7a62
ma wiregrill: update gum, add rockit 2019-06-14 23:56:07 +02:00
makefu
276ad5f9d5
Merge remote-tracking branch 'lass/master' 2019-06-14 18:41:27 +02:00
lassulus
4e7af580d8 krops: get correct secrets 2019-06-13 23:35:55 +02:00
makefu
592d157eba
wolf secrets: add shackspace-gitlab-ci 2019-06-13 20:43:32 +02:00
makefu
df8e811695
external: add 0x4a6f 2019-06-13 20:28:32 +02:00
makefu
27f3c2cd53
wolf.r: add netbox docker-compose 2019-06-13 20:17:45 +02:00
makefu
30a90e48b9
wolf.r: add documentation for imports 2019-06-12 20:53:02 +02:00
makefu
4caeb3d3f8
wolf.r: add declarative gitlab-runner 2019-06-12 09:56:07 +02:00
lassulus
ac07497652 syncthing: add more options, remove uneeded id 2019-05-29 15:18:28 +02:00
lassulus
64539ffaa4 l prism.r: add codi.lassul.us 2019-05-29 15:02:30 +02:00
lassulus
c8784043f1 schasch.r: add syncthing.id 2019-05-29 15:01:49 +02:00
lassulus
f846ad7bea kruck.r: add video.kruck.r alias 2019-05-29 15:01:10 +02:00
lassulus
816dba3a15 Merge remote-tracking branch 'enklave/master' 2019-05-29 09:07:47 +02:00
lassulus
680d5b4cff Merge remote-tracking branch 'ni/master' 2019-05-29 09:07:03 +02:00
makefu
08ddffd781
nixpkgs: 705986f -> e2883c3 2019-05-28 09:33:37 +02:00
makefu
952aeb6c14
Merge remote-tracking branch 'lass/master' 2019-05-28 09:12:57 +02:00
magenbluten
be12b8a413 mb sunshine.r: disable ci 2019-05-21 20:23:09 +02:00
magenbluten
09552a6945 Merge remote-tracking branch 'origin/master' 2019-05-21 19:52:44 +02:00
magenbluten
c74d86cf6a mb: add new machines 2019-05-21 19:43:40 +02:00
jeschli
ef05aadec9 Merge remote-tracking branch 'prism/master' 2019-05-21 19:12:50 +02:00
tv
eb9c9b80ca github-known-hosts: add new hosts 2019-05-21 10:39:18 +02:00
lassulus
31df4e128b nixpkgs: 04954e3 -> 705986f 2019-05-20 11:42:36 +02:00
tv
a666abeaab github-hosts-sync: make user name/mail overridable 2019-05-17 14:02:22 +02:00
tv
2950b893b0 github-hosts-sync: add nettools 2019-05-17 13:53:55 +02:00
tv
e91f56a409 krebs: add dummy github-hosts-sync.ssh.id_ed25519 2019-05-17 13:48:48 +02:00
tv
c7cfc7d6a3 github-hosts-sync: update default URL 2019-05-17 13:43:13 +02:00
tv
866e94b4fa hotdog.r: enable github-hosts-sync 2019-05-17 13:36:13 +02:00
tv
acb3f95fa6 github-hosts-sync: 1.0.0 -> 2.0.0 2019-05-17 13:31:33 +02:00
tv
4630d10b31 github-hosts-sync: import 1.0.0 from painload 2019-05-17 12:51:29 +02:00
tv
1ceae8b0e3 Merge remote-tracking branch 'gum/master' 2019-05-15 16:10:14 +02:00
makefu
f541eae020
external/hosts: add horisa
host of ulrich which weirdly is in the krebs/retiolum repo, but not in
our hosts
2019-05-15 16:07:12 +02:00
makefu
66ade66c5d
pkgs.prison-break: drop from krebs namespace 2019-05-14 20:34:20 +02:00
jeschli
e869a8a82a Merge branch 'master' of prism.r:stockholm 2019-05-14 19:02:02 +02:00
makefu
135dc5297a
ma pkgs.prison-break: move back to own namespace, use nur.repos.makefu.prison-break for krebs 2019-05-14 09:18:26 +02:00
makefu
b65e9c0762
pkgs.prison-break: 1.0.1 -> 1.2.0 2019-05-11 11:34:15 +02:00
makefu
8f87254a2a
puyak.r: allow access from raute and ulrich 2019-05-10 21:03:36 +02:00
makefu
45f2d6af58
Merge remote-tracking branch 'lass/master' 2019-05-10 21:02:33 +02:00
makefu
795ba0b57f
ma pkgs.prison-break: bump to 1.0.1 2019-05-08 13:56:33 +02:00
lassulus
9da52b378d Merge remote-tracking branch 'gum/master' 2019-05-05 10:40:24 +02:00
lassulus
595574d433 Merge remote-tracking branch 'ni/master' 2019-05-05 10:28:52 +02:00
lassulus
397fad2366 nixpkgs: cf3e277 -> 04954e3 2019-05-05 10:27:57 +02:00
tv
df6007c2eb treewide: nixpkgsVersion -> version 2019-04-30 21:50:07 +02:00
tv
c7d02cb595 ssh-audit: init at 1.7.0 2019-04-30 20:25:53 +02:00
jeschli
97b78b45a8 Merge branch 'master' of prism.r:stockholm 2019-04-30 19:19:55 +02:00
lassulus
222160fc3a allow multiple hostKeys 2019-04-30 19:12:00 +02:00
jeschli
e45b3492b3 Merge branch 'master' of prism.r:stockholm 2019-04-28 15:05:34 +02:00
lassulus
18b98333d4 irc-announce: add _ to nick, for filtering 2019-04-28 15:01:50 +02:00
lassulus
915e4b8437 Merge remote-tracking branch 'ni/master' 2019-04-28 14:18:00 +02:00
lassulus
710609af31 mb p1nk: fix tinc pubkey 2019-04-28 13:56:01 +02:00
lassulus
2f8a55268c Merge branch 'mb' 2019-04-28 13:46:00 +02:00
lassulus
c483c69ba1 nixpkgs: 8ea36d7 -> cf3e277 2019-04-27 12:11:25 +02:00
makefu
2685464a60
Merge branch 'master' of prism:stockholm 2019-04-26 20:35:52 +02:00
makefu
95f6a06c5a
prison-break: move to krebs 2019-04-26 20:31:21 +02:00
lassulus
3dc61a8f2d mb: add p1nk.r 2019-04-26 20:11:30 +02:00
lassulus
7653f7d9f3 mb orange: add more aliases 2019-04-26 20:10:02 +02:00
lassulus
d5c580daa1 init mb 2019-04-26 20:09:55 +02:00
jeschli
35fdfbe5cc Merge branch 'master' of prism.r:stockholm 2019-04-23 20:15:10 +02:00
lassulus
cd825d9934 reaktor2: add user 2019-04-23 20:12:58 +02:00
lassulus
a65e68e51c nixpkgs: 5c52b25 -> 8ea36d7 2019-04-23 20:12:53 +02:00
tv
46172b7f01 flameshot-once: make timeout configurable 2019-04-23 13:22:50 +02:00
tv
d7ca88168c flameshot-once: fix _file in profile module 2019-04-23 13:17:01 +02:00
tv
3e5ec99203 flameshot-once: 1.1.0 -> 1.2.0 2019-04-23 13:15:57 +02:00
tv
d825d2db87 Merge remote-tracking branch 'prism/master' 2019-04-19 16:39:05 +02:00
tv
5fbe320b91 krebs.shadow: init 2019-04-19 16:32:00 +02:00
tv
b002e799b4 krebs.permown: fix typo in PrivateTmp 2019-04-19 13:58:38 +02:00
lassulus
6c719f03c1 Merge remote-tracking branch 'ni/master' 2019-04-18 20:28:06 +02:00
tv
c082c8d62b krebs.permown: use named pipe
This commit fixes following issues:
1. reexecution causes stray inotifywait processes
2. errors in the while part renderes the service defunct
2019-04-18 11:43:00 +02:00
lassulus
cd6c5e1311 Merge remote-tracking branch 'ni/master' 2019-04-18 11:13:31 +02:00
tv
1bbd53c459 krebs.permown: admit symlinks 2019-04-18 11:00:56 +02:00
tv
64d6955e5a Revert "krebs.permown: [] -> {}"
This reverts commit 87937a5394.

Thanks for reviewing...
2019-04-18 10:19:10 +02:00
lassulus
3adcf3a74c syncthing: listOf -> attrsOf 2019-04-18 10:14:18 +02:00
tv
87937a5394 krebs.permown: [] -> {} 2019-04-18 09:53:31 +02:00
tv
bc200e5155 krebs.permown: mkdirs on activation 2019-04-18 01:23:55 +02:00
tv
520c9ef692 krebs.permown: listOf -> attrsOf 2019-04-18 01:23:12 +02:00
tv
ffd36f5554 Merge remote-tracking branch 'gum/master' 2019-04-17 22:04:03 +02:00
tv
e051fecf9c qrscan: init 2019-04-17 21:49:43 +02:00
makefu
1314eb9284
Merge remote-tracking branch 'tv/master' 2019-04-17 21:48:20 +02:00
tv
84ad0b0a93 krebs.permown: init
Derived from lass/3modules/ensure-permissions.nix
2019-04-17 21:05:23 +02:00
lassulus
d61f9654f2 l daedalus.r: add ublock origin 2019-04-17 17:38:57 +02:00
lassulus
c4af929d39 l shodan.r: add syncthing.id 2019-04-17 17:38:15 +02:00
lassulus
40f83f1140 external: add ada.r 2019-04-17 17:37:28 +02:00
tv
20fa5109af Merge remote-tracking branch 'prism/master' 2019-04-17 17:17:25 +02:00
lassulus
8058af6c74 realwallpaper: reduce log noise 2019-04-17 14:16:53 +02:00
lassulus
13388e1d9c Merge remote-tracking branch 'ni/master' 2019-04-14 14:15:08 +02:00
tv
d0883b3d3e lass: move p from lassul.us to krebsco.de 2019-04-13 22:05:48 +02:00
tv
3214a47d45 krebspaste: print public URL 2019-04-13 22:01:13 +02:00
lassulus
7083200810 Merge remote-tracking branch 'ni/master' 2019-04-13 21:54:23 +02:00
lassulus
4ac7399b75 bepasty-server: use python2 again 2019-04-13 21:54:15 +02:00
tv
a224e77dfb lass paste: add p.krebsco.de 2019-04-13 21:51:58 +02:00
lassulus
7f9b2c6f45 ci: create gcroot only if result exists 2019-04-13 15:39:40 +02:00
tv
0430fbbbfe Merge remote-tracking branch 'prism/master' 2019-04-13 14:07:30 +02:00
tv
39fba33bed krebs.setuid: propagate env by default 2019-04-13 13:44:49 +02:00
lassulus
6c28491768 bepasty: use python3 2019-04-13 11:30:43 +02:00
lassulus
46c06dd997 nixpkgs: 67bc63f -> 5c52b25 2019-04-11 15:17:54 +02:00
jeschli
a4be985644 Merge branch 'master' of prism.r:stockholm 2019-04-09 20:12:06 +02:00
lassulus
3fee51f737 syncthing: fix permissions of keys 2019-04-09 16:54:06 +02:00
lassulus
ade34e2ccd hotdog.r: don't set NIX_REMOTE 2019-04-08 20:59:10 +02:00
lassulus
7d7be871d8 nixpkgs: 2229509 -> 67bc63f 2019-04-08 17:34:12 +02:00
lassulus
9eb7244146 email-header: add 19.03 compatibility 2019-04-08 17:20:26 +02:00
lassulus
a1cf824e2f blessings: add 19.03 compatibility 2019-04-08 17:20:26 +02:00
lassulus
64c8c06f02 18.09 -> 19.03 2019-04-08 17:20:26 +02:00
lassulus
7e1b197dab Merge remote-tracking branch 'ni/master' 2019-04-08 17:16:29 +02:00
lassulus
44a48a8d3a l: add green.r 2019-04-07 19:36:05 +02:00
lassulus
212e7f4b98 syncthing: add id option 2019-04-07 18:21:18 +02:00
lassulus
e56e7fbe71 l phone.w: rotate all keys 2019-04-07 18:19:05 +02:00
lassulus
a8c958821d l skynet.r: add wiregrill 2019-04-07 18:10:02 +02:00
lassulus
1c014eb05c l prism.r: add syncthing.id 2019-04-07 18:09:32 +02:00
lassulus
2b748822b1 nixpkgs: 8abca4b -> 2229509 2019-04-07 17:59:22 +02:00
jeschli
f8b88080d5 :Merge branch 'master' of prism.r:stockholm 2019-04-02 19:38:35 +02:00
tv
d40f20b711 q-power_supply: init from tv's q 2019-03-29 18:15:52 +01:00
lassulus
67ca249e33 syncthing: increase rescanInterval to track upstream 2019-03-23 16:04:50 +01:00
lassulus
86150b31f2 syncthing: wait for service startup 2019-03-23 16:04:22 +01:00
lassulus
0bb9321d1b syncthing folders: add watch & ignorePerms options 2019-03-23 16:04:01 +01:00
lassulus
84d0489583 l phone: add syncthing.id 2019-03-23 16:03:20 +01:00
lassulus
c3a1847b98 l blue: add syncthing.id 2019-03-23 16:02:07 +01:00
lassulus
e1f33f0b58 l littleT: add wiregrill & syncthing 2019-03-23 14:18:03 +01:00
lassulus
90ab9c288e l: add syncthing ids for mors, icarus & skynet 2019-03-22 08:01:03 +01:00
lassulus
67d3a55df5 k: add syncthing module 2019-03-22 07:57:34 +01:00
makefu
57850480ee
power-action module: no need for stockholm/lib
this makes the module available to be reused by others without the need
for having stockholm in the search path
2019-03-19 19:49:24 +01:00
lassulus
550faa1f64 Merge remote-tracking branch 'enklave/master' 2019-03-12 11:19:16 +01:00
lassulus
a56a2ef008 Merge remote-tracking branch 'ni/master' 2019-03-12 11:18:05 +01:00
lassulus
c4ebcc43d2 Merge remote-tracking branch 'gum/master' 2019-03-12 11:16:45 +01:00
lassulus
44540e0814 nixpkgs: 4c0be40 -> 8abca4b 2019-03-07 21:50:19 +01:00
lassulus
244c773212 nixpkgs: 9bd45dd -> 4c0be40 2019-03-04 00:49:16 +01:00
tv
4b7673a6a7 external: add palo-pepe.pubkey 2019-03-01 11:25:44 +01:00
makefu
ec2dffd71e
ma: add base name to aliases when overriding 2019-02-27 23:58:28 +01:00
makefu
f786e5a22f
ma: make extensive use of defaults for inventory 2019-02-27 23:27:39 +01:00
Jan Heidbrink
6c8d073710 external: add toastbrot.r 2019-02-26 23:11:49 +01:00
makefu
e437c7d17b
Merge remote-tracking branch 'lass/master' 2019-02-26 08:58:51 +01:00
makefu
6da32a5952
ma: cleanup hosts
move pubkeys to separate files in folder
RIP drop latte pigstarter wry shoney heidi lariat soundflower falk bridge horisa tahoe tcac-0-1
2019-02-26 08:58:40 +01:00
tv
c6b863a403 Reaktor: 0.7.0 -> 0.7.1 2019-02-17 18:19:13 +01:00
tv
6f6e18d22f Revert "brscan4: init at 0.4.4-4"
This reverts commit 1993cbc421.
2019-02-16 18:49:26 +01:00
tv
3a262f1c24 symlinkJoin: remove compatibility
This reverts commit f46b3153c0.
2019-02-16 18:15:13 +01:00
tv
4e81d40e30 flameshot-once: default filenamePattern w/o .png 2019-02-16 17:47:12 +01:00
lassulus
5845742ae0 nixpkgs: 168cbb3 -> 9bd45dd 2019-02-16 15:28:30 +01:00
lassulus
5605d675da nixpkgs: b01a89d -> 168cbb3 2019-02-12 14:55:19 +01:00
tv
e29debea42 flameshot-once: 1.0.1 -> 1.1.0 2019-02-09 13:43:27 +01:00
tv
f949639497 flameshot-once: make filenamePattern configurable 2019-02-09 13:43:27 +01:00
tv
1b526ec1a5 flameshot-once: add config 2019-02-09 13:43:27 +01:00
tv
7f40ff9b5c flameshot-once: use qt5.qtbase 2019-02-09 13:43:27 +01:00
lassulus
5d4ca64478 nixpkgs: 97e0d53 -> b01a89d 2019-02-08 17:05:47 +01:00
lassulus
3a2d5affbb external: actually import palo.nix 2019-02-08 09:43:33 +01:00
tv
76fd127a7f flameshot-once: 1.0.0 -> 1.0.1 2019-02-08 05:19:48 +01:00
tv
24d008d92d flameshot-once: init at 1.0.0 2019-02-08 05:19:48 +01:00
tv
d3f9c8efcc blessings: 2.1.0 -> 2.2.0 2019-02-08 05:19:48 +01:00
tv
cdb548ac30 krebs-hosts-*: don't add lines without alias 2019-02-08 05:19:48 +01:00
tv
659cbed237 krebs-hosts_combined: init 2019-02-08 05:19:48 +01:00
tv
bc4984c7fa retiolum-hosts: RIP 2019-02-08 05:19:48 +01:00
tv
6830a9b32a krebs-hosts-*: generate from krebs.hosts 2019-02-08 05:19:48 +01:00
lassulus
932d11ed93 external: add catullus.r 2019-02-05 20:14:55 +01:00
lassulus
e2ae92445c external: add palo.nix 2019-02-02 09:13:53 +01:00
lassulus
936bf9f7b2 remove kruck.r, add pepe.r 2019-02-01 21:15:27 +01:00
lassulus
79cad8349b bier bal: fix regex 2019-01-29 21:39:16 +01:00
lassulus
937c1bc02c Merge remote-tracking branch 'ni/master' 2019-01-29 20:53:38 +01:00
tv
773db3ae47 reaktor2: 0.2.1 -> 0.2.2 2019-01-29 20:51:11 +01:00
jeschli
1f6ba2a01d xmonad-stockholm: arguments in one line 2019-01-29 19:59:59 +01:00
jeschli
924c8fb748 Merge branch 'master' of prism.r:stockholm 2019-01-29 19:17:43 +01:00
lassulus
fd5615a298 krops: bootstrap nixpkgs 2019-01-28 23:16:48 +01:00
makefu
7bc36518d1
Merge remote-tracking branch 'lass/master' 2019-01-28 08:32:05 +01:00
makefu
0ead7ae0a7
k shack/ympd: add next and prev buttons at top 2019-01-28 08:29:19 +01:00
tv
06b23af29d reaktor2 task: define env in hook 2019-01-27 20:32:04 +01:00
tv
f608351da1 reaktor2: 0.2.0 -> 0.2.1 2019-01-27 20:27:16 +01:00
tv
74dbc7c8b2 Reaktor: 0.6.2 -> 0.7.0 2019-01-27 20:15:40 +01:00
tv
b4f24ff76a krebs nscd-fix: normalize style 2019-01-27 20:09:11 +01:00
tv
52ef20148e reaktor2 service: user -> username + proper type 2019-01-27 20:06:06 +01:00
lassulus
fa1e5d5b7f l reaktor-plugins: use correct header 2019-01-27 19:33:43 +01:00
lassulus
88a281c020 Reaktor sed-plugin: use mirc colorcodes 2019-01-27 19:28:54 +01:00
tv
6965a1df8e reaktor2 service: add useTLS option 2019-01-27 18:33:22 +01:00
lassulus
5926a71859 reaktor2 task: use single hook for more efficency 2019-01-27 16:55:47 +01:00
lassulus
35a2ace1ae Merge remote-tracking branch 'ni/master' 2019-01-27 16:36:40 +01:00
lassulus
92caf2dada reaktor2 bier: allow 'bier bal' as command 2019-01-27 14:32:33 +01:00
lassulus
fd4876da16 reaktor2: pretty print bier balance 2019-01-27 14:27:54 +01:00
lassulus
052cef71fd reaktor: ledger balance -> bier balance 2019-01-27 13:50:31 +01:00
lassulus
b28706964e hotdog.r: Reaktor -> reaktor2 2019-01-27 13:42:05 +01:00
lassulus
6271cfaed4 reaktor2: add user option 2019-01-27 13:42:05 +01:00
lassulus
aa070d5db7 hotdog.r: import nscd-fix 2019-01-27 03:33:30 +01:00
tv
ab18e5a468 reaktor2: 0.1.7 -> 0.2.0 2019-01-27 03:29:00 +01:00
lassulus
a7af3289a9 pkgs: add reaktor2-plugins 2019-01-27 03:27:29 +01:00
lassulus
2263863845 add nscd-fix 2019-01-27 03:18:03 +01:00
lassulus
6f2dd04604 Merge remote-tracking branch 'ni/master' 2019-01-27 02:51:14 +01:00
tv
775d7a789d reaktor2: 0.1.6 -> 0.1.7 2019-01-26 21:28:35 +01:00
tv
27bd27f150 reaktor2: 0.1.5 -> 0.1.6 2019-01-26 20:41:45 +01:00
lassulus
d0a55575fa Merge remote-tracking branch 'ni/master' 2019-01-25 19:41:00 +01:00
tv
b3c65141b8 reaktor2: 0.1.4 -> 0.1.5 2019-01-25 14:54:31 +01:00
tv
7c160fd1fa blessings: 1.3.0 -> 2.1.0 2019-01-25 14:32:11 +01:00
lassulus
1f6b43acbd Merge remote-tracking branch 'ni/master' 2019-01-24 22:58:09 +01:00
tv
2e5ed5d1bb reaktor2: 0.1.2 -> 0.1.3 2019-01-24 21:16:44 +01:00