mirror of
https://github.com/kmein/niveum
synced 2026-03-24 05:31:08 +01:00
Compare commits
1 Commits
94bdfda91b
...
tahina
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e96539faa |
1
ci.nix
1
ci.nix
@@ -36,7 +36,6 @@
|
|||||||
"mail/gmail/amroplay"
|
"mail/gmail/amroplay"
|
||||||
"mail/gmail/kieran.meinhardt"
|
"mail/gmail/kieran.meinhardt"
|
||||||
"mail/meinhaki"
|
"mail/meinhaki"
|
||||||
"mail/dslalewa"
|
|
||||||
"mail/posteo"
|
"mail/posteo"
|
||||||
"nextcloud-fysi/password"
|
"nextcloud-fysi/password"
|
||||||
"nextcloud/password"
|
"nextcloud/password"
|
||||||
|
|||||||
@@ -3,9 +3,7 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
inherit (import <niveum/lib>) tmpfilesConfig;
|
|
||||||
in {
|
|
||||||
imports = [
|
imports = [
|
||||||
<niveum/modules/dropbox.nix>
|
<niveum/modules/dropbox.nix>
|
||||||
];
|
];
|
||||||
@@ -14,45 +12,17 @@ in {
|
|||||||
dropbox.enable = false;
|
dropbox.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = map tmpfilesConfig [
|
system.activationScripts.home-symlinks = ''
|
||||||
{
|
ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
|
||||||
type = "L+";
|
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
|
||||||
user = config.users.users.me.name;
|
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
|
||||||
group = "users";
|
'';
|
||||||
mode = "0755";
|
|
||||||
argument = "${config.users.users.me.home}/cloud/Seafile/Wiki";
|
|
||||||
path = "${config.users.users.me.home}/notes";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
type = "L+";
|
|
||||||
user = config.users.users.me.name;
|
|
||||||
group = "users";
|
|
||||||
mode = "0755";
|
|
||||||
argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
|
|
||||||
path = "${config.users.users.me.home}/uni";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
type = "L+";
|
|
||||||
user = config.users.users.me.name;
|
|
||||||
group = "users";
|
|
||||||
mode = "0755";
|
|
||||||
argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
|
|
||||||
path = "${config.users.users.me.home}/mahlzeit";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
services.gnome-keyring.enable = true;
|
|
||||||
services.nextcloud-client = {
|
services.nextcloud-client = {
|
||||||
enable = true;
|
enable = true;
|
||||||
startInBackground = true;
|
startInBackground = true;
|
||||||
};
|
};
|
||||||
systemd.user.services.nextcloud-client = {
|
|
||||||
Unit = {
|
|
||||||
Wants = ["gnome-keyring.service"];
|
|
||||||
After = ["gnome-keyring.service"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
|||||||
@@ -144,8 +144,8 @@ in {
|
|||||||
wcd = "source ${wcd}";
|
wcd = "source ${wcd}";
|
||||||
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
||||||
where = "source ${where}";
|
where = "source ${where}";
|
||||||
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
yt = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
|
||||||
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
|
yta = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{i18n.defaultLocale = "en_DK.UTF-8";}
|
{i18n.defaultLocale = "en_DK.UTF-8";}
|
||||||
@@ -262,6 +262,5 @@ in {
|
|||||||
./vscode.nix
|
./vscode.nix
|
||||||
./watson.nix
|
./watson.nix
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
./tor.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,57 +1,42 @@
|
|||||||
{pkgs, ...}: let
|
{pkgs, ...}: {
|
||||||
nixpkgs-unstable = import <nixpkgs-unstable> {};
|
|
||||||
in {
|
|
||||||
nixpkgs.config.joypixels.acceptLicense = true;
|
nixpkgs.config.joypixels.acceptLicense = true;
|
||||||
|
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultFonts = true;
|
enableDefaultFonts = true;
|
||||||
fontDir.enable = true;
|
fontDir.enable = true;
|
||||||
fonts = with pkgs; [
|
fonts = with pkgs; [
|
||||||
alegreya
|
alegreya
|
||||||
alegreya-sans
|
alegreya-sans
|
||||||
amiri
|
|
||||||
nixpkgs-unstable.annapurna-sil
|
|
||||||
cantarell-fonts
|
|
||||||
charis-sil
|
|
||||||
corefonts
|
corefonts
|
||||||
crimson
|
|
||||||
eb-garamond
|
eb-garamond
|
||||||
etBook
|
|
||||||
nixpkgs-unstable.ezra-sil
|
|
||||||
fira
|
fira
|
||||||
font-awesome-ttf
|
font-awesome-ttf
|
||||||
nixpkgs-unstable.galatia-sil
|
|
||||||
gentium
|
|
||||||
gfs-fonts
|
|
||||||
gyre-fonts
|
|
||||||
ia-writer-duospace
|
|
||||||
ibm-plex
|
ibm-plex
|
||||||
jetbrains-mono
|
inconsolata
|
||||||
joypixels
|
iosevka
|
||||||
libertinus
|
libertine
|
||||||
libre-bodoni
|
|
||||||
lmodern
|
lmodern
|
||||||
merriweather
|
noto-fonts
|
||||||
ocr-a
|
noto-fonts-cjk
|
||||||
|
noto-fonts-emoji
|
||||||
roboto
|
roboto
|
||||||
roboto-mono
|
roboto-mono
|
||||||
roboto-slab
|
roboto-slab
|
||||||
scheherazade-new
|
|
||||||
source-code-pro
|
source-code-pro
|
||||||
source-sans-pro
|
|
||||||
source-serif-pro
|
source-serif-pro
|
||||||
theano
|
source-sans-pro
|
||||||
|
ubuntu_font_family
|
||||||
|
gfs-fonts
|
||||||
|
jetbrains-mono
|
||||||
|
twemoji-color-font
|
||||||
|
joypixels
|
||||||
tocharian-font
|
tocharian-font
|
||||||
vistafonts
|
];
|
||||||
vollkorn
|
fontconfig.defaultFonts = {
|
||||||
zilla-slab
|
monospace = ["JetBrains Mono" "JoyPixels"];
|
||||||
]; # google-fonts league-of-moveable-type
|
serif = ["Roboto Slab"];
|
||||||
fontconfig.defaultFonts = let
|
sansSerif = ["Roboto" "Noto Sans"];
|
||||||
emojiFont = "JoyPixels";
|
emoji = ["JoyPixels"];
|
||||||
in {
|
|
||||||
monospace = ["JetBrains Mono" emojiFont];
|
|
||||||
serif = ["Merriweather"];
|
|
||||||
sansSerif = ["Cantarell" emojiFont];
|
|
||||||
emoji = [emojiFont];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,12 +5,9 @@
|
|||||||
}: let
|
}: let
|
||||||
commaSep = builtins.concatStringsSep ",";
|
commaSep = builtins.concatStringsSep ",";
|
||||||
in {
|
in {
|
||||||
# man 7 xkeyboard-config
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
layout = commaSep ["de" "gr" "ru" "ara"];
|
layout = commaSep ["de" "gr"];
|
||||||
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
xkbVariant = commaSep ["T3" "polytonic"];
|
||||||
# buckwalter: http://www.qamus.org/transliteration.htm
|
|
||||||
xkbVariant = commaSep ["T3" "polytonic" "phonetic" "buckwalter"];
|
|
||||||
xkbOptions =
|
xkbOptions =
|
||||||
commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
@@ -20,15 +17,4 @@ in {
|
|||||||
|
|
||||||
# improve held key rate
|
# improve held key rate
|
||||||
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||||
|
|
||||||
systemd.user.services.gxkb = {
|
|
||||||
wantedBy = ["graphical-session.target"];
|
|
||||||
serviceConfig = {
|
|
||||||
SyslogIdentifier = "gxkb";
|
|
||||||
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "15s";
|
|
||||||
StartLimitBurst = 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,10 +18,8 @@ in {
|
|||||||
programs.mpv = {
|
programs.mpv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
|
|
||||||
ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
|
ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
|
||||||
screenshot-template = "%F-%wH%wM%wS-%#04n";
|
screenshot-template = "%F-%wH%wM%wS-%#04n";
|
||||||
script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
|
|
||||||
};
|
};
|
||||||
bindings = {
|
bindings = {
|
||||||
"Alt+RIGHT" = "add video-rotate 90";
|
"Alt+RIGHT" = "add video-rotate 90";
|
||||||
|
|||||||
@@ -47,20 +47,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
accounts.work-admin = {
|
|
||||||
user = "dslalewa";
|
|
||||||
password = lib.strings.fileContents <secrets/mail/dslalewa>;
|
|
||||||
address = "admin.alew.vglsprwi@hu-berlin.de";
|
|
||||||
imap = "mailbox.cms.hu-berlin.de";
|
|
||||||
smtp = "mailhost.cms.hu-berlin.de";
|
|
||||||
smtpSettings = smtp: "smtp://${smtp}";
|
|
||||||
folders = {
|
|
||||||
drafts = "Drafts";
|
|
||||||
sent = "Sent";
|
|
||||||
trash = "Trash";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
accounts.work-fysi = rec {
|
accounts.work-fysi = rec {
|
||||||
user = "kieran@fysi.tech";
|
user = "kieran@fysi.tech";
|
||||||
address = user;
|
address = user;
|
||||||
@@ -145,7 +131,6 @@ in {
|
|||||||
application/pdf; ${pkgs.zathura}/bin/zathura %s ;
|
application/pdf; ${pkgs.zathura}/bin/zathura %s ;
|
||||||
application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
|
application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
|
||||||
application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
|
application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
|
||||||
application/vnd.openxmlformats*; ${pkgs.libreoffice}/bin/soffice '%s';
|
|
||||||
''
|
''
|
||||||
}:$mailcap_path
|
}:$mailcap_path
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
}: let
|
}: let
|
||||||
ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
|
ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
|
||||||
|
|
||||||
youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";
|
youtube-download = "${pkgs.ts}/bin/ts ${pkgs.youtube-dl}/bin/youtube-dl -f ${ytdl-format} --add-metadata";
|
||||||
|
|
||||||
newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
|
newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
|
||||||
linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
|
linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
|
||||||
|
|||||||
@@ -137,7 +137,6 @@ in {
|
|||||||
pdfpc # presenter console for pdf slides
|
pdfpc # presenter console for pdf slides
|
||||||
hc # print files as qr codes
|
hc # print files as qr codes
|
||||||
youtubeDL
|
youtubeDL
|
||||||
yt-dlp
|
|
||||||
espeak
|
espeak
|
||||||
bc # calculator
|
bc # calculator
|
||||||
pari # gp -- better calculator
|
pari # gp -- better calculator
|
||||||
@@ -162,7 +161,7 @@ in {
|
|||||||
scripts.vimv
|
scripts.vimv
|
||||||
scripts.swallow # window swallowing
|
scripts.swallow # window swallowing
|
||||||
scripts.literature-quote
|
scripts.literature-quote
|
||||||
jless # less(1) for json
|
scripts.nav # json navigation
|
||||||
scripts.notetags
|
scripts.notetags
|
||||||
scripts.booksplit
|
scripts.booksplit
|
||||||
scripts.dmenurandr
|
scripts.dmenurandr
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
niveum.telegramBots.transits = {
|
niveum.telegramBots.transits = {
|
||||||
enable = false;
|
enable = true;
|
||||||
time = "*:0/1";
|
time = "*:0/1";
|
||||||
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
||||||
chatIds = ["-1001796440545"];
|
chatIds = ["-1001796440545"];
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{pkgs, ...}: {
|
{
|
||||||
services.tor.enable = true;
|
services.tor.enable = true;
|
||||||
environment.systemPackages = [pkgs.tor];
|
services.tor.torsocks.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
50
flake.lock
generated
50
flake.lock
generated
@@ -2,11 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1649676176,
|
"lastModified": 1648297722,
|
||||||
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
|
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
|
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -22,11 +22,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1651519540,
|
"lastModified": 1647175256,
|
||||||
"narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
|
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
|
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -62,11 +62,11 @@
|
|||||||
"menstruation-backend": {
|
"menstruation-backend": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1649545504,
|
"lastModified": 1634573652,
|
||||||
"narHash": "sha256-TVm3246ML7gWPeGm+bdb+Qo8o/7nve7sQ2hBdCZm3z8=",
|
"narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "menstruation.rs",
|
"repo": "menstruation.rs",
|
||||||
"rev": "d9f3c6d53542fd7c7ed191e37cf4e342d4a47bcb",
|
"rev": "dd405fe2acf32441e8ac56e488e689bb1c4bea82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -109,11 +109,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1651848520,
|
"lastModified": 1647992509,
|
||||||
"narHash": "sha256-KkJ28fShdd78+zal5HlHsXUICOCtO7Bdvylc5zlp5Mk=",
|
"narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5656d7f92aa8264eb06ba68ad94c87ac5b5312e8",
|
"rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,11 +125,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1651970800,
|
"lastModified": 1648337267,
|
||||||
"narHash": "sha256-6mDxz6fD7fgBC1TY5OMcU/Qubf+OlAyeVR8YCoNKD2A=",
|
"narHash": "sha256-8DRg8UDvs63iaIaHEbWG7/lnD9ImQlMNsTZMY3PvFLc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d707e510df39cdd8fe1d3e244371a3a9f23051d2",
|
"rev": "6de161729c81dc98e844793cc9c8fda29d5ef62a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -158,11 +158,11 @@
|
|||||||
"retiolum": {
|
"retiolum": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1651665107,
|
"lastModified": 1647444524,
|
||||||
"narHash": "sha256-/fKmwakb9E8ctILu5RNUrjzq7gls0tqn8Oup3Y1xmzY=",
|
"narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
|
||||||
"owner": "krebs",
|
"owner": "krebs",
|
||||||
"repo": "retiolum",
|
"repo": "retiolum",
|
||||||
"rev": "2bafba9621b83529b78fb2db34b351fd19411c0e",
|
"rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -194,11 +194,11 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1650993582,
|
"lastModified": 1648314795,
|
||||||
"narHash": "sha256-cKcdHzyy6Y4H9+KcnCgk/Tt1Zqd8lhfiXv4LClcETLc=",
|
"narHash": "sha256-hGIXkAcGiJnVXnl8kigZpI3VFrLmAr2+yr85hi5JwP0=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "scripts",
|
"repo": "scripts",
|
||||||
"rev": "c1aaeb4339e9c41057d362667554835a0f49850f",
|
"rev": "d1d525b92a34e55b1ad886807c284106e58716b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -210,11 +210,11 @@
|
|||||||
"stockholm": {
|
"stockholm": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1651664500,
|
"lastModified": 1648214990,
|
||||||
"narHash": "sha256-KYGx877YzpWQWk++YqnUQK4pu8JYJnSdMSUU9r2/xGU=",
|
"narHash": "sha256-rptATGq+jcpL+P+Cr6d3OajV6zYkbHPWlt3aQNZI2TY=",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"rev": "376b92c877442ec3be476ea5f4c89f8a715426dd",
|
"rev": "ae9c0b12710b5361d0d45510eb401eebfc1b3fb0",
|
||||||
"revCount": 10527,
|
"revCount": 10497,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://cgit.lassul.us/stockholm"
|
"url": "https://cgit.lassul.us/stockholm"
|
||||||
},
|
},
|
||||||
|
|||||||
350
lib/streams.nix
350
lib/streams.nix
File diff suppressed because it is too large
Load Diff
@@ -307,11 +307,16 @@ in
|
|||||||
packages = [pkgs.xdo];
|
packages = [pkgs.xdo];
|
||||||
};
|
};
|
||||||
|
|
||||||
ipa = wrapScript {
|
ipa =
|
||||||
script = ./ipa.py;
|
pkgs.writers.writeHaskellBin "ipa" {
|
||||||
name = "ipa";
|
libraries = with pkgs; [haskellPackages.text haskellPackages.ipa];
|
||||||
packages = [pkgs.python3];
|
} ''
|
||||||
};
|
import Data.Maybe (fromJust)
|
||||||
|
import Language.IPA
|
||||||
|
import qualified Data.Text as T
|
||||||
|
import qualified Data.Text.IO as T
|
||||||
|
main = T.interact (T.unwords . map (unIPA . fromJust . (xSampaToIpa =<<) . mkXSampa) . T.words)
|
||||||
|
'';
|
||||||
|
|
||||||
default-gateway = pkgs.writers.writeDashBin "default-gateway" ''
|
default-gateway = pkgs.writers.writeDashBin "default-gateway" ''
|
||||||
${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'
|
${pkgs.iproute}/bin/ip -json route | ${pkgs.jq}/bin/jq --raw-output '.[0].gateway'
|
||||||
|
|||||||
@@ -7,8 +7,9 @@
|
|||||||
stateLocation = "/var/lib/codimd/state.sqlite";
|
stateLocation = "/var/lib/codimd/state.sqlite";
|
||||||
nixpkgs-unstable = import <nixpkgs-unstable> {};
|
nixpkgs-unstable = import <nixpkgs-unstable> {};
|
||||||
domain = "pad.kmein.de";
|
domain = "pad.kmein.de";
|
||||||
inherit (import <niveum/lib>) tmpfilesConfig;
|
|
||||||
in {
|
in {
|
||||||
|
imports = [<stockholm/krebs/3modules/permown.nix>];
|
||||||
|
|
||||||
services.nginx.virtualHosts.${domain} = {
|
services.nginx.virtualHosts.${domain} = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
@@ -48,15 +49,11 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
krebs.permown.${backupLocation} = {
|
||||||
(tmpfilesConfig {
|
owner = "codimd";
|
||||||
user = "codimd";
|
group = "codimd";
|
||||||
group = "codimd";
|
umask = "0002";
|
||||||
mode = "0755";
|
};
|
||||||
type = "d";
|
|
||||||
path = backupLocation;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.hedgedoc-backup = {
|
systemd.services.hedgedoc-backup = {
|
||||||
description = "Hedgedoc backup service";
|
description = "Hedgedoc backup service";
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ in {
|
|||||||
"tarot.kmein.de"
|
"tarot.kmein.de"
|
||||||
"cloud.xn--kiern-0qa.de"
|
"cloud.xn--kiern-0qa.de"
|
||||||
"grafana.kmein.r"
|
"grafana.kmein.r"
|
||||||
# "names.kmein.r"
|
"names.kmein.r"
|
||||||
"rrm.r"
|
"rrm.r"
|
||||||
"graph.r"
|
"graph.r"
|
||||||
];
|
];
|
||||||
@@ -238,6 +238,16 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
job_name = "tahina";
|
||||||
|
static_configs = [
|
||||||
|
{
|
||||||
|
targets = [
|
||||||
|
"tahina.r:${toString config.services.prometheus.exporters.node.port}"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
services.prometheus.exporters.blackbox = {
|
services.prometheus.exporters.blackbox = {
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
port = 5703;
|
port = 5703;
|
||||||
onomap-src = "${<scripts>}/onomastics-ng";
|
geogen-src = "${<scripts>}/onomastics";
|
||||||
onomap = pkgs.haskellPackages.callCabal2nix "onomap" onomap-src {};
|
geogen = pkgs.callPackage geogen-src {};
|
||||||
in {
|
in {
|
||||||
systemd.services.names = {
|
systemd.services.names = {
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
@@ -13,11 +13,12 @@ in {
|
|||||||
description = "Better clone of geogen.stoepel.net";
|
description = "Better clone of geogen.stoepel.net";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
ExecStart = "${onomap}/bin/onomap-web";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "15s";
|
|
||||||
};
|
};
|
||||||
environment.PORT = toString port;
|
script = ''
|
||||||
|
cd $(mktemp -d)
|
||||||
|
ln -s "${geogen-src}/wsgi.py" wsgi.py
|
||||||
|
${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|||||||
@@ -143,11 +143,6 @@ in {
|
|||||||
tags = ["nick_gitlab"];
|
tags = ["nick_gitlab"];
|
||||||
regex = "*";
|
regex = "*";
|
||||||
};
|
};
|
||||||
people = {
|
|
||||||
buffer = "irc.*.*";
|
|
||||||
tags = map (name: "nick_${name}") ["mod_p[matrix-fli"];
|
|
||||||
regex = "*";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraCommands = ''/matrix connect nibbana'';
|
extraCommands = ''/matrix connect nibbana'';
|
||||||
|
|||||||
@@ -11,22 +11,23 @@ in {
|
|||||||
<niveum/configs/spacetime.nix>
|
<niveum/configs/spacetime.nix>
|
||||||
<niveum/modules/retiolum.nix>
|
<niveum/modules/retiolum.nix>
|
||||||
<niveum/configs/sshd.nix>
|
<niveum/configs/sshd.nix>
|
||||||
|
{
|
||||||
|
console.keyMap = "de";
|
||||||
|
i18n.defaultLocale = "de_DE.UTF-8";
|
||||||
|
services.xserver = {
|
||||||
|
layout = "de";
|
||||||
|
libinput.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
nix.nixPath = ["/var/src"];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
nix.nixPath = ["/var/src"];
|
|
||||||
|
|
||||||
console.keyMap = "de";
|
|
||||||
i18n.defaultLocale = "de_DE.UTF-8";
|
|
||||||
services.xserver = {
|
|
||||||
layout = "de";
|
|
||||||
libinput.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
users.users.xenos = {
|
users.users.xenos = {
|
||||||
name = "xenos";
|
name = "xenos";
|
||||||
password = "xenos";
|
password = "xenos";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = ["networkmanager"];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
|
|||||||
@@ -26,23 +26,17 @@
|
|||||||
extraModulePackages = [];
|
extraModulePackages = [];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems."/" = {
|
||||||
"/" = {
|
device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
|
||||||
device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
|
fsType = "xfs";
|
||||||
fsType = "xfs";
|
|
||||||
};
|
|
||||||
"/boot" = {
|
|
||||||
device = "/dev/disk/by-uuid/9B2F-31E1";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [
|
fileSystems."/boot" = {
|
||||||
{
|
device = "/dev/disk/by-uuid/9B2F-31E1";
|
||||||
device = "/swapfile";
|
fsType = "vfat";
|
||||||
size = 2048;
|
};
|
||||||
}
|
|
||||||
];
|
swapDevices = [];
|
||||||
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,16 +69,6 @@ in {
|
|||||||
108283 # Digital Classicist
|
108283 # Digital Classicist
|
||||||
109211 # Altlitauisch
|
109211 # Altlitauisch
|
||||||
109185 # Etymologie
|
109185 # Etymologie
|
||||||
|
|
||||||
# SS 2022
|
|
||||||
112606 # Avestisch
|
|
||||||
111761 # Griechische Wissenschaftsliteratur
|
|
||||||
111515 # H. Furens
|
|
||||||
110914 # Apostelgeschichte
|
|
||||||
112225 # Gr. Paläographie
|
|
||||||
113275 # ALEW
|
|
||||||
112783 # Akzent und Silbenstruktur
|
|
||||||
113493 # Papyrologie
|
|
||||||
];
|
];
|
||||||
download_submissions = true;
|
download_submissions = true;
|
||||||
download_descriptions = true;
|
download_descriptions = true;
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
firewall = (import <niveum/lib>).firewall lib;
|
firewall = (import <niveum/lib>).firewall lib;
|
||||||
inherit (import <niveum/lib>) tmpfilesConfig;
|
|
||||||
|
|
||||||
streams = import <niveum/lib/streams.nix> {
|
streams = import <niveum/lib/streams.nix> {
|
||||||
di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
|
di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
|
||||||
@@ -72,31 +71,13 @@ in {
|
|||||||
extraStopCommands = firewall.removeRules rules;
|
extraStopCommands = firewall.removeRules rules;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = let
|
system.activationScripts.mpd-playlists = let
|
||||||
tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
|
playlistFile = pkgs.writeText "radio.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
|
||||||
tagStreams = tag: lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
|
in ''
|
||||||
makePlaylist = name: streams: pkgs.writeText "${name}.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
|
rm -rf /var/lib/mpd/playlists
|
||||||
in
|
install -d /var/lib/mpd/playlists
|
||||||
map (tag:
|
ln -sfn "${toString playlistFile}" "/var/lib/mpd/playlists/radio.m3u"
|
||||||
tmpfilesConfig {
|
'';
|
||||||
type = "L+";
|
|
||||||
path = "/var/lib/mpd/playlists/${tag}.m3u";
|
|
||||||
mode = "0644";
|
|
||||||
user = "mpd";
|
|
||||||
group = "mpd";
|
|
||||||
argument = makePlaylist tag (tagStreams tag);
|
|
||||||
})
|
|
||||||
tags
|
|
||||||
++ [
|
|
||||||
(tmpfilesConfig {
|
|
||||||
type = "L+";
|
|
||||||
mode = "0644";
|
|
||||||
user = "mpd";
|
|
||||||
group = "mpd";
|
|
||||||
path = "/var/lib/mpd/playlist/all.m3u";
|
|
||||||
argument = makePlaylist "all" streams;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.tuna = {
|
services.tuna = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -106,15 +87,33 @@ in {
|
|||||||
logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
|
logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
|
||||||
stream,
|
stream,
|
||||||
station,
|
station,
|
||||||
...
|
|
||||||
}: {inherit id desc logo stream station;})
|
}: {inherit id desc logo stream station;})
|
||||||
streams;
|
streams;
|
||||||
webPort = 7044;
|
webPort = 8080;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.ympd = {
|
systemd.services.tuna-stations = let
|
||||||
enable = true;
|
stations = lib.lists.imap0 (id: {
|
||||||
mpd.port = config.services.mpd.network.port;
|
desc ? "",
|
||||||
|
logo ? "https://picsum.photos/seed/${builtins.hashString "md5" stream}/300",
|
||||||
|
stream,
|
||||||
|
station,
|
||||||
|
}: {inherit id desc logo stream station;})
|
||||||
|
streams;
|
||||||
|
stationsJson = (pkgs.formats.json {}).generate "stations.json" stations;
|
||||||
|
in {
|
||||||
|
enable = false;
|
||||||
|
wantedBy = ["tuna.service"];
|
||||||
|
startAt = "hourly";
|
||||||
|
script = ''
|
||||||
|
mkdir -p /etc/tuna
|
||||||
|
antenne_asb_url=$(
|
||||||
|
${pkgs.curl}/bin/curl -sS 'https://www.caster.fm/widgets/em_player.php?jsinit=true&uid=529295&t=blue&c=' \
|
||||||
|
| grep streamUrl \
|
||||||
|
| sed ${lib.escapeShellArg "s/^.*'\\([^']*\\)'.*/\\1/"}
|
||||||
|
)
|
||||||
|
${pkgs.jq}/bin/jq "map(if .station == \"Antenne ASB\" then .stream |= \"$antenne_asb_url\" else . end)" < ${stationsJson} > /etc/tuna/stations.json
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
@@ -126,7 +125,7 @@ in {
|
|||||||
virtualHosts."radio.kmein.r" = {
|
virtualHosts."radio.kmein.r" = {
|
||||||
basicAuth.dj = password;
|
basicAuth.dj = password;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://127.0.0.1:${config.services.ympd.webPort}";
|
proxyPass = "http://127.0.0.1:${toString config.services.tuna.webPort}";
|
||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user