kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
Code Releases Activity

remove specialArgs niveum and niveumLib, add overlay

Browse Source
This commit is contained in:
Kierán Meinhardt
2025-12-25 14:00:03 +01:00
parent c490c81a32
commit 82b7ffd39f
59 changed files with 535 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configs/admin-essentials.nix
View File

@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
niveumPackages,
lib, lib,
... ...
}: let }: let
@@ -37,12 +36,12 @@ in {
pkgs.bc # calculator pkgs.bc # calculator
pkgs.pari # gp -- better calculator pkgs.pari # gp -- better calculator
pkgs.ts pkgs.ts
niveumPackages.vimv pkgs.vimv
niveumPackages.vg pkgs.vg
niveumPackages.fkill pkgs.fkill
niveumPackages.cyberlocker-tools pkgs.cyberlocker-tools
niveumPackages.untilport pkgs.untilport
niveumPackages.kpaste pkgs.kpaste
# HARDWARE # HARDWARE
pkgs.pciutils # for lspci pkgs.pciutils # for lspci
] ]

16
configs/aerc.nix
View File

@@ -2,12 +2,8 @@
pkgs, pkgs,
config, config,
lib, lib,
niveumPackages,
... ...
}: }:
let
inherit (import ../lib/email.nix) defaults thunderbirdProfile;
in
{ {
age.secrets = { age.secrets = {
email-password-ical-ephemeris = { email-password-ical-ephemeris = {
@@ -45,7 +41,7 @@ in
extraConfig = { extraConfig = {
database.path = config.home-manager.users.me.accounts.email.maildirBasePath; database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
new.tags = ""; new.tags = "";
user.name = defaults.realName; user.name = pkgs.lib.niveum.email.defaults.realName;
user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address; user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
}; };
}; };
@@ -87,7 +83,7 @@ in
mailhost = "mail.cock.li"; mailhost = "mail.cock.li";
address = "2210@cock.li"; address = "2210@cock.li";
in in
lib.recursiveUpdate defaults { lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
address = address; address = address;
userName = address; userName = address;
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}"; passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
@@ -102,7 +98,7 @@ in
let let
address = "ical.ephemeris@web.de"; address = "ical.ephemeris@web.de";
in in
lib.recursiveUpdate defaults { lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
userName = address; userName = address;
realName = "Kieran from iCal Ephemeris"; realName = "Kieran from iCal Ephemeris";
address = address; address = address;
@@ -118,7 +114,7 @@ in
mailhost = "posteo.de"; mailhost = "posteo.de";
address = "kieran.meinhardt@posteo.net"; address = "kieran.meinhardt@posteo.net";
in in
lib.recursiveUpdate defaults { lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
address = address; address = address;
aliases = [ "kmein@posteo.de" ]; aliases = [ "kmein@posteo.de" ];
userName = address; userName = address;
@@ -144,7 +140,7 @@ in
enable = true; enable = true;
settings = { settings = {
}; };
profiles.${thunderbirdProfile} = { profiles.${pkgs.lib.niveum.email.thunderbirdProfile} = {
isDefault = true; isDefault = true;
settings = { settings = {
"mail.default_send_format" = 1; "mail.default_send_format" = 1;
@@ -215,7 +211,7 @@ in
"*" = ":filter -x Flagged<Enter>"; "*" = ":filter -x Flagged<Enter>";
}; };
view = { view = {
tr = ":pipe ${niveumPackages.trans}/bin/trans -show-original n -b -no-autocorrect<Enter>"; # https://man.sr.ht/~rjarry/aerc/integrations/translator.md tr = ":pipe ${pkgs.trans}/bin/trans -show-original n -b -no-autocorrect<Enter>"; # https://man.sr.ht/~rjarry/aerc/integrations/translator.md
"/" = ":toggle-key-passthrough <Enter> /"; "/" = ":toggle-key-passthrough <Enter> /";
q = ":close<Enter>"; q = ":close<Enter>";
O = ":open<Enter>"; O = ":open<Enter>";

12
configs/backup.nix
View File

@@ -1,13 +1,13 @@
{ {
pkgs, pkgs,
config, config,
lib,
... ...
}: let }:
inherit (import ../lib) restic; {
in {
services.restic.backups.niveum = { services.restic.backups.niveum = {
initialize = true; initialize = true;
inherit (restic) repository; repository = pkgs.lib.niveum.restic.repository;
timerConfig = { timerConfig = {
OnCalendar = "8:00"; OnCalendar = "8:00";
RandomizedDelaySec = "1h"; RandomizedDelaySec = "1h";
@@ -38,7 +38,7 @@ in {
environment.systemPackages = [ environment.systemPackages = [
(pkgs.writers.writeDashBin "restic-niveum" '' (pkgs.writers.writeDashBin "restic-niveum" ''
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} "$@" ${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} "$@"
'') '')
(pkgs.writers.writeDashBin "restic-mount" '' (pkgs.writers.writeDashBin "restic-mount" ''
mountdir=$(mktemp -d) mountdir=$(mktemp -d)
@@ -46,7 +46,7 @@ in {
clean() { clean() {
rm -r "$mountdir" rm -r "$mountdir"
} }
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir" ${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
'') '')
]; ];
} }

3
configs/bots/default.nix
View File

@@ -8,7 +8,6 @@
telebots = inputs.telebots.defaultPackage.x86_64-linux; telebots = inputs.telebots.defaultPackage.x86_64-linux;
reverseDirectory = "/run/telegram-reverse"; reverseDirectory = "/run/telegram-reverse";
proverbDirectory = "/run/telegram-proverb"; proverbDirectory = "/run/telegram-proverb";
inherit (import ../../lib) tmpfilesConfig;
in { in {
imports = [ imports = [
./logotheca.nix ./logotheca.nix
@@ -27,7 +26,7 @@ in {
}; };
systemd.tmpfiles.rules = map (path: systemd.tmpfiles.rules = map (path:
tmpfilesConfig { pkgs.lib.niveum.tmpfilesConfig {
type = "d"; type = "d";
mode = "0750"; mode = "0750";
age = "1h"; age = "1h";

4
configs/bots/logotheca.nix
View File

@@ -1,8 +1,6 @@
{ {
pkgs, pkgs,
config, config,
lib,
niveumPackages,
... ...
}: { }: {
niveum.bots.logotheca = { niveum.bots.logotheca = {
@@ -22,7 +20,7 @@
"!zlwCuPiCNMSxDviFzA:4d2.org" "!zlwCuPiCNMSxDviFzA:4d2.org"
]; ];
}; };
command = "${niveumPackages.literature-quote}/bin/literature-quote"; command = "${pkgs.literature-quote}/bin/literature-quote";
}; };
age.secrets = { age.secrets = {

5
configs/bots/nietzsche.nix
View File

@@ -1,7 +1,6 @@
{ {
config, config,
pkgs, pkgs,
niveumPackages,
... ...
}: { }: {
niveum.bots.nietzsche = { niveum.bots.nietzsche = {
@@ -16,9 +15,9 @@
set -efu set -efu
random_number=$(( ($RANDOM % 10) + 1 )) random_number=$(( ($RANDOM % 10) + 1 ))
if [ "$random_number" -eq 1 ]; then if [ "$random_number" -eq 1 ]; then
${niveumPackages.random-zeno}/bin/random-zeno "/Literatur/M/Nietzsche,+Friedrich" ${pkgs.random-zeno}/bin/random-zeno "/Literatur/M/Nietzsche,+Friedrich"
else else
${niveumPackages.random-zeno}/bin/random-zeno "/Philosophie/M/Nietzsche,+Friedrich" ${pkgs.random-zeno}/bin/random-zeno "/Philosophie/M/Nietzsche,+Friedrich"
fi fi
''); '');
}; };

3
configs/bots/tlg-wotd.nix
View File

@@ -1,9 +1,6 @@
{ {
pkgs, pkgs,
lib,
config, config,
niveumPackages,
unstablePackages,
... ...
}: let }: let
mastodonEndpoint = "https://social.krebsco.de"; mastodonEndpoint = "https://social.krebsco.de";

3
configs/browser.nix
View File

@@ -1,11 +1,10 @@
{ {
config, config,
pkgs, pkgs,
niveumPackages,
... ...
}: { }: {
environment.systemPackages = [ environment.systemPackages = [
niveumPackages.cro pkgs.cro
pkgs.tor-browser pkgs.tor-browser
pkgs.firefox pkgs.firefox
pkgs.brave pkgs.brave

10
configs/cloud.nix
View File

@@ -3,9 +3,7 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }: {
inherit (import ../lib) tmpfilesConfig;
in {
systemd.user.services.systemd-tmpfiles-clean = { systemd.user.services.systemd-tmpfiles-clean = {
enable = true; enable = true;
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
@@ -16,7 +14,7 @@ in {
}; };
}; };
systemd.user.tmpfiles.users.me.rules = map tmpfilesConfig [ systemd.user.tmpfiles.users.me.rules = map pkgs.lib.niveum.tmpfilesConfig [
{ {
type = "d"; type = "d";
mode = "0755"; mode = "0755";
@@ -29,7 +27,7 @@ in {
age = "7d"; age = "7d";
path = "${config.users.users.me.home}/cloud/nextcloud/tmp"; path = "${config.users.users.me.home}/cloud/nextcloud/tmp";
} }
] ++ map (path: tmpfilesConfig { ] ++ map (path: pkgs.lib.niveum.tmpfilesConfig {
type = "L+"; type = "L+";
user = config.users.users.me.name; user = config.users.users.me.name;
group = config.users.users.me.group; group = config.users.users.me.group;
@@ -121,7 +119,7 @@ in {
cert = config.age.secrets.syncthing-cert.path; cert = config.age.secrets.syncthing-cert.path;
key = config.age.secrets.syncthing-key.path; key = config.age.secrets.syncthing-key.path;
settings = { settings = {
inherit ((import ../lib).syncthing) devices; devices = pkgs.lib.niveum.syncthingIds;
folders = { folders = {
"${config.users.users.me.home}/sync" = { "${config.users.users.me.home}/sync" = {
devices = ["kabsa" "manakish" "fatteh"]; devices = ["kabsa" "manakish" "fatteh"];

11
configs/default.nix
View File

@@ -2,14 +2,11 @@
pkgs, pkgs,
lib, lib,
config, config,
niveumPackages,
inputs, inputs,
... ...
}: }:
let let
inherit (lib.strings) makeBinPath; inherit (lib.strings) makeBinPath;
inherit (import ../lib) localAddresses kieran remoteDir;
defaultApplications = (import ../lib).defaultApplications { inherit pkgs; };
in in
{ {
imports = [ imports = [
@@ -68,7 +65,7 @@ in
users.users.me = { users.users.me = {
name = "kfm"; name = "kfm";
description = kieran.name; description = pkgs.lib.niveum.kieran.name;
hashedPasswordFile = config.age.secrets.kfm-password.path; hashedPasswordFile = config.age.secrets.kfm-password.path;
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
@@ -90,7 +87,7 @@ in
environment.interactiveShellInit = "export PATH=$PATH"; environment.interactiveShellInit = "export PATH=$PATH";
environment.shellAliases = environment.shellAliases =
let let
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}"; swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
in in
{ {
o = "${pkgs.xdg-utils}/bin/xdg-open"; o = "${pkgs.xdg-utils}/bin/xdg-open";
@@ -169,7 +166,7 @@ in
networking.hosts = lib.mapAttrs' (name: address: { networking.hosts = lib.mapAttrs' (name: address: {
name = address; name = address;
value = [ "${name}.local" ]; value = [ "${name}.local" ];
}) localAddresses; }) pkgs.lib.niveum.localAddresses;
} }
{ {
home-manager.users.me.home.stateVersion = "22.05"; home-manager.users.me.home.stateVersion = "22.05";
@@ -190,7 +187,7 @@ in
dconf.enable = true; dconf.enable = true;
dconf.settings = { dconf.settings = {
# Change the default terminal for Nemo # Change the default terminal for Nemo
"org/cinnamon/desktop/applications/terminal".exec = defaultApplications.terminal; "org/cinnamon/desktop/applications/terminal".exec = pkgs.lib.niveum.defaultApplications.terminal;
}; };
}; };
} }

7
configs/dunst.nix
View File

@@ -1,9 +1,8 @@
{ {
config, lib,
pkgs, pkgs,
... ...
}: let }: let
inherit (import ../lib) defaultApplications theme;
sgr = code: string: ''\u001b[${code}m${string}\u001b[0m''; sgr = code: string: ''\u001b[${code}m${string}\u001b[0m'';
in { in {
environment.systemPackages = [ environment.systemPackages = [
@@ -18,7 +17,7 @@ in {
home-manager.users.me.services.dunst = { home-manager.users.me.services.dunst = {
enable = true; enable = true;
iconTheme = (theme pkgs).icon; iconTheme = pkgs.lib.niveum.theme.icon;
settings = { settings = {
global = { global = {
transparency = 10; transparency = 10;
@@ -44,7 +43,7 @@ in {
sticky_history = true; sticky_history = true;
history_length = 20; history_length = 20;
dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run"; dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run";
browser = (defaultApplications pkgs).browser; browser = pkgs.lib.niveum.defaultApplications.browser;
verbosity = "mesg"; verbosity = "mesg";
corner_radius = 0; corner_radius = 0;
mouse_left_click = "do_action"; mouse_left_click = "do_action";

4
configs/fonts.nix
View File

@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
niveumPackages,
... ...
}: let }: let
zip-font = name: arguments: let zip-font = name: arguments: let
@@ -93,7 +92,6 @@ in {
font-awesome font-awesome
galatia-sil galatia-sil
gentium gentium
# niveumPackages.gfs-fonts
gyre-fonts gyre-fonts
ibm-plex ibm-plex
jetbrains-mono jetbrains-mono
@@ -114,7 +112,7 @@ in {
source-sans-pro source-sans-pro
source-serif-pro source-serif-pro
theano theano
niveumPackages.tocharian-font tocharian-font
vista-fonts vista-fonts
vollkorn vollkorn
zilla-slab zilla-slab

13
configs/git.nix
View File

@@ -1,10 +1,9 @@
{ {
pkgs, pkgs,
inputs, lib,
... ...
}: let }:
inherit (import ../lib) kieran ignorePaths; {
in {
environment.systemPackages = [ environment.systemPackages = [
pkgs.mr pkgs.mr
pkgs.gitFull pkgs.gitFull
@@ -41,9 +40,9 @@ in {
logs = "log --pretty=oneline"; logs = "log --pretty=oneline";
graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all"; graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
}; };
ignores = ignorePaths; ignores = pkgs.lib.niveum.ignorePaths;
settings.user.name = kieran.name; settings.user.name = pkgs.lib.niveum.kieran.name;
settings.user.email = kieran.email; settings.user.email = pkgs.lib.niveum.kieran.email;
settings.pull.ff = "only"; settings.pull.ff = "only";
settings.rebase.autoStash = true; settings.rebase.autoStash = true;
settings.merge.autoStash = true; settings.merge.autoStash = true;

32
configs/i3.nix
View File

@@ -2,13 +2,11 @@
config, config,
pkgs, pkgs,
lib, lib,
niveumPackages,
... ...
}: let }: let
inherit (import ../lib) defaultApplications; klem = pkgs.klem.override {
klem = niveumPackages.klem.override { options.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem"; options.scripts = {
config.scripts = {
"p.r paste" = pkgs.writers.writeDash "p.r" '' "p.r paste" = pkgs.writers.writeDash "p.r" ''
${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \ ${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
| ${pkgs.coreutils}/bin/tail --lines=1 \ | ${pkgs.coreutils}/bin/tail --lines=1 \
@@ -37,10 +35,10 @@
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]' ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
''; '';
"ipa" = pkgs.writers.writeDash "ipa" '' "ipa" = pkgs.writers.writeDash "ipa" ''
${niveumPackages.ipa}/bin/ipa ${pkgs.ipa}/bin/ipa
''; '';
"betacode" = pkgs.writers.writeDash "betacode" '' "betacode" = pkgs.writers.writeDash "betacode" ''
${niveumPackages.betacode}/bin/betacode ${pkgs.betacode}/bin/betacode
''; '';
"curl" = pkgs.writers.writeDash "curl" '' "curl" = pkgs.writers.writeDash "curl" ''
${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)" ${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
@@ -51,12 +49,6 @@
emojai = pkgs.writers.writeDash "emojai" '' emojai = pkgs.writers.writeDash "emojai" ''
${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result ${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
''; '';
"gpt-3.5" = pkgs.writers.writeDash "gpt" ''
${niveumPackages.gpt35}/bin/gpt
'';
gpt-4 = pkgs.writers.writeDash "gpt" ''
${niveumPackages.gpt4}/bin/gpt
'';
}; };
}; };
in { in {
@@ -224,15 +216,15 @@ in {
"${modifier}+w" = "layout tabbed"; "${modifier}+w" = "layout tabbed";
"${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu"; "${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";
"${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}"; "${modifier}+Return" = "exec ${pkgs.lib.niveum.defaultApplications.terminal}";
"${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}"; "${modifier}+t" = "exec ${pkgs.lib.niveum.defaultApplications.fileManager}";
"${modifier}+y" = "exec ${(defaultApplications pkgs).browser}"; "${modifier}+y" = "exec ${pkgs.lib.niveum.defaultApplications.browser}";
"${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}"; "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
"${modifier}+Shift+d" = "exec ${niveumPackages.notemenu}/bin/notemenu"; "${modifier}+Shift+d" = "exec ${pkgs.notemenu}/bin/notemenu";
"${modifier}+p" = "exec rofi-pass"; "${modifier}+p" = "exec rofi-pass";
"${modifier}+Shift+p" = "exec rofi-pass --insert"; "${modifier}+Shift+p" = "exec rofi-pass --insert";
"${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/unicodmenu"; "${modifier}+u" = "exec ${pkgs.unicodmenu}/bin/unicodmenu";
"${modifier}+Shift+u" = "exec ${pkgs.writers.writeDash "last-unicode" ''${pkgs.xdotool}/bin/xdotool type --delay 1000 "$(${pkgs.gawk}/bin/awk 'END{print $1}' ~/.cache/unicodmenu)"''}"; "${modifier}+Shift+u" = "exec ${pkgs.writers.writeDash "last-unicode" ''${pkgs.xdotool}/bin/xdotool type --delay 1000 "$(${pkgs.gawk}/bin/awk 'END{print $1}' ~/.cache/unicodmenu)"''}";
"${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" '' "${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
@@ -252,7 +244,6 @@ in {
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next"; "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous"; "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
"XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop"; "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
"XF86ScreenSaver" = "exec ${niveumPackages.k-lock}/bin/k-lock";
# key names detected with xorg.xev: # key names detected with xorg.xev:
# XF86WakeUp (fn twice) # XF86WakeUp (fn twice)
@@ -288,7 +279,6 @@ in {
config = { config = {
inherit modifier gaps modes bars floating window colors; inherit modifier gaps modes bars floating window colors;
keybindings = keybindings // { keybindings = keybindings // {
"${modifier}+ß" = "exec ${niveumPackages.menu-calc}/bin/=";
"${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill"; "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
"${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85"; "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
"${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x"; "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
@@ -296,7 +286,7 @@ in {
"Print" = "exec flameshot gui"; "Print" = "exec flameshot gui";
# "${modifier}+Shift+x" = "exec ${move-to-new-workspace}"; # "${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
# "${modifier}+x" = "exec ${new-workspace}"; # "${modifier}+x" = "exec ${new-workspace}";
"XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr"; "XF86Display" = "exec ${pkgs.dmenu-randr}/bin/dmenu-randr";
}; };
}; };
}; };

3
configs/mpv.nix
View File

@@ -2,10 +2,9 @@
pkgs, pkgs,
lib, lib,
config, config,
niveumPackages,
... ...
}: let }: let
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}"; swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
in { in {
environment.shellAliases.smpv = swallow "mpv"; environment.shellAliases.smpv = swallow "mpv";

7
configs/mycelium.nix
View File

@@ -1,7 +1,4 @@
{ lib, ... }: { lib, pkgs, ... }:
let
myceliumAddresses = import ../lib/mycelium-network.nix;
in
{ {
services.mycelium = { services.mycelium = {
enable = true; enable = true;
@@ -11,5 +8,5 @@ in
networking.hosts = lib.mapAttrs' (name: address: { networking.hosts = lib.mapAttrs' (name: address: {
name = address; name = address;
value = [ "${name}.m" ]; value = [ "${name}.m" ];
}) myceliumAddresses; }) pkgs.lib.niveum.myceliumAddresses;
} }

3
configs/neovim.nix
View File

@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
niveumPackages,
config, config,
... ...
}: { }: {
@@ -36,7 +35,7 @@
environment.systemPackages = [ environment.systemPackages = [
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'') (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
(niveumPackages.vim.override { (pkgs.vim-kmein.override {
# stylixColors = config.lib.stylix.colors; # stylixColors = config.lib.stylix.colors;
colorscheme = "base16-gruvbox-dark-medium"; colorscheme = "base16-gruvbox-dark-medium";
}) })

92
configs/packages.nix
View File

@@ -3,13 +3,10 @@
pkgs, pkgs,
lib, lib,
inputs, inputs,
niveumPackages,
... ...
}: let }: let
worldradio = pkgs.callPackage ../packages/worldradio.nix {}; worldradio = pkgs.callPackage ../packages/worldradio.nix {};
externalNetwork = import ../lib/external-network.nix;
zoteroStyle = { zoteroStyle = {
name, name,
sha256, sha256,
@@ -109,7 +106,7 @@ in {
calibre calibre
electrum electrum
inkscape inkscape
niveumPackages.gimp gimp
gthumb gthumb
astrolog astrolog
obsidian obsidian
@@ -120,7 +117,7 @@ in {
zoom-us # video conferencing zoom-us # video conferencing
(pkgs.writers.writeDashBin "im" '' (pkgs.writers.writeDashBin "im" ''
weechat_password=$(${pkgs.pass}/bin/pass weechat) weechat_password=$(${pkgs.pass}/bin/pass weechat)
exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek' exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${pkgs.lib.niveum.systems.makanek.externalIp}:8002 -password='"$weechat_password"'; /remote connect makanek'
'') '')
alejandra # nix formatter alejandra # nix formatter
pdfgrep # search in pdf pdfgrep # search in pdf
@@ -130,60 +127,59 @@ in {
kdePackages.okular # the word is nucular kdePackages.okular # the word is nucular
xournalpp # for annotating pdfs xournalpp # for annotating pdfs
pdfpc # presenter console for pdf slides pdfpc # presenter console for pdf slides
niveumPackages.hc # print files as qr codes hc # print files as qr codes
yt-dlp yt-dlp
espeak espeak
rink # unit converter rink # unit converter
niveumPackages.auc auc
niveumPackages.noise-waves noise-waves
niveumPackages.stag stag
niveumPackages.cheat-sh cheat-sh
niveumPackages.polyglot polyglot
niveumPackages.qrpaste qrpaste
niveumPackages.ttspaste ttspaste
niveumPackages.new-mac # get a new mac address new-mac # get a new mac address
niveumPackages.scanned scanned
niveumPackages.default-gateway default-gateway
niveumPackages.kirciuoklis kirciuoklis
niveumPackages.image-convert-favicon image-convert-favicon
niveumPackages.heuretes heuretes
niveumPackages.ipa # XSAMPA to IPA converter ipa # XSAMPA to IPA converter
niveumPackages.pls pls
niveumPackages.mpv-tv mpv-tv
niveumPackages.mpv-iptv mpv-iptv
niveumPackages.devanagari devanagari
niveumPackages.betacode # ancient greek betacode to unicode converter betacode # ancient greek betacode to unicode converter
pkgs.jq-lsp jq-lsp
niveumPackages.swallow # window swallowing swallow # window swallowing
niveumPackages.literature-quote literature-quote
niveumPackages.booksplit booksplit
niveumPackages.dmenu-randr dmenu-randr
niveumPackages.manual-sort manual-sort
niveumPackages.wttr wttr
niveumPackages.unicodmenu unicodmenu
niveumPackages.emailmenu emailmenu
niveumPackages.closest closest
niveumPackages.trans trans
(niveumPackages.mpv-radio.override { (mpv-radio.override {
di-fm-key-file = config.age.secrets.di-fm-key.path; di-fm-key-file = config.age.secrets.di-fm-key.path;
}) })
(niveumPackages.mpv-radio.override { (mpv-radio.override {
di-fm-key-file = config.age.secrets.di-fm-key.path; di-fm-key-file = config.age.secrets.di-fm-key.path;
executableName = "cro-radio"; executableName = "cro-radio";
mpvCommand = "${niveumPackages.cro}/bin/cro"; mpvCommand = "${cro}/bin/cro";
}) })
(niveumPackages.mpv-tuner.override { (mpv-tuner.override {
di-fm-key-file = config.age.secrets.di-fm-key.path; di-fm-key-file = config.age.secrets.di-fm-key.path;
}) })
# kmein.slide # kmein.slide
termdown termdown
niveumPackages.image-convert-tolino image-convert-tolino
niveumPackages.rfc rfc
niveumPackages.tag tag
niveumPackages.timer timer
niveumPackages.menu-calc
nix-prefetch-git nix-prefetch-git
niveumPackages.nix-git nix-git
nixfmt-rfc-style nixfmt-rfc-style
par par
qrencode qrencode
@@ -239,7 +235,7 @@ in {
latexrun latexrun
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers])) (aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
# haskellPackages.pandoc-citeproc # haskellPackages.pandoc-citeproc
niveumPackages.text2pdf text2pdf
lowdown lowdown
glow # markdown to term glow # markdown to term
libreoffice libreoffice
@@ -247,7 +243,7 @@ in {
dia dia
pandoc pandoc
librsvg # pandoc depends on this to include SVG in documents librsvg # pandoc depends on this to include SVG in documents
# niveumPackages.man-pandoc # man-pandoc
typst typst
# proselint # proselint
asciidoctor asciidoctor

5
configs/printing.nix
View File

@@ -1,5 +1,4 @@
{pkgs, ...}: let {pkgs, lib, ...}: let
inherit (import ../lib) localAddresses;
hp-driver = pkgs.hplip; hp-driver = pkgs.hplip;
in { in {
services.printing = { services.printing = {
@@ -18,7 +17,7 @@ in {
{ {
name = "OfficeJet"; name = "OfficeJet";
location = "Zimmer"; location = "Zimmer";
deviceUri = "https://${localAddresses.officejet}"; deviceUri = "https://${pkgs.lib.niveum.localAddresses.officejet}";
model = "drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd"; model = "drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd";
ppdOptions = { ppdOptions = {
Duplex = "DuplexNoTumble"; # DuplexNoTumble DuplexTumble None Duplex = "DuplexNoTumble"; # DuplexNoTumble DuplexTumble None

28
configs/ssh.nix
View File

@@ -1,8 +1,6 @@
{pkgs, ...}: let { pkgs, lib, ... }:
inherit (import ../lib) sshPort kieran; {
externalNetwork = import ../lib/external-network.nix; users.users.me.openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys;
in {
users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
services.gnome.gcr-ssh-agent.enable = false; services.gnome.gcr-ssh-agent.enable = false;
@@ -25,42 +23,42 @@ in {
zaatar = { zaatar = {
hostname = "zaatar.r"; hostname = "zaatar.r";
user = "root"; user = "root";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
makanek = { makanek = {
hostname = externalNetwork.makanek; hostname = pkgs.lib.niveum.externalNetwork.makanek;
user = "root"; user = "root";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
ful = { ful = {
hostname = externalNetwork.ful; hostname = pkgs.lib.niveum.externalNetwork.ful;
user = "root"; user = "root";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
tahina = { tahina = {
hostname = "tahina.r"; hostname = "tahina.r";
user = "root"; user = "root";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
tabula = { tabula = {
hostname = "tabula.r"; hostname = "tabula.r";
user = "root"; user = "root";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
manakish = { manakish = {
hostname = "manakish.r"; hostname = "manakish.r";
user = "kfm"; user = "kfm";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
kabsa = { kabsa = {
hostname = "kabsa.r"; hostname = "kabsa.r";
user = "kfm"; user = "kfm";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
fatteh = { fatteh = {
hostname = "fatteh.r"; hostname = "fatteh.r";
user = "kfm"; user = "kfm";
port = sshPort; port = pkgs.lib.niveum.sshPort;
}; };
}; };
}; };

10
configs/sshd.nix
View File

@@ -1,23 +1,21 @@
{ {
config, config,
lib,
pkgs, pkgs,
... ...
}: let }:
inherit (import ../lib) sshPort kieran; {
in {
users.motd = "Welcome to ${config.networking.hostName}!"; users.motd = "Welcome to ${config.networking.hostName}!";
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [sshPort]; ports = [ pkgs.lib.niveum.sshPort ];
settings = { settings = {
PasswordAuthentication = false; PasswordAuthentication = false;
X11Forwarding = true; X11Forwarding = true;
}; };
}; };
users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys ++ [ users.users.root.openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys ++ [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop
]; ];
} }

8
configs/uni.nix
View File

@@ -5,8 +5,6 @@
... ...
}: let }: let
username = "meinhak99"; username = "meinhak99";
inherit (import ../lib/email.nix) defaults pronouns;
inherit (import ../lib) remoteDir;
fu-defaults = let mailhost = "mail.zedat.fu-berlin.de"; in { fu-defaults = let mailhost = "mail.zedat.fu-berlin.de"; in {
imap.host = mailhost; imap.host = mailhost;
imap.port = 993; imap.port = 993;
@@ -31,7 +29,7 @@ in {
}; };
accounts.email.accounts = { accounts.email.accounts = {
letos = letos =
lib.recursiveUpdate defaults lib.recursiveUpdate pkgs.lib.niveum.email.defaults
{ {
userName = "slfletos"; userName = "slfletos";
address = "letos.sprachlit@hu-berlin.de"; address = "letos.sprachlit@hu-berlin.de";
@@ -43,7 +41,7 @@ in {
smtp.tls.useStartTls = true; smtp.tls.useStartTls = true;
}; };
fu = fu =
lib.recursiveUpdate defaults lib.recursiveUpdate pkgs.lib.niveum.email.defaults
(lib.recursiveUpdate fu-defaults (lib.recursiveUpdate fu-defaults
(let userName = "meinhak99"; in { (let userName = "meinhak99"; in {
userName = userName; userName = userName;
@@ -100,7 +98,7 @@ in {
firstCharacter = lib.strings.substring 0 1; firstCharacter = lib.strings.substring 0 1;
home-directory-mount = user: { home-directory-mount = user: {
"${remoteDir}/fu/${user}/home" = { "${pkgs.lib.niveum.remoteDir}/fu/${user}/home" = {
device = "${user}@login.zedat.fu-berlin.de:/home/${firstCharacter user}/${user}"; device = "${user}@login.zedat.fu-berlin.de:/home/${firstCharacter user}/${user}";
fsType = "sshfs"; fsType = "sshfs";
options = [ options = [

283
flake.nix
View File

@@ -53,6 +53,7 @@
agenix, agenix,
retiolum, retiolum,
nixinate, nixinate,
coptic-dictionary,
menstruation-backend, menstruation-backend,
menstruation-telegram, menstruation-telegram,
scripts, scripts,
@@ -79,8 +80,7 @@
lib = nixpkgs.lib; lib = nixpkgs.lib;
in in
lib.mergeAttrsList [ lib.mergeAttrsList [
nixinate.nixinate.x86_64-linux (nixinate.nixinate.x86_64-linux self)
self
{ {
mock-secrets = { mock-secrets = {
type = "app"; type = "app";
@@ -152,9 +152,144 @@
}; };
lib = { lib = {
panoptikon = import lib/panoptikon.nix;
}; };
overlays.default = final: prev: {
# wrapped from upstream
wrapScript =
{
packages ? [ ],
name,
script,
}:
prev.writers.writeDashBin name ''PATH=$PATH:${
nixpkgs.lib.makeBinPath (
packages
++ [
final.findutils
final.coreutils
final.gnused
final.gnugrep
]
)
} ${script} "$@"'';
tag = final.wrapScript {
script = voidrice.outPath + "/.local/bin/tag";
name = "tag";
packages = [ final.ffmpeg ];
};
booksplit = final.wrapScript {
script = voidrice.outPath + "/.local/bin/booksplit";
name = "booksplit";
packages = [
final.ffmpeg
final.glibc.bin
];
};
auc = prev.callPackage packages/auc.nix { };
cheat-sh = prev.callPackage packages/cheat-sh.nix { };
brassica = prev.callPackage packages/brassica.nix { }; # TODO upstream
text2pdf = prev.callPackage packages/text2pdf.nix { }; # TODO upstream
wttr = prev.callPackage packages/wttr.nix { }; # TODO upstream
jsesh = prev.callPackage packages/jsesh.nix { }; # TODO upstream
opustags = prev.callPackage packages/opustags.nix { }; # TODO upstream
trans = prev.callPackage packages/trans.nix { }; # TODO upstream
go-webring = prev.callPackage packages/go-webring.nix { }; # TODO upstream
stag = prev.callPackage packages/stag.nix { }; # TODO upstream
mpv = prev.mpv.override {
scripts = [
final.mpvScripts.visualizer
final.mpvScripts.mpris
];
};
cro = prev.callPackage packages/cro.nix { };
dmenu = prev.writers.writeDashBin "dmenu" ''exec ${final.rofi}/bin/rofi -dmenu "$@"'';
weechatScripts = prev.weechatScripts // {
hotlist2extern = prev.callPackage packages/weechatScripts/hotlist2extern.nix { }; # TODO upstream
};
vimPlugins = prev.vimPlugins // {
cheat-sh = prev.callPackage packages/vimPlugins/cheat-sh.nix { };
icalendar-vim = prev.callPackage packages/vimPlugins/icalendar-vim.nix { }; # TODO upstream
jq-vim = prev.callPackage packages/vimPlugins/jq-vim.nix { }; # TODO upstream
typst-vim = prev.callPackage packages/vimPlugins/typst-vim.nix { }; # TODO upstream
mdwa-nvim = prev.callPackage packages/vimPlugins/mdwa-nvim.nix { }; # TODO upstream
vim-ernest = prev.callPackage packages/vimPlugins/vim-ernest.nix { }; # TODO upstream
vim-256noir = prev.callPackage packages/vimPlugins/vim-256noir.nix { }; # TODO upstream
vim-colors-paramount =
prev.callPackage packages/vimPlugins/vim-colors-paramount.nix { }; # TODO upstream
vim-fetch = prev.callPackage packages/vimPlugins/vim-fetch.nix { }; # TODO upstream
vim-fsharp = prev.callPackage packages/vimPlugins/vim-fsharp.nix { }; # TODO upstream
vim-mail = prev.callPackage packages/vimPlugins/vim-mail.nix { }; # TODO upstream
vim-reason-plus = prev.callPackage packages/vimPlugins/vim-reason-plus.nix { }; # TODO upstream
};
# krebs
brainmelter = prev.callPackage packages/brainmelter.nix { };
cyberlocker-tools = prev.callPackage packages/cyberlocker-tools.nix { };
hc = prev.callPackage packages/hc.nix { };
pls = prev.callPackage packages/pls.nix { };
radio-news = prev.callPackage packages/radio-news.nix { };
untilport = prev.callPackage packages/untilport.nix { };
weechat-declarative = prev.callPackage packages/weechat-declarative {};
# my packages
betacode = prev.callPackage packages/betacode.nix { };
closest = prev.callPackage packages/closest { };
default-gateway = prev.callPackage packages/default-gateway.nix { };
depp = prev.callPackage packages/depp.nix { };
devanagari = prev.callPackage packages/devanagari { };
devour = prev.callPackage packages/devour.nix { };
dmenu-randr = prev.callPackage packages/dmenu-randr.nix { };
emailmenu = prev.callPackage packages/emailmenu.nix { };
fkill = prev.callPackage packages/fkill.nix { };
fzfmenu = prev.callPackage packages/fzfmenu.nix { };
gfs-fonts = prev.callPackage packages/gfs-fonts.nix { };
heuretes = prev.callPackage packages/heuretes.nix { };
image-convert-favicon = prev.callPackage packages/image-convert-favicon.nix { };
image-convert-tolino = prev.callPackage packages/image-convert-tolino.nix { };
ipa = prev.writers.writePython3Bin "ipa" { flakeIgnore = [ "E501" ]; } packages/ipa.py;
kirciuoklis = prev.callPackage packages/kirciuoklis.nix { };
kpaste = prev.callPackage packages/kpaste.nix { };
literature-quote = prev.callPackage packages/literature-quote.nix { };
man-pdf = prev.callPackage packages/man-pdf.nix { };
mansplain = prev.callPackage packages/mansplain.nix { };
manual-sort = prev.callPackage packages/manual-sort.nix { };
mpv-iptv = prev.callPackage packages/mpv-iptv.nix { };
mpv-radio = prev.callPackage packages/mpv-radio.nix { di-fm-key-file = "/dev/null"; };
mpv-tuner = prev.callPackage packages/mpv-tuner.nix { di-fm-key-file = "/dev/null"; };
mpv-tv = prev.callPackage packages/mpv-tv.nix { };
new-mac = prev.callPackage packages/new-mac.nix { };
nix-git = prev.callPackage packages/nix-git.nix { };
noise-waves = prev.callPackage packages/noise-waves.nix { };
notemenu = prev.callPackage packages/notemenu.nix { };
obsidian-vim = prev.callPackage packages/obsidian-vim.nix { };
polyglot = prev.callPackage packages/polyglot.nix { };
q = prev.callPackage packages/q.nix { };
qrpaste = prev.callPackage packages/qrpaste.nix { };
random-zeno = prev.callPackage packages/random-zeno.nix { };
scanned = prev.callPackage packages/scanned.nix { };
stardict-tools = prev.callPackage packages/stardict-tools.nix { };
swallow = prev.callPackage packages/swallow.nix { };
tocharian-font = prev.callPackage packages/tocharian-font.nix { };
ttspaste = prev.callPackage packages/ttspaste.nix { };
unicodmenu = prev.callPackage packages/unicodmenu.nix { };
vg = prev.callPackage packages/vg.nix { };
vim-kmein = prev.callPackage packages/vim.nix {};
vimv = prev.callPackage packages/vimv.nix { };
klem = prev.callPackage packages/klem.nix { };
lib = lib // {
niveum = import lib/default.nix {
inherit lib;
pkgs = final;
};
panoptikon = import lib/panoptikon.nix {
inherit lib;
pkgs = final;
};
};
};
nixosConfigurations = nixosConfigurations =
let let
niveumSpecialArgs = system: { niveumSpecialArgs = system: {
@@ -168,9 +303,6 @@
"zoom" "zoom"
]; ];
}; };
niveumPackages = self.packages.${system};
niveumLib = self.lib;
inputs = { inputs = {
inherit inherit
tinc-graph tinc-graph
@@ -179,6 +311,7 @@
menstruation-telegram menstruation-telegram
menstruation-backend menstruation-backend
scripts scripts
coptic-dictionary
agenix agenix
recht recht
autorenkalender autorenkalender
@@ -293,6 +426,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
modules = [ modules = [
{ nixpkgs.overlays = [ self.overlays.default ]; }
systems/fatteh/configuration.nix systems/fatteh/configuration.nix
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum
@@ -312,145 +446,12 @@
config.allowUnfree = true; config.allowUnfree = true;
overlays = [ overlays = [
nur.overlays.default nur.overlays.default
(self: super: { self.overlays.default
mpv = super.mpv.override {
scripts = [
super.mpvScripts.visualizer
super.mpvScripts.mpris
];
};
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
})
]; ];
}; };
wrapScript =
{
packages ? [ ],
name,
script,
}:
pkgs.writers.writeDashBin name ''PATH=$PATH:${
nixpkgs.lib.makeBinPath (
packages
++ [
pkgs.findutils
pkgs.coreutils
pkgs.gnused
pkgs.gnugrep
]
)
} ${script} "$@"'';
in in
{ {
# linguistics and ancient world inherit (pkgs) auc swallow cheat-sh hc kpaste noise-waves trans stag qrpaste new-mac scanned default-gateway kirciuoklis tocharian-font image-convert-favicon image-convert-tolino heuretes mpv-tv mpv-iptv devanagari literature-quote booksplit manual-sort wttr emailmenu closest mpv-radio mpv-tuner cro nix-git text2pdf betacode brassica ipa polyglot jsesh gfs-fonts vim-kmein vimv brainmelter cyberlocker-tools pls untilport radio-news vg ttspaste depp fkill fzfmenu unicodmenu dmenu-randr notemenu man-pdf mansplain opustags q timer rfc gimp obsidian-vim devour go-webring random-zeno stardict-tools weechat-declarative klem;
auc = pkgs.callPackage packages/auc.nix { };
betacode = pkgs.callPackage packages/betacode.nix { };
brassica = pkgs.callPackage packages/brassica.nix { }; # TODO upstream
devanagari = pkgs.callPackage packages/devanagari { };
stardict-tools = pkgs.callPackage packages/stardict-tools.nix { };
heuretes = pkgs.callPackage packages/heuretes.nix { };
ipa = pkgs.writers.writePython3Bin "ipa" { flakeIgnore = [ "E501" ]; } (
builtins.readFile packages/ipa.py
);
jsesh = pkgs.callPackage packages/jsesh.nix { }; # TODO upstream
kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix { };
polyglot = pkgs.callPackage packages/polyglot.nix { };
tocharian-font = pkgs.callPackage packages/tocharian-font.nix { };
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix { };
closest = pkgs.callPackage packages/closest { };
# lit
random-zeno = pkgs.callPackage packages/random-zeno.nix { };
literature-quote = pkgs.callPackage packages/literature-quote.nix { };
# krebs
brainmelter = pkgs.callPackage packages/brainmelter.nix { };
cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix { };
hc = pkgs.callPackage packages/hc.nix { };
kpaste = pkgs.callPackage packages/kpaste.nix { };
pls = pkgs.callPackage packages/pls.nix { };
untilport = pkgs.callPackage packages/untilport.nix { };
radio-news = pkgs.callPackage packages/radio-news.nix { };
# window manager
swallow = pkgs.callPackage packages/swallow.nix { };
devour = pkgs.callPackage packages/devour.nix { };
cheat-sh = pkgs.callPackage packages/cheat-sh.nix { };
vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix { }; # TODO upstream
cro = pkgs.callPackage packages/cro.nix { };
default-gateway = pkgs.callPackage packages/default-gateway.nix { };
depp = pkgs.callPackage packages/depp.nix { };
fkill = pkgs.callPackage packages/fkill.nix { };
fzfmenu = pkgs.callPackage packages/fzfmenu.nix { };
gpt35 = pkgs.callPackage packages/gpt.nix { model = "gpt-3.5-turbo"; };
gpt4 = pkgs.callPackage packages/gpt.nix { model = "gpt-4"; };
image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix { };
image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix { };
k-lock = pkgs.callPackage packages/k-lock.nix { };
klem = pkgs.callPackage packages/klem.nix { };
man-pandoc = pkgs.callPackage packages/man/pandoc.nix { }; # TODO upstream
man-pdf = pkgs.callPackage packages/man-pdf.nix { };
mansplain = pkgs.callPackage packages/mansplain.nix { };
manual-sort = pkgs.callPackage packages/manual-sort.nix { };
menu-calc = pkgs.callPackage packages/menu-calc.nix { };
noise-waves = pkgs.callPackage packages/noise-waves.nix { };
mpv-radio = pkgs.callPackage packages/mpv-radio.nix { di-fm-key-file = "/dev/null"; };
mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix { di-fm-key-file = "/dev/null"; };
mpv-tv = pkgs.callPackage packages/mpv-tv.nix { };
mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix { };
new-mac = pkgs.callPackage packages/new-mac.nix { };
nix-git = pkgs.callPackage packages/nix-git.nix { };
notemenu = pkgs.callPackage packages/notemenu.nix { niveumPackages = self.packages.${system}; };
opustags = pkgs.callPackage packages/opustags.nix { }; # TODO upstream
q = pkgs.callPackage packages/q.nix { };
qrpaste = pkgs.callPackage packages/qrpaste.nix { };
go-webring = pkgs.callPackage packages/go-webring.nix { }; # TODO upstream
rfc = pkgs.callPackage packages/rfc.nix { };
gimp = pkgs.callPackage packages/gimp.nix { };
scanned = pkgs.callPackage packages/scanned.nix { };
text2pdf = pkgs.callPackage packages/text2pdf.nix { }; # TODO upstream
timer = pkgs.callPackage packages/timer.nix { };
trans = pkgs.callPackage packages/trans.nix { }; # TODO upstream
ttspaste = pkgs.callPackage packages/ttspaste.nix { };
unicodmenu = pkgs.callPackage packages/unicodmenu.nix { };
emailmenu = pkgs.callPackage packages/emailmenu.nix { };
stag = pkgs.callPackage packages/stag.nix { }; # TODO upstream
vg = pkgs.callPackage packages/vg.nix { };
vim = pkgs.callPackage packages/vim.nix { niveumPackages = self.packages.${system}; };
obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix { };
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix { }; # TODO upstream
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix { }; # TODO upstream
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix { }; # TODO upstream
vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix { }; # TODO upstream
vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix { }; # TODO upstream
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix { }; # TODO upstream
vimPlugins-vim-colors-paramount =
pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix
{ }; # TODO upstream
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix { }; # TODO upstream
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix { }; # TODO upstream
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix { }; # TODO upstream
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix { }; # TODO upstream
vimv = pkgs.callPackage packages/vimv.nix { };
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix { }; # TODO upstream
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix { }; # TODO upstream
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix { };
wttr = pkgs.callPackage packages/wttr.nix { }; # TODO upstream
booksplit = wrapScript {
script = voidrice.outPath + "/.local/bin/booksplit";
name = "booksplit";
packages = [
pkgs.ffmpeg
pkgs.glibc.bin
];
};
tag = wrapScript {
script = voidrice.outPath + "/.local/bin/tag";
name = "tag";
packages = [ pkgs.ffmpeg ];
};
} }
); );
}; };

5
lib/default-applications.nix
View File

@@ -1,5 +0,0 @@
pkgs: {
terminal = "alacritty";
browser = "${pkgs.firefox}/bin/firefox";
fileManager = "${pkgs.pcmanfm}/bin/pcmanfm";
}

92
lib/default.nix
View File

@@ -1,27 +1,40 @@
{ lib, pkgs }:
let
systems = import ./systems.nix;
in
{ {
tmpfilesConfig = { tmpfilesConfig =
type, {
path, type,
mode ? "-", path,
user ? "-", mode ? "-",
group ? "-", user ? "-",
age ? "-", group ? "-",
argument ? "-", age ? "-",
}: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}"; argument ? "-",
}:
"${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
restic = let host = "zaatar.r"; port = 3571; in { restic =
inherit host port; let
repository = "rest:http://${host}:${toString port}/"; host = "zaatar.r";
}; port = 3571;
in
{
inherit host port;
repository = "rest:http://${host}:${toString port}/";
};
remoteDir = "/home/kfm/remote"; remoteDir = "/home/kfm/remote";
firewall = lib: { firewall = {
accept = { accept =
source, {
protocol, source,
dport, protocol,
}: "nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept"; dport,
}:
"nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept";
addRules = lib.concatMapStringsSep "\n" (rule: "iptables -A ${rule}"); addRules = lib.concatMapStringsSep "\n" (rule: "iptables -A ${rule}");
removeRules = lib.concatMapStringsSep "\n" (rule: "iptables -D ${rule} || true"); removeRules = lib.concatMapStringsSep "\n" (rule: "iptables -D ${rule} || true");
}; };
@@ -41,7 +54,7 @@
sshPort = 22022; sshPort = 22022;
theme = pkgs: { theme = {
gtk = { gtk = {
name = "Adwaita-dark"; name = "Adwaita-dark";
package = pkgs.gnome-themes-extra; package = pkgs.gnome-themes-extra;
@@ -56,32 +69,43 @@
}; };
}; };
defaultApplications = import ./default-applications.nix; defaultApplications = {
terminal = "alacritty";
browser = "${pkgs.firefox}/bin/firefox";
fileManager = "${pkgs.pcmanfm}/bin/pcmanfm";
};
retiolumAddresses = import ./retiolum-network.nix; retiolumAddresses = lib.mapAttrs (_: v: { inherit (v.retiolum) ipv4 ipv6; }) (
lib.filterAttrs (_: v: v ? "retiolum") systems
);
externalNetwork = lib.mapAttrs (_: v: v.externalIp) (
lib.filterAttrs (_: v: v ? "externalIp") systems
);
localAddresses = lib.mapAttrs (_: v: v.internalIp) (
lib.filterAttrs (_: v: v ? "internalIp") systems
);
myceliumAddresses = lib.mapAttrs (_: v: v.mycelium.ipv6) (
lib.filterAttrs (_: v: v ? "mycelium") systems
);
syncthingIds = lib.mapAttrs (_: v: { id = v.syncthingId; }) (
lib.filterAttrs (_: v: v ? "syncthingId") systems
);
localAddresses = import ./local-network.nix; email = import ./email.nix;
email-sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINKz33wHtPuIfgXEb0+hybxFGV9ZuPsDTLUZo/+hlcdA"; systems = systems;
kieran = { kieran = {
github = "kmein"; github = "kmein";
email = "kmein@posteo.de"; email = "kmein@posteo.de";
name = "Kierán Meinhardt"; name = "Kierán Meinhardt";
sshKeys = [ sshKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk" # kabsa systems.fatteh.sshKey
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiQEc8rTr7C7xVLYV7tQ99BDDBLrJsy5hslxtCEatkB" # manakish systems.manakish.sshKey
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByreBjBEMJKjgpKLd5XZHIUUwIhNafVqN6OUOQpJa3y" # fatteh systems.kabsa.sshKey
]; ];
}; };
syncthing.devices = {
kabsa.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
kibbeh.id = "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
fatteh.id = "GSOGYT3-2GBHZXT-MNCTDIY-3BJIR4V-OHVOOMJ-ICVLKXR-U4C7RFB-HJOK3AC";
};
ignorePaths = [ ignorePaths = [
"*~" "*~"
".stack-work/" ".stack-work/"

4
lib/external-network.nix
View File

@@ -1,4 +0,0 @@
{
ful = "130.61.217.114";
makanek = "88.99.83.173";
}

4
lib/local-network.nix
View File

@@ -1,4 +0,0 @@
{
officejet = "192.168.0.251";
router = "192.168.0.1";
}

8
lib/mycelium-network.nix
View File

@@ -1,8 +0,0 @@
{
zaatar = "5c5:49e0:7793:f017:59e1:1715:9e0e:3fc8";
fatteh = "463:a0d4:daa3:aa8d:a9b1:744a:46a5:7a80";
ful = "5bf:d60e:bebf:5163:f495:8787:880c:6d41";
kabsa = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
makanek = "43f:ad4f:fa67:d9f7:8a56:713c:7418:164b";
manakish = "512:d3bd:3cd9:fcc8:ae34:81fa:385f:8c21";
}

3
lib/panoptikon.nix
View File

@@ -1,7 +1,6 @@
{ {
pkgs, pkgs,
lib, lib,
niveumPackages,
... ...
}: { }: {
# watcher scripts # watcher scripts
@@ -30,7 +29,7 @@
nick ? ''"$PANOPTIKON_WATCHER"-watcher'', nick ? ''"$PANOPTIKON_WATCHER"-watcher'',
}: }:
pkgs.writers.writeDash "kpaste-irc-reporter" '' pkgs.writers.writeDash "kpaste-irc-reporter" ''
KPASTE_CONTENT_TYPE=text/plain ${niveumPackages.kpaste}/bin/kpaste \ KPASTE_CONTENT_TYPE=text/plain ${pkgs.kpaste}/bin/kpaste \
| ${pkgs.gnused}/bin/sed -n "${ | ${pkgs.gnused}/bin/sed -n "${
if retiolumLink if retiolumLink
then "2" then "2"

39
lib/retiolum-network.nix
View File

@@ -1,39 +0,0 @@
{
kabsa = {
ipv4 = "10.243.2.4";
ipv6 = "42:0:3c46:861f:a118:8e9a:82c9:3d";
};
ful = {
ipv4 = "10.243.2.107";
ipv6 = "42:0:3c46:2c8b:a564:1213:9fb4:1bc4";
};
zaatar = {
ipv4 = "10.243.2.34";
ipv6 = "42:0:3c46:156e:10b6:3bd6:6e82:b2cd";
};
makanek = {
ipv4 = "10.243.2.84";
ipv6 = "42:0:3c46:f7a9:1f0a:1b2b:822a:6050";
};
fatteh = {
ipv6 = "42:0:3c46:aa73:82b0:14d7:7bf8:bf2";
ipv4 = "10.243.2.77";
};
manakish = {
ipv4 = "10.243.2.85";
ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
};
tabula = {
ipv4 = "10.243.2.78";
ipv6 = "";
};
tahina = {
ipv4 = "10.243.2.74";
ipv6 = "42:0:3c46:2923:1c90:872:edd6:306";
};
}

73
lib/systems.nix Normal file
View File

@@ -0,0 +1,73 @@
{
kabsa = {
sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk";
syncthingId = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF";
retiolum = {
ipv4 = "10.243.2.4";
ipv6 = "42:0:3c46:861f:a118:8e9a:82c9:3d";
};
mycelium.ipv6 = "432:e30:d5d8:9311:e34b:6587:96ee:3fcb";
};
manakish = {
sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiQEc8rTr7C7xVLYV7tQ99BDDBLrJsy5hslxtCEatkB";
syncthingId = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
retiolum = {
ipv4 = "10.243.2.85";
ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
};
mycelium.ipv6 = "512:d3bd:3cd9:fcc8:ae34:81fa:385f:8c21";
};
fatteh = {
sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByreBjBEMJKjgpKLd5XZHIUUwIhNafVqN6OUOQpJa3y";
syncthingId = "GSOGYT3-2GBHZXT-MNCTDIY-3BJIR4V-OHVOOMJ-ICVLKXR-U4C7RFB-HJOK3AC";
retiolum = {
ipv6 = "42:0:3c46:aa73:82b0:14d7:7bf8:bf2";
ipv4 = "10.243.2.77";
};
mycelium.ipv6 = "463:a0d4:daa3:aa8d:a9b1:744a:46a5:7a80";
};
kibbeh = {
syncthingId = "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
};
ful = {
externalIp = "130.61.217.114";
retiolum = {
ipv4 = "10.243.2.107";
ipv6 = "42:0:3c46:2c8b:a564:1213:9fb4:1bc4";
};
mycelium.ipv6 = "5bf:d60e:bebf:5163:f495:8787:880c:6d41";
};
zaatar = {
retiolum = {
ipv4 = "10.243.2.34";
ipv6 = "42:0:3c46:156e:10b6:3bd6:6e82:b2cd";
};
mycelium.ipv6 = "5c5:49e0:7793:f017:59e1:1715:9e0e:3fc8";
};
makanek = {
externalIp = "88.99.83.173";
retiolum = {
ipv4 = "10.243.2.84";
ipv6 = "42:0:3c46:f7a9:1f0a:1b2b:822a:6050";
};
mycelium.ipv6 = "43f:ad4f:fa67:d9f7:8a56:713c:7418:164b";
};
officejet = {
internalIp = "192.168.0.251";
};
router = {
internalIp = "192.168.0.1";
};
tabula = {
retiolum = {
ipv4 = "10.243.2.78";
ipv6 = "";
};
};
tahina = {
retiolum = {
ipv4 = "10.243.2.74";
ipv6 = "42:0:3c46:2923:1c90:872:edd6:306";
};
};
}

42
packages/klem.nix
View File

@@ -1,32 +1,36 @@
# klem < klemm < klemmbrett ~ clipboard # klem < klemm < klemmbrett ~ clipboard
{ {
pkgs,
lib, lib,
dmenu,
curl,
gnused,
coreutils,
xclip,
libnotify,
writers,
options ? { },
... ...
} @ args: let }: let
cfg = eval.config;
eval = lib.evalModules { eval = lib.evalModules {
modules = [ modules = [
{ {
_file = toString ./klem.nix; imports = [options];
imports = [(args.config or {})];
options = { options = {
selection = lib.mkOption { selection = lib.mkOption {
default = "clipboard"; default = "clipboard";
type = lib.types.enum ["primary" "secondary" "clipboard"]; type = lib.types.enum ["primary" "secondary" "clipboard"];
}; };
dmenu = lib.mkOption { dmenu = lib.mkOption {
default = "${pkgs.dmenu}/bin/dmenu -i -p klem"; default = "${dmenu}/bin/dmenu -i -p klem";
type = lib.types.path; type = lib.types.path;
}; };
scripts = lib.mkOption { scripts = lib.mkOption {
default = { default = {
pastebin = "${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io"; pastebin = "${curl}/bin/curl -fSs -F 'f:1=<-' ix.io";
shorten = '' shorten = ''
${pkgs.curl}/bin/curl -fSs -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://0x0.st ${curl}/bin/curl -fSs -F "shorten=$(${coreutils}/bin/cat)" https://0x0.st
''; '';
"replace p.r" = "${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'"; "replace p.r" = "${gnused}/bin/sed 's/\\<r\\>/krebsco.de/'";
}; };
type = lib.types.attrs; type = lib.types.attrs;
}; };
@@ -35,21 +39,21 @@
]; ];
}; };
scriptCase = option: script: '' cfg = eval.config;
'${option}') ${toString script} ;;
'';
in in
pkgs.writers.writeDashBin "klem" '' writers.writeDashBin "klem" ''
set -efu set -efu
${pkgs.xclip}/bin/xclip -selection ${cfg.selection} -out \ ${xclip}/bin/xclip -selection ${cfg.selection} -out \
| case $(echo "${ | case $(echo "${
lib.concatStringsSep "\n" (lib.attrNames cfg.scripts) lib.concatStringsSep "\n" (lib.attrNames cfg.scripts)
}" | ${cfg.dmenu}) in }" | ${cfg.dmenu}) in
${lib.concatStringsSep "\n" (lib.mapAttrsToList scriptCase cfg.scripts)} ${lib.concatStringsSep "\n" (lib.mapAttrsToList (option: script: ''
*) ${pkgs.coreutils}/bin/cat ;; '${option}') ${toString script} ;;
'') cfg.scripts)}
*) ${coreutils}/bin/cat ;;
esac \ esac \
| ${pkgs.xclip}/bin/xclip -selection ${cfg.selection} -in | ${xclip}/bin/xclip -selection ${cfg.selection} -in
${pkgs.libnotify}/bin/notify-send --app-name="klem" "Result copied to clipboard." ${libnotify}/bin/notify-send --app-name="klem" "Result copied to clipboard."
'' ''

19
packages/man/pandoc.nix
View File

@@ -1,19 +0,0 @@
{
stdenv,
pandoc,
lib,
fetchgit,
}:
stdenv.mkDerivation {
name = "pandoc-doc";
version = pandoc.version;
src = fetchgit {
url = "https://github.com/jgm/pandoc";
rev = pandoc.version;
hash = "sha256-4VDfRUr6TyF4oZsCve9t6FlEN0AqzYdlYXRny+SAcsY=";
};
buildPhase = ''
mkdir -p $out/man/man1
${pandoc}/bin/pandoc -V section=1 --standalone --write=man $src/MANUAL.txt -o $out/man/man1/pandoc.1
'';
}

21
packages/menu-calc.nix
View File

@@ -1,21 +0,0 @@
{
writers,
gnused,
pari,
dmenu,
xclip,
}:
writers.writeDashBin "=" ''
# https://github.com/onespaceman/menu-calc
answer=$(echo "$@" | ${pari}/bin/gp -q | ${gnused}/bin/sed '/\./ s/\.\{0,1\}0\{1,\}$//')
action=$(printf "copy\nclear" | ${dmenu}/bin/dmenu -p "= $answer")
case $action in
"clear") $0 ;;
"copy") printf %s "$answer" | ${xclip}/bin/xclip -selection clipboard;;
"") ;;
*) $0 "$answer $action" ;;
esac
''

4
packages/notemenu.nix
View File

@@ -6,7 +6,7 @@
coreutils, coreutils,
noteDirectory ? "~/state/obsidian", noteDirectory ? "~/state/obsidian",
currentDates ? false, currentDates ? false,
niveumPackages, obsidian-vim
}: }:
writers.writeDashBin "notemenu" '' writers.writeDashBin "notemenu" ''
set -efu set -efu
@@ -24,6 +24,6 @@ writers.writeDashBin "notemenu" ''
} | rofi -dmenu -i -p 'notes') } | rofi -dmenu -i -p 'notes')
if test "$note_file" if test "$note_file"
then then
alacritty --working-directory ${noteDirectory} -e ${niveumPackages.obsidian-vim}/bin/nvim "$note_file" alacritty --working-directory ${noteDirectory} -e ${obsidian-vim}/bin/nvim "$note_file"
fi fi
'' ''

21
packages/vim.nix
View File

@@ -3,7 +3,6 @@
vimPlugins, vimPlugins,
fetchFromGitHub, fetchFromGitHub,
vimUtils, vimUtils,
niveumPackages,
writeText, writeText,
stylixColors ? null, stylixColors ? null,
colorscheme ? null, colorscheme ? null,
@@ -44,8 +43,8 @@
goyo goyo
limelight-vim limelight-vim
niveumPackages.vimPlugins-mdwa-nvim vimPlugins.mdwa-nvim
niveumPackages.vimPlugins-vim-ernest vimPlugins.vim-ernest
fzf-vim fzf-vim
fzfWrapper fzfWrapper
@@ -53,20 +52,20 @@
undotree undotree
tabular tabular
# vimwiki # vimwiki
niveumPackages.vimPlugins-vim-colors-paramount vimPlugins.vim-colors-paramount
nvim-lspconfig nvim-lspconfig
vim-commentary vim-commentary
vim-css-color vim-css-color
vim-eunuch vim-eunuch
niveumPackages.vimPlugins-vim-fetch vimPlugins.vim-fetch
vim-fugitive vim-fugitive
vim-gitgutter vim-gitgutter
vim-repeat vim-repeat
vim-sensible vim-sensible
vim-surround vim-surround
(vimUtils.buildVimPlugin { (let version = "1.1.0"; pname = "vim-dim"; in vimUtils.buildVimPlugin {
pname = "vim-dim"; pname = "vim-dim";
version = "1.1.0"; version = version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jeffkreeftmeijer"; owner = "jeffkreeftmeijer";
repo = pname; repo = pname;
@@ -82,8 +81,8 @@
emmet-vim emmet-vim
vim-elixir vim-elixir
haskell-vim haskell-vim
niveumPackages.vimPlugins-icalendar-vim vimPlugins.icalendar-vim
niveumPackages.vimPlugins-jq-vim vimPlugins.jq-vim
rust-vim rust-vim
typescript-vim typescript-vim
vim-javascript vim-javascript
@@ -92,8 +91,8 @@
vimtex vimtex
vim-pandoc vim-pandoc
vim-pandoc-syntax vim-pandoc-syntax
niveumPackages.vimPlugins-vim-256noir vimPlugins.vim-256noir
niveumPackages.vimPlugins-typst-vim vimPlugins.typst-vim
]; ];
}; };
}; };

6
systems/fatteh/configuration.nix
View File

@@ -2,9 +2,7 @@
config, config,
pkgs, pkgs,
... ...
}: let }: {
inherit (import ../../lib) retiolumAddresses;
in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../configs/networkmanager.nix ../../configs/networkmanager.nix
@@ -42,7 +40,7 @@ in {
}; };
networking.hostName = "fatteh"; networking.hostName = "fatteh";
networking.retiolum = retiolumAddresses.fatteh; networking.retiolum = pkgs.lib.niveum.retiolumAddresses.fatteh;
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

10
systems/ful/configuration.nix
View File

@@ -3,9 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }: {
inherit (import ../../lib) kieran retiolumAddresses restic;
in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./matomo.nix ./matomo.nix
@@ -60,7 +58,7 @@ in {
services.restic.backups.niveum = { services.restic.backups.niveum = {
initialize = true; initialize = true;
inherit (restic) repository; repository = pkgs.lib.niveum.restic.repository;
timerConfig = { timerConfig = {
OnCalendar = "daily"; OnCalendar = "daily";
RandomizedDelaySec = "1h"; RandomizedDelaySec = "1h";
@@ -75,7 +73,7 @@ in {
firewall.allowedTCPPorts = [80 443]; firewall.allowedTCPPorts = [80 443];
hostName = "ful"; hostName = "ful";
interfaces.enp0s3.useDHCP = true; interfaces.enp0s3.useDHCP = true;
retiolum = retiolumAddresses.ful; retiolum = pkgs.lib.niveum.retiolumAddresses.ful;
useDHCP = false; useDHCP = false;
}; };
@@ -92,7 +90,7 @@ in {
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults.email = kieran.email; defaults.email = pkgs.lib.niveum.kieran.email;
}; };
users.users.root.hashedPasswordFile = config.age.secrets.root.path; users.users.root.hashedPasswordFile = config.age.secrets.root.path;

4
systems/ful/go-webring.nix
View File

@@ -1,4 +1,4 @@
{ config, niveumPackages ,... }: { config, pkgs, ... }:
let let
port = 2857; port = 2857;
in in
@@ -7,7 +7,7 @@ in
enable = true; enable = true;
host = "dichtungsring.kmein.de"; host = "dichtungsring.kmein.de";
listenAddress = "127.0.0.1:${toString port}"; listenAddress = "127.0.0.1:${toString port}";
package = niveumPackages.go-webring; package = pkgs.go-webring;
members = [ members = [
{ username = "meteora"; site = "meteora.xn--kiern-0qa.de"; } { username = "meteora"; site = "meteora.xn--kiern-0qa.de"; }
{ username = "huldra"; site = "huldras-halbtraum.com"; } { username = "huldra"; site = "huldras-halbtraum.com"; }

6
systems/ful/matomo.nix
View File

@@ -1,6 +1,4 @@
{pkgs, ...}: let {pkgs, lib, ...}: {
inherit (import ../../lib) kieran;
in {
services.nginx = { services.nginx = {
enable = true; enable = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
@@ -12,7 +10,7 @@ in {
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults.email = kieran.email; defaults.email = pkgs.lib.niveum.kieran.email;
}; };
services.matomo = { services.matomo = {

48
systems/ful/panoptikon.nix
View File

@@ -2,13 +2,9 @@
config, config,
pkgs, pkgs,
lib, lib,
niveumLib,
niveumPackages,
... ...
}: let }: let
panoptikon = niveumLib.panoptikon {inherit pkgs lib niveumPackages config;}; irc-xxx = lib.panoptikon.kpaste-irc {
irc-xxx = panoptikon.kpaste-irc {
target = lib.escapeShellArg "#xxx"; target = lib.escapeShellArg "#xxx";
retiolumLink = true; retiolumLink = true;
}; };
@@ -41,7 +37,7 @@
| ${pkgs.jq}/bin/jq -e .ok | ${pkgs.jq}/bin/jq -e .ok
''; '';
irc-kmein = panoptikon.kpaste-irc { irc-kmein = lib.panoptikon.kpaste-irc {
messagePrefix = "$PANOPTIKON_WATCHER: "; messagePrefix = "$PANOPTIKON_WATCHER: ";
target = "kmein"; target = "kmein";
nick = "panoptikon-kmein"; nick = "panoptikon-kmein";
@@ -60,7 +56,7 @@ in {
enable = true; enable = true;
watchers = { watchers = {
"github-meta" = { "github-meta" = {
script = panoptikon.urlJSON { script = lib.panoptikon.urlJSON {
jqScript = '' jqScript = ''
{ {
ssh_key_fingerprints: .ssh_key_fingerprints, ssh_key_fingerprints: .ssh_key_fingerprints,
@@ -71,79 +67,79 @@ in {
reporters = [irc-xxx]; reporters = [irc-xxx];
}; };
lammla = { lammla = {
script = panoptikon.url "http://lammla.info/index.php?reihe=30"; script = lib.panoptikon.url "http://lammla.info/index.php?reihe=30";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
kratylos = { kratylos = {
script = panoptikon.url "https://kratylos.reichert-online.org/current_issue/KRATYLOS"; script = lib.panoptikon.url "https://kratylos.reichert-online.org/current_issue/KRATYLOS";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
kobudo-tesshinkan = { kobudo-tesshinkan = {
script = panoptikon.url "https://kobudo-tesshinkan.eu/index.php/de/termine-berichte/lehrgaenge/"; script = lib.panoptikon.url "https://kobudo-tesshinkan.eu/index.php/de/termine-berichte/lehrgaenge/";
reporters = [telegram-kmein matrix-kmein]; reporters = [telegram-kmein matrix-kmein];
}; };
zeno-free = { zeno-free = {
script = panoptikon.urlSelector ".zenoCOMain" "http://www.zeno.org/Lesesaal/M/E-Books"; script = lib.panoptikon.urlSelector ".zenoCOMain" "http://www.zeno.org/Lesesaal/M/E-Books";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
carolinawelslau = { carolinawelslau = {
script = panoptikon.urlSelector "#main" "https://carolinawelslau.de/"; script = lib.panoptikon.urlSelector "#main" "https://carolinawelslau.de/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
humboldt-preis = { humboldt-preis = {
script = panoptikon.urlSelector "#content-core" "https://www.hu-berlin.de/de/ueberblick/menschen/ehrungen/humboldtpreis"; script = lib.panoptikon.urlSelector "#content-core" "https://www.hu-berlin.de/de/ueberblick/menschen/ehrungen/humboldtpreis";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
lisalittmann = { lisalittmann = {
script = panoptikon.urlSelector "#site-content" "https://lisalittmann.de/"; script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
lisalittmann-archive = { lisalittmann-archive = {
script = panoptikon.urlSelector "#site-content" "https://lisalittmann.de/archive/"; script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/archive/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
lisalittmann-projects = { lisalittmann-projects = {
script = panoptikon.urlSelector "#site-content" "https://lisalittmann.de/projects/"; script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/projects/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
tatort = { tatort = {
script = panoptikon.urlSelector ".linklist" "https://www.daserste.de/unterhaltung/krimi/tatort/sendung/index.html"; script = lib.panoptikon.urlSelector ".linklist" "https://www.daserste.de/unterhaltung/krimi/tatort/sendung/index.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-idiomarium = { warpgrid-idiomarium = {
script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/idiomarium/"; script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/idiomarium/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-futurism = { warpgrid-futurism = {
script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/futurism/"; script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/futurism/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-imagiary = { warpgrid-imagiary = {
script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/imagiary/"; script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/imagiary/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
warpgrid-alchemy = { warpgrid-alchemy = {
script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/alchemy/"; script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/alchemy/";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
indogermanische-forschungen = { indogermanische-forschungen = {
script = panoptikon.urlSelector "#latestIssue" "https://www.degruyter.com/journal/key/INDO/html"; script = lib.panoptikon.urlSelector "#latestIssue" "https://www.degruyter.com/journal/key/INDO/html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
ig-neuigkeiten = { ig-neuigkeiten = {
script = panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/aktuelles/neuigkeiten.html"; script = lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/aktuelles/neuigkeiten.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
ig-tagungen = { ig-tagungen = {
script = panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/tagungen/tagungen-der-ig.html"; script = lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/tagungen/tagungen-der-ig.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
fu-distant = { fu-distant = {
script = panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/en/e/ma-distant/Termine/index.html"; script = lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/en/e/ma-distant/Termine/index.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
fu-aegyptologie = { fu-aegyptologie = {
script = panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/e/aegyptologie/termine/index.html"; script = lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/e/aegyptologie/termine/index.html";
reporters = [matrix-kmein]; reporters = [matrix-kmein];
}; };
}; };

8
systems/ful/radio.nix
View File

@@ -1,11 +1,9 @@
{ {
lib,
pkgs, pkgs,
config, config,
niveumPackages, lib,
... ...
}: let }: let
inherit (import ../../lib) tmpfilesConfig;
liquidsoapDirectory = "/var/cache/liquidsoap"; liquidsoapDirectory = "/var/cache/liquidsoap";
icecastPassword = "hackme"; icecastPassword = "hackme";
refresh-qasaid = pkgs.writers.writeDashBin "refresh-qasaid" '' refresh-qasaid = pkgs.writers.writeDashBin "refresh-qasaid" ''
@@ -23,7 +21,7 @@
poem: .[0].["#text"], poem: .[0].["#text"],
author: .[1].["#text"] author: .[1].["#text"]
}) })
' | ${niveumPackages.cyberlocker-tools}/bin/cput qasaid.json ' | ${pkgs.cyberlocker-tools}/bin/cput qasaid.json
''; '';
qasida-poem = pkgs.writers.writeDash "qasida.sh" '' qasida-poem = pkgs.writers.writeDash "qasida.sh" ''
set -efu set -efu
@@ -136,7 +134,7 @@ in {
environment.systemPackages = [refresh-qasaid]; environment.systemPackages = [refresh-qasaid];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
(tmpfilesConfig { (pkgs.lib.niveum.tmpfilesConfig {
type = "d"; type = "d";
path = liquidsoapDirectory; path = liquidsoapDirectory;
mode = "0750"; mode = "0750";

6
systems/kabsa/configuration.nix
View File

@@ -3,9 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }: {
inherit (import ../../lib) retiolumAddresses;
in {
imports = [ imports = [
../kibbeh/hardware-configuration.nix ../kibbeh/hardware-configuration.nix
../../configs/tlp.nix ../../configs/tlp.nix
@@ -50,7 +48,7 @@ in {
networking = { networking = {
hostName = "kabsa"; hostName = "kabsa";
wireless.interfaces = ["wlp3s0"]; wireless.interfaces = ["wlp3s0"];
retiolum = retiolumAddresses.kabsa; retiolum = pkgs.lib.niveum.retiolumAddresses.kabsa;
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";

7
systems/kibbeh/configuration.nix
View File

@@ -1,7 +1,6 @@
{ {
config, config,
pkgs, pkgs,
niveumPackages,
... ...
}: }:
@@ -76,9 +75,9 @@
libreoffice libreoffice
xournalpp xournalpp
jellyfin-media-player jellyfin-media-player
niveumPackages.mpv-tv mpv-tv
telegram-desktop telegram-desktop
(niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; }) (mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
spotify spotify
]; ];
}; };
@@ -88,7 +87,7 @@
git git
vim vim
tmux tmux
(niveumPackages.vim.override { colorscheme = "base16-gruvbox-dark-medium"; }) (vim-kmein.override { colorscheme = "base16-gruvbox-dark-medium"; })
]; ];
system.stateVersion = "23.11"; system.stateVersion = "23.11";

10
systems/makanek/configuration.nix
View File

@@ -3,9 +3,7 @@
config, config,
pkgs, pkgs,
... ...
}: let }: {
inherit (import ../../lib) kieran retiolumAddresses restic;
in {
imports = [ imports = [
./gitea.nix ./gitea.nix
./hardware-configuration.nix ./hardware-configuration.nix
@@ -36,7 +34,7 @@ in {
services.restic.backups.niveum = { services.restic.backups.niveum = {
initialize = true; initialize = true;
inherit (restic) repository; repository = pkgs.lib.niveum.restic.repository;
timerConfig = { timerConfig = {
OnCalendar = "daily"; OnCalendar = "daily";
RandomizedDelaySec = "1h"; RandomizedDelaySec = "1h";
@@ -82,7 +80,7 @@ in {
firewall.allowedTCPPorts = [80 443]; firewall.allowedTCPPorts = [80 443];
hostName = "makanek"; hostName = "makanek";
interfaces.ens3.useDHCP = true; interfaces.ens3.useDHCP = true;
retiolum = retiolumAddresses.makanek; retiolum = pkgs.lib.niveum.retiolumAddresses.makanek;
useDHCP = false; useDHCP = false;
}; };
@@ -115,7 +113,7 @@ in {
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults.email = kieran.email; defaults.email = pkgs.lib.niveum.kieran.email;
}; };
services.nginx.virtualHosts."www.kmein.de" = { services.nginx.virtualHosts."www.kmein.de" = {

5
systems/makanek/gitea.nix
View File

@@ -1,6 +1,5 @@
{ config, ... }: { config, pkgs, ... }:
let let
inherit (import ../../lib) sshPort;
domain = "code.kmein.de"; domain = "code.kmein.de";
in { in {
services.anubis = { services.anubis = {
@@ -27,7 +26,7 @@ in {
settings = { settings = {
server.ROOT_URL = "https://${domain}"; server.ROOT_URL = "https://${domain}";
server.DOMAIN = domain; server.DOMAIN = domain;
server.SSH_PORT = sshPort; server.SSH_PORT = pkgs.lib.niveum.sshPort;
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
}; };
}; };

4
systems/makanek/hedgedoc.nix
View File

@@ -1,12 +1,12 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: let }: let
backupLocation = "/var/lib/codimd-backup"; backupLocation = "/var/lib/codimd-backup";
stateLocation = "/var/lib/codimd/state.sqlite"; stateLocation = "/var/lib/codimd/state.sqlite";
domain = "pad.kmein.de"; domain = "pad.kmein.de";
inherit (import ../../lib) tmpfilesConfig;
in { in {
services.nginx.virtualHosts.${domain} = { services.nginx.virtualHosts.${domain} = {
enableACME = true; enableACME = true;
@@ -56,7 +56,7 @@ in {
]; ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
(tmpfilesConfig { (pkgs.lib.niveum.tmpfilesConfig {
user = "codimd"; user = "codimd";
group = "codimd"; group = "codimd";
mode = "0755"; mode = "0755";

3
systems/makanek/monitoring/default.nix
View File

@@ -7,7 +7,6 @@
let let
lokiConfig = import ./loki.nix; lokiConfig = import ./loki.nix;
blackboxConfig = import ./blackbox.nix; blackboxConfig = import ./blackbox.nix;
inherit (import ../../../lib) restic;
in in
{ {
services.grafana = { services.grafana = {
@@ -426,7 +425,7 @@ in
{ {
targets = [ targets = [
"zaatar.r:${toString config.services.prometheus.exporters.node.port}" "zaatar.r:${toString config.services.prometheus.exporters.node.port}"
"zaatar.r:${toString restic.port}" "zaatar.r:${toString pkgs.lib.niveum.restic.port}"
]; ];
} }
]; ];

3
systems/makanek/radio-news.nix
View File

@@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
lib, lib,
niveumPackages,
... ...
}: let }: let
inherit (import ../../lib) serveHtml; inherit (import ../../lib) serveHtml;
@@ -25,7 +24,7 @@ in {
script = '' script = ''
PATH=$PATH:${lib.makeBinPath [pkgs.gnused pkgs.curl pkgs.jq]} PATH=$PATH:${lib.makeBinPath [pkgs.gnused pkgs.curl pkgs.jq]}
GEMINI_API_KEY="$(cat "$CREDENTIALS_DIRECTORY/gemini-api-key")" ${niveumPackages.radio-news}/bin/radio-news | jq --arg from "$(date -u -Is | sed 's/+00:00/Z/')" --arg to "$(date -u -Is -d 'now + 30 minutes' | sed 's/+00:00/Z/')" ' GEMINI_API_KEY="$(cat "$CREDENTIALS_DIRECTORY/gemini-api-key")" ${pkgs.radio-news}/bin/radio-news | jq --arg from "$(date -u -Is | sed 's/+00:00/Z/')" --arg to "$(date -u -Is -d 'now + 30 minutes' | sed 's/+00:00/Z/')" '
{ {
from: $from, from: $from,
to: $to, to: $to,

6
systems/makanek/weechat.nix
View File

@@ -3,9 +3,7 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (import ../../lib) kieran;
weechatHome = "/var/lib/weechat"; weechatHome = "/var/lib/weechat";
weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {};
in { in {
systemd.services.weechat = let systemd.services.weechat = let
tmux = pkgs.writers.writeDash "tmux" '' tmux = pkgs.writers.writeDash "tmux" ''
@@ -26,7 +24,7 @@ in {
'' ''
} "$@" } "$@"
''; '';
weechat = weechat-declarative.override { weechat = pkgs.weechat-declarative.override {
config = { config = {
scripts = [ scripts = [
pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.weechat-autosort
@@ -52,7 +50,7 @@ in {
msg_part = "tschö mit ö"; msg_part = "tschö mit ö";
msg_quit = "ciao kakao"; msg_quit = "ciao kakao";
msg_kick = "warum machst du diese?"; msg_kick = "warum machst du diese?";
realname = lib.head (lib.strings.split " " kieran.name); realname = lib.head (lib.strings.split " " pkgs.lib.niveum.kieran.name);
}; };
server = { server = {
hackint = { hackint = {

5
systems/makanek/weechat.sync-conflict-20250130-092406-AJVBWR2.nix
View File

@@ -1,6 +1,5 @@
{ lib, pkgs, config, unstablePackages, ... }: { lib, pkgs, config, unstablePackages, ... }:
let let
inherit (import ../../lib) kieran;
weechatHome = "/var/lib/weechat"; weechatHome = "/var/lib/weechat";
weechat-declarative = weechat-declarative =
pkgs.callPackage ../../packages/weechat-declarative.nix { pkgs.callPackage ../../packages/weechat-declarative.nix {
@@ -54,7 +53,7 @@ in {
msg_part = "tschö mit ö"; msg_part = "tschö mit ö";
msg_quit = "ciao kakao"; msg_quit = "ciao kakao";
msg_kick = "warum machst du diese?"; msg_kick = "warum machst du diese?";
realname = lib.head (lib.strings.split " " kieran.name); realname = lib.head (lib.strings.split " " pkgs.lib.niveum.kieran.name);
}; };
server = { server = {
hackint = { hackint = {
@@ -185,7 +184,7 @@ in {
users.groups.weechat = { }; users.groups.weechat = { };
users.extraUsers.weechat = { users.extraUsers.weechat = {
useDefaultShell = true; useDefaultShell = true;
openssh.authorizedKeys.keys = kieran.sshKeys ++ [ openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys ++ [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh"
]; ];
createHome = true; createHome = true;

6
systems/manakish/configuration.nix
View File

@@ -3,9 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }: {
inherit (import ../../lib) retiolumAddresses;
in {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
@@ -50,7 +48,7 @@ in {
wwp0s20u4i6.useDHCP = true; wwp0s20u4i6.useDHCP = true;
}; };
wireless.interfaces = ["wlp3s0"]; wireless.interfaces = ["wlp3s0"];
retiolum = retiolumAddresses.manakish; retiolum = pkgs.lib.niveum.retiolumAddresses.manakish;
hostName = "manakish"; hostName = "manakish";
}; };

7
systems/tabula/configuration.nix
View File

@@ -1,10 +1,9 @@
{ {
config, config,
lib,
pkgs, pkgs,
... ...
}: let }: {
inherit (import ../../lib) retiolumAddresses;
in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../configs/spacetime.nix ../../configs/spacetime.nix
@@ -67,7 +66,7 @@ in {
enp0s4.useDHCP = true; enp0s4.useDHCP = true;
wlp2s0.useDHCP = true; wlp2s0.useDHCP = true;
}; };
retiolum = retiolumAddresses.tabula; retiolum = pkgs.lib.niveum.retiolumAddresses.tabula;
hostName = "tabula"; hostName = "tabula";
}; };

7
systems/tahina/configuration.nix
View File

@@ -1,10 +1,9 @@
{ {
config, config,
lib,
pkgs, pkgs,
... ...
}: let }: {
inherit (import ../../lib) retiolumAddresses;
in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../configs/spacetime.nix ../../configs/spacetime.nix
@@ -75,7 +74,7 @@ in {
enp0s25.useDHCP = true; enp0s25.useDHCP = true;
wlo1.useDHCP = true; wlo1.useDHCP = true;
}; };
retiolum = retiolumAddresses.tahina; retiolum = pkgs.lib.niveum.retiolumAddresses.tahina;
hostName = "tahina"; hostName = "tahina";
}; };

31
systems/zaatar/backup.nix
View File

@@ -4,9 +4,6 @@
lib, lib,
... ...
}: let }: let
niveumLib = import ../../lib;
inherit (niveumLib) retiolumAddresses restic;
firewall = niveumLib.firewall lib;
dataDir = "/backup/restic"; dataDir = "/backup/restic";
in { in {
services.restic.server = { services.restic.server = {
@@ -15,7 +12,7 @@ in {
inherit dataDir; inherit dataDir;
prometheus = true; prometheus = true;
extraFlags = ["--no-auth"]; # auth is done via firewall extraFlags = ["--no-auth"]; # auth is done via firewall
listenAddress = toString restic.port; listenAddress = toString pkgs.lib.niveum.restic.port;
}; };
environment.systemPackages = [ environment.systemPackages = [
@@ -30,32 +27,32 @@ in {
}; };
networking.firewall = let networking.firewall = let
dport = restic.port; dport = pkgs.lib.niveum.restic.port;
protocol = "tcp"; protocol = "tcp";
rules = [ rules = [
(firewall.accept { (pkgs.lib.niveum.firewall.accept {
inherit dport protocol; inherit dport protocol;
source = retiolumAddresses.kabsa.ipv4; source = pkgs.lib.niveum.retiolumAddresses.kabsa.ipv4;
}) })
(firewall.accept { (pkgs.lib.niveum.firewall.accept {
inherit dport protocol; inherit dport protocol;
source = retiolumAddresses.manakish.ipv4; source = pkgs.lib.niveum.retiolumAddresses.manakish.ipv4;
}) })
(firewall.accept { (pkgs.lib.niveum.firewall.accept {
inherit dport protocol; inherit dport protocol;
source = retiolumAddresses.makanek.ipv4; source = pkgs.lib.niveum.retiolumAddresses.makanek.ipv4;
}) })
(firewall.accept { (pkgs.lib.niveum.firewall.accept {
inherit dport protocol; inherit dport protocol;
source = retiolumAddresses.fatteh.ipv4; source = pkgs.lib.niveum.retiolumAddresses.fatteh.ipv4;
}) })
(firewall.accept { (pkgs.lib.niveum.firewall.accept {
inherit dport protocol; inherit dport protocol;
source = retiolumAddresses.ful.ipv4; source = pkgs.lib.niveum.retiolumAddresses.ful.ipv4;
}) })
]; ];
in { in {
extraCommands = firewall.addRules rules; extraCommands = pkgs.lib.niveum.firewall.addRules rules;
extraStopCommands = firewall.removeRules rules; extraStopCommands = pkgs.lib.niveum.firewall.removeRules rules;
}; };
} }

39
systems/zaatar/configuration.nix
View File

@@ -3,9 +3,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:
inherit (import ../../lib) retiolumAddresses restic; {
in {
imports = [ imports = [
./backup.nix ./backup.nix
./gaslight.nix ./gaslight.nix
@@ -51,7 +50,7 @@ in {
services.restic.backups.niveum = { services.restic.backups.niveum = {
initialize = true; initialize = true;
inherit (restic) repository; repository = pkgs.lib.niveum.restic.repository;
timerConfig = { timerConfig = {
OnCalendar = "daily"; OnCalendar = "daily";
RandomizedDelaySec = "1h"; RandomizedDelaySec = "1h";
@@ -70,24 +69,26 @@ in {
services.illum.enable = true; services.illum.enable = true;
environment.systemPackages = let environment.systemPackages =
worldradio = pkgs.callPackage ../../packages/worldradio.nix {}; let
in [ worldradio = pkgs.callPackage ../../packages/worldradio.nix { };
(pkgs.writers.writeDashBin "mpv" ''${pkgs.mpv}/bin/mpv --no-video "$@"'') in
(pkgs.writers.writeDashBin "worldradio" '' [
shuf ${worldradio} | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv --no-video (pkgs.writers.writeDashBin "mpv" ''${pkgs.mpv}/bin/mpv --no-video "$@"'')
'') (pkgs.writers.writeDashBin "worldradio" ''
pkgs.git shuf ${worldradio} | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv --no-video
pkgs.vim '')
pkgs.htop pkgs.git
pkgs.ncmpcpp pkgs.vim
pkgs.python3 # for sshuttle pkgs.htop
]; pkgs.ncmpcpp
pkgs.python3 # for sshuttle
];
networking = { networking = {
hostName = "zaatar"; hostName = "zaatar";
wireless.interfaces = ["wlp2s0"]; wireless.interfaces = [ "wlp2s0" ];
retiolum = retiolumAddresses.zaatar; retiolum = pkgs.lib.niveum.retiolumAddresses.zaatar;
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";

3
systems/zaatar/home-assistant.nix
View File

@@ -1,6 +1,5 @@
{config, pkgs, lib, ...}: let {config, pkgs, lib, ...}: let
port = 8123; port = 8123;
inherit (import ../../lib) restic;
volumeName = "home-assistant"; volumeName = "home-assistant";
streams = import ../../lib/streams.nix { streams = import ../../lib/streams.nix {
di-fm-key = "%DI_FM_KEY%"; # TODO lib.strings.fileContents <secrets/di.fm/key>; di-fm-key = "%DI_FM_KEY%"; # TODO lib.strings.fileContents <secrets/di.fm/key>;
@@ -17,7 +16,7 @@ in {
services.restic.backups.niveum = { services.restic.backups.niveum = {
initialize = true; initialize = true;
inherit (restic) repository; repository = pkgs.lib.niveum.restic.repository;
timerConfig = { timerConfig = {
OnCalendar = "daily"; OnCalendar = "daily";
RandomizedDelaySec = "1h"; RandomizedDelaySec = "1h";

2
systems/zaatar/moodle-dl-meinhark.nix
View File

@@ -141,7 +141,7 @@ in {
services.nfs.server = { services.nfs.server = {
enable = true; enable = true;
exports = let exports = let
machines = with (import ../../lib).retiolumAddresses; [kabsa manakish]; machines = with pkgs.lib.niveum.retiolumAddresses; [kabsa manakish];
in '' in ''
/export ${lib.concatMapStringsSep " " (machine: "${machine.ipv4}(fsid=0)") machines} /export ${lib.concatMapStringsSep " " (machine: "${machine.ipv4}(fsid=0)") machines}
/export/moodle ${lib.concatMapStringsSep " " (machine: "${machine.ipv4}(insecure,rw)") machines} /export/moodle ${lib.concatMapStringsSep " " (machine: "${machine.ipv4}(insecure,rw)") machines}

15
systems/zaatar/mpd.nix
View File

@@ -4,9 +4,6 @@
lib, lib,
... ...
}: let }: let
firewall = (import ../../lib).firewall lib;
inherit (import ../../lib) tmpfilesConfig;
mukkeMountPoint = "/mnt/mukke"; mukkeMountPoint = "/mnt/mukke";
fritzboxMountPoint = "/mnt/fritz"; fritzboxMountPoint = "/mnt/fritz";
@@ -57,7 +54,7 @@ in {
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
(tmpfilesConfig { (pkgs.lib.niveum.tmpfilesConfig {
type = "L+"; type = "L+";
mode = "0644"; mode = "0644";
user = "mpd"; user = "mpd";
@@ -65,7 +62,7 @@ in {
path = "${config.services.mpd.musicDirectory}/mukke"; path = "${config.services.mpd.musicDirectory}/mukke";
argument = mukkeMountPoint; argument = mukkeMountPoint;
}) })
(tmpfilesConfig { (pkgs.lib.niveum.tmpfilesConfig {
type = "L+"; type = "L+";
mode = "0644"; mode = "0644";
user = "mpd"; user = "mpd";
@@ -81,19 +78,19 @@ in {
dport = config.services.mpd.network.port; dport = config.services.mpd.network.port;
protocol = "tcp"; protocol = "tcp";
rules = [ rules = [
(firewall.accept { (pkgs.lib.niveum.firewall.accept {
inherit dport protocol; inherit dport protocol;
source = "192.168.0.0/16"; source = "192.168.0.0/16";
}) })
(firewall.accept { (pkgs.lib.niveum.firewall.accept {
inherit dport protocol; inherit dport protocol;
source = "127.0.0.0/8"; source = "127.0.0.0/8";
}) })
]; ];
in { in {
allowedTCPPorts = [80]; allowedTCPPorts = [80];
extraCommands = firewall.addRules rules; extraCommands = pkgs.lib.niveum.firewall.addRules rules;
extraStopCommands = firewall.removeRules rules; extraStopCommands = pkgs.lib.niveum.firewall.removeRules rules;
}; };
systemd.services.mpd-playlists = { systemd.services.mpd-playlists = {