configs: drop stockholm and nix-writers overlays · lass.pds.lassul.us/superconfig@1790aa4

+6 -8

configs/default.nix

··· 5 5 pkgs, 6 6 ... 7 7 }: 8 + let 9 + stockholmPkgs = self.inputs.stockholm.packages.${pkgs.stdenv.hostPlatform.system}; 10 + in 8 11 { 9 - # Nixpkgs overlays 10 - nixpkgs.overlays = [ 11 - self.inputs.stockholm.overlays.default 12 - (import (self.inputs.stockholm.inputs.nix-writers + "/pkgs")) # TODO get rid of that overlay 13 - ]; 14 12 15 13 imports = [ 16 14 # Import modules ··· 201 199 #neat utils 202 200 file 203 201 xkcdpass 204 - kpaste 205 - cyberlocker-tools 202 + stockholmPkgs.kpaste 203 + stockholmPkgs.cyberlocker-tools 206 204 pciutils 207 205 pop 208 - untilport 206 + stockholmPkgs.untilport 209 207 (pkgs.writers.writeDashBin "urgent" '' 210 208 printf '\a' 211 209 '')

+5 -3

configs/paste.nix

View file

··· 7 7 }: 8 8 9 9 let 10 + stockholmPkgs = self.inputs.stockholm.packages.${pkgs.stdenv.hostPlatform.system}; 11 + 10 12 uploadPage = pkgs.writeText "paste-upload.html" '' 11 13 <!doctype html> 12 14 <title>p.krebsco.de</title> ··· 123 125 port = 9081; 124 126 script = # sh 125 127 '' 126 - (. ${pkgs.htgen-paste}/bin/htgen-paste) 128 + (. ${stockholmPkgs.htgen-paste}/bin/htgen-paste) 127 129 ''; 128 130 }; 129 131 ··· 177 179 port = 7771; 178 180 script = # sh 179 181 '' 180 - (. ${pkgs.htgen-imgur}/bin/htgen-imgur) 182 + (. ${stockholmPkgs.htgen-imgur}/bin/htgen-imgur) 181 183 ''; 182 184 }; 183 185 krebs.htgen.cyberlocker = { 184 186 port = 7772; 185 187 script = # sh 186 188 '' 187 - (. ${pkgs.htgen-cyberlocker}/bin/htgen-cyberlocker) 189 + (. ${stockholmPkgs.htgen-cyberlocker}/bin/htgen-cyberlocker) 188 190 ''; 189 191 }; 190 192 krebs.iptables.tables.filter.INPUT.rules = [

+256 -249

configs/weechat.nix

View file

··· 1 - { config, pkgs, ... }: 1 + { 2 + config, 3 + pkgs, 4 + self, 5 + ... 6 + }: 2 7 let 3 8 4 - weechat-configured = pkgs.weechat-declarative.override { 5 - config = { 6 - scripts = [ 7 - pkgs.weechatScripts.wee-slack 8 - ]; 9 - settings = { 10 - irc.server_default.nicks = [ 11 - "lassulus" 12 - "hackulus" 13 - ]; 14 - irc.server.bitlbee = { 15 - addresses = "localhost/6666"; 16 - command = "msg &bitlbee identify \${sec.data.bitlbee}"; 17 - }; 18 - irc.server.hackint = { 19 - addresses = "irc.hackint.org/6697"; 20 - autojoin = [ 21 - "#c3-gsm" 22 - "#panthermoderns" 23 - "#feldoffice" 24 - "#36c3" 25 - "#cccac" 26 - "#nixos" 27 - "#krebs" 28 - "#krebstel" 29 - "#c-base" 30 - "#afra" 31 - "#tvl" 32 - "#tvix-dev" 33 - "#eloop" 34 - "#systemdultras" 35 - "#rc3" 36 - "#krebs-announce" 37 - "#the_playlist" 38 - "#germany" 39 - "#hackint" 40 - "#dezentrale" 41 - "#hackerfleet \${sec.data.c3-gsm}" # TODO support channel passwords in a cooler way 9 + weechat-configured = 10 + self.inputs.stockholm.packages.${pkgs.stdenv.hostPlatform.system}.weechat-declarative.override 11 + { 12 + config = { 13 + scripts = [ 14 + pkgs.weechatScripts.wee-slack 42 15 ]; 43 - ssl = true; 44 - sasl_fail = "reconnect"; 45 - sasl_username = "lassulus"; 46 - sasl_password = "\${sec.data.hackint_sasl}"; 47 - }; 48 - irc.server.r = { 49 - addresses = "irc.r"; 50 - autojoin = [ 51 - "#xxx" 52 - "#autowifi" 53 - "#brockman" 54 - "#flix" 55 - "#kollkoll" 56 - "#noise" 57 - "#mukke" 58 - ]; 59 - sasl_fail = "reconnect"; 60 - sasl_username = "lassulus"; 61 - sasl_password = "\${sec.data.r_sasl}"; 62 - anti_flood_prio_high = 0; 63 - anti_flood_prio_low = 0; 64 - }; 65 - irc.server.libera = { 66 - addresses = "irc.libera.chat/6697"; 67 - autojoin = [ 68 - "#shackspace" 69 - "#nixos" 70 - "#krebs" 71 - "#dezentrale" 72 - "#tinc" 73 - "#nixos-de" 74 - "#fysi" 75 - "#hillhacks" 76 - "#nixos-rc3" 77 - "#binaergewitter" 78 - "#hackerfleet" 79 - "#weechat" 80 - ]; 81 - ssl = true; 82 - sasl_username = "lassulus"; 83 - sasl_fail = "reconnect"; 84 - sasl_password = "\${sec.data.libera_sasl}"; 85 - }; 86 - irc.server.news = { 87 - addresses = "news.r"; 88 - autojoin = [ 89 - "#all" 90 - "#aluhut" 91 - "#querdenkos" 92 - "#news" 93 - "#drachengame" 94 - ]; 95 - anti_flood_prio_high = 0; 96 - anti_flood_prio_low = 0; 97 - }; 98 - matrix.server.lassulus = { 99 - address = "matrix.lassul.us"; 100 - username = "lassulus"; 101 - password = "\${sec.data.matrix_lassulus}"; 102 - device_name = config.networking.hostName; 103 - }; 104 - plugins.var.python.go.short_name = true; 105 - plugins.var.python.go.short_name_server = true; 106 - plugins.var.python.go.fuzzy_search = true; 107 - relay.network.password = "xxx"; # secret? 108 - relay.port.weechat = 9998; 109 - relay.weechat.commands = "*,!exec,!quit"; 110 - weechat.look.buffer_time_format = "%m-%d_%H:%M:%S"; 111 - weechat.look.item_time_format = "%m-%d_%H:%M:%S"; 112 - irc.look.color_nicks_in_names = true; 113 - irc.look.color_nicks_in_nicklist = true; 114 - logger.file.mask = "$plugin.$name/%Y-%m-%d.weechatlog"; 115 - logger.file.path = "/var/state/weechat_logs"; 116 - logger.look.backlog = 1000; 117 - weechat.notify.irc.news."#all" = "highlight"; 16 + settings = { 17 + irc.server_default.nicks = [ 18 + "lassulus" 19 + "hackulus" 20 + ]; 21 + irc.server.bitlbee = { 22 + addresses = "localhost/6666"; 23 + command = "msg &bitlbee identify \${sec.data.bitlbee}"; 24 + }; 25 + irc.server.hackint = { 26 + addresses = "irc.hackint.org/6697"; 27 + autojoin = [ 28 + "#c3-gsm" 29 + "#panthermoderns" 30 + "#feldoffice" 31 + "#36c3" 32 + "#cccac" 33 + "#nixos" 34 + "#krebs" 35 + "#krebstel" 36 + "#c-base" 37 + "#afra" 38 + "#tvl" 39 + "#tvix-dev" 40 + "#eloop" 41 + "#systemdultras" 42 + "#rc3" 43 + "#krebs-announce" 44 + "#the_playlist" 45 + "#germany" 46 + "#hackint" 47 + "#dezentrale" 48 + "#hackerfleet \${sec.data.c3-gsm}" # TODO support channel passwords in a cooler way 49 + ]; 50 + ssl = true; 51 + sasl_fail = "reconnect"; 52 + sasl_username = "lassulus"; 53 + sasl_password = "\${sec.data.hackint_sasl}"; 54 + }; 55 + irc.server.r = { 56 + addresses = "irc.r"; 57 + autojoin = [ 58 + "#xxx" 59 + "#autowifi" 60 + "#brockman" 61 + "#flix" 62 + "#kollkoll" 63 + "#noise" 64 + "#mukke" 65 + ]; 66 + sasl_fail = "reconnect"; 67 + sasl_username = "lassulus"; 68 + sasl_password = "\${sec.data.r_sasl}"; 69 + anti_flood_prio_high = 0; 70 + anti_flood_prio_low = 0; 71 + }; 72 + irc.server.libera = { 73 + addresses = "irc.libera.chat/6697"; 74 + autojoin = [ 75 + "#shackspace" 76 + "#nixos" 77 + "#krebs" 78 + "#dezentrale" 79 + "#tinc" 80 + "#nixos-de" 81 + "#fysi" 82 + "#hillhacks" 83 + "#nixos-rc3" 84 + "#binaergewitter" 85 + "#hackerfleet" 86 + "#weechat" 87 + ]; 88 + ssl = true; 89 + sasl_username = "lassulus"; 90 + sasl_fail = "reconnect"; 91 + sasl_password = "\${sec.data.libera_sasl}"; 92 + }; 93 + irc.server.news = { 94 + addresses = "news.r"; 95 + autojoin = [ 96 + "#all" 97 + "#aluhut" 98 + "#querdenkos" 99 + "#news" 100 + "#drachengame" 101 + ]; 102 + anti_flood_prio_high = 0; 103 + anti_flood_prio_low = 0; 104 + }; 105 + matrix.server.lassulus = { 106 + address = "matrix.lassul.us"; 107 + username = "lassulus"; 108 + password = "\${sec.data.matrix_lassulus}"; 109 + device_name = config.networking.hostName; 110 + }; 111 + plugins.var.python.go.short_name = true; 112 + plugins.var.python.go.short_name_server = true; 113 + plugins.var.python.go.fuzzy_search = true; 114 + relay.network.password = "xxx"; # secret? 115 + relay.port.weechat = 9998; 116 + relay.weechat.commands = "*,!exec,!quit"; 117 + weechat.look.buffer_time_format = "%m-%d_%H:%M:%S"; 118 + weechat.look.item_time_format = "%m-%d_%H:%M:%S"; 119 + irc.look.color_nicks_in_names = true; 120 + irc.look.color_nicks_in_nicklist = true; 121 + logger.file.mask = "$plugin.$name/%Y-%m-%d.weechatlog"; 122 + logger.file.path = "/var/state/weechat_logs"; 123 + logger.look.backlog = 1000; 124 + weechat.notify.irc.news."#all" = "highlight"; 118 125 119 - # setting logger levels for channels is currently not possible declarativly 120 - # because of already defined 121 - logger.level.core.weechat = 0; 122 - logger.level.irc = 3; 123 - logger.level.python = 3; 124 - weechat.bar.title.color_bg = 0; 125 - weechat.bar.status.color_bg = 0; 126 - alias.cmd.reload = "exec -oc cat /etc/weechat.set"; 127 - script.scripts.download_enabled = true; 128 - weechat.look.prefix_align = "left"; 129 - weechat.look.prefix_align_max = 20; 130 - irc.look.server_buffer = "independent"; 131 - matrix.look.server_buffer = "independent"; 132 - weechat.bar.buflist.size_max = 20; 133 - weechat.color.chat_nick_colors = [ 134 - 1 135 - 2 136 - 3 137 - 4 138 - 5 139 - 6 140 - 9 141 - 10 142 - 11 143 - 12 144 - 13 145 - 14 146 - 28 147 - 29 148 - 30 149 - 31 150 - 32 151 - 33 152 - 34 153 - 35 154 - 36 155 - 37 156 - 38 157 - 39 158 - 70 159 - 94 160 - 101 161 - 102 162 - 103 163 - 104 164 - 105 165 - 106 166 - 107 167 - 130 168 - 131 169 - 133 170 - 134 171 - 135 172 - 136 173 - 137 174 - 140 175 - 141 176 - 142 177 - 143 178 - 160 179 - 161 180 - 162 181 - 163 182 - 165 183 - 166 184 - 167 185 - 168 186 - 169 187 - 170 188 - 171 189 - 172 190 - 173 191 - 174 192 - 175 193 - 196 194 - 197 195 - 198 196 - 199 197 - 200 198 - 201 199 - 202 200 - 203 201 - 204 202 - 205 203 - 206 204 - 208 205 - 209 206 - 209 207 - 210 208 - 211 209 - 212 210 - ]; 126 + # setting logger levels for channels is currently not possible declarativly 127 + # because of already defined 128 + logger.level.core.weechat = 0; 129 + logger.level.irc = 3; 130 + logger.level.python = 3; 131 + weechat.bar.title.color_bg = 0; 132 + weechat.bar.status.color_bg = 0; 133 + alias.cmd.reload = "exec -oc cat /etc/weechat.set"; 134 + script.scripts.download_enabled = true; 135 + weechat.look.prefix_align = "left"; 136 + weechat.look.prefix_align_max = 20; 137 + irc.look.server_buffer = "independent"; 138 + matrix.look.server_buffer = "independent"; 139 + weechat.bar.buflist.size_max = 20; 140 + weechat.color.chat_nick_colors = [ 141 + 1 142 + 2 143 + 3 144 + 4 145 + 5 146 + 6 147 + 9 148 + 10 149 + 11 150 + 12 151 + 13 152 + 14 153 + 28 154 + 29 155 + 30 156 + 31 157 + 32 158 + 33 159 + 34 160 + 35 161 + 36 162 + 37 163 + 38 164 + 39 165 + 70 166 + 94 167 + 101 168 + 102 169 + 103 170 + 104 171 + 105 172 + 106 173 + 107 174 + 130 175 + 131 176 + 133 177 + 134 178 + 135 179 + 136 180 + 137 181 + 140 182 + 141 183 + 142 184 + 143 185 + 160 186 + 161 187 + 162 188 + 163 189 + 165 190 + 166 191 + 167 192 + 168 193 + 169 194 + 170 195 + 171 196 + 172 197 + 173 198 + 174 199 + 175 200 + 196 201 + 197 202 + 198 203 + 199 204 + 200 205 + 201 206 + 202 207 + 203 208 + 204 209 + 205 210 + 206 211 + 208 212 + 209 213 + 209 214 + 210 215 + 211 216 + 212 217 + ]; 218 + }; 219 + extraCommands = '' 220 + /script upgrade 221 + /script install go.py 222 + /script install nickregain.pl 223 + /script install autosort.py 224 + /key bind meta-q /go 225 + /key bind meta-t /bar toggle nicklist 226 + /key bind meta-y /bar toggle buflist 227 + /filter addreplace irc_smart * irc_smart_filter * 228 + /filter addreplace playlist_topic irc.*.#the_playlist irc_topic * 229 + /filter addreplace xxx_joinpart irc.r.#xxx irc_join,irc_part,irc_quit * 230 + /set logger.level.irc.news 0 231 + /set logger.level.python.server.nixos_dev = 0; 232 + /set logger.level.irc.hackint.#the_playlist = 0; 233 + /connect bitlbee 234 + /connect r 235 + /connect news 236 + /connect libera 237 + /connect hackint 238 + /matrix connect nixos_dev 239 + /matrix connect lassulus 240 + ''; 241 + files."sec.conf" = toString ( 242 + pkgs.writeText "sec.conf" '' 243 + [crypt] 244 + cipher = aes256 245 + hash_algo = sha256 246 + passphrase_command = "cat $CREDENTIALS_DIRECTORY/WEECHAT_PASSPHRASE" 247 + salt = on 248 + 249 + [data] 250 + __passphrase__ = on 251 + hackint_sasl = "5CA242E92E7A09B180711B50C4AE2E65C42934EB4E584EC82BC1281D8C72CD411D590C16CC435687C0DA13759873CC" 252 + libera_sasl = "9500B5AC3B29F9CAA273F1B89DC99550E038AF95C4B47442B1FB4CB9F0D6B86B26015988AD39E642CA9C4A78DED7F42D1F409B268C93E778" 253 + r_sasl = "CB6FB1421ED5A9094CD2C05462DB1FA87C4A675628ABD9AEC9928A1A6F3F96C07D9F26472331BAF80B7B73270680EB1BBEFD" 254 + c3-gsm = "C49DD845900CFDFA93EEBCE4F1ABF4A963EF6082B7DA6410FA701CC77A04BB6C201FCB864988C4F2B97ED7D44D5A28F162" 255 + bitlbee = "814ECAC59D9CF6E8340B566563E5D7E92AB92209B49C1EDE4CAAC32DD0DF1EC511D97C75E840C45D69BB9E3D03E79C" 256 + matrix_lassulus = "0CA5C0F70A9F893881370F4A665B4CC40FBB1A41E53BC94916CD92B029103528611EC0B390116BE60FA79AE10F486E96E17B0824BE2DE1C97D87B88F5407330DAD70C044147533C36B09B7030CAD97" 257 + '' 258 + ); 259 + }; 211 260 }; 212 - extraCommands = '' 213 - /script upgrade 214 - /script install go.py 215 - /script install nickregain.pl 216 - /script install autosort.py 217 - /key bind meta-q /go 218 - /key bind meta-t /bar toggle nicklist 219 - /key bind meta-y /bar toggle buflist 220 - /filter addreplace irc_smart * irc_smart_filter * 221 - /filter addreplace playlist_topic irc.*.#the_playlist irc_topic * 222 - /filter addreplace xxx_joinpart irc.r.#xxx irc_join,irc_part,irc_quit * 223 - /set logger.level.irc.news 0 224 - /set logger.level.python.server.nixos_dev = 0; 225 - /set logger.level.irc.hackint.#the_playlist = 0; 226 - /connect bitlbee 227 - /connect r 228 - /connect news 229 - /connect libera 230 - /connect hackint 231 - /matrix connect nixos_dev 232 - /matrix connect lassulus 233 - ''; 234 - files."sec.conf" = toString ( 235 - pkgs.writeText "sec.conf" '' 236 - [crypt] 237 - cipher = aes256 238 - hash_algo = sha256 239 - passphrase_command = "cat $CREDENTIALS_DIRECTORY/WEECHAT_PASSPHRASE" 240 - salt = on 241 - 242 - [data] 243 - __passphrase__ = on 244 - hackint_sasl = "5CA242E92E7A09B180711B50C4AE2E65C42934EB4E584EC82BC1281D8C72CD411D590C16CC435687C0DA13759873CC" 245 - libera_sasl = "9500B5AC3B29F9CAA273F1B89DC99550E038AF95C4B47442B1FB4CB9F0D6B86B26015988AD39E642CA9C4A78DED7F42D1F409B268C93E778" 246 - r_sasl = "CB6FB1421ED5A9094CD2C05462DB1FA87C4A675628ABD9AEC9928A1A6F3F96C07D9F26472331BAF80B7B73270680EB1BBEFD" 247 - c3-gsm = "C49DD845900CFDFA93EEBCE4F1ABF4A963EF6082B7DA6410FA701CC77A04BB6C201FCB864988C4F2B97ED7D44D5A28F162" 248 - bitlbee = "814ECAC59D9CF6E8340B566563E5D7E92AB92209B49C1EDE4CAAC32DD0DF1EC511D97C75E840C45D69BB9E3D03E79C" 249 - matrix_lassulus = "0CA5C0F70A9F893881370F4A665B4CC40FBB1A41E53BC94916CD92B029103528611EC0B390116BE60FA79AE10F486E96E17B0824BE2DE1C97D87B88F5407330DAD70C044147533C36B09B7030CAD97" 250 - '' 251 - ); 252 - }; 253 - }; 254 261 255 262 in 256 263 { ··· 277 284 RemainAfterExit = true; 278 285 Type = "oneshot"; 279 286 # LoadCredential = [ 280 - # "WEECHAT_PASSPHRASE:${config.krebs.secret.directory}/weechat_passphrase" 287 + # "WEECHAT_PASSPHRASE:${config.clan.core.vars.password-store.secretLocation}/weechat_passphrase" 281 288 # ]; 282 289 ExecStart = "${pkgs.tmux}/bin/tmux -2 new-session -d -s IM ${weechat-configured}/bin/weechat"; 283 290 ExecStop = "${pkgs.tmux}/bin/tmux kill-session -t IM"; # TODO run save in weechat

+8 -5

configs/desktops/lib/x11.nix

View file

··· 5 5 pkgs, 6 6 ... 7 7 }: 8 + let 9 + stockholmPkgs = self.inputs.stockholm.packages.${pkgs.stdenv.hostPlatform.system}; 10 + in 8 11 { 9 12 imports = [ 10 13 ../../alacritty.nix ··· 68 71 acpilight 69 72 ripgrep 70 73 dmenu 71 - fzfmenu 74 + stockholmPkgs.fzfmenu 72 75 dconf 73 76 libarchive 74 77 ncdu ··· 132 135 133 136 nixpkgs.config.packageOverrides = _super: { 134 137 dmenu = pkgs.writers.writeDashBin "dmenu" '' 135 - ${pkgs.fzfmenu}/bin/fzfmenu "$@" 138 + ${stockholmPkgs.fzfmenu}/bin/fzfmenu "$@" 136 139 ''; 137 140 }; 138 141 139 142 lass.klem = { 140 143 kpaste.script = pkgs.writers.writeDash "kpaste-wrapper" '' 141 - ${pkgs.kpaste}/bin/kpaste \ 144 + ${stockholmPkgs.kpaste}/bin/kpaste \ 142 145 | ${pkgs.coreutils}/bin/tail -1 \ 143 146 | ${pkgs.coreutils}/bin/tr -d '\r\n' 144 147 ''; 145 148 go = { 146 149 target = "STRING"; 147 - script = "${pkgs.goify}/bin/goify"; 150 + script = "${stockholmPkgs.goify}/bin/goify"; 148 151 }; 149 152 "go.lassul.us" = { 150 153 target = "STRING"; 151 154 script = pkgs.writers.writeDash "go.lassul.us" '' 152 155 export GO_HOST='go.lassul.us' 153 - ${pkgs.goify}/bin/goify 156 + ${stockholmPkgs.goify}/bin/goify 154 157 ''; 155 158 }; 156 159 qrcode = {

+4 -2

configs/services/radio/default.nix

View file

··· 9 9 let 10 10 name = "radio"; 11 11 12 + stockholmPkgs = self.inputs.stockholm.packages.${pkgs.stdenv.hostPlatform.system}; 13 + 12 14 music_dir = "/var/music"; 13 15 14 16 # dash 0.5.13 has a regression where `read` builtin discards input when stdin is a socket ··· 22 24 }; 23 25 }); 24 26 25 - htgen-fixed = pkgs.htgen.override { 27 + htgen-fixed = stockholmPkgs.htgen.override { 26 28 pkgs = pkgs // { 27 29 dash = dash-0_5_12; 28 30 }; ··· 87 89 inherit name; 88 90 createHome = true; 89 91 group = name; 90 - uid = pkgs.stockholm.lib.genid_uint31 name; 92 + uid = self.inputs.stockholm.lib.genid_uint31 name; 91 93 description = "radio manager"; 92 94 home = "/home/${name}"; 93 95 useDefaultShell = true;

+3 -1

configs/services/radio/news.nix

View file

··· 7 7 let 8 8 send_to_radio = pkgs.writers.writeDashBin "send_to_radio" '' 9 9 ${pkgs.vorbis-tools}/bin/oggenc - | 10 - ${pkgs.cyberlocker-tools}/bin/cput news.ogg 10 + ${ 11 + self.inputs.stockholm.packages.${pkgs.stdenv.hostPlatform.system}.cyberlocker-tools 12 + }/bin/cput news.ogg 11 13 ${pkgs.curl}/bin/curl -fSs -X POST http://localhost:8002/newsshow 12 14 ''; 13 15

Configure Feed

Configure Feed