mirror of
https://github.com/kmein/niveum
synced 2026-03-19 11:31:09 +01:00
Compare commits
111 Commits
wayland
...
32fa3e75ea
| Author | SHA1 | Date | |
|---|---|---|---|
| 32fa3e75ea | |||
| 435aa4a365 | |||
| 8d955bf640 | |||
| a44d15a166 | |||
| b33e1d3569 | |||
| cba0f92a7a | |||
| 1f163d65cd | |||
| e816145b13 | |||
| 4cb62b382b | |||
| ad2c922ab4 | |||
| a0f7867a25 | |||
| dd75268d60 | |||
| 0c6ec93443 | |||
| 15ef01268b | |||
| 682db94aae | |||
| 1bba38be77 | |||
| f7a7e80d97 | |||
| 7327b3149a | |||
| 9ab93d0e82 | |||
| 2f5ad473c6 | |||
| e478ae3e6e | |||
| 06d3d12afa | |||
| 1060339a93 | |||
| af1e852228 | |||
| 9ff500bb37 | |||
| 18603a5682 | |||
| 53578ac92b | |||
| 14118b6a63 | |||
| 0813d2e37c | |||
| 8d5743119f | |||
| 5105ef0b1e | |||
| d67c8a6298 | |||
| 64ac86b32b | |||
| ed5c8815ce | |||
| 5e41f04f72 | |||
| e8e5bb6211 | |||
| e910bf6f6a | |||
| bd47cef7e5 | |||
| ad3249077b | |||
| 367acd05e5 | |||
| bae1d0b0cc | |||
| f58e111ce1 | |||
| b647b9f901 | |||
| 883655dc58 | |||
| 21960a2c95 | |||
| 254195b331 | |||
| ce032525d2 | |||
| f9b992cce3 | |||
| 3f6e4755a6 | |||
| cc4c5b79c1 | |||
| 673edbb8b3 | |||
| 89f9e09c3d | |||
| f1a6b1f4f6 | |||
| 16398282ed | |||
| 315ccf102d | |||
| 7d8feb0876 | |||
| 44f7a9d4fa | |||
| b070207bd5 | |||
| 614f7e0f8c | |||
| a1af05ff48 | |||
| 83536372f0 | |||
| 3357121044 | |||
| 2a7e972256 | |||
| 0d75ab146e | |||
| 385ae53c7e | |||
| a08c41d3db | |||
| bd84c35138 | |||
| 04722684aa | |||
| 025b725551 | |||
| 6411d8a03d | |||
| edce4538d8 | |||
| d1dd41bc6b | |||
| 5d80f6ec0f | |||
| c8ad9d4433 | |||
| 0f05e0467a | |||
| 3c2abbb3b9 | |||
| 61b5e4bd6e | |||
| d4aca5b6f1 | |||
| 551462f1dd | |||
| 5d954684e1 | |||
| b12373eb1b | |||
| 31e6b28b72 | |||
| 4a77a20c9e | |||
| fe5bbbc647 | |||
| 8699f09307 | |||
| d458fb333f | |||
| e7264641a2 | |||
| 8afc04f266 | |||
| 427df80396 | |||
| ff3ba9047f | |||
| 1d14174ad5 | |||
| a307e2c186 | |||
| 1cc3a7c6e3 | |||
| db33374dc0 | |||
| 2c75c0d608 | |||
| f84cd44db5 | |||
| 84cec2eb24 | |||
| 031b934c99 | |||
|
|
7491396645 | ||
| 1c299cafef | |||
| cbce724ade | |||
| 00dfe27738 | |||
| 6e0026ed5c | |||
| d92f382b9a | |||
| 630ec3d052 | |||
| bfd7195543 | |||
| 0d2481bd78 | |||
| 28cd462bc6 | |||
| 67358560b8 | |||
| 675c453599 | |||
| e4543eeb0b |
114
.bin/mp3player-write
Executable file
114
.bin/mp3player-write
Executable file
@@ -0,0 +1,114 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Usage:
|
||||||
|
# ./mp3_transfer.sh -s 1.3 /mnt/mp3player file1.m4a file2.m4a ...
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Default speed
|
||||||
|
SPEED=1.0
|
||||||
|
|
||||||
|
# Parse options
|
||||||
|
while getopts ":s:" opt; do
|
||||||
|
case $opt in
|
||||||
|
s)
|
||||||
|
SPEED=$OPTARG
|
||||||
|
;;
|
||||||
|
\?)
|
||||||
|
echo "Invalid option: -$OPTARG" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
:)
|
||||||
|
echo "Option -$OPTARG requires a value." >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# Shift past the options
|
||||||
|
shift $((OPTIND -1))
|
||||||
|
|
||||||
|
# Check arguments
|
||||||
|
if [ "$#" -lt 2 ]; then
|
||||||
|
echo "Usage: $0 [-s speed] MOUNT_POINT FILE1 [FILE2 ...]"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
MOUNT_POINT=$1
|
||||||
|
shift
|
||||||
|
FILES=("$@")
|
||||||
|
|
||||||
|
# Check mount point exists
|
||||||
|
if [ ! -d "$MOUNT_POINT" ]; then
|
||||||
|
echo "Error: Mount point '$MOUNT_POINT' does not exist."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Estimate required space
|
||||||
|
TOTAL_SIZE=0
|
||||||
|
for f in "${FILES[@]}"; do
|
||||||
|
if [ ! -f "$f" ]; then
|
||||||
|
echo "Warning: File '$f' does not exist, skipping."
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
# Get file size in bytes
|
||||||
|
FILE_SIZE=$(stat --printf="%s" "$f")
|
||||||
|
# Estimate mp3 output size: roughly 1/2 of original m4a (adjust if needed)
|
||||||
|
TOTAL_SIZE=$((TOTAL_SIZE + FILE_SIZE / 2))
|
||||||
|
done
|
||||||
|
|
||||||
|
# Get available space in bytes
|
||||||
|
AVAILABLE=$(df --output=avail "$MOUNT_POINT" | tail -n 1)
|
||||||
|
AVAILABLE=$((AVAILABLE * 1024)) # df reports in KB
|
||||||
|
|
||||||
|
if [ "$TOTAL_SIZE" -gt "$AVAILABLE" ]; then
|
||||||
|
echo "Error: Not enough space on device. Required: $TOTAL_SIZE bytes, Available: $AVAILABLE bytes"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Enough space available. Starting conversion..."
|
||||||
|
|
||||||
|
sanitize_filename() {
|
||||||
|
local name="$1"
|
||||||
|
# Remove path, keep only base name
|
||||||
|
name=$(basename "$name" .m4a)
|
||||||
|
# Replace spaces and special chars with underscore
|
||||||
|
name=$(echo "$name" | tr ' ' '_' | tr -cd '[:alnum:]_-')
|
||||||
|
# Truncate to max 50 chars
|
||||||
|
echo "${name:0:50}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Convert and copy files
|
||||||
|
for f in "${FILES[@]}"; do
|
||||||
|
if [ ! -f "$f" ]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Determine the next prefix
|
||||||
|
existing_prefixes=$(ls "$MOUNT_POINT" | grep -E '^[0-9].*\.mp3$' | sed -E 's/^([0-9]).*/\1/' | sort -n | uniq)
|
||||||
|
for i in {0..9}; do
|
||||||
|
if ! echo "$existing_prefixes" | grep -q "^$i$"; then
|
||||||
|
PREFIX=$i
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Using prefix: $PREFIX"
|
||||||
|
|
||||||
|
BASENAME=$(sanitize_filename "$f")
|
||||||
|
OUT_PATTERN="$MOUNT_POINT/${PREFIX}%02d_${BASENAME}.mp3"
|
||||||
|
|
||||||
|
echo "Converting '$f' to '$OUT_PATTERN' at speed $SPEED..."
|
||||||
|
|
||||||
|
ffmpeg -i "$f" \
|
||||||
|
-filter:a "atempo=$SPEED" -ar 44100 -ac 2 -c:a libmp3lame -b:a 128k \
|
||||||
|
-f segment -segment_time 300 \
|
||||||
|
"$OUT_PATTERN"
|
||||||
|
|
||||||
|
# Update prefix for next file
|
||||||
|
# Count how many segments were created
|
||||||
|
SEG_COUNT=$(ls "$MOUNT_POINT" | grep -E "^${PREFIX}[0-9]{2}_" | wc -l)
|
||||||
|
PREFIX=$((PREFIX + SEG_COUNT))
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "All files processed successfully."
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
# niveum
|
# niveum
|
||||||
|
|
||||||
|
> I must Create a System, or be enslav'd by another Man's. —William Blake
|
||||||
|
|
||||||
> [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
|
> [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
|
||||||
>
|
>
|
||||||
> 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—
|
> 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
darwin = lib.strings.hasSuffix "-darwin" pkgs.system;
|
darwin = lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
|
||||||
in {
|
in {
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
[
|
[
|
||||||
|
|||||||
@@ -8,14 +8,14 @@
|
|||||||
inherit (import ../lib/email.nix) defaults thunderbirdProfile;
|
inherit (import ../lib/email.nix) defaults thunderbirdProfile;
|
||||||
in {
|
in {
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
email-password-cock = {
|
email-password-ical-ephemeris = {
|
||||||
file = ../secrets/email-password-cock.age;
|
file = ../secrets/email-password-ical-ephemeris.age;
|
||||||
owner = config.users.users.me.name;
|
owner = config.users.users.me.name;
|
||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
email-password-letos = {
|
email-password-cock = {
|
||||||
file = ../secrets/email-password-letos.age;
|
file = ../secrets/email-password-cock.age;
|
||||||
owner = config.users.users.me.name;
|
owner = config.users.users.me.name;
|
||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
@@ -92,16 +92,17 @@ in {
|
|||||||
smtp.port = 25;
|
smtp.port = 25;
|
||||||
smtp.tls.useStartTls = true;
|
smtp.tls.useStartTls = true;
|
||||||
};
|
};
|
||||||
letos =
|
ical-ephemeris =
|
||||||
lib.recursiveUpdate defaults
|
lib.recursiveUpdate defaults
|
||||||
{
|
rec {
|
||||||
userName = "slfletos";
|
userName = "ical.ephemeris@web.de";
|
||||||
address = "letos.sprachlit@hu-berlin.de";
|
realName = "Kieran from iCal Ephemeris";
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-letos.path}";
|
address = userName;
|
||||||
imap.host = "mailbox.cms.hu-berlin.de";
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-ical-ephemeris.path}";
|
||||||
|
imap.host = "imap.web.de";
|
||||||
imap.port = 993;
|
imap.port = 993;
|
||||||
smtp.host = "mailhost.cms.hu-berlin.de";
|
smtp.host = "smtp.web.de";
|
||||||
smtp.port = 25;
|
smtp.port = 587;
|
||||||
smtp.tls.useStartTls = true;
|
smtp.tls.useStartTls = true;
|
||||||
};
|
};
|
||||||
posteo =
|
posteo =
|
||||||
|
|||||||
@@ -5,6 +5,6 @@
|
|||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
set -o vi
|
set -o vi
|
||||||
'';
|
'';
|
||||||
enableCompletion = true;
|
completion.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,9 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
config,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
autorenkalender-package = pkgs.fetchFromGitHub {
|
autorenkalender = inputs.autorenkalender.packages.x86_64-linux.default;
|
||||||
owner = "kmein";
|
|
||||||
repo = "autorenkalender";
|
|
||||||
rev = "cf49a7b057301332d980eb47042a626add93db66";
|
|
||||||
sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
|
|
||||||
};
|
|
||||||
autorenkalender =
|
|
||||||
pkgs.python3Packages.callPackage autorenkalender-package {};
|
|
||||||
in {
|
in {
|
||||||
niveum.bots.autorenkalender = {
|
niveum.bots.autorenkalender = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -17,11 +17,15 @@ in {
|
|||||||
./hesychius.nix
|
./hesychius.nix
|
||||||
./smyth.nix
|
./smyth.nix
|
||||||
./nachtischsatan.nix
|
./nachtischsatan.nix
|
||||||
./tlg-wotd.nix
|
# ./tlg-wotd.nix TODO reenable
|
||||||
./celan.nix
|
./celan.nix
|
||||||
./nietzsche.nix
|
./nietzsche.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
age.secrets = {
|
||||||
|
telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
|
||||||
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = map (path:
|
systemd.tmpfiles.rules = map (path:
|
||||||
tmpfilesConfig {
|
tmpfilesConfig {
|
||||||
type = "d";
|
type = "d";
|
||||||
|
|||||||
@@ -20,15 +20,31 @@
|
|||||||
command = toString (pkgs.writers.writeDash "random-smyth" ''
|
command = toString (pkgs.writers.writeDash "random-smyth" ''
|
||||||
set -efu
|
set -efu
|
||||||
|
|
||||||
|
good_curl() {
|
||||||
|
${pkgs.curl}/bin/curl "$@" \
|
||||||
|
--compressed \
|
||||||
|
-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' \
|
||||||
|
-H 'Accept-Language: en-US,en;q=0.5' \
|
||||||
|
-H 'DNT: 1' \
|
||||||
|
-H 'Connection: keep-alive' \
|
||||||
|
-H 'Upgrade-Insecure-Requests: 1' \
|
||||||
|
-H 'Sec-Fetch-Dest: document' \
|
||||||
|
-H 'Sec-Fetch-Mode: navigate' \
|
||||||
|
-H 'Sec-Fetch-Site: cross-site' \
|
||||||
|
-H 'Priority: u=0, i' \
|
||||||
|
-H 'Pragma: no-cache' \
|
||||||
|
-H 'Cache-Control: no-cache'
|
||||||
|
}
|
||||||
|
|
||||||
RANDOM_SECTION=$(
|
RANDOM_SECTION=$(
|
||||||
${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
|
good_curl -sSL http://www.perseus.tufts.edu/hopper/xmltoc?doc=Perseus%3Atext%3A1999.04.0007%3Asmythp%3D1 \
|
||||||
| ${pkgs.gnugrep}/bin/grep -o 'ref="[^"]*"' \
|
| ${pkgs.gnugrep}/bin/grep -o 'ref="[^"]*"' \
|
||||||
| ${pkgs.coreutils}/bin/shuf -n1 \
|
| ${pkgs.coreutils}/bin/shuf -n1 \
|
||||||
| ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
|
| ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
|
||||||
)
|
)
|
||||||
|
|
||||||
url="http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION"
|
url="http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION"
|
||||||
${pkgs.curl}/bin/curl -sSL "$url"\
|
good_curl -sSL "$url"\
|
||||||
| ${pkgs.htmlq}/bin/htmlq '#text_main' \
|
| ${pkgs.htmlq}/bin/htmlq '#text_main' \
|
||||||
| ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
|
| ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
|
||||||
| ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
|
| ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
|
||||||
|
|||||||
@@ -3,11 +3,14 @@
|
|||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
niveumPackages,
|
niveumPackages,
|
||||||
|
unstablePackages,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
mastodonEndpoint = "https://social.krebsco.de";
|
mastodonEndpoint = "https://social.krebsco.de";
|
||||||
in {
|
in {
|
||||||
systemd.services.bot-tlg-wotd = {
|
systemd.services.bot-tlg-wotd = {
|
||||||
|
# TODO reenable
|
||||||
|
# once https://github.com/NixOS/nixpkgs/pull/462893 is in stable NixOS
|
||||||
enable = true;
|
enable = true;
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
startAt = "9:30";
|
startAt = "9:30";
|
||||||
@@ -42,9 +45,8 @@ in {
|
|||||||
|
|
||||||
#ancientgreek #classics #wotd #wordoftheday
|
#ancientgreek #classics #wotd #wordoftheday
|
||||||
|
|
||||||
transliteration=$(${pkgs.writers.makePythonWriter pkgs.python311 pkgs.python311Packages pkgs.python3Packages "translit.py" {
|
transliteration=$(${pkgs.writers.writePython3 "translit.py" {
|
||||||
# revert to pkgs.writers.writePython3 once https://github.com/NixOS/nixpkgs/pull/353367 is merged
|
libraries = py: [ py.cltk ];
|
||||||
libraries = [ pkgs.python3Packages.cltk ];
|
|
||||||
} ''
|
} ''
|
||||||
import sys
|
import sys
|
||||||
from cltk.phonology.grc.transcription import Transcriber
|
from cltk.phonology.grc.transcription import Transcriber
|
||||||
@@ -149,7 +151,6 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
|
|
||||||
mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
|
mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
}: {
|
}: {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
niveumPackages.cro
|
niveumPackages.cro
|
||||||
pkgs.tor-browser-bundle-bin
|
pkgs.tor-browser
|
||||||
pkgs.firefox
|
pkgs.firefox
|
||||||
pkgs.brave
|
pkgs.brave
|
||||||
];
|
];
|
||||||
@@ -82,5 +82,9 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
stylix.targets.firefox.profileNames = ["default"];
|
||||||
|
};
|
||||||
|
|
||||||
environment.variables.BROWSER = "firefox";
|
environment.variables.BROWSER = "firefox";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
niveumPackages,
|
niveumPackages,
|
||||||
unstablePackages,
|
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
@@ -27,9 +26,6 @@ in
|
|||||||
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||||
};
|
};
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
"qtwebkit-5.212.0-alpha4"
|
|
||||||
"zotero-6.0.26"
|
|
||||||
"electron-25.9.0"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -106,7 +102,7 @@ in
|
|||||||
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
||||||
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";
|
||||||
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
||||||
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format opus --audio-quality 0 -xic"; # Download with audio
|
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic"; # Download with audio
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -139,7 +135,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{ programs.command-not-found.enable = true; }
|
|
||||||
{
|
{
|
||||||
programs.gnupg = {
|
programs.gnupg = {
|
||||||
agent = {
|
agent = {
|
||||||
@@ -215,13 +210,12 @@ in
|
|||||||
./direnv.nix
|
./direnv.nix
|
||||||
./docker.nix
|
./docker.nix
|
||||||
./dunst.nix
|
./dunst.nix
|
||||||
./flix.nix
|
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./fzf.nix
|
./fzf.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./hledger.nix
|
./hledger.nix
|
||||||
./htop.nix
|
./htop.nix
|
||||||
./fu-berlin.nix
|
./uni.nix
|
||||||
./i3.nix
|
./i3.nix
|
||||||
./i3status-rust.nix
|
./i3status-rust.nix
|
||||||
./keyboard.nix
|
./keyboard.nix
|
||||||
@@ -236,8 +230,8 @@ in
|
|||||||
./nix.nix
|
./nix.nix
|
||||||
./newsboat.nix
|
./newsboat.nix
|
||||||
./flameshot.nix
|
./flameshot.nix
|
||||||
./fritzbox.nix
|
|
||||||
./packages.nix
|
./packages.nix
|
||||||
|
./virtualization.nix
|
||||||
./picom.nix
|
./picom.nix
|
||||||
./stardict.nix
|
./stardict.nix
|
||||||
./polkit.nix
|
./polkit.nix
|
||||||
@@ -262,7 +256,6 @@ in
|
|||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
./tor.nix
|
./tor.nix
|
||||||
./stw-berlin.nix
|
|
||||||
./mastodon-bot.nix
|
./mastodon-bot.nix
|
||||||
{
|
{
|
||||||
fileSystems."${remoteDir}/fritz" = {
|
fileSystems."${remoteDir}/fritz" = {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
showHelp = false;
|
showHelp = false;
|
||||||
squareMagnifier = true;
|
squareMagnifier = true;
|
||||||
uploadWithoutConfirmation = true;
|
uploadWithoutConfirmation = true;
|
||||||
buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
|
# buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,98 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
flixLocation = "/media/flix";
|
|
||||||
flixLocationNew = "/media/flix-new";
|
|
||||||
cacheLocation = "/var/cache/flix";
|
|
||||||
indexFilename = "index";
|
|
||||||
indexFilenameNew = "index-new";
|
|
||||||
flixUser = "flix";
|
|
||||||
flixGroup = "users";
|
|
||||||
inherit (import ../lib) tmpfilesConfig;
|
|
||||||
in {
|
|
||||||
fileSystems.${flixLocation} = {
|
|
||||||
device = "prism.r:/export/download";
|
|
||||||
fsType = "nfs";
|
|
||||||
options = [
|
|
||||||
"noauto"
|
|
||||||
"noatime"
|
|
||||||
"nodiratime"
|
|
||||||
"x-systemd.automount"
|
|
||||||
"x-systemd.device-timeout=1"
|
|
||||||
"x-systemd.idle-timeout=1min"
|
|
||||||
"x-systemd.requires=tinc.retiolum.service"
|
|
||||||
"user"
|
|
||||||
"_netdev"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems.${flixLocationNew} = {
|
|
||||||
device = "//yellow.r/public";
|
|
||||||
fsType = "cifs";
|
|
||||||
options = [
|
|
||||||
"guest"
|
|
||||||
"nofail"
|
|
||||||
"noauto"
|
|
||||||
"ro"
|
|
||||||
"x-systemd.automount"
|
|
||||||
"x-systemd.device-timeout=1"
|
|
||||||
"x-systemd.idle-timeout=1min"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
(tmpfilesConfig {
|
|
||||||
type = "d";
|
|
||||||
path = cacheLocation;
|
|
||||||
mode = "0750";
|
|
||||||
user = flixUser;
|
|
||||||
group = flixGroup;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.flix-index = {
|
|
||||||
description = "Flix indexing service";
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
script = ''
|
|
||||||
cp ${flixLocation}/index ./${indexFilename}
|
|
||||||
cp ${flixLocationNew}/index ./${indexFilenameNew}
|
|
||||||
'';
|
|
||||||
startAt = "hourly";
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
User = flixUser;
|
|
||||||
Group = flixGroup;
|
|
||||||
WorkingDirectory = cacheLocation;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
users.extraUsers.${flixUser} = {
|
|
||||||
isSystemUser = true;
|
|
||||||
createHome = true;
|
|
||||||
home = cacheLocation;
|
|
||||||
group = flixGroup;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.writers.writeDashBin "mpv-simpsons" ''
|
|
||||||
set -efu
|
|
||||||
cd "${flixLocation}/download"
|
|
||||||
[ -f "${cacheLocation}/${indexFilename}" ] || exit 1
|
|
||||||
|
|
||||||
cat "${cacheLocation}/${indexFilename}" \
|
|
||||||
| ${pkgs.gnugrep}/bin/grep -i 'simpsons.*mkv' \
|
|
||||||
| shuf \
|
|
||||||
| ${pkgs.findutils}/bin/xargs -d '\n' ${pkgs.mpv}/bin/mpv
|
|
||||||
'')
|
|
||||||
(pkgs.writers.writeDashBin "flixmenu" ''
|
|
||||||
set -efu
|
|
||||||
(
|
|
||||||
${pkgs.gnused}/bin/sed 's#^\.#${flixLocation}#' ${cacheLocation}/${indexFilename}
|
|
||||||
${pkgs.gnused}/bin/sed 's#^\.#${flixLocationNew}#' ${cacheLocation}/${indexFilenameNew}
|
|
||||||
) | ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" \
|
|
||||||
| ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.util-linux}/bin/setsid ${pkgs.xdg-utils}/bin/xdg-open '{}'
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -102,11 +102,12 @@ in {
|
|||||||
lmodern
|
lmodern
|
||||||
merriweather
|
merriweather
|
||||||
ocr-a
|
ocr-a
|
||||||
|
montserrat
|
||||||
roboto
|
roboto
|
||||||
roboto-mono
|
roboto-mono
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-color-emoji
|
||||||
roboto-slab
|
roboto-slab
|
||||||
scheherazade-new
|
scheherazade-new
|
||||||
source-code-pro
|
source-code-pro
|
||||||
@@ -114,7 +115,7 @@ in {
|
|||||||
source-serif-pro
|
source-serif-pro
|
||||||
theano
|
theano
|
||||||
niveumPackages.tocharian-font
|
niveumPackages.tocharian-font
|
||||||
vistafonts
|
vista-fonts
|
||||||
vollkorn
|
vollkorn
|
||||||
zilla-slab
|
zilla-slab
|
||||||
]; # google-fonts league-of-moveable-type
|
]; # google-fonts league-of-moveable-type
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
{ config, ... }:
|
|
||||||
{
|
|
||||||
networking.firewall.allowedUDPPorts = [ 51820 ];
|
|
||||||
networking.wg-quick.interfaces.aether = {
|
|
||||||
autostart = false;
|
|
||||||
dns = ["192.168.178.1" "fritz.box"];
|
|
||||||
listenPort = 51820;
|
|
||||||
privateKeyFile = config.age.secrets.wireguard-aether-key.path;
|
|
||||||
peers = [
|
|
||||||
{
|
|
||||||
allowedIPs = ["192.168.178.0/24" "0.0.0.0/0"];
|
|
||||||
endpoint = "lng5gx2rmssv8ge1.myfritz.net:58997";
|
|
||||||
persistentKeepalive = 25;
|
|
||||||
presharedKeyFile = config.age.secrets.wireguard-aether-psk.path;
|
|
||||||
publicKey = "8Rr7BueC0CGmycBQFS7YM7VF7Adkdc1ZcLFy8YXyOQk=";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
19
configs/gaming.nix
Normal file
19
configs/gaming.nix
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.zeroad
|
||||||
|
pkgs.mari0
|
||||||
|
pkgs.luanti # fka minetest
|
||||||
|
# pkgs.openarena
|
||||||
|
# pkgs.teeworlds
|
||||||
|
pkgs.nethack
|
||||||
|
# pkgs.freeciv
|
||||||
|
# pkgs.lincity-ng
|
||||||
|
# pkgs.superTuxKart
|
||||||
|
];
|
||||||
|
networking.firewall = {
|
||||||
|
# for 0ad multiplayer
|
||||||
|
allowedTCPPorts = [ 20595 ];
|
||||||
|
allowedUDPPorts = [ 20595 ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -17,7 +17,6 @@ in {
|
|||||||
pkgs.gitstats
|
pkgs.gitstats
|
||||||
pkgs.patch
|
pkgs.patch
|
||||||
pkgs.patchutils
|
pkgs.patchutils
|
||||||
inputs.self.packages.${pkgs.system}.git-preview
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.shellAliases = {
|
environment.shellAliases = {
|
||||||
@@ -29,9 +28,7 @@ in {
|
|||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.gitFull;
|
package = pkgs.gitFull;
|
||||||
userName = kieran.name;
|
settings.alias = {
|
||||||
userEmail = kieran.email;
|
|
||||||
aliases = {
|
|
||||||
br = "branch";
|
br = "branch";
|
||||||
co = "checkout";
|
co = "checkout";
|
||||||
ci = "commit";
|
ci = "commit";
|
||||||
@@ -45,19 +42,12 @@ in {
|
|||||||
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 = ignorePaths;
|
||||||
extraConfig = {
|
settings.user.name = kieran.name;
|
||||||
pull.ff = "only";
|
settings.user.email = kieran.email;
|
||||||
rebase.autoStash = true;
|
settings.pull.ff = "only";
|
||||||
merge.autoStash = true;
|
settings.rebase.autoStash = true;
|
||||||
push.autoSetupRemote = true;
|
settings.merge.autoStash = true;
|
||||||
|
settings.push.autoSetupRemove = true;
|
||||||
# # ref https://github.com/dandavison/delta
|
|
||||||
# core.pager = "${pkgs.delta}/bin/delta";
|
|
||||||
# interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
|
||||||
# delta.navigate = true;
|
|
||||||
# merge.conflictStyle = "diff3";
|
|
||||||
# diff.colorMoved = "default";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ in {
|
|||||||
services.xserver = {
|
services.xserver = {
|
||||||
windowManager.i3 = {
|
windowManager.i3 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.i3-gaps;
|
package = pkgs.i3;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -113,6 +113,7 @@ in {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
home-manager.users.me = let
|
home-manager.users.me = let
|
||||||
modifier = "Mod4";
|
modifier = "Mod4";
|
||||||
infoWorkspace = "ℹ";
|
infoWorkspace = "ℹ";
|
||||||
@@ -131,7 +132,7 @@ in {
|
|||||||
border = 1;
|
border = 1;
|
||||||
};
|
};
|
||||||
bars = [
|
bars = [
|
||||||
(config.home-manager.users.me.lib.stylix.i3.bar
|
(config.home-manager.users.me.stylix.targets.i3.exportedBarConfig
|
||||||
// rec {
|
// rec {
|
||||||
workspaceButtons = true;
|
workspaceButtons = true;
|
||||||
mode = "hide"; # "dock";
|
mode = "hide"; # "dock";
|
||||||
@@ -269,32 +270,7 @@ in {
|
|||||||
# XF86Launch1 (thinkvantage)
|
# XF86Launch1 (thinkvantage)
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
wayland.windowManager.sway = {
|
stylix.targets.i3.enable = true;
|
||||||
enable = true;
|
|
||||||
config = {
|
|
||||||
menu = "rofi -modi run,ssh,window -show run";
|
|
||||||
inherit modifier modes gaps bars floating window colors keybindings;
|
|
||||||
input = {
|
|
||||||
"*" = {
|
|
||||||
xkb_layout = "de";
|
|
||||||
xkb_variant = "T3";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
terminal = (defaultApplications pkgs).terminal;
|
|
||||||
up = "k";
|
|
||||||
down = "j";
|
|
||||||
left = "h";
|
|
||||||
right = "l";
|
|
||||||
seat = {
|
|
||||||
"*" = {
|
|
||||||
hide_cursor = "when-typing enable";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
startup = [
|
|
||||||
{command = "echo hello";}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xsession.windowManager.i3 = {
|
xsession.windowManager.i3 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -311,19 +287,9 @@ in {
|
|||||||
assign [class="dashboard"] ${infoWorkspace}
|
assign [class="dashboard"] ${infoWorkspace}
|
||||||
exec ${dashboard}/bin/dashboard
|
exec ${dashboard}/bin/dashboard
|
||||||
'';
|
'';
|
||||||
config = lib.mkMerge [
|
config = {
|
||||||
{
|
inherit modifier gaps modes bars floating window colors;
|
||||||
inherit modifier gaps modes bars floating window colors keybindings;
|
keybindings = keybindings // {
|
||||||
}
|
|
||||||
{
|
|
||||||
keybindings = let
|
|
||||||
new-workspace = pkgs.writers.writeDash "new-workspace" ''
|
|
||||||
i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
|
|
||||||
'';
|
|
||||||
move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
|
|
||||||
i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
"${modifier}+ß" = "exec ${niveumPackages.menu-calc}/bin/=";
|
"${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";
|
||||||
@@ -334,8 +300,7 @@ in {
|
|||||||
# "${modifier}+x" = "exec ${new-workspace}";
|
# "${modifier}+x" = "exec ${new-workspace}";
|
||||||
"XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
|
"XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,27 +2,63 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
|
|
||||||
commaSep = builtins.concatStringsSep ",";
|
commaSep = builtins.concatStringsSep ",";
|
||||||
xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
xkbOptions = [
|
||||||
|
"compose:caps"
|
||||||
|
"terminate:ctrl_alt_bksp"
|
||||||
|
"grp:ctrls_toggle"
|
||||||
|
];
|
||||||
languages = {
|
languages = {
|
||||||
deutsch = { code = "de"; variant = "T3"; };
|
deutsch = {
|
||||||
greek = { code = "gr"; variant = "polytonic"; };
|
code = "de";
|
||||||
russian = { code = "ru"; variant = "phonetic"; };
|
variant = "T3";
|
||||||
arabic = { code = "ara"; variant = "buckwalter"; }; # ../lib/keyboards/arabic;
|
};
|
||||||
|
greek = {
|
||||||
|
code = "gr";
|
||||||
|
variant = "polytonic";
|
||||||
|
};
|
||||||
|
russian = {
|
||||||
|
code = "ru";
|
||||||
|
variant = "phonetic";
|
||||||
|
};
|
||||||
|
arabic = {
|
||||||
|
code = "ara";
|
||||||
|
variant = "buckwalter";
|
||||||
|
}; # ../lib/keyboards/arabic;
|
||||||
coptic = ../lib/keyboards/coptic;
|
coptic = ../lib/keyboards/coptic;
|
||||||
avestan = ../lib/keyboards/avestan;
|
avestan = ../lib/keyboards/avestan;
|
||||||
gothic = ../lib/keyboards/gothic;
|
gothic = ../lib/keyboards/gothic;
|
||||||
farsi = { code = "ir"; variant = "qwerty"; };
|
farsi = {
|
||||||
syriac = { code = "sy"; variant = "syc_phonetic"; };
|
code = "ir";
|
||||||
sanskrit = { code = "in"; variant = "san-kagapa"; };
|
variant = "qwerty";
|
||||||
gujarati = {code = "in"; variant = "guj-kagapa"; };
|
};
|
||||||
urdu = {code = "in"; variant = "urd-phonetic"; };
|
syriac = {
|
||||||
hebrew = {code = "il"; variant = "phonetic";};
|
code = "sy";
|
||||||
|
variant = "syc_phonetic";
|
||||||
|
};
|
||||||
|
sanskrit = {
|
||||||
|
code = "in";
|
||||||
|
variant = "san-kagapa";
|
||||||
|
};
|
||||||
|
gujarati = {
|
||||||
|
code = "in";
|
||||||
|
variant = "guj-kagapa";
|
||||||
|
};
|
||||||
|
urdu = {
|
||||||
|
code = "in";
|
||||||
|
variant = "urd-phonetic";
|
||||||
|
};
|
||||||
|
hebrew = {
|
||||||
|
code = "il";
|
||||||
|
variant = "phonetic";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
defaultLanguage = languages.deutsch;
|
defaultLanguage = languages.deutsch;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.libinput.enable = true;
|
services.libinput.enable = true;
|
||||||
|
|
||||||
# man 7 xkeyboard-config
|
# man 7 xkeyboard-config
|
||||||
@@ -41,7 +77,8 @@ in {
|
|||||||
lib.mapAttrsToList (name: value: {
|
lib.mapAttrsToList (name: value: {
|
||||||
name = "symbols/${name}";
|
name = "symbols/${name}";
|
||||||
path = value;
|
path = value;
|
||||||
}) (lib.filterAttrs (_: value: !(value ? "code")) languages) ++ [
|
}) (lib.filterAttrs (_: value: !(value ? "code")) languages)
|
||||||
|
++ [
|
||||||
{
|
{
|
||||||
name = "symbols/ir";
|
name = "symbols/ir";
|
||||||
path = ../lib/keyboards/farsi;
|
path = ../lib/keyboards/farsi;
|
||||||
@@ -54,25 +91,40 @@ in {
|
|||||||
|
|
||||||
environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
|
environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
home.file =
|
||||||
|
lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; })
|
||||||
|
(lib.filterAttrs (_: value: !(value ? "code")) languages) // {
|
||||||
|
".xkb/symbols/ir".source = ../lib/keyboards/farsi;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
console.keyMap = "de";
|
console.keyMap = "de";
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.systemPackages = lib.mapAttrsToList (
|
||||||
lib.mapAttrsToList
|
language: settings:
|
||||||
(language: settings:
|
|
||||||
let
|
let
|
||||||
code = if settings ? "code" then settings.code else language;
|
code = if settings ? "code" then settings.code else language;
|
||||||
variant = if settings ? "variant" then settings.variant else "";
|
variant = if settings ? "variant" then settings.variant else "";
|
||||||
in
|
in
|
||||||
pkgs.writers.writeDashBin "kb-${language}" ''
|
pkgs.writers.writeDashBin "kb-${language}" ''
|
||||||
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
|
if [ -z $SWAYSOCK ]; then
|
||||||
'')
|
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${
|
||||||
languages;
|
toString (map (option: "-option ${option}") xkbOptions)
|
||||||
|
}
|
||||||
|
else
|
||||||
|
swaymsg -s $SWAYSOCK 'input * xkb_layout "${defaultLanguage.code},${code}"'
|
||||||
|
swaymsg -s $SWAYSOCK 'input * xkb_variant "${defaultLanguage.variant},${variant}"'
|
||||||
|
swaymsg -s $SWAYSOCK 'input * xkb_options "${lib.concatStringsSep "," xkbOptions}"'
|
||||||
|
fi
|
||||||
|
''
|
||||||
|
) languages;
|
||||||
|
|
||||||
# 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 = {
|
systemd.user.services.gxkb = {
|
||||||
wantedBy = ["graphical-session.target"];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
SyslogIdentifier = "gxkb";
|
SyslogIdentifier = "gxkb";
|
||||||
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ in {
|
|||||||
};
|
};
|
||||||
scripts = [
|
scripts = [
|
||||||
pkgs.mpvScripts.quality-menu
|
pkgs.mpvScripts.quality-menu
|
||||||
niveumPackages.mpv-visualizer
|
pkgs.mpvScripts.visualizer
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
||||||
(niveumPackages.vim.override {
|
(niveumPackages.vim.override {
|
||||||
# stylixColors = config.lib.stylix.colors;
|
# stylixColors = config.lib.stylix.colors;
|
||||||
colorscheme = "base16-gruvbox-light-medium";
|
colorscheme = "base16-gruvbox-dark-medium";
|
||||||
})
|
})
|
||||||
|
|
||||||
# language servers
|
# language servers
|
||||||
@@ -46,13 +46,14 @@
|
|||||||
pkgs.haskellPackages.haskell-language-server
|
pkgs.haskellPackages.haskell-language-server
|
||||||
pkgs.texlab
|
pkgs.texlab
|
||||||
pkgs.nil
|
pkgs.nil
|
||||||
|
pkgs.gopls
|
||||||
pkgs.nixfmt-rfc-style
|
pkgs.nixfmt-rfc-style
|
||||||
pkgs.rust-analyzer
|
pkgs.rust-analyzer
|
||||||
pkgs.nodePackages.typescript-language-server
|
pkgs.nodePackages.typescript-language-server
|
||||||
pkgs.lua-language-server
|
pkgs.lua-language-server
|
||||||
pkgs.nodePackages.vscode-langservers-extracted
|
pkgs.nodePackages.vscode-langservers-extracted
|
||||||
pkgs.lemminx
|
pkgs.lemminx # XML LSP
|
||||||
niveumPackages.jq-lsp
|
pkgs.jq-lsp
|
||||||
pkgs.dhall-lsp-server
|
pkgs.dhall-lsp-server
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
{ pkgs, niveumPackages, config, ... }: {
|
|
||||||
environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
|
|
||||||
environment.shellAliases.vi = "nvim";
|
|
||||||
environment.shellAliases.vim = "nvim";
|
|
||||||
environment.shellAliases.view = "nvim -R";
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
editorconfig = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
"*" = {
|
|
||||||
charset = "utf-8";
|
|
||||||
end_of_line = "lf";
|
|
||||||
trim_trailing_whitespace = true;
|
|
||||||
insert_final_newline = true;
|
|
||||||
indent_style = "space";
|
|
||||||
indent_size = 2;
|
|
||||||
};
|
|
||||||
"*.py" = { indent_size = 4; };
|
|
||||||
Makefile = { indent_style = "tab"; };
|
|
||||||
"*.md" = { trim_trailing_whitespace = false; };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
|
||||||
(niveumPackages.vim.override {
|
|
||||||
stylixColors = config.lib.stylix.colors;
|
|
||||||
# colorscheme = "base16-gruvbox-dark-medium";
|
|
||||||
})
|
|
||||||
|
|
||||||
# language servers
|
|
||||||
pkgs.pyright
|
|
||||||
pkgs.haskellPackages.haskell-language-server
|
|
||||||
pkgs.texlab
|
|
||||||
pkgs.nil
|
|
||||||
pkgs.rust-analyzer
|
|
||||||
pkgs.nodePackages.typescript-language-server
|
|
||||||
pkgs.lua-language-server
|
|
||||||
pkgs.nodePackages.vscode-langservers-extracted
|
|
||||||
pkgs.lemminx
|
|
||||||
niveumPackages.jq-lsp
|
|
||||||
pkgs.dhall-lsp-server
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@
|
|||||||
lib,
|
lib,
|
||||||
inputs,
|
inputs,
|
||||||
niveumPackages,
|
niveumPackages,
|
||||||
unstablePackages,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
worldradio = pkgs.callPackage ../packages/worldradio.nix {};
|
worldradio = pkgs.callPackage ../packages/worldradio.nix {};
|
||||||
@@ -63,9 +62,15 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
(pkgs.writers.writeDashBin "amfora" ''
|
||||||
|
${pkgs.st}/bin/st -e ${pkgs.amfora}/bin/amfora
|
||||||
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "gpodder" ''
|
||||||
|
GPODDER_DOWNLOAD_DIR=${config.users.users.me.home}/mobile/audio/Text/podcasts exec ${pkgs.gpodder}/bin/gpodder "$@"
|
||||||
|
'')
|
||||||
# INTERNET
|
# INTERNET
|
||||||
aria2
|
aria2
|
||||||
tdesktop
|
telegram-desktop
|
||||||
whois
|
whois
|
||||||
dnsutils
|
dnsutils
|
||||||
# FILE MANAGERS
|
# FILE MANAGERS
|
||||||
@@ -94,9 +99,10 @@ in {
|
|||||||
# HARDWARE TOOLS
|
# HARDWARE TOOLS
|
||||||
gnome-disk-utility
|
gnome-disk-utility
|
||||||
arandr # xrandr for noobs
|
arandr # xrandr for noobs
|
||||||
|
wdisplays
|
||||||
libnotify # for notify-send
|
libnotify # for notify-send
|
||||||
xclip # clipboard CLI
|
xclip # clipboard CLI
|
||||||
xdragon # drag and drop
|
dragon-drop # drag and drop
|
||||||
xorg.xkill # kill by clicking
|
xorg.xkill # kill by clicking
|
||||||
portfolio # personal finance overview
|
portfolio # personal finance overview
|
||||||
audacity
|
audacity
|
||||||
@@ -114,13 +120,13 @@ 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 ${unstablePackages.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://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek'
|
||||||
'')
|
'')
|
||||||
alejandra # nix formatter
|
alejandra # nix formatter
|
||||||
pdfgrep # search in pdf
|
pdfgrep # search in pdf
|
||||||
pdftk # pdf toolkit
|
pdftk # pdf toolkit
|
||||||
mupdf
|
mupdf
|
||||||
poppler_utils # pdf toolkit
|
poppler-utils # pdf toolkit
|
||||||
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
|
||||||
@@ -130,6 +136,7 @@ in {
|
|||||||
rink # unit converter
|
rink # unit converter
|
||||||
niveumPackages.auc
|
niveumPackages.auc
|
||||||
niveumPackages.noise-waves
|
niveumPackages.noise-waves
|
||||||
|
niveumPackages.stag
|
||||||
niveumPackages.cheat-sh
|
niveumPackages.cheat-sh
|
||||||
niveumPackages.polyglot
|
niveumPackages.polyglot
|
||||||
niveumPackages.qrpaste
|
niveumPackages.qrpaste
|
||||||
@@ -144,18 +151,14 @@ in {
|
|||||||
niveumPackages.pls
|
niveumPackages.pls
|
||||||
niveumPackages.mpv-tv
|
niveumPackages.mpv-tv
|
||||||
niveumPackages.mpv-iptv
|
niveumPackages.mpv-iptv
|
||||||
jellyfin-media-player
|
|
||||||
niveumPackages.devanagari
|
niveumPackages.devanagari
|
||||||
niveumPackages.betacode # ancient greek betacode to unicode converter
|
niveumPackages.betacode # ancient greek betacode to unicode converter
|
||||||
niveumPackages.meteo
|
pkgs.jq-lsp
|
||||||
niveumPackages.jq-lsp
|
|
||||||
niveumPackages.swallow # window swallowing
|
niveumPackages.swallow # window swallowing
|
||||||
niveumPackages.literature-quote
|
niveumPackages.literature-quote
|
||||||
niveumPackages.booksplit
|
niveumPackages.booksplit
|
||||||
niveumPackages.dmenu-randr
|
niveumPackages.dmenu-randr
|
||||||
niveumPackages.dmenu-bluetooth
|
|
||||||
niveumPackages.manual-sort
|
niveumPackages.manual-sort
|
||||||
niveumPackages.dns-sledgehammer
|
|
||||||
niveumPackages.wttr
|
niveumPackages.wttr
|
||||||
niveumPackages.unicodmenu
|
niveumPackages.unicodmenu
|
||||||
niveumPackages.emailmenu
|
niveumPackages.emailmenu
|
||||||
@@ -197,20 +200,13 @@ in {
|
|||||||
${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
|
${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
|
||||||
'')
|
'')
|
||||||
|
|
||||||
(pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
|
|
||||||
(pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
|
|
||||||
|
|
||||||
inputs.scripts.packages.x86_64-linux.alarm
|
inputs.scripts.packages.x86_64-linux.alarm
|
||||||
|
|
||||||
spotify
|
spotify
|
||||||
ncspot
|
ncspot
|
||||||
playerctl
|
playerctl
|
||||||
|
|
||||||
nix-index
|
|
||||||
niveumPackages.nix-index-update
|
|
||||||
|
|
||||||
#krebs
|
#krebs
|
||||||
niveumPackages.dic
|
|
||||||
pkgs.nur.repos.mic92.ircsink
|
pkgs.nur.repos.mic92.ircsink
|
||||||
|
|
||||||
(haskellPackages.ghcWithHoogle (hs: [
|
(haskellPackages.ghcWithHoogle (hs: [
|
||||||
@@ -237,9 +233,8 @@ in {
|
|||||||
dhall
|
dhall
|
||||||
|
|
||||||
html-tidy
|
html-tidy
|
||||||
nodePackages.csslint
|
|
||||||
nodePackages.jsonlint
|
|
||||||
deno # better node.js
|
deno # better node.js
|
||||||
|
go
|
||||||
texlive.combined.scheme-full
|
texlive.combined.scheme-full
|
||||||
latexrun
|
latexrun
|
||||||
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{services.redshift.enable = false;}
|
{ services.redshift.enable = true; }
|
||||||
|
|||||||
@@ -3,5 +3,6 @@
|
|||||||
location = {
|
location = {
|
||||||
latitude = 52.517;
|
latitude = 52.517;
|
||||||
longitude = 13.3872;
|
longitude = 13.3872;
|
||||||
|
provider = "geoclue2";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
in {
|
in {
|
||||||
users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
|
users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
|
||||||
programs.ssh.startAgent = true;
|
programs.ssh.startAgent = true;
|
||||||
|
services.gnome.gcr-ssh-agent.enable = false;
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
# https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
|
# https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
|
||||||
@@ -40,6 +41,7 @@ in {
|
|||||||
|
|
||||||
home-manager.users.me.programs.ssh = {
|
home-manager.users.me.programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
enableDefaultConfig = false;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"github.com" = {
|
"github.com" = {
|
||||||
hostname = "ssh.github.com";
|
hostname = "ssh.github.com";
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
age.secrets.stw-berlin-card-code.file = ../secrets/stw-berlin-card-code.age;
|
|
||||||
|
|
||||||
systemd.services.stw-berlin = {
|
|
||||||
enable = true;
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
startAt = "weekly";
|
|
||||||
serviceConfig = {
|
|
||||||
User = config.users.users.me.name;
|
|
||||||
Group = config.users.users.me.group;
|
|
||||||
WorkingDirectory = "/home/kfm/cloud/nextcloud/Uni/Meta/Mensa";
|
|
||||||
LoadCredential = [
|
|
||||||
"password:${config.age.secrets.stw-berlin-card-code.path}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
script = ''
|
|
||||||
KARTEN_ID=8071859
|
|
||||||
PASSWORT=$(cat "$CREDENTIALS_DIRECTORY"/password)
|
|
||||||
|
|
||||||
endpoint=https://ks.stw.berlin:4433/TL1/TLM/KASVC
|
|
||||||
authorization_header='Authorization: Basic S0FTVkM6ekt2NXlFMUxaVW12VzI5SQ=='
|
|
||||||
|
|
||||||
get_auth_token() {
|
|
||||||
${pkgs.curl}/bin/curl -sSL "$endpoint/LOGIN?karteNr=$KARTEN_ID&format=JSON&datenformat=JSON" \
|
|
||||||
-X POST \
|
|
||||||
-H "$authorization_header" \
|
|
||||||
--data-raw '{"BenutzerID":"'$KARTEN_ID'","Passwort":"'$PASSWORT'"}' \
|
|
||||||
| ${pkgs.jq}/bin/jq -r '.[0].authToken|@uri'
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
get_transactions() {
|
|
||||||
${pkgs.curl}/bin/curl -sSL "$endpoint/TRANS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
|
|
||||||
-H "$authorization_header" \
|
|
||||||
| ${pkgs.jq}/bin/jq
|
|
||||||
}
|
|
||||||
|
|
||||||
get_items() {
|
|
||||||
${pkgs.curl}/bin/curl -sSL "$endpoint/TRANSPOS?format=JSON&authToken=$(get_auth_token)&karteNr=$KARTEN_ID&datumVon=12.02.2018&datumBis=$(date -d tomorrow +%d.%m.%Y)" \
|
|
||||||
-H "$authorization_header" \
|
|
||||||
| ${pkgs.jq}/bin/jq
|
|
||||||
}
|
|
||||||
|
|
||||||
get_transactions > transactions-$(date -I).json
|
|
||||||
get_items > items-$(date -I).json
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,7 @@ in {
|
|||||||
stylix.enable = true;
|
stylix.enable = true;
|
||||||
stylix.image = generatedWallpaper;
|
stylix.image = generatedWallpaper;
|
||||||
|
|
||||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
|
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
|
||||||
|
|
||||||
stylix.cursor = {
|
stylix.cursor = {
|
||||||
name = "capitaine-cursors-white";
|
name = "capitaine-cursors-white";
|
||||||
@@ -26,6 +26,9 @@ in {
|
|||||||
size = 12;
|
size = 12;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
stylix.autoEnable = true;
|
||||||
|
};
|
||||||
|
|
||||||
# environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
|
# environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
|
||||||
|
|
||||||
@@ -67,7 +70,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
emoji = {
|
emoji = {
|
||||||
package = pkgs.noto-fonts-emoji;
|
package = pkgs.noto-fonts-color-emoji;
|
||||||
name = "Noto Color Emoji";
|
name = "Noto Color Emoji";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
aggressiveResize = true;
|
aggressiveResize = true;
|
||||||
escapeTime = 50;
|
escapeTime = 50;
|
||||||
historyLimit = 7000;
|
historyLimit = 7000;
|
||||||
shortcut = "a";
|
shortcut = "b";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set -g mouse on
|
set -g mouse on
|
||||||
|
|
||||||
@@ -37,15 +37,6 @@
|
|||||||
set -g status-left-length 32
|
set -g status-left-length 32
|
||||||
set -g status-right-length 150
|
set -g status-right-length 150
|
||||||
|
|
||||||
set -g status-bg colour242
|
|
||||||
|
|
||||||
setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
|
|
||||||
setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
|
|
||||||
|
|
||||||
set -g status-left ""
|
|
||||||
set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
|
|
||||||
set -g status-justify left
|
|
||||||
|
|
||||||
set -g status-position bottom
|
set -g status-position bottom
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -30,7 +30,19 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
accounts.email.accounts = {
|
accounts.email.accounts = {
|
||||||
fu-student =
|
letos =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
{
|
||||||
|
userName = "slfletos";
|
||||||
|
address = "letos.sprachlit@hu-berlin.de";
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-letos.path}";
|
||||||
|
imap.host = "mailbox.cms.hu-berlin.de";
|
||||||
|
imap.port = 993;
|
||||||
|
smtp.host = "mailhost.cms.hu-berlin.de";
|
||||||
|
smtp.port = 25;
|
||||||
|
smtp.tls.useStartTls = true;
|
||||||
|
};
|
||||||
|
fu =
|
||||||
lib.recursiveUpdate defaults
|
lib.recursiveUpdate defaults
|
||||||
(lib.recursiveUpdate fu-defaults
|
(lib.recursiveUpdate fu-defaults
|
||||||
rec {
|
rec {
|
||||||
@@ -38,21 +50,6 @@ in {
|
|||||||
address = "kieran.meinhardt@fu-berlin.de";
|
address = "kieran.meinhardt@fu-berlin.de";
|
||||||
aliases = ["${userName}@fu-berlin.de"];
|
aliases = ["${userName}@fu-berlin.de"];
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
|
||||||
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
|
|
||||||
signature = {
|
|
||||||
showSignature = "append";
|
|
||||||
text = ''
|
|
||||||
${defaults.realName}
|
|
||||||
${pronouns}
|
|
||||||
|
|
||||||
---
|
|
||||||
Studentische Hilfskraft / ZODIAC
|
|
||||||
Freie Universität Berlin
|
|
||||||
|
|
||||||
Telefon: +49 30 838 58118
|
|
||||||
Arnimallee 10, Raum 106, 14195 Berlin
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
himalaya = {
|
himalaya = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.backend = "imap";
|
settings.backend = "imap";
|
||||||
@@ -68,6 +65,12 @@ in {
|
|||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
|
email-password-letos = {
|
||||||
|
file = ../secrets/email-password-letos.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
fu-sftp-key = {
|
fu-sftp-key = {
|
||||||
file = ../secrets/fu-sftp-key.age;
|
file = ../secrets/fu-sftp-key.age;
|
||||||
owner = "root";
|
owner = "root";
|
||||||
@@ -110,24 +113,31 @@ in {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in home-directory-mount "meinhak99";
|
||||||
"${remoteDir}/fu/zodiac" = {
|
|
||||||
device = "//trove.storage.fu-berlin.de/GESCHKULT";
|
|
||||||
fsType = "cifs";
|
|
||||||
options =
|
|
||||||
fu-berlin-cifs-options
|
|
||||||
++ [
|
|
||||||
"credentials=${config.age.secrets.cifs-credentials-zodiac.path}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
} // home-directory-mount "meinhak99"
|
|
||||||
// home-directory-mount "xm7234fu";
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
cifs-credentials-zodiac.file = ../secrets/cifs-credentials-zodiac.age;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
(pkgs.writers.writeDashBin "hu-vpn-split" ''
|
||||||
|
${pkgs.openfortivpn}/bin/openfortivpn \
|
||||||
|
--password="$(cat "${config.age.secrets.email-password-letos.path}")" \
|
||||||
|
--config=${
|
||||||
|
pkgs.writeText "hu-berlin-split.config" ''
|
||||||
|
host = forti-ssl.vpn.hu-berlin.de
|
||||||
|
port = 443
|
||||||
|
username = slfletos@split_tunnel
|
||||||
|
''
|
||||||
|
}
|
||||||
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "hu-vpn-full" ''
|
||||||
|
${pkgs.openfortivpn}/bin/openfortivpn \
|
||||||
|
--password="$(cat "${config.age.secrets.email-password-letos.path}")" \
|
||||||
|
--config=${
|
||||||
|
pkgs.writeText "hu-berlin-full.config" ''
|
||||||
|
host = forti-ssl.vpn.hu-berlin.de
|
||||||
|
port = 443
|
||||||
|
username = slfletos@tunnel_all
|
||||||
|
''
|
||||||
|
}
|
||||||
|
'')
|
||||||
(pkgs.writers.writeDashBin "fu-vpn" ''
|
(pkgs.writers.writeDashBin "fu-vpn" ''
|
||||||
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
||||||
then
|
then
|
||||||
@@ -138,16 +148,4 @@ in {
|
|||||||
fi
|
fi
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.services.fu-vpn = {
|
|
||||||
enable = false;
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhak99.path}";
|
|
||||||
script = ''
|
|
||||||
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
|
||||||
then
|
|
||||||
cat "$CREDENTIALS_DIRECTORY/password" | ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --user ${username} --passwd-on-stdin
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
14
configs/virtualization.nix
Normal file
14
configs/virtualization.nix
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
users.users.me.extraGroups = [ "libvirtd" ];
|
||||||
|
virtualisation.libvirtd.enable = true;
|
||||||
|
|
||||||
|
# Enable TPM support for VMs
|
||||||
|
virtualisation.libvirtd.qemu = {
|
||||||
|
# swtpm.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
virt-manager
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
networking.wireless = {
|
networking.wireless = {
|
||||||
enable = true;
|
enable = true;
|
||||||
networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
|
secretsFile = config.age.secrets.wifi.path;
|
||||||
|
# networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
|
||||||
|
networks.Schilfpalast.pskRaw = "ext:schilfpalast";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,15 +6,6 @@
|
|||||||
promptColours.success = "cyan";
|
promptColours.success = "cyan";
|
||||||
promptColours.failure = "red";
|
promptColours.failure = "red";
|
||||||
in {
|
in {
|
||||||
environment.systemPackages = [pkgs.atuin];
|
|
||||||
environment.variables.ATUIN_CONFIG_DIR = toString (pkgs.writeTextDir "/config.toml" ''
|
|
||||||
auto_sync = true
|
|
||||||
update_check = false
|
|
||||||
sync_address = "http://zaatar.r:8888"
|
|
||||||
sync_frequency = 0
|
|
||||||
style = "compact"
|
|
||||||
'');
|
|
||||||
|
|
||||||
programs.zsh = let
|
programs.zsh = let
|
||||||
zsh-completions = pkgs.fetchFromGitHub {
|
zsh-completions = pkgs.fetchFromGitHub {
|
||||||
owner = "zsh-users";
|
owner = "zsh-users";
|
||||||
@@ -67,13 +58,6 @@ in {
|
|||||||
zstyle ':vcs_info:*' formats "%c%u%F{cyan}%b%f"
|
zstyle ':vcs_info:*' formats "%c%u%F{cyan}%b%f"
|
||||||
zstyle ':vcs_info:*' actionformats "(%a) %c%u%F{cyan}%b%f"
|
zstyle ':vcs_info:*' actionformats "(%a) %c%u%F{cyan}%b%f"
|
||||||
|
|
||||||
# atuin distributed shell history
|
|
||||||
export ATUIN_NOBIND="true" # disable all keybdinings of atuin
|
|
||||||
eval "$(atuin init zsh)"
|
|
||||||
bindkey '^r' _atuin_search_widget # bind ctrl+r to atuin
|
|
||||||
# use zsh only session history
|
|
||||||
fc -p
|
|
||||||
|
|
||||||
precmd () {
|
precmd () {
|
||||||
vcs_info
|
vcs_info
|
||||||
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] || [ -n "$SSH_CONNECTION" ]; then
|
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] || [ -n "$SSH_CONNECTION" ]; then
|
||||||
|
|||||||
582
flake.lock
generated
582
flake.lock
generated
File diff suppressed because it is too large
Load Diff
364
flake.nix
364
flake.nix
@@ -2,25 +2,25 @@
|
|||||||
description = "niveum: packages, modules, systems";
|
description = "niveum: packages, modules, systems";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
|
self.submodules = true;
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
# alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master";
|
autorenkalender.url = "github:kmein/autorenkalender";
|
||||||
coptic-dictionary.url = "github:kmein/coptic-dictionary";
|
coptic-dictionary.url = "github:kmein/coptic-dictionary";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
|
||||||
menstruation-backend.url = "github:kmein/menstruation.rs";
|
menstruation-backend.url = "github:kmein/menstruation.rs";
|
||||||
menstruation-telegram.url = "github:kmein/menstruation-telegram";
|
menstruation-telegram.url = "github:kmein/menstruation-telegram";
|
||||||
nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
|
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||||
nixinate.url = "github:matthewcroughan/nixinate";
|
nixinate.url = "github:matthewcroughan/nixinate";
|
||||||
nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
|
nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
recht.url = "github:kmein/recht";
|
recht.url = "github:kmein/recht";
|
||||||
retiolum.url = "github:krebs/retiolum";
|
retiolum.url = "github:krebs/retiolum";
|
||||||
rust-overlay.url = "github:oxalica/rust-overlay";
|
|
||||||
scripts.url = "github:kmein/scripts";
|
scripts.url = "github:kmein/scripts";
|
||||||
stockholm.url = "github:krebs/stockholm";
|
stockholm.url = "github:krebs/stockholm";
|
||||||
stylix.url = "github:danth/stylix/release-25.05";
|
stylix.url = "github:danth/stylix/release-25.11";
|
||||||
telebots.url = "github:kmein/telebots";
|
telebots.url = "github:kmein/telebots";
|
||||||
tinc-graph.url = "github:kmein/tinc-graph";
|
tinc-graph.url = "github:kmein/tinc-graph";
|
||||||
voidrice.url = "github:Lukesmithxyz/voidrice";
|
voidrice.url = "github:Lukesmithxyz/voidrice";
|
||||||
@@ -29,116 +29,107 @@
|
|||||||
|
|
||||||
agenix.inputs.home-manager.follows = "home-manager";
|
agenix.inputs.home-manager.follows = "home-manager";
|
||||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
|
coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# menstruation-backend.inputs.flake-utils.follows = "flake-utils";
|
|
||||||
# menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
# menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
|
|
||||||
menstruation-telegram.inputs.flake-utils.follows = "flake-utils";
|
|
||||||
menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
|
menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
|
||||||
menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
|
menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
|
||||||
nix-on-droid.inputs.home-manager.follows = "home-manager";
|
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
recht.inputs.flake-utils.follows = "flake-utils";
|
|
||||||
recht.inputs.nixpkgs.follows = "nixpkgs";
|
recht.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
scripts.inputs.flake-utils.follows = "flake-utils";
|
|
||||||
scripts.inputs.nixpkgs.follows = "nixpkgs";
|
scripts.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
scripts.inputs.rust-overlay.follows = "rust-overlay";
|
|
||||||
stylix.inputs.home-manager.follows = "home-manager";
|
|
||||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
tinc-graph.inputs.flake-utils.follows = "flake-utils";
|
|
||||||
tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
|
tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
tinc-graph.inputs.rust-overlay.follows = "rust-overlay";
|
|
||||||
voidrice.flake = false;
|
voidrice.flake = false;
|
||||||
wallpaper-generator.inputs.flake-utils.follows = "flake-utils";
|
|
||||||
wallpapers.flake = false;
|
wallpapers.flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
outputs =
|
||||||
extra-substituters = [ "https://kmein.cachix.org" ];
|
inputs@{
|
||||||
extra-trusted-public-keys = [ "kmein.cachix.org-1:rsJ2b6++VQHJ1W6rGuDUYsK/qUkFA3bNpO6PyEyJ9Ls=" ];
|
self,
|
||||||
};
|
nixpkgs,
|
||||||
|
nixpkgs-unstable,
|
||||||
outputs = inputs @ {
|
nur,
|
||||||
self,
|
home-manager,
|
||||||
nixpkgs,
|
agenix,
|
||||||
nixpkgs-unstable,
|
retiolum,
|
||||||
nur,
|
nixinate,
|
||||||
home-manager,
|
flake-utils,
|
||||||
agenix,
|
nix-index-database,
|
||||||
retiolum,
|
stylix,
|
||||||
nixinate,
|
...
|
||||||
flake-utils,
|
}:
|
||||||
nix-on-droid,
|
let
|
||||||
stylix,
|
lib = nixpkgs.lib;
|
||||||
...
|
eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
|
||||||
}:
|
in
|
||||||
{
|
{
|
||||||
apps = {
|
apps = {
|
||||||
x86_64-darwin = let
|
x86_64-linux =
|
||||||
pkgs = nixpkgs.legacyPackages.x86_64-darwin;
|
let
|
||||||
in {
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
deploy-maakaron = {
|
lib = nixpkgs.lib;
|
||||||
type = "app";
|
in
|
||||||
program = toString (pkgs.writers.writeDash "deploy-maakaron" ''
|
|
||||||
exec $(nix build .#homeConfigurations.maakaron.activationPackage --no-link --print-out-paths)/activate
|
|
||||||
'');
|
|
||||||
};
|
|
||||||
};
|
|
||||||
x86_64-linux = let
|
|
||||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
|
||||||
lib = nixpkgs.lib;
|
|
||||||
in
|
|
||||||
nixinate.nixinate.x86_64-linux self
|
nixinate.nixinate.x86_64-linux self
|
||||||
// {
|
// {
|
||||||
mock-secrets = {
|
mock-secrets = {
|
||||||
type = "app";
|
type = "app";
|
||||||
program = toString (pkgs.writers.writeDash "mock-secrets" ''
|
program = toString (
|
||||||
${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f | ${pkgs.coreutils}/bin/sort > secrets.txt
|
pkgs.writers.writeDash "mock-secrets" ''
|
||||||
'');
|
${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f | ${pkgs.coreutils}/bin/sort > secrets.txt
|
||||||
|
''
|
||||||
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
# the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873
|
# the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873
|
||||||
// builtins.listToAttrs (map (hostname: let
|
// builtins.listToAttrs (
|
||||||
externalNetwork = import ./lib/external-network.nix;
|
map (
|
||||||
targets = {
|
hostname:
|
||||||
ful = "root@ful";
|
let
|
||||||
zaatar = "root@zaatar";
|
targets = {
|
||||||
makanek = "root@makanek";
|
ful = "root@ful";
|
||||||
manakish = "root@manakish";
|
zaatar = "root@zaatar";
|
||||||
tahina = "root@tahina";
|
makanek = "root@makanek";
|
||||||
tabula = "root@tabula";
|
manakish = "root@manakish";
|
||||||
kabsa = "root@kabsa";
|
tahina = "root@tahina";
|
||||||
fatteh = "root@fatteh";
|
tabula = "root@tabula";
|
||||||
kibbeh = "root@kibbeh";
|
kabsa = "root@kabsa";
|
||||||
};
|
fatteh = "root@fatteh";
|
||||||
in
|
kibbeh = "root@kibbeh";
|
||||||
lib.attrsets.nameValuePair "deploy-${hostname}" {
|
};
|
||||||
type = "app";
|
in
|
||||||
program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
|
lib.attrsets.nameValuePair "deploy-${hostname}" {
|
||||||
exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
|
type = "app";
|
||||||
--max-jobs 2 \
|
program = toString (
|
||||||
--log-format internal-json \
|
pkgs.writers.writeDash "deploy-${hostname}" ''
|
||||||
--flake .?submodules=1#${hostname} \
|
exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
|
||||||
--target-host ${targets.${hostname}} 2>&1 \
|
--max-jobs 2 \
|
||||||
| ${pkgs.nix-output-monitor}/bin/nom --json
|
--log-format internal-json \
|
||||||
'');
|
--flake .#${hostname} \
|
||||||
}) (builtins.attrNames self.nixosConfigurations))
|
--target-host ${targets.${hostname}} 2>&1 \
|
||||||
|
| ${pkgs.nix-output-monitor}/bin/nom --json
|
||||||
|
''
|
||||||
|
);
|
||||||
|
}
|
||||||
|
) (builtins.attrNames self.nixosConfigurations)
|
||||||
|
)
|
||||||
// {
|
// {
|
||||||
deploy-ful = {
|
deploy-ful = {
|
||||||
type = "app";
|
type = "app";
|
||||||
program = toString (pkgs.writers.writeDash "deploy-ful" ''
|
program = toString (
|
||||||
exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful \
|
pkgs.writers.writeDash "deploy-ful" ''
|
||||||
--log-format internal-json 2>&1 \
|
exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
|
||||||
| ${pkgs.nix-output-monitor}/bin/nom --json
|
--log-format internal-json 2>&1 \
|
||||||
'');
|
| ${pkgs.nix-output-monitor}/bin/nom --json
|
||||||
|
''
|
||||||
|
);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# TODO overlay for packages
|
||||||
|
# TODO remove flake-utils dependency from my own repos
|
||||||
|
|
||||||
nixosModules = {
|
nixosModules = {
|
||||||
htgen = import modules/htgen.nix;
|
|
||||||
moodle-dl = import modules/moodle-dl.nix;
|
moodle-dl = import modules/moodle-dl.nix;
|
||||||
networkmanager-declarative = import modules/networkmanager-declarative.nix;
|
networkmanager-declarative = import modules/networkmanager-declarative.nix;
|
||||||
passport = import modules/passport.nix;
|
passport = import modules/passport.nix;
|
||||||
@@ -146,43 +137,13 @@
|
|||||||
power-action = import modules/power-action.nix;
|
power-action = import modules/power-action.nix;
|
||||||
system-dependent = import modules/system-dependent.nix;
|
system-dependent = import modules/system-dependent.nix;
|
||||||
telegram-bot = import modules/telegram-bot.nix;
|
telegram-bot = import modules/telegram-bot.nix;
|
||||||
|
go-webring = import modules/go-webring.nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
lib = {
|
lib = {
|
||||||
panoptikon = import lib/panoptikon.nix;
|
panoptikon = import lib/panoptikon.nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixOnDroidConfigurations = {
|
|
||||||
moto = nix-on-droid.lib.nixOnDroidConfiguration {
|
|
||||||
modules = [systems/moto/configuration.nix];
|
|
||||||
pkgs = import nixpkgs {
|
|
||||||
system = "aarch64-linux";
|
|
||||||
overlays = [nix-on-droid.overlays.default];
|
|
||||||
};
|
|
||||||
extraSpecialArgs = {
|
|
||||||
niveumPackages = inputs.self.packages.aarch64-linux;
|
|
||||||
niveumLib = inputs.self.lib;
|
|
||||||
inherit inputs;
|
|
||||||
};
|
|
||||||
home-manager-path = home-manager.outPath;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
homeConfigurations = {
|
|
||||||
maakaron = let
|
|
||||||
system = "x86_64-darwin";
|
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
|
||||||
in
|
|
||||||
home-manager.lib.homeManagerConfiguration {
|
|
||||||
inherit pkgs;
|
|
||||||
modules = [./systems/maakaron/home.nix];
|
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit inputs;
|
|
||||||
niveumPackages = inputs.self.packages.${system};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nixosConfigurations = let
|
nixosConfigurations = let
|
||||||
niveumSpecialArgs = system: {
|
niveumSpecialArgs = system: {
|
||||||
unstablePackages = import nixpkgs-unstable {
|
unstablePackages = import nixpkgs-unstable {
|
||||||
@@ -207,7 +168,7 @@
|
|||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
inputs.self.nixosModules.passport
|
inputs.self.nixosModules.passport
|
||||||
inputs.self.nixosModules.panoptikon
|
inputs.self.nixosModules.panoptikon
|
||||||
inputs.self.nixosModules.htgen
|
inputs.self.nixosModules.go-webring
|
||||||
inputs.stockholm.nixosModules.reaktor2
|
inputs.stockholm.nixosModules.reaktor2
|
||||||
retiolum.nixosModules.retiolum
|
retiolum.nixosModules.retiolum
|
||||||
nur.modules.nixos.default
|
nur.modules.nixos.default
|
||||||
@@ -239,6 +200,7 @@
|
|||||||
systems/kibbeh/configuration.nix
|
systems/kibbeh/configuration.nix
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
retiolum.nixosModules.retiolum
|
retiolum.nixosModules.retiolum
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
makanek = nixpkgs.lib.nixosSystem rec {
|
makanek = nixpkgs.lib.nixosSystem rec {
|
||||||
@@ -248,7 +210,6 @@
|
|||||||
modules = [
|
modules = [
|
||||||
systems/makanek/configuration.nix
|
systems/makanek/configuration.nix
|
||||||
inputs.self.nixosModules.telegram-bot
|
inputs.self.nixosModules.telegram-bot
|
||||||
inputs.self.nixosModules.htgen
|
|
||||||
inputs.self.nixosModules.passport
|
inputs.self.nixosModules.passport
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
retiolum.nixosModules.retiolum
|
retiolum.nixosModules.retiolum
|
||||||
@@ -281,6 +242,7 @@
|
|||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
retiolum.nixosModules.retiolum
|
retiolum.nixosModules.retiolum
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
nix-index-database.nixosModules.default
|
||||||
nur.modules.nixos.default
|
nur.modules.nixos.default
|
||||||
stylix.nixosModules.stylix
|
stylix.nixosModules.stylix
|
||||||
];
|
];
|
||||||
@@ -294,6 +256,7 @@
|
|||||||
retiolum.nixosModules.retiolum
|
retiolum.nixosModules.retiolum
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
nur.modules.nixos.default
|
nur.modules.nixos.default
|
||||||
|
nix-index-database.nixosModules.default
|
||||||
stylix.nixosModules.stylix
|
stylix.nixosModules.stylix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -306,143 +269,134 @@
|
|||||||
retiolum.nixosModules.retiolum
|
retiolum.nixosModules.retiolum
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
nur.modules.nixos.default
|
nur.modules.nixos.default
|
||||||
|
nix-index-database.nixosModules.default
|
||||||
stylix.nixosModules.stylix
|
stylix.nixosModules.stylix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
|
||||||
// flake-utils.lib.eachSystem [flake-utils.lib.system.x86_64-linux flake-utils.lib.system.x86_64-darwin flake-utils.lib.system.aarch64-linux] (system: let
|
packages = eachSupportedSystem (system: let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [
|
config.allowUnfree = true;
|
||||||
nur.overlays.default
|
overlays = [
|
||||||
(self: super: {
|
nur.overlays.default
|
||||||
mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
|
(self: super: {
|
||||||
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];};
|
||||||
})
|
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||||
];
|
})
|
||||||
};
|
];
|
||||||
unstablePackages = import nixpkgs-unstable {
|
};
|
||||||
inherit system;
|
wrapScript = {
|
||||||
};
|
packages ? [],
|
||||||
wrapScript = {
|
name,
|
||||||
packages ? [],
|
script,
|
||||||
name,
|
}:
|
||||||
script,
|
pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
|
||||||
}:
|
in {
|
||||||
pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
|
# linguistics and ancient world
|
||||||
in {
|
|
||||||
packages = rec {
|
|
||||||
auc = pkgs.callPackage packages/auc.nix {};
|
auc = pkgs.callPackage packages/auc.nix {};
|
||||||
betacode = pkgs.callPackage packages/betacode.nix {};
|
betacode = pkgs.callPackage packages/betacode.nix {};
|
||||||
brainmelter = pkgs.callPackage packages/brainmelter.nix {};
|
brassica = pkgs.callPackage packages/brassica.nix {}; # TODO upstream
|
||||||
brassica = pkgs.callPackage packages/brassica.nix {};
|
devanagari = pkgs.callPackage packages/devanagari {};
|
||||||
cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
|
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 {};
|
closest = pkgs.callPackage packages/closest {};
|
||||||
cro = pkgs.callPackage packages/cro.nix {};
|
|
||||||
|
# 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 {};
|
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 {};
|
default-gateway = pkgs.callPackage packages/default-gateway.nix {};
|
||||||
depp = pkgs.callPackage packages/depp.nix {};
|
depp = pkgs.callPackage packages/depp.nix {};
|
||||||
dashboard = pkgs.callPackage packages/dashboard {};
|
dashboard = pkgs.callPackage packages/dashboard {};
|
||||||
devanagari = pkgs.callPackage packages/devanagari {};
|
|
||||||
devour = pkgs.callPackage packages/devour.nix {};
|
|
||||||
dic = pkgs.callPackage packages/dic.nix {};
|
|
||||||
dirmir = pkgs.callPackage packages/dirmir.nix {};
|
|
||||||
dmenu-bluetooth = pkgs.callPackage packages/dmenu-bluetooth.nix {};
|
|
||||||
dmenu-scrot = pkgs.callPackage packages/dmenu-scrot.nix {};
|
|
||||||
dns-sledgehammer = pkgs.callPackage packages/dns-sledgehammer.nix {};
|
|
||||||
fkill = pkgs.callPackage packages/fkill.nix {};
|
fkill = pkgs.callPackage packages/fkill.nix {};
|
||||||
fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
|
fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
|
||||||
genius = pkgs.callPackage packages/genius.nix {};
|
|
||||||
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
|
|
||||||
git-preview = pkgs.callPackage packages/git-preview.nix {};
|
|
||||||
gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
|
gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
|
||||||
gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
|
gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
|
||||||
hc = pkgs.callPackage packages/hc.nix {};
|
|
||||||
jq-lsp = pkgs.callPackage packages/jq-lsp.nix {};
|
|
||||||
stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
|
|
||||||
heuretes = pkgs.callPackage packages/heuretes.nix {};
|
|
||||||
htgen = pkgs.callPackage packages/htgen.nix {};
|
|
||||||
image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
|
image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
|
||||||
image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix {};
|
image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix {};
|
||||||
infschmv = pkgs.callPackage packages/infschmv.nix {};
|
|
||||||
iolanguage = pkgs.callPackage packages/iolanguage.nix {};
|
|
||||||
ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
|
|
||||||
ix = pkgs.callPackage packages/ix.nix {};
|
|
||||||
jsesh = pkgs.callPackage packages/jsesh.nix {};
|
|
||||||
k-lock = pkgs.callPackage packages/k-lock.nix {};
|
k-lock = pkgs.callPackage packages/k-lock.nix {};
|
||||||
kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
|
|
||||||
klem = pkgs.callPackage packages/klem.nix {};
|
klem = pkgs.callPackage packages/klem.nix {};
|
||||||
kpaste = pkgs.callPackage packages/kpaste.nix {};
|
man-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream
|
||||||
literature-quote = pkgs.callPackage packages/literature-quote.nix {};
|
|
||||||
mahlzeit = pkgs.haskellPackages.callPackage packages/mahlzeit.nix {};
|
|
||||||
man-pandoc = pkgs.callPackage packages/man/pandoc.nix {};
|
|
||||||
man-pdf = pkgs.callPackage packages/man-pdf.nix {};
|
man-pdf = pkgs.callPackage packages/man-pdf.nix {};
|
||||||
mansplain = pkgs.callPackage packages/mansplain.nix {};
|
mansplain = pkgs.callPackage packages/mansplain.nix {};
|
||||||
manual-sort = pkgs.callPackage packages/manual-sort.nix {};
|
manual-sort = pkgs.callPackage packages/manual-sort.nix {};
|
||||||
menu-calc = pkgs.callPackage packages/menu-calc.nix {};
|
menu-calc = pkgs.callPackage packages/menu-calc.nix {};
|
||||||
meteo = pkgs.callPackage packages/meteo.nix {};
|
|
||||||
noise-waves = pkgs.callPackage packages/noise-waves.nix {};
|
noise-waves = pkgs.callPackage packages/noise-waves.nix {};
|
||||||
mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
|
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-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
|
||||||
mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
|
mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
|
||||||
mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
|
mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
|
||||||
mpv-visualizer = unstablePackages.mpvScripts.visualizer;
|
|
||||||
new-mac = pkgs.callPackage packages/new-mac.nix {};
|
new-mac = pkgs.callPackage packages/new-mac.nix {};
|
||||||
nix-git = pkgs.callPackage packages/nix-git.nix {};
|
nix-git = pkgs.callPackage packages/nix-git.nix {};
|
||||||
nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;};
|
|
||||||
notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
|
notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
|
||||||
opustags = pkgs.callPackage packages/opustags.nix {};
|
opustags = pkgs.callPackage packages/opustags.nix {}; # TODO upstream
|
||||||
pls = pkgs.callPackage packages/pls.nix {};
|
|
||||||
polyglot = pkgs.callPackage packages/polyglot.nix {};
|
|
||||||
q = pkgs.callPackage packages/q.nix {};
|
q = pkgs.callPackage packages/q.nix {};
|
||||||
qrpaste = pkgs.callPackage packages/qrpaste.nix {};
|
qrpaste = pkgs.callPackage packages/qrpaste.nix {};
|
||||||
random-zeno = pkgs.callPackage packages/random-zeno.nix {};
|
go-webring = pkgs.callPackage packages/go-webring.nix {}; # TODO upstream
|
||||||
rfc = pkgs.callPackage packages/rfc.nix {};
|
rfc = pkgs.callPackage packages/rfc.nix {};
|
||||||
gimp = pkgs.callPackage packages/gimp.nix {};
|
gimp = pkgs.callPackage packages/gimp.nix {};
|
||||||
scanned = pkgs.callPackage packages/scanned.nix {};
|
scanned = pkgs.callPackage packages/scanned.nix {};
|
||||||
swallow = pkgs.callPackage packages/swallow.nix {};
|
text2pdf = pkgs.callPackage packages/text2pdf.nix {}; # TODO upstream
|
||||||
text2pdf = pkgs.callPackage packages/text2pdf.nix {};
|
|
||||||
timer = pkgs.callPackage packages/timer.nix {};
|
timer = pkgs.callPackage packages/timer.nix {};
|
||||||
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
|
trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream
|
||||||
trans = pkgs.callPackage packages/trans.nix {};
|
|
||||||
ttspaste = pkgs.callPackage packages/ttspaste.nix {};
|
ttspaste = pkgs.callPackage packages/ttspaste.nix {};
|
||||||
unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
|
unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
|
||||||
emailmenu = pkgs.callPackage packages/emailmenu.nix {};
|
emailmenu = pkgs.callPackage packages/emailmenu.nix {};
|
||||||
untilport = pkgs.callPackage packages/untilport.nix {};
|
stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream
|
||||||
vg = pkgs.callPackage packages/vg.nix {};
|
vg = pkgs.callPackage packages/vg.nix {};
|
||||||
vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
|
vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
|
||||||
obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
|
obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
|
||||||
radio-news = pkgs.callPackage packages/radio-news.nix {};
|
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream
|
||||||
vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
|
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream
|
||||||
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
|
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream
|
||||||
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
|
vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream
|
||||||
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
|
vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream
|
||||||
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
|
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream
|
||||||
vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
|
vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream
|
||||||
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
|
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream
|
||||||
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
|
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream
|
||||||
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
|
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream
|
||||||
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
|
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream
|
||||||
vimv = pkgs.callPackage packages/vimv.nix {};
|
vimv = pkgs.callPackage packages/vimv.nix {};
|
||||||
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
|
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {}; # TODO upstream
|
||||||
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
|
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream
|
||||||
wttr = pkgs.callPackage packages/wttr.nix {};
|
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
|
||||||
|
wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream
|
||||||
itl = pkgs.callPackage packages/itl.nix {};
|
|
||||||
itools = pkgs.callPackage packages/itools.nix {itl = itl;};
|
|
||||||
|
|
||||||
booksplit = wrapScript {
|
booksplit = wrapScript {
|
||||||
script = inputs.voidrice.outPath + "/.local/bin/booksplit";
|
script = inputs.voidrice.outPath + "/.local/bin/booksplit";
|
||||||
name = "booksplit";
|
name = "booksplit";
|
||||||
packages = [pkgs.ffmpeg pkgs.glibc.bin];
|
packages = [pkgs.ffmpeg pkgs.glibc.bin];
|
||||||
};
|
};
|
||||||
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
|
|
||||||
tag = wrapScript {
|
tag = wrapScript {
|
||||||
script = inputs.voidrice.outPath + "/.local/bin/tag";
|
script = inputs.voidrice.outPath + "/.local/bin/tag";
|
||||||
name = "tag";
|
name = "tag";
|
||||||
packages = [pkgs.ffmpeg];
|
packages = [pkgs.ffmpeg];
|
||||||
};
|
};
|
||||||
};
|
});
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,4 @@
|
|||||||
{
|
{
|
||||||
toum = "192.168.178.24";
|
officejet = "192.168.0.251";
|
||||||
zaatar = "192.168.178.21";
|
router = "192.168.0.1";
|
||||||
kabsa = "192.168.178.32";
|
|
||||||
android = "192.168.178.35";
|
|
||||||
manakish = "192.168.178.29";
|
|
||||||
|
|
||||||
officejet = "192.168.178.27";
|
|
||||||
fritzbox = "192.168.178.1";
|
|
||||||
}
|
}
|
||||||
|
|||||||
282
lib/streams.nix
282
lib/streams.nix
@@ -85,9 +85,6 @@ let
|
|||||||
big-fm-name = name: "${name} | bigFM";
|
big-fm-name = name: "${name} | bigFM";
|
||||||
big-fm = name: "https://streams.bigfm.de/bigfm-${name}-128-aac";
|
big-fm = name: "https://streams.bigfm.de/bigfm-${name}-128-aac";
|
||||||
|
|
||||||
rautemusik-name = name: "${name} | rm.fm";
|
|
||||||
rautemusik = name: "http://${name}-high.rautemusik.fm/";
|
|
||||||
|
|
||||||
rte-name = name: "RTÉ ${name}";
|
rte-name = name: "RTÉ ${name}";
|
||||||
rte = name: "https://www.rte.ie/manifests/${name}.m3u8";
|
rte = name: "https://www.rte.ie/manifests/${name}.m3u8";
|
||||||
|
|
||||||
@@ -1207,198 +1204,6 @@ in
|
|||||||
logo = "https://cdn.schlagerparadies.de/images/rsp_setup/logo-radio-schlagerparadies.svg";
|
logo = "https://cdn.schlagerparadies.de/images/rsp_setup/logo-radio-schlagerparadies.svg";
|
||||||
tags = [tags.schlager];
|
tags = [tags.schlager];
|
||||||
}
|
}
|
||||||
{
|
|
||||||
station = rautemusik-name "Volksmusik";
|
|
||||||
desc = "Volksmusik, Blasmusik, Schlager";
|
|
||||||
stream = rautemusik "volksmusik";
|
|
||||||
tags = [tags.schlager];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Study";
|
|
||||||
stream = rautemusik "study";
|
|
||||||
desc = "Lo-Fi, Chillout, Easy Listening";
|
|
||||||
tags = [tags.lofi tags.chill];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "TechHouse";
|
|
||||||
stream = rautemusik "techhouse";
|
|
||||||
desc = "Techhouse, Deephouse, Techno, Minimal";
|
|
||||||
tags = [tags.party];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Goldies";
|
|
||||||
stream = rautemusik "goldies";
|
|
||||||
desc = "Oldies, 60s, 70s, 80s";
|
|
||||||
tags = [tags.vintage];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "90s";
|
|
||||||
stream = rautemusik "90s";
|
|
||||||
desc = "90s, Eurodance, Pop, HipHop";
|
|
||||||
tags = [tags.vintage];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Schlager";
|
|
||||||
stream = rautemusik "schlager";
|
|
||||||
desc = "Schlager, Discofox, Deutsch, Pop";
|
|
||||||
tags = [tags.schlager];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Country";
|
|
||||||
stream = rautemusik "country";
|
|
||||||
desc = "Country, Western, Americana";
|
|
||||||
tags = [tags.trad tags.american];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Sex";
|
|
||||||
stream = rautemusik "sex";
|
|
||||||
desc = "RnB, Pop, Easy Listening";
|
|
||||||
tags = [tags.chill];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "LoveHits";
|
|
||||||
stream = rautemusik "lovehits";
|
|
||||||
desc = "Lovesongs, Balladen, RnB, Pop";
|
|
||||||
tags = [tags.pop];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Klassik";
|
|
||||||
stream = rautemusik "klassik";
|
|
||||||
desc = "Symphonie, Orchester, Klassik";
|
|
||||||
tags = [tags.classical];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Traurig";
|
|
||||||
stream = rautemusik "traurig";
|
|
||||||
desc = "Balladen, Pop, Easy Listening";
|
|
||||||
tags = [tags.pop];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Happy";
|
|
||||||
stream = rautemusik "happy";
|
|
||||||
desc = "Pop, Dance, Charts";
|
|
||||||
tags = [tags.pop];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Solo Piano";
|
|
||||||
stream = rautemusik "solopiano";
|
|
||||||
desc = "Klavier, Instrumental, Easy Listening";
|
|
||||||
tags = [tags.classical];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "HappyHardcore";
|
|
||||||
stream = rautemusik "happyhardcore";
|
|
||||||
desc = "UK Core, Happy Hardcore, Dance";
|
|
||||||
tags = [tags.party];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "HardeR";
|
|
||||||
stream = rautemusik "harder";
|
|
||||||
desc = "Hardstyle, Hardcore, Jumpstyle";
|
|
||||||
tags = [tags.party];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "BigCityBeats";
|
|
||||||
stream = rautemusik "bigcitybeats";
|
|
||||||
desc = "EDM, Dance, House, Electro, Star DJs";
|
|
||||||
tags = [tags.pop tags.party];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Lounge";
|
|
||||||
stream = rautemusik "lounge";
|
|
||||||
desc = "Ambient, Jazz, Chillout, Easy Listening";
|
|
||||||
tags = [tags.chill];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Oriental";
|
|
||||||
stream = rautemusik "oriental";
|
|
||||||
desc = "Arabisch, Oriental, HipHop";
|
|
||||||
tags = [tags.arabic];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Salsa";
|
|
||||||
stream = rautemusik "salsa";
|
|
||||||
desc = "Salsa, Latina, Tropical";
|
|
||||||
tags = [tags.groovy];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Christmas";
|
|
||||||
stream = rautemusik "christmas";
|
|
||||||
desc = "Weihnachtslieder, Balladen, Schlager";
|
|
||||||
tags = [tags.xmas];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Christmas Chor";
|
|
||||||
stream = rautemusik "christmas-chor";
|
|
||||||
desc = "Chor, Weihnachtslieder, Gesang";
|
|
||||||
tags = [tags.xmas];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Christmas Schlager";
|
|
||||||
stream = rautemusik "christmas-schlager";
|
|
||||||
desc = "Schlager, Weihnachtslieder";
|
|
||||||
tags = [tags.xmas tags.schlager];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Weihnachten.FM";
|
|
||||||
stream = rautemusik "weihnachten";
|
|
||||||
desc = "Weihnachtslieder, Pop";
|
|
||||||
tags = [tags.xmas];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Top40";
|
|
||||||
stream = rautemusik "top40";
|
|
||||||
desc = "Charts, Top40, Dance, Hiphop";
|
|
||||||
tags = [tags.top40];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Rock";
|
|
||||||
desc = "Rock, Alternative, Punk";
|
|
||||||
stream = rautemusik "rock";
|
|
||||||
tags = [tags.rock];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "PartyHits";
|
|
||||||
desc = "Karneval, Mallorca, Après Ski, Schlager";
|
|
||||||
stream = rautemusik "partyhits";
|
|
||||||
tags = [tags.schlager];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Deutschrap Charts";
|
|
||||||
stream = rautemusik "deutschrap-charts";
|
|
||||||
desc = "Deutschrap, HipHop, Rap, Charts";
|
|
||||||
tags = [tags.rap];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Deutschrap Classic";
|
|
||||||
stream = rautemusik "deutschrap-classic";
|
|
||||||
desc = "Oldschool, Rap, HipHop, Deutschrap";
|
|
||||||
tags = [tags.rap];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "ChartHits";
|
|
||||||
stream = rautemusik "ChartHits";
|
|
||||||
desc = "House, RnB, Dance, Electro";
|
|
||||||
tags = [tags.top40];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "BreakZ.FM";
|
|
||||||
stream = rautemusik "breakz";
|
|
||||||
desc = "RnB, House, HipHop, Dance, Mixtapes";
|
|
||||||
tags = [tags.top40];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "Bass";
|
|
||||||
stream = rautemusik "bass";
|
|
||||||
desc = "DnB, Dubstep, Trap & Bass House";
|
|
||||||
tags = [tags.party];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = rautemusik-name "12punks";
|
|
||||||
stream = rautemusik "12punks";
|
|
||||||
desc = "Punk, Punk Rock, Ska, Hardcore";
|
|
||||||
tags = [tags.rock];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
logo = "https://d3kle7qwymxpcy.cloudfront.net/images/broadcasts/77/a4/13931/1/c175.png";
|
logo = "https://d3kle7qwymxpcy.cloudfront.net/images/broadcasts/77/a4/13931/1/c175.png";
|
||||||
station = "Raidió Rírá";
|
station = "Raidió Rírá";
|
||||||
@@ -1406,12 +1211,6 @@ in
|
|||||||
desc = "Is cairt-staisiún ceoil é Raidió Rí-Rá a bhíonn ag craoladh go hiomlán trí Ghaeilge! Bíonn an ceol ar fad ó na cairteacha le cloisteáil ar an stáisiún, mar aon leis an bpopnuacht, an nuacht spóirt agus an nuacht scannánaíochta is déanaí!";
|
desc = "Is cairt-staisiún ceoil é Raidió Rí-Rá a bhíonn ag craoladh go hiomlán trí Ghaeilge! Bíonn an ceol ar fad ó na cairteacha le cloisteáil ar an stáisiún, mar aon leis an bpopnuacht, an nuacht spóirt agus an nuacht scannánaíochta is déanaí!";
|
||||||
tags = [tags.top40];
|
tags = [tags.top40];
|
||||||
}
|
}
|
||||||
{
|
|
||||||
stream = "http://188.247.86.67:8008";
|
|
||||||
station = "Rotana Tarab";
|
|
||||||
logo = "https://liveonlineradio.net/wp-content/uploads/2017/11/Rotana-Tarab-100x47.jpg";
|
|
||||||
tags = [tags.trad tags.arabic];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
stream = "http://asima.out.airtime.pro:8000/asima_a";
|
stream = "http://asima.out.airtime.pro:8000/asima_a";
|
||||||
station = "Asima";
|
station = "Asima";
|
||||||
@@ -1554,6 +1353,11 @@ in
|
|||||||
desc = "Ohne Blatt vor dem Mund! Für alle, die aufwachen wollen.";
|
desc = "Ohne Blatt vor dem Mund! Für alle, die aufwachen wollen.";
|
||||||
tags = [tags.text];
|
tags = [tags.text];
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
station = "NIUS";
|
||||||
|
stream = "https://nius.stream25.radiohost.de/live_mp3-192";
|
||||||
|
tags = [tags.text];
|
||||||
|
}
|
||||||
{
|
{
|
||||||
station = "Kontrafunk";
|
station = "Kontrafunk";
|
||||||
stream = "https://icecast.multhielemedia.de/listen/kontrafunk/radio.mp3";
|
stream = "https://icecast.multhielemedia.de/listen/kontrafunk/radio.mp3";
|
||||||
@@ -1649,21 +1453,6 @@ in
|
|||||||
station = "ERTU Al Quran Al Kareem";
|
station = "ERTU Al Quran Al Kareem";
|
||||||
tags = [tags.arabic tags.text tags.holy];
|
tags = [tags.arabic tags.text tags.holy];
|
||||||
}
|
}
|
||||||
{
|
|
||||||
stream = "http://149.28.52.216:3344/listen.mp3";
|
|
||||||
station = "Verse 24/7 Holy Quran";
|
|
||||||
tags = [tags.arabic tags.text tags.holy];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
stream = "https://s6.voscast.com:9355/stream";
|
|
||||||
station = "Kilid Herat";
|
|
||||||
tags = [tags.arabic tags.holy]; # nasheeds
|
|
||||||
}
|
|
||||||
{
|
|
||||||
stream = "https://s6.voscast.com:9355/stream";
|
|
||||||
station = "Radio Salam Watandar";
|
|
||||||
tags = [tags.arabic tags.holy];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
stream = "http://onair15.xdevel.com:7064/1/";
|
stream = "http://onair15.xdevel.com:7064/1/";
|
||||||
station = "Radio Mozart Italia";
|
station = "Radio Mozart Italia";
|
||||||
@@ -1671,12 +1460,6 @@ in
|
|||||||
desc = "Emittente ufficiale delle Associazioni Mozart Italia nel mondo";
|
desc = "Emittente ufficiale delle Associazioni Mozart Italia nel mondo";
|
||||||
tags = [tags.classical];
|
tags = [tags.classical];
|
||||||
}
|
}
|
||||||
{
|
|
||||||
stream = "http://onair7.xdevel.com:7126/1/";
|
|
||||||
station = "Opera Radio Budapest";
|
|
||||||
logo = "https://www.opera.hu/static/default/asset/img/common/opera-logo.svg";
|
|
||||||
tags = [tags.classical];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
stream = "http://peacefulpiano.stream.publicradio.org/peacefulpiano.mp3";
|
stream = "http://peacefulpiano.stream.publicradio.org/peacefulpiano.mp3";
|
||||||
station = "Peaceful Piano";
|
station = "Peaceful Piano";
|
||||||
@@ -1846,11 +1629,6 @@ in
|
|||||||
stream = "https://playerservices.streamtheworld.com/api/livestream-redirect/KAN_88.mp3";
|
stream = "https://playerservices.streamtheworld.com/api/livestream-redirect/KAN_88.mp3";
|
||||||
tags = [tags.hebrew];
|
tags = [tags.hebrew];
|
||||||
}
|
}
|
||||||
{
|
|
||||||
station = "Digital Impulse – Classical Channel";
|
|
||||||
stream = "http://orion.shoutca.st:8978/stream";
|
|
||||||
tags = [tags.classical];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
station = "Старое радио (детское)";
|
station = "Старое радио (детское)";
|
||||||
stream = "http://195.91.237.50:8000/detskoe128";
|
stream = "http://195.91.237.50:8000/detskoe128";
|
||||||
@@ -1921,18 +1699,23 @@ in
|
|||||||
stream = "http://cw.dimebank.com:8080/CNNfast";
|
stream = "http://cw.dimebank.com:8080/CNNfast";
|
||||||
tags = [tags.text];
|
tags = [tags.text];
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
station = "80s80s | Dark Wave";
|
||||||
|
stream = "https://streams.80s80s.de/darkwave/mp3-192/homepage/";
|
||||||
|
tags = [tags.wave];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
station = "80s80s | Wave";
|
||||||
|
stream = "https://streams.80s80s.de/wave/mp3-192/homepage/";
|
||||||
|
tags = [tags.wave];
|
||||||
|
}
|
||||||
{
|
{
|
||||||
station = "XXX orchestral";
|
station = "XXX orchestral";
|
||||||
stream = "http://orion.shoutca.st:8978/stream";
|
stream = "http://orion.shoutca.st:8978/stream";
|
||||||
tags = [tags.classical];
|
tags = [tags.classical];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
station = "XXX greek";
|
station = "Kral FM Xanthi";
|
||||||
stream = "http://radio.hostchefs.net:8046/stream?1520818130148";
|
|
||||||
tags = [tags.greek];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
station = "XXX turkish or greek";
|
|
||||||
stream = "https://onairmediagroup.live24.gr/kralfm100xanthi";
|
stream = "https://onairmediagroup.live24.gr/kralfm100xanthi";
|
||||||
tags = [tags.greek tags.turkish];
|
tags = [tags.greek tags.turkish];
|
||||||
}
|
}
|
||||||
@@ -1986,11 +1769,6 @@ in
|
|||||||
stream = "http://s2.voscast.com:12312/;";
|
stream = "http://s2.voscast.com:12312/;";
|
||||||
station = "Bahrain Quran Radio";
|
station = "Bahrain Quran Radio";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
tags = [tags.arabic tags.text tags.holy];
|
|
||||||
stream = "http://162.244.81.30:8224/;";
|
|
||||||
station = "Quran Radio Lebanon";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
tags = [tags.arabic tags.text tags.holy];
|
tags = [tags.arabic tags.text tags.holy];
|
||||||
stream = "http://tijaniyyah.asuscomm.com:8000/stream/2/";
|
stream = "http://tijaniyyah.asuscomm.com:8000/stream/2/";
|
||||||
@@ -2001,16 +1779,6 @@ in
|
|||||||
station = "Coptic for God";
|
station = "Coptic for God";
|
||||||
stream = "http://66.70.249.70:5832/stream";
|
stream = "http://66.70.249.70:5832/stream";
|
||||||
}
|
}
|
||||||
{
|
|
||||||
stream = "http://stream-025.zeno.fm/5y95pu36sm0uv?";
|
|
||||||
station = "Hayat FM";
|
|
||||||
tags = [tags.arabic tags.text tags.holy];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
stream = "http://uk2.internet-radio.com:8151/stream";
|
|
||||||
station = "The Quran Radio";
|
|
||||||
tags = [tags.arabic tags.text tags.holy];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
stream = "http://www.radioeins.de/livemp3";
|
stream = "http://www.radioeins.de/livemp3";
|
||||||
station = "radioeins | RBB";
|
station = "radioeins | RBB";
|
||||||
@@ -2025,9 +1793,25 @@ in
|
|||||||
stream = "http://mp3.ffh.de/radioffh/hqlivestream.mp3";
|
stream = "http://mp3.ffh.de/radioffh/hqlivestream.mp3";
|
||||||
station = "Hitradio FFH";
|
station = "Hitradio FFH";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
stream = "https://mp3.planetradio.de/planetradio/hqlivestream.aac";
|
||||||
|
station = "planet radio";
|
||||||
|
}
|
||||||
{ # Lex Fridman's favourite
|
{ # Lex Fridman's favourite
|
||||||
stream = "av://lavfi:anoisesrc=color=brown";
|
stream = "av://lavfi:anoisesrc=color=brown";
|
||||||
station = "Brownian noise";
|
station = "Brown noise";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
stream = "av://lavfi:anoisesrc=color=pink";
|
||||||
|
station = "Pink noise";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
stream = "https://st03.sslstream.dlf.de/dlf/03/high/aac/stream.aac";
|
||||||
|
station = "Deutschlandfunk Nova";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
stream = "https://samaaisb107-itelservices.radioca.st/stream";
|
||||||
|
station = "Samaa FM 107.4 Pakistan";
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
++ map (name: {
|
++ map (name: {
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ local language_servers = {
|
|||||||
-- tsserver = {}, -- typescript-language-server
|
-- tsserver = {}, -- typescript-language-server
|
||||||
cssls = {},
|
cssls = {},
|
||||||
elmls = {}, -- elm-language-server
|
elmls = {}, -- elm-language-server
|
||||||
|
gopls = {}, -- gopls
|
||||||
denols = {}, -- deno built in
|
denols = {}, -- deno built in
|
||||||
bashls = {}, -- bash-language-server
|
bashls = {}, -- bash-language-server
|
||||||
lua_ls = {
|
lua_ls = {
|
||||||
@@ -154,10 +155,11 @@ local language_servers = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for server, settings in pairs(language_servers) do
|
for server, settings in pairs(language_servers) do
|
||||||
require('lspconfig')[server].setup{
|
vim.lsp.config(server, {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = lsp_flags,
|
flags = lsp_flags,
|
||||||
settings = settings,
|
settings = settings,
|
||||||
capabilities = capabilities
|
capabilities = capabilities
|
||||||
}
|
})
|
||||||
|
vim.lsp.enable(server)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -102,6 +102,7 @@ augroup filetypes
|
|||||||
autocmd bufnewfile,bufread urls,config set filetype=conf
|
autocmd bufnewfile,bufread urls,config set filetype=conf
|
||||||
autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
|
autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
|
||||||
autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
|
autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
|
||||||
|
autocmd bufnewfile,bufread *.ex,*.exs packadd vim-elixir | set filetype=elixir
|
||||||
autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
|
autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
|
||||||
autocmd filetype javascript packadd vim-javascript
|
autocmd filetype javascript packadd vim-javascript
|
||||||
autocmd filetype make setlocal noexpandtab
|
autocmd filetype make setlocal noexpandtab
|
||||||
@@ -124,3 +125,12 @@ set complete+=kspell
|
|||||||
let g:pandoc#syntax#conceal#use = 0
|
let g:pandoc#syntax#conceal#use = 0
|
||||||
let g:pandoc#modules#disabled = []
|
let g:pandoc#modules#disabled = []
|
||||||
let g:pandoc#spell#default_langs = ['en', 'de']
|
let g:pandoc#spell#default_langs = ['en', 'de']
|
||||||
|
|
||||||
|
autocmd! User GoyoEnter Limelight
|
||||||
|
autocmd! User GoyoLeave Limelight!
|
||||||
|
|
||||||
|
|
||||||
|
" Disable Copilot by default
|
||||||
|
let b:copilot_enabled = v:false
|
||||||
|
" keymap to toggle it enabled
|
||||||
|
nnoremap <leader>gc :let b:copilot_enabled = !b:copilot_enabled<CR>
|
||||||
|
|||||||
140
modules/go-webring.nix
Normal file
140
modules/go-webring.nix
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib)
|
||||||
|
mkEnableOption
|
||||||
|
mkPackageOption
|
||||||
|
mkOption
|
||||||
|
types
|
||||||
|
literalExpression
|
||||||
|
mkIf
|
||||||
|
;
|
||||||
|
cfg = config.services.go-webring;
|
||||||
|
|
||||||
|
defaultAddress = "127.0.0.1:2857";
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
options = {
|
||||||
|
services.go-webring = {
|
||||||
|
enable = mkEnableOption "go-webring";
|
||||||
|
|
||||||
|
package = mkPackageOption pkgs "go-webring" { };
|
||||||
|
|
||||||
|
contactInstructions = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
description = "Contact instructions for errors";
|
||||||
|
example = "contact the admin and let them know what's up";
|
||||||
|
};
|
||||||
|
|
||||||
|
host = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "Host this webring runs on, primarily used for validation";
|
||||||
|
example = "my-webri.ng";
|
||||||
|
};
|
||||||
|
|
||||||
|
homePageTemplate = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = ''
|
||||||
|
This should be any HTML file with the string "{{ . }}" placed
|
||||||
|
wherever you want the table of members inserted. This table is
|
||||||
|
plain HTML so you can style it with CSS.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
listenAddress = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = defaultAddress;
|
||||||
|
description = "Host and port go-webring will listen on";
|
||||||
|
};
|
||||||
|
|
||||||
|
members = mkOption {
|
||||||
|
type = types.listOf (
|
||||||
|
types.submodule {
|
||||||
|
options = {
|
||||||
|
username = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "Member's name";
|
||||||
|
};
|
||||||
|
site = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "Member's site URL";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
description = "List of members in the webring";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
systemd.services.go-webring = {
|
||||||
|
description = "go-webring service";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network.target" ];
|
||||||
|
requires = [ "network.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = ''
|
||||||
|
${lib.getExe cfg.package} \
|
||||||
|
${lib.optionalString (cfg.contactInstructions != null) ("--contact " + lib.escapeShellArg cfg.contactInstructions)} \
|
||||||
|
--host ${cfg.host} \
|
||||||
|
--index ${pkgs.writeText "index.html" cfg.homePageTemplate} \
|
||||||
|
--listen ${cfg.listenAddress} \
|
||||||
|
--members ${
|
||||||
|
pkgs.writeText "list.txt" (
|
||||||
|
lib.concatMapStrings (member: member.username + " " + member.site + "\n") cfg.members
|
||||||
|
)
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
User = "go-webring";
|
||||||
|
DynamicUser = true;
|
||||||
|
RuntimeDirectory = "go-webring";
|
||||||
|
WorkingDirectory = "/var/lib/go-webring";
|
||||||
|
StateDirectory = "go-webring";
|
||||||
|
RuntimeDirectoryMode = "0750";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = 5;
|
||||||
|
|
||||||
|
# Hardening
|
||||||
|
CapabilityBoundingSet = [ "" ];
|
||||||
|
DeviceAllow = [ "" ];
|
||||||
|
LockPersonality = true;
|
||||||
|
MemoryDenyWriteExecute = true;
|
||||||
|
PrivateDevices = true;
|
||||||
|
PrivateUsers = true;
|
||||||
|
ProcSubset = "pid";
|
||||||
|
ProtectClock = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectHome = true;
|
||||||
|
ProtectHostname = true;
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
ProtectProc = "invisible";
|
||||||
|
RestrictAddressFamilies = [
|
||||||
|
"AF_INET"
|
||||||
|
"AF_INET6"
|
||||||
|
"AF_UNIX"
|
||||||
|
];
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
RestrictRealtime = true;
|
||||||
|
RestrictSUIDSGID = true;
|
||||||
|
SystemCallArchitectures = "native";
|
||||||
|
SystemCallFilter = [
|
||||||
|
"@system-service"
|
||||||
|
"~@privileged"
|
||||||
|
];
|
||||||
|
UMask = "0077";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
htgen = pkgs.callPackage ../packages/htgen.nix {};
|
|
||||||
in {
|
|
||||||
options.services.htgen = lib.mkOption {
|
|
||||||
default = {};
|
|
||||||
type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
|
|
||||||
options = {
|
|
||||||
enable = lib.mkEnableOption "htgen-${config._module.args.name}";
|
|
||||||
port = lib.mkOption {
|
|
||||||
type = lib.types.int;
|
|
||||||
};
|
|
||||||
script = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
config = {
|
|
||||||
systemd.services =
|
|
||||||
lib.mapAttrs' (
|
|
||||||
name: cfg:
|
|
||||||
lib.nameValuePair "htgen-${name}" {
|
|
||||||
wantedBy = ["multi-user.target"];
|
|
||||||
after = ["network.target"];
|
|
||||||
environment = {
|
|
||||||
HOME = "/var/lib/htgen-${name}";
|
|
||||||
HTGEN_PORT = toString cfg.port;
|
|
||||||
HTGEN_SCRIPT = cfg.script;
|
|
||||||
};
|
|
||||||
serviceConfig = {
|
|
||||||
SyslogIdentifier = "htgen-${name}";
|
|
||||||
DynamicUser = true;
|
|
||||||
StateDirectory = "htgen-${name}";
|
|
||||||
PrivateTmp = true;
|
|
||||||
Restart = "always";
|
|
||||||
ExecStart = "${htgen}/bin/htgen --serve";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
)
|
|
||||||
config.services.htgen;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
default = "daily";
|
default = "daily";
|
||||||
};
|
};
|
||||||
loadCredential = lib.mkOption {
|
loadCredential = lib.mkOption {
|
||||||
type = lib.types.listOf lib.types.string;
|
type = lib.types.listOf lib.types.str;
|
||||||
description = ''
|
description = ''
|
||||||
This can be used to pass secrets to the systemd service without adding them to the nix store.
|
This can be used to pass secrets to the systemd service without adding them to the nix store.
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
writers,
|
writers,
|
||||||
curl,
|
curl,
|
||||||
}:
|
}:
|
||||||
writers.writeDashBin "so" ''
|
writers.writeDashBin "cht.sh" ''
|
||||||
IFS=+
|
IFS=+
|
||||||
${curl}/bin/curl -sSL http://cht.sh/"$*"
|
${curl}/bin/curl -sSL http://cht.sh/"$*"
|
||||||
''
|
''
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{ writers, chromium }:
|
{ coreutils, chromium }:
|
||||||
writers.writeDashBin "cro" ''
|
chromium.override {
|
||||||
${chromium}/bin/chromium \
|
commandLineArgs = [
|
||||||
--disable-sync \
|
"--disable-sync"
|
||||||
--no-default-browser-check \
|
"--no-default-browser-check"
|
||||||
--no-first-run \
|
"--no-first-run"
|
||||||
--user-data-dir="$(mktemp -d)" \
|
"--user-data-dir=$(${coreutils}/bin/mktemp -d)"
|
||||||
--incognito \
|
"--incognito"
|
||||||
"$@"
|
];
|
||||||
''
|
}
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
{
|
|
||||||
fetchgit,
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
coreutils,
|
|
||||||
curl,
|
|
||||||
gnugrep,
|
|
||||||
gnused,
|
|
||||||
util-linux,
|
|
||||||
}:
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "dic";
|
|
||||||
|
|
||||||
src = fetchgit {
|
|
||||||
url = https://cgit.ni.krebsco.de/dic;
|
|
||||||
rev = "refs/tags/v1.1.1";
|
|
||||||
sha256 = "1gbj967a5hj53fdkkxijqgwnl9hb8kskz0cmpjq7v65ffz3v6vag";
|
|
||||||
};
|
|
||||||
|
|
||||||
phases = [
|
|
||||||
"unpackPhase"
|
|
||||||
"installPhase"
|
|
||||||
];
|
|
||||||
|
|
||||||
installPhase = let
|
|
||||||
path = lib.makeBinPath [
|
|
||||||
coreutils
|
|
||||||
curl
|
|
||||||
gnused
|
|
||||||
gnugrep
|
|
||||||
util-linux
|
|
||||||
];
|
|
||||||
in ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
|
|
||||||
sed \
|
|
||||||
's,^main() {$,&\n PATH=${path}; export PATH,' \
|
|
||||||
< ./dic \
|
|
||||||
> $out/bin/dic
|
|
||||||
|
|
||||||
chmod +x $out/bin/dic
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
{writers}:
|
|
||||||
writers.writeDashBin "dirmir" ''
|
|
||||||
SOURCE="$1"
|
|
||||||
TARGET="$2"
|
|
||||||
|
|
||||||
if [ ! -d "$SOURCE" ] || [ $# -ne 2 ]; then
|
|
||||||
echo >/dev/stderr "Usage: dirmir SOURCE TARGET"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e "$TARGET" ]; then
|
|
||||||
echo >/dev/stderr "$TARGET" already exists. Please use a different name.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
find "$SOURCE" | while read -r entry; do
|
|
||||||
if [ -d "$entry" ]; then
|
|
||||||
mkdir -p "$TARGET/$entry"
|
|
||||||
else
|
|
||||||
# create a file with the same permissions as $entry
|
|
||||||
install -m "$(stat -c %a "$entry")" /dev/null "$TARGET/$entry"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
''
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
{
|
|
||||||
writers,
|
|
||||||
libnotify,
|
|
||||||
dmenu,
|
|
||||||
bluez5,
|
|
||||||
lib,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "dmenu-bluetooth" ''
|
|
||||||
# UI for connecting to bluetooth devices
|
|
||||||
set -efu
|
|
||||||
PATH=$PATH=${lib.makeBinPath [libnotify dmenu bluez5]}
|
|
||||||
|
|
||||||
bluetooth_notify() {
|
|
||||||
notify-send --app-name=" Bluetooth" "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
chose_device() {
|
|
||||||
# the output from `bluetoothctl {paired-,}devices` has a first column which always contains `Device` followed by a MAC address and the device name
|
|
||||||
cut -d ' ' -f2- | dmenu -i -l 5 -p "Bluetooth device"
|
|
||||||
}
|
|
||||||
|
|
||||||
bluetoothctl scan on &
|
|
||||||
|
|
||||||
case "$(printf "pair\nconnect\ndisconnect" | dmenu -i)" in
|
|
||||||
pair)
|
|
||||||
chosen="$(bluetoothctl devices | chose_device)"
|
|
||||||
chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
|
|
||||||
|
|
||||||
bluetooth_notify "$chosen_name" "Pairing ..."
|
|
||||||
|
|
||||||
if bluetoothctl pair "$(echo "$chosen" | cut -d ' ' -f1)"; then
|
|
||||||
bluetooth_notify "✔ $chosen_name" "Paired with device."
|
|
||||||
else
|
|
||||||
test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to pair with device."
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
connect)
|
|
||||||
chosen="$(bluetoothctl paired-devices | chose_device)"
|
|
||||||
chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
|
|
||||||
|
|
||||||
bluetooth_notify "$chosen_name" "Trying to connect ..."
|
|
||||||
|
|
||||||
if bluetoothctl connect "$(echo "$chosen" | cut -d ' ' -f1)"; then
|
|
||||||
bluetooth_notify "✔ $chosen_name" "Connected to device."
|
|
||||||
else # something was selected but it didn't work
|
|
||||||
test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to connect to device."
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
disconnect)
|
|
||||||
chosen="$(bluetoothctl paired-devices | chose_device)"
|
|
||||||
chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
|
|
||||||
|
|
||||||
bluetooth_notify "$chosen_name" "Disconnecting ..."
|
|
||||||
|
|
||||||
if bluetoothctl disconnect "$(echo "$chosen" | cut -d ' ' -f1)"; then
|
|
||||||
bluetooth_notify "✔ $chosen_name" "Disconnected from device."
|
|
||||||
else # something was selected but it didn't work
|
|
||||||
test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to disconnect from device."
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
''
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
{
|
|
||||||
writers,
|
|
||||||
lib,
|
|
||||||
dmenu,
|
|
||||||
scrot,
|
|
||||||
libnotify,
|
|
||||||
xclip,
|
|
||||||
screenshotsDirectory ? "/tmp",
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "dmenu-scrot" ''
|
|
||||||
# ref https://gitlab.com/dwt1/dotfiles/-/blob/master/.dmenu/dmenu-scrot.sh
|
|
||||||
PATH=$PATH:${lib.makeBinPath [dmenu scrot libnotify xclip]}
|
|
||||||
|
|
||||||
APP_NAME="📸 Scrot"
|
|
||||||
IMG_PATH="${screenshotsDirectory}"
|
|
||||||
TIME=3000 #Miliseconds notification should remain visible
|
|
||||||
|
|
||||||
cmd=$(printf "fullscreen\nsection\nupload_fullscreen\nupload_section\n" | dmenu -p 'Screenshot')
|
|
||||||
|
|
||||||
cd "$IMG_PATH" || exit
|
|
||||||
case ''${cmd%% *} in
|
|
||||||
fullscreen)
|
|
||||||
scrot -d 1 \
|
|
||||||
&& notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (full screen) saved.'
|
|
||||||
;;
|
|
||||||
|
|
||||||
section)
|
|
||||||
scrot -s \
|
|
||||||
&& notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (section) saved.'
|
|
||||||
;;
|
|
||||||
|
|
||||||
upload_fullscreen)
|
|
||||||
scrot -d 1 -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
|
|
||||||
&& notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (full screen) uploaded: $(xclip -selection clipboard -out)"
|
|
||||||
;;
|
|
||||||
|
|
||||||
upload_section)
|
|
||||||
scrot -s -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
|
|
||||||
&& notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (section) uploaded: $(xclip -selection clipboard -out)"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
''
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
writers,
|
|
||||||
coreutils,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "dns-sledgehammer" ''
|
|
||||||
${coreutils}/bin/printf '%s\n' 'nameserver 1.1.1.1' 'options edns0' > /etc/resolv.conf
|
|
||||||
''
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
{
|
|
||||||
writers,
|
|
||||||
curl,
|
|
||||||
coreutils,
|
|
||||||
gnused,
|
|
||||||
pandoc,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "genius" ''
|
|
||||||
${coreutils}/bin/test "$#" -eq 2 || (
|
|
||||||
echo "usage: $0 <artist> <song>"
|
|
||||||
exit 1
|
|
||||||
)
|
|
||||||
|
|
||||||
normalize() {
|
|
||||||
${coreutils}/bin/tr -d -c '0-9A-Za-z ' | ${coreutils}/bin/tr ' ' - | ${coreutils}/bin/tr '[:upper:]' '[:lower:]'
|
|
||||||
}
|
|
||||||
|
|
||||||
ARTIST=$(echo "$1" | normalize | ${gnused}/bin/sed 's/./\U&/')
|
|
||||||
TITLE=$(echo "$2" | normalize)
|
|
||||||
GENIUS_URL="https://genius.com/$ARTIST-$TITLE-lyrics"
|
|
||||||
|
|
||||||
${curl}/bin/curl -s "$GENIUS_URL" \
|
|
||||||
| ${gnused}/bin/sed -ne '/class="lyrics"/,/<\/p>/p' \
|
|
||||||
| ${pandoc}/bin/pandoc -f html -s -t plain \
|
|
||||||
| ${gnused}/bin/sed 's/^_/\x1b[3m/g;s/_$/\x1b[0m/g;s/^\[/\n\x1b\[1m\[/g;s/\]$/\]\x1b[0m/g'
|
|
||||||
|
|
||||||
printf "\n%s\n" "$GENIUS_URL" >/dev/stderr
|
|
||||||
''
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
coreutils,
|
|
||||||
git,
|
|
||||||
writers,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "git-preview" ''
|
|
||||||
set -efu
|
|
||||||
head_commit=$(${git}/bin/git log -1 --format=%H)
|
|
||||||
merge_commit=$1; shift
|
|
||||||
merge_message='Merge for git-preview'
|
|
||||||
preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
|
|
||||||
preview_name=$(${coreutils}/bin/basename "$preview_dir")
|
|
||||||
${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
|
|
||||||
${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
|
|
||||||
${git}/bin/git -C "$preview_dir" merge \
|
|
||||||
''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \
|
|
||||||
-m "$merge_message" \
|
|
||||||
-q \
|
|
||||||
"$merge_commit"
|
|
||||||
${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
|
|
||||||
${coreutils}/bin/rm -fR "$preview_dir"
|
|
||||||
${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
|
|
||||||
''
|
|
||||||
21
packages/go-webring.nix
Normal file
21
packages/go-webring.nix
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{ buildGoModule, fetchgit, lib }:
|
||||||
|
buildGoModule {
|
||||||
|
pname = "go-webring";
|
||||||
|
version = "2024-12-18";
|
||||||
|
|
||||||
|
src = fetchgit {
|
||||||
|
url = "https://git.sr.ht/~amolith/go-webring";
|
||||||
|
rev = "0b5b1bf21ff91119ea2dd042ee9fe94e9d1cd8d4";
|
||||||
|
hash = "sha256-az6vBOGiZmzfsMjYUacXMHhDeRDmVI/arCKCpHeTcns=";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
mainProgram = "go-webring";
|
||||||
|
description = "Simple webring implementation";
|
||||||
|
homepage = "https://git.sr.ht/~amolith/go-webring";
|
||||||
|
license = lib.licenses.bsd2; # cc0 as well
|
||||||
|
maintainers = [ lib.maintainers.kmein ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
gnugrep,
|
gnugrep,
|
||||||
qrencode,
|
qrencode,
|
||||||
texlive,
|
texlive,
|
||||||
utillinux,
|
util-linux,
|
||||||
zbar,
|
zbar,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||||||
gnugrep
|
gnugrep
|
||||||
qrencode
|
qrencode
|
||||||
texlive.combined.scheme-full
|
texlive.combined.scheme-full
|
||||||
utillinux
|
util-linux
|
||||||
zbar
|
zbar
|
||||||
]}
|
]}
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
writers,
|
writers,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
xan,
|
xan,
|
||||||
|
util-linux,
|
||||||
}: let
|
}: let
|
||||||
database = fetchurl {
|
database = fetchurl {
|
||||||
url = "http://c.krebsco.de/greek.csv";
|
url = "http://c.krebsco.de/greek.csv";
|
||||||
@@ -9,5 +10,5 @@
|
|||||||
};
|
};
|
||||||
in
|
in
|
||||||
writers.writeDashBin "heuretes" ''
|
writers.writeDashBin "heuretes" ''
|
||||||
${xan}/bin/xan search -s simple "^$*$" ${database} | ${xan}/bin/xan table
|
${xan}/bin/xan search -s simple "$*" ${database} | ${util-linux}/bin/column -s, -t
|
||||||
''
|
''
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
{
|
|
||||||
fetchgit,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
stdenv,
|
|
||||||
}:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "htgen";
|
|
||||||
version = "1.3.1";
|
|
||||||
|
|
||||||
src = fetchgit {
|
|
||||||
url = "http://cgit.krebsco.de/htgen";
|
|
||||||
rev = "refs/tags/${version}";
|
|
||||||
sha256 = "0ml8kp89bwkrwy6iqclzyhxgv2qn9dcpwaafbmsr4mgcl70zx22r";
|
|
||||||
};
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
{
|
|
||||||
echo '#! ${pkgs.dash}/bin/dash'
|
|
||||||
echo 'export PATH=${lib.makeBinPath [
|
|
||||||
pkgs.coreutils
|
|
||||||
pkgs.jq
|
|
||||||
pkgs.ucspi-tcp
|
|
||||||
]}''${PATH+":$PATH"}'
|
|
||||||
sed 's:^Server=htgen$:&/${version}:' htgen
|
|
||||||
} > $out/bin/htgen
|
|
||||||
chmod +x $out/bin/htgen
|
|
||||||
cp -r examples $out
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
writers,
|
|
||||||
pup,
|
|
||||||
curl,
|
|
||||||
pandoc,
|
|
||||||
man,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "InfSchMV" ''
|
|
||||||
${curl}/bin/curl -sSL https://www.berlin.de/corona/massnahmen/verordnung/ \
|
|
||||||
| ${pup}/bin/pup .textile \
|
|
||||||
| ${pandoc}/bin/pandoc -f html -t man -s \
|
|
||||||
| ${man}/bin/man -l -
|
|
||||||
''
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
cmake,
|
|
||||||
python3,
|
|
||||||
fetchFromGitHub,
|
|
||||||
}:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
version = "2017.09.06";
|
|
||||||
name = "iolanguage-${version}";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "IoLanguage";
|
|
||||||
repo = "io";
|
|
||||||
rev = "${version}";
|
|
||||||
sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
};
|
|
||||||
buildInputs = [cmake python3];
|
|
||||||
preBuild = "mkdir -p build && cd build";
|
|
||||||
buildPhase = ''
|
|
||||||
cmake -DCMAKE_INSTALL_PREFIX=$out/ ..
|
|
||||||
make all
|
|
||||||
'';
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "https://iolanguage.org/";
|
|
||||||
description = "Io programming language. Inspired by Self, Smalltalk and LISP.";
|
|
||||||
license = licenses.bsd3;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
stdenv,
|
|
||||||
fetchurl,
|
|
||||||
}:
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "ix";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://ix.io/client";
|
|
||||||
sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";
|
|
||||||
};
|
|
||||||
phases = ["installPhase"];
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
install $src $out/bin/ix
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
buildGoModule,
|
|
||||||
fetchFromGitHub,
|
|
||||||
lib,
|
|
||||||
}:
|
|
||||||
buildGoModule {
|
|
||||||
name = "jq-lsp";
|
|
||||||
version = "unstable-2023-09-08";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "wader";
|
|
||||||
repo = "jq-lsp";
|
|
||||||
rev = "85edf1adbe5e6c91b37c67b6a4bf85eda1e49f2f";
|
|
||||||
hash = "sha256-ItLKRSbGZ8UqFEHCoh96KwhSpuKZ3l+2ZXnBkHEZL0M=";
|
|
||||||
};
|
|
||||||
vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw=";
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
fetchFromGitHub,
|
|
||||||
mkDerivation,
|
|
||||||
ansi-terminal,
|
|
||||||
base,
|
|
||||||
directory,
|
|
||||||
doctest,
|
|
||||||
filepath,
|
|
||||||
megaparsec,
|
|
||||||
optparse-applicative,
|
|
||||||
prettyprinter,
|
|
||||||
process,
|
|
||||||
raw-strings-qq,
|
|
||||||
stdenv,
|
|
||||||
tasty,
|
|
||||||
tasty-hunit,
|
|
||||||
text,
|
|
||||||
yaml,
|
|
||||||
}:
|
|
||||||
mkDerivation {
|
|
||||||
pname = "mahlzeit";
|
|
||||||
version = "0.1.0";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "kmein";
|
|
||||||
repo = "mahlzeit";
|
|
||||||
rev = "954c0fb3f45815999bc65d003794af6a850b069c";
|
|
||||||
sha256 = "046yrr40hjmxkjmwzcvmwb39fxx2v2i6hgdxrjfiwilzvhikarrg";
|
|
||||||
};
|
|
||||||
isLibrary = true;
|
|
||||||
isExecutable = true;
|
|
||||||
libraryHaskellDepends = [
|
|
||||||
ansi-terminal
|
|
||||||
base
|
|
||||||
directory
|
|
||||||
filepath
|
|
||||||
megaparsec
|
|
||||||
prettyprinter
|
|
||||||
text
|
|
||||||
yaml
|
|
||||||
];
|
|
||||||
executableHaskellDepends = [
|
|
||||||
ansi-terminal
|
|
||||||
base
|
|
||||||
directory
|
|
||||||
filepath
|
|
||||||
optparse-applicative
|
|
||||||
process
|
|
||||||
text
|
|
||||||
yaml
|
|
||||||
];
|
|
||||||
testHaskellDepends = [
|
|
||||||
base
|
|
||||||
doctest
|
|
||||||
megaparsec
|
|
||||||
raw-strings-qq
|
|
||||||
tasty
|
|
||||||
tasty-hunit
|
|
||||||
];
|
|
||||||
homepage = "https://github.com/kmein/mahlzeit";
|
|
||||||
description = "Recipe toolkit";
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
{
|
|
||||||
writers,
|
|
||||||
lib,
|
|
||||||
jq,
|
|
||||||
curl,
|
|
||||||
xdotool,
|
|
||||||
nsxiv,
|
|
||||||
gnused,
|
|
||||||
defaultStation ? 103840,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "meteo" ''
|
|
||||||
# usage: meteo --list
|
|
||||||
# usage: meteo --update
|
|
||||||
# usage: meteo STATION
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
PATH=$PATH:${lib.makeBinPath [jq curl xdotool nsxiv gnused]}
|
|
||||||
|
|
||||||
# TODO XDG
|
|
||||||
CONFIG_DIR=$HOME/.config/wetter
|
|
||||||
STATIONS_FILE=$CONFIG_DIR/stations.json
|
|
||||||
|
|
||||||
case ''${1-} in
|
|
||||||
--list)
|
|
||||||
sed -n 's/^\s*\(--[^)]\+\))$/\1/p' "$0"
|
|
||||||
jq -r -n \
|
|
||||||
--slurpfile stations_file "$STATIONS_FILE" \
|
|
||||||
'
|
|
||||||
$stations_file[0] as $known_stations |
|
|
||||||
|
|
||||||
$known_stations | keys[]
|
|
||||||
'
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
--update)
|
|
||||||
mkdir -p "$(dirname "$STATIONS_FILE")"
|
|
||||||
exec >"$STATIONS_FILE"
|
|
||||||
|
|
||||||
curl -fsSL http://wetterstationen.meteomedia.de/ |
|
|
||||||
jq -Rrs '
|
|
||||||
def decodeHTML:
|
|
||||||
gsub("ä";"ä") |
|
|
||||||
gsub("ö";"ö") |
|
|
||||||
gsub("ü";"ü") |
|
|
||||||
gsub("Ä";"Ä") |
|
|
||||||
gsub("Ö";"Ö") |
|
|
||||||
gsub("Ü";"Ü") |
|
|
||||||
gsub("ß";"ß")
|
|
||||||
;
|
|
||||||
[
|
|
||||||
match(".*<option value=\"/\\?map=Deutschland&station=(?<station>[0-9]+)\">(?<name>[^<]+)</option>";"g")
|
|
||||||
.captures |
|
|
||||||
map({"\(.name)":(.string)}) |
|
|
||||||
add |
|
|
||||||
{"\(.name|decodeHTML)":(.station|tonumber)}
|
|
||||||
] |
|
|
||||||
add
|
|
||||||
'
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# set -x
|
|
||||||
|
|
||||||
station=''${1-${toString defaultStation}}
|
|
||||||
station=$(jq -e -n \
|
|
||||||
--arg station "$station" \
|
|
||||||
--slurpfile stations_file "$STATIONS_FILE" \
|
|
||||||
'
|
|
||||||
$stations_file[0] as $known_stations |
|
|
||||||
|
|
||||||
$station |
|
|
||||||
if test("^[0-9]+$") then
|
|
||||||
tonumber
|
|
||||||
else
|
|
||||||
$known_stations[.]
|
|
||||||
end
|
|
||||||
')
|
|
||||||
cache="/tmp/''${LOGNAME}_wetter_$station.png"
|
|
||||||
curl -sSL \
|
|
||||||
"http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \
|
|
||||||
-o "$cache"
|
|
||||||
|
|
||||||
if window_id=$(xdotool search --name "^nsxiv - $cache$"); then
|
|
||||||
xdotool key --window "$window_id" r
|
|
||||||
else
|
|
||||||
nsxiv "$cache" &
|
|
||||||
fi
|
|
||||||
''
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
writers,
|
|
||||||
wget,
|
|
||||||
system,
|
|
||||||
}:
|
|
||||||
writers.writeDashBin "nix-index-update" ''
|
|
||||||
filename="index-${system}"
|
|
||||||
mkdir -p ~/.cache/nix-index
|
|
||||||
cd ~/.cache/nix-index
|
|
||||||
# -N will only download a new version if there is an update.
|
|
||||||
${wget}/bin/wget -q -N https://github.com/Mic92/nix-index-database/releases/latest/download/$filename
|
|
||||||
ln -f $filename files
|
|
||||||
''
|
|
||||||
@@ -22,7 +22,7 @@ neovim.override {
|
|||||||
\ 'path': '${obsidiantVaultDirectory}',
|
\ 'path': '${obsidiantVaultDirectory}',
|
||||||
\ 'syntax': 'markdown',
|
\ 'syntax': 'markdown',
|
||||||
\ 'ext': '.md',
|
\ 'ext': '.md',
|
||||||
\ 'diary_rel_path' '.',
|
\ 'diary_rel_path': '.',
|
||||||
\}]
|
\}]
|
||||||
|
|
||||||
let NERDTreeSortOrder = ['[[-timestamp]]']
|
let NERDTreeSortOrder = ['[[-timestamp]]']
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
writers,
|
writers,
|
||||||
|
yt-dlp,
|
||||||
miller,
|
miller,
|
||||||
gnused,
|
gnused,
|
||||||
curl,
|
curl,
|
||||||
@@ -95,6 +96,10 @@
|
|||||||
"ich kann damit leben"
|
"ich kann damit leben"
|
||||||
"es ist was es ist"
|
"es ist was es ist"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
download = writers.writeDash "download" ''
|
||||||
|
${yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic "$@"
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
writers.writeDashBin "pls" ''
|
writers.writeDashBin "pls" ''
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
{
|
{
|
||||||
writers,
|
writers,
|
||||||
curl,
|
curl,
|
||||||
pup,
|
|
||||||
gawk,
|
gawk,
|
||||||
gnused,
|
gnused,
|
||||||
gnugrep,
|
|
||||||
less,
|
less,
|
||||||
fzf,
|
fzf,
|
||||||
}:
|
}:
|
||||||
|
|||||||
@@ -2,8 +2,12 @@
|
|||||||
{
|
{
|
||||||
writers,
|
writers,
|
||||||
imagemagick,
|
imagemagick,
|
||||||
|
ghostscript,
|
||||||
|
lib
|
||||||
}:
|
}:
|
||||||
writers.writeDashBin "scanned" ''
|
writers.writeDashBin "scanned" ''
|
||||||
|
export PATH=${lib.makeBinPath [ imagemagick ghostscript ]}:$PATH
|
||||||
|
|
||||||
[ $# -eq 1 -a -f "$1" -a -r "$1" ] || exit 1
|
[ $# -eq 1 -a -f "$1" -a -r "$1" ] || exit 1
|
||||||
|
|
||||||
${imagemagick}/bin/convert \
|
${imagemagick}/bin/convert \
|
||||||
|
|||||||
45
packages/stag.nix
Normal file
45
packages/stag.nix
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
ncurses,
|
||||||
|
taglib,
|
||||||
|
zlib,
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "stag";
|
||||||
|
version = "1.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "smabie";
|
||||||
|
repo = "stag";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-IWb6ZbPlFfEvZogPh8nMqXatrg206BTV2DYg7BMm7R4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
ncurses
|
||||||
|
taglib
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
make all
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp stag $out/bin/
|
||||||
|
|
||||||
|
mkdir -p $out/man/man1
|
||||||
|
mv stag.1 $out/man/man1/
|
||||||
|
'';
|
||||||
|
meta = {
|
||||||
|
description = "public domain utf8 curses based audio file tagger";
|
||||||
|
homepage = "https://github.com/smabie/stag";
|
||||||
|
license = lib.licenses.publicDomain;
|
||||||
|
maintainers = [ lib.maintainers.kmein ];
|
||||||
|
platforms = lib.platforms.unix;
|
||||||
|
source = src;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -40,6 +40,13 @@
|
|||||||
|
|
||||||
editorconfig-vim
|
editorconfig-vim
|
||||||
|
|
||||||
|
copilot-vim
|
||||||
|
|
||||||
|
goyo
|
||||||
|
limelight-vim
|
||||||
|
niveumPackages.vimPlugins-mdwa-nvim
|
||||||
|
niveumPackages.vimPlugins-vim-ernest
|
||||||
|
|
||||||
fzf-vim
|
fzf-vim
|
||||||
fzfWrapper
|
fzfWrapper
|
||||||
supertab
|
supertab
|
||||||
@@ -74,6 +81,7 @@
|
|||||||
dhall-vim
|
dhall-vim
|
||||||
elm-vim
|
elm-vim
|
||||||
emmet-vim
|
emmet-vim
|
||||||
|
vim-elixir
|
||||||
haskell-vim
|
haskell-vim
|
||||||
niveumPackages.vimPlugins-icalendar-vim
|
niveumPackages.vimPlugins-icalendar-vim
|
||||||
niveumPackages.vimPlugins-jq-vim
|
niveumPackages.vimPlugins-jq-vim
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}: (vimUtils.buildVimPluginFrom2Nix {
|
}: (vimUtils.buildVimPlugin {
|
||||||
pname = "cheat.sh-vim";
|
pname = "cheat.sh-vim";
|
||||||
version = "826219d1";
|
version = "826219d1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}: (vimUtils.buildVimPluginFrom2Nix {
|
}: (vimUtils.buildVimPlugin {
|
||||||
pname = "icalendar.vim";
|
pname = "icalendar.vim";
|
||||||
version = "542fff45";
|
version = "542fff45";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
vimUtils.buildVimPluginFrom2Nix {
|
vimUtils.buildVimPlugin {
|
||||||
pname = "jq.vim";
|
pname = "jq.vim";
|
||||||
version = "5baf8ed1";
|
version = "5baf8ed1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
13
packages/vimPlugins/mdwa-nvim.nix
Normal file
13
packages/vimPlugins/mdwa-nvim.nix
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
vimUtils,
|
||||||
|
fetchFromGitHub,
|
||||||
|
}: (vimUtils.buildVimPlugin {
|
||||||
|
pname = "mdwa.nvim";
|
||||||
|
version = "9f37270";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "tihawk";
|
||||||
|
repo = "mdwa.nvim";
|
||||||
|
rev = "9f3727037e0d85fd0930334b91b9687a5a880192";
|
||||||
|
hash = "sha256-h2jy2E+pN2Ma/5n9Eq2oXr9xHma2OxxVvx9EJ+bIYxA=";
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
vimUtils.buildVimPluginFrom2Nix {
|
vimUtils.buildVimPlugin {
|
||||||
pname = "typst.vim";
|
pname = "typst.vim";
|
||||||
version = "2882f21";
|
version = "2882f21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
vimUtils.buildVimPluginFrom2Nix {
|
vimUtils.buildVimPlugin {
|
||||||
pname = "vim-256noir";
|
pname = "vim-256noir";
|
||||||
version = "e8668a18";
|
version = "e8668a18";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
vimUtils.buildVimPluginFrom2Nix rec {
|
vimUtils.buildVimPlugin {
|
||||||
pname = "vim-colors-paramount";
|
pname = "vim-colors-paramount";
|
||||||
version = "a5601d36";
|
version = "a5601d36";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
14
packages/vimPlugins/vim-ernest.nix
Normal file
14
packages/vimPlugins/vim-ernest.nix
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
vimUtils,
|
||||||
|
fetchFromGitHub,
|
||||||
|
lib,
|
||||||
|
}: (vimUtils.buildVimPlugin {
|
||||||
|
pname = "vim-ernest";
|
||||||
|
version = "4b99bc3";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "lgalke";
|
||||||
|
repo = "vim-ernest";
|
||||||
|
rev = "4b99bc3fe3deb7bb958ad2f64cad93569eeb50d7";
|
||||||
|
hash = "sha256-AUuRnnZU39XUerBxNelEqVyDAalRm3VGNUQb15fjXjM=";
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}: (vimUtils.buildVimPluginFrom2Nix rec {
|
}: (vimUtils.buildVimPlugin {
|
||||||
pname = "vim-fetch";
|
pname = "vim-fetch";
|
||||||
version = "76c08586";
|
version = "76c08586";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
vimUtils.buildVimPluginFrom2Nix {
|
vimUtils.buildVimPlugin {
|
||||||
pname = "vim-fsharp";
|
pname = "vim-fsharp";
|
||||||
version = "627db7d7";
|
version = "627db7d7";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
vimUtils.buildVimPluginFrom2Nix {
|
vimUtils.buildVimPlugin {
|
||||||
pname = "vim-mail";
|
pname = "vim-mail";
|
||||||
version = "acdbb5bd";
|
version = "acdbb5bd";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
vimUtils,
|
vimUtils,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}: (vimUtils.buildVimPluginFrom2Nix {
|
}: (vimUtils.buildVimPlugin {
|
||||||
pname = "vim-reason-plus";
|
pname = "vim-reason-plus";
|
||||||
version = "c11a2940";
|
version = "c11a2940";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
unstablePackages,
|
|
||||||
...
|
...
|
||||||
} @ args: let
|
} @ args: let
|
||||||
# config cannot be declared in the input attribute set because that would
|
# config cannot be declared in the input attribute set because that would
|
||||||
@@ -137,7 +136,7 @@
|
|||||||
))
|
))
|
||||||
);
|
);
|
||||||
|
|
||||||
weechat = unstablePackages.weechat.override {
|
weechatPkg = pkgs.weechat.override {
|
||||||
configure = _: {
|
configure = _: {
|
||||||
init = "/exec -oc cat ${setFile}";
|
init = "/exec -oc cat ${setFile}";
|
||||||
|
|
||||||
@@ -163,14 +162,14 @@
|
|||||||
cfg.files
|
cfg.files
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
exec ${weechat}/bin/weechat "$@"
|
exec ${weechatPkg}/bin/weechat "$@"
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
pkgs.symlinkJoin {
|
pkgs.symlinkJoin {
|
||||||
name = "weechat-configured";
|
name = "weechat-configured";
|
||||||
paths = [
|
paths = [
|
||||||
wrapper
|
wrapper
|
||||||
unstablePackages.weechat
|
weechatPkg
|
||||||
];
|
];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
ln -s ${setFile} $out/weechat.set
|
ln -s ${setFile} $out/weechat.set
|
||||||
|
|||||||
2
secrets
2
secrets
Submodule secrets updated: e14a3170cc...236a3353a7
@@ -1,8 +1,11 @@
|
|||||||
secrets/alertmanager-token-reporters.age
|
secrets/alertmanager-token-reporters.age
|
||||||
|
secrets/brevo-key.age
|
||||||
secrets/cifs-credentials-zodiac.age
|
secrets/cifs-credentials-zodiac.age
|
||||||
|
secrets/copecart-ipn.age
|
||||||
secrets/di-fm-key.age
|
secrets/di-fm-key.age
|
||||||
secrets/email-password-cock.age
|
secrets/email-password-cock.age
|
||||||
secrets/email-password-fysi.age
|
secrets/email-password-fysi.age
|
||||||
|
secrets/email-password-ical-ephemeris.age
|
||||||
secrets/email-password-letos.age
|
secrets/email-password-letos.age
|
||||||
secrets/email-password-meinhak99.age
|
secrets/email-password-meinhak99.age
|
||||||
secrets/email-password-posteo.age
|
secrets/email-password-posteo.age
|
||||||
@@ -76,6 +79,7 @@ secrets/telegram-token-proverb.age
|
|||||||
secrets/telegram-token-reverse.age
|
secrets/telegram-token-reverse.age
|
||||||
secrets/telegram-token-streaming-link.age
|
secrets/telegram-token-streaming-link.age
|
||||||
secrets/weechat-sec.conf.age
|
secrets/weechat-sec.conf.age
|
||||||
|
secrets/wifi.age
|
||||||
secrets/zaatar-moodle-dl-basicAuth.age
|
secrets/zaatar-moodle-dl-basicAuth.age
|
||||||
secrets/zaatar-moodle-dl-tokens.json.age
|
secrets/zaatar-moodle-dl-tokens.json.age
|
||||||
secrets/zaatar-retiolum-privateKey-ed25519.age
|
secrets/zaatar-retiolum-privateKey-ed25519.age
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ in {
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../configs/networkmanager.nix
|
../../configs/networkmanager.nix
|
||||||
../../configs/default.nix
|
../../configs/default.nix
|
||||||
|
../../configs/gaming.nix
|
||||||
# ../../configs/gnome.nix
|
# ../../configs/gnome.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -40,8 +41,6 @@ in {
|
|||||||
wireguard-aether-psk.file = ../../secrets/fatteh-wireguard-aether-psk.age;
|
wireguard-aether-psk.file = ../../secrets/fatteh-wireguard-aether-psk.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.wg-quick.interfaces.aether.address = ["192.168.178.202/24"];
|
|
||||||
|
|
||||||
networking.hostName = "fatteh";
|
networking.hostName = "fatteh";
|
||||||
networking.retiolum = retiolumAddresses.fatteh;
|
networking.retiolum = retiolumAddresses.fatteh;
|
||||||
|
|
||||||
|
|||||||
@@ -16,8 +16,17 @@
|
|||||||
boot.initrd.kernelModules = [];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = ["kvm-intel"];
|
boot.kernelModules = ["kvm-intel"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot = {
|
||||||
|
loader = {
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
systemd-boot = {
|
||||||
|
enable = true;
|
||||||
|
configurationLimit = 5;
|
||||||
|
consoleMode = "max";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-aa6beb1b-3e54-4a0e-ac9c-e0c007d73cd5".device = "/dev/disk/by-uuid/aa6beb1b-3e54-4a0e-ac9c-e0c007d73cd5";
|
boot.initrd.luks.devices."luks-aa6beb1b-3e54-4a0e-ac9c-e0c007d73cd5".device = "/dev/disk/by-uuid/aa6beb1b-3e54-4a0e-ac9c-e0c007d73cd5";
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,10 @@ in {
|
|||||||
./radio.nix
|
./radio.nix
|
||||||
./panoptikon.nix
|
./panoptikon.nix
|
||||||
./hledger.nix
|
./hledger.nix
|
||||||
|
./go-webring.nix
|
||||||
|
./gemini.nix
|
||||||
./wallabag.nix
|
./wallabag.nix
|
||||||
./alew.nix
|
./nethack.nix
|
||||||
../../configs/monitoring.nix
|
../../configs/monitoring.nix
|
||||||
../../configs/mycelium.nix
|
../../configs/mycelium.nix
|
||||||
../../configs/tor.nix
|
../../configs/tor.nix
|
||||||
@@ -69,65 +71,6 @@ in {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
users.users.servant = {
|
|
||||||
isSystemUser = true;
|
|
||||||
group = "servant";
|
|
||||||
};
|
|
||||||
users.groups.servant = {};
|
|
||||||
systemd.services.servant = {
|
|
||||||
enable = true;
|
|
||||||
environment.PORT = toString 18987;
|
|
||||||
environment.VIRTUAL_HOST = "https://openapiaiapi.kmein.de";
|
|
||||||
serviceConfig.ExecStart = pkgs.writers.writeHaskell "server" {
|
|
||||||
libraries = with pkgs.haskellPackages; [
|
|
||||||
servant
|
|
||||||
servant-server
|
|
||||||
servant-openapi3
|
|
||||||
servant-swagger-ui
|
|
||||||
servant-client
|
|
||||||
aeson
|
|
||||||
text
|
|
||||||
warp
|
|
||||||
uuid
|
|
||||||
lens
|
|
||||||
];
|
|
||||||
ghcArgs = ["-O3" "-threaded"];
|
|
||||||
} ./servant-openapi.hs;
|
|
||||||
serviceConfig.User = "servant";
|
|
||||||
serviceConfig.Group = "servant";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.htgen.openapi-conversion = {
|
|
||||||
port = 18988;
|
|
||||||
script = ''. ${pkgs.writers.writeDash "openapi-conversion" ''
|
|
||||||
case "$Method $Request_URI" in
|
|
||||||
"GET /openapi-3.1.json")
|
|
||||||
schema=$(mktemp -d)
|
|
||||||
trap 'rm -rf $schema' EXIT
|
|
||||||
${pkgs.wget}/bin/wget http://127.0.0.1:${toString 18987}/openapi.json -O "$schema"/openapi.json
|
|
||||||
cat "$schema"/openapi.json >&2
|
|
||||||
PATH=${lib.makeBinPath [pkgs.bashInteractive pkgs.nodejs]} ${pkgs.nodejs}/bin/npx --yes openapi-format "$schema"/openapi.json --convertTo "3.1" -o "$schema"/openapi-new.json
|
|
||||||
printf 'HTTP/1.1 200 OK\r\n'
|
|
||||||
printf 'Content-Type: %s\r\n' "$(${pkgs.file}/bin/file -ib "$schema"/openapi-new.json)"
|
|
||||||
printf 'Server: %s\r\n' "$Server"
|
|
||||||
printf 'Connection: close\r\n'
|
|
||||||
printf 'Content-Length: %d\r\n' $(${pkgs.coreutils}/bin/wc -c < "$schema"/openapi-new.json)
|
|
||||||
printf '\r\n'
|
|
||||||
cat "$schema"/openapi-new.json
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
''}'';
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."openapiaiapi.kmein.de" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/openapi-3.1.json".proxyPass = "http://127.0.0.1:${toString 18988}";
|
|
||||||
locations."/".proxyPass = "http://127.0.0.1:${toString 18987}";
|
|
||||||
};
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
firewall.allowedTCPPorts = [80 443];
|
firewall.allowedTCPPorts = [80 443];
|
||||||
hostName = "ful";
|
hostName = "ful";
|
||||||
|
|||||||
15
systems/ful/gemini.nix
Normal file
15
systems/ful/gemini.nix
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{ config, ... }:
|
||||||
|
{
|
||||||
|
networking.firewall.allowedTCPPorts = [ 1965 ];
|
||||||
|
services.agate = {
|
||||||
|
enable = true;
|
||||||
|
addresses = [ "0.0.0.0:1965" ];
|
||||||
|
hostnames = [ "kmein.de" ];
|
||||||
|
language = "de";
|
||||||
|
};
|
||||||
|
|
||||||
|
services.restic.backups.niveum.paths = [
|
||||||
|
config.services.agate.contentDir
|
||||||
|
config.services.agate.certificatesDir
|
||||||
|
];
|
||||||
|
}
|
||||||
39
systems/ful/go-webring.nix
Normal file
39
systems/ful/go-webring.nix
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
{ config, niveumPackages ,... }:
|
||||||
|
let
|
||||||
|
port = 2857;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.go-webring = {
|
||||||
|
enable = true;
|
||||||
|
host = "dichtungsring.kmein.de";
|
||||||
|
listenAddress = "127.0.0.1:${toString port}";
|
||||||
|
package = niveumPackages.go-webring;
|
||||||
|
members = [
|
||||||
|
{ username = "meteora"; site = "meteora.xn--kiern-0qa.de"; }
|
||||||
|
{ username = "huldra"; site = "huldras-halbtraum.com"; }
|
||||||
|
];
|
||||||
|
homePageTemplate = ''
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="de">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Dichtungsring</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Willkommen beim Dichtungs-Ring</h1>
|
||||||
|
<p>Ein <a href="https://de.wikipedia.org/wiki/Webring">Webring</a> für die Dichtung.</p>
|
||||||
|
<section id="members">
|
||||||
|
<table><tbody>{{ . }}</tbody></table>
|
||||||
|
</section>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."dichtungsring.kmein.de" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/".proxyPass = "http://${config.services.go-webring.listenAddress}";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -21,7 +21,7 @@ in {
|
|||||||
nginx = {
|
nginx = {
|
||||||
serverName = "matomo.kmein.de";
|
serverName = "matomo.kmein.de";
|
||||||
};
|
};
|
||||||
package = pkgs.matomo_5;
|
package = pkgs.matomo;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.mysql = {
|
services.mysql = {
|
||||||
|
|||||||
60
systems/ful/nethack.nix
Normal file
60
systems/ful/nethack.nix
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
{
|
||||||
|
networking.firewall.allowedTCPPorts = [ 22 ];
|
||||||
|
|
||||||
|
containers.nethack = {
|
||||||
|
autoStart = true;
|
||||||
|
|
||||||
|
forwardPorts = [
|
||||||
|
{
|
||||||
|
containerPort = 22;
|
||||||
|
hostPort = 22;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
config =
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
system.stateVersion = "25.11";
|
||||||
|
|
||||||
|
networking.hostName = "nethack";
|
||||||
|
services.openssh.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = [ pkgs.nethack ];
|
||||||
|
|
||||||
|
programs.tmux.enable = true;
|
||||||
|
programs.tmux.extraConfig = ''
|
||||||
|
set -g mouse on
|
||||||
|
set -g allow-rename off
|
||||||
|
set -g detach-on-destroy off
|
||||||
|
|
||||||
|
unbind-key C-b
|
||||||
|
set -g prefix None
|
||||||
|
'';
|
||||||
|
|
||||||
|
users.users.nethack = {
|
||||||
|
isNormalUser = true;
|
||||||
|
home = "/home/nethack";
|
||||||
|
createHome = true;
|
||||||
|
shell = pkgs.bash;
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
"ssh-ed25519 AAAA...yourkey"
|
||||||
|
"ssh-ed25519 AAAA...friendkey"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.openssh.settings = {
|
||||||
|
PasswordAuthentication = false;
|
||||||
|
PermitRootLogin = "no";
|
||||||
|
};
|
||||||
|
|
||||||
|
services.openssh.extraConfig = ''
|
||||||
|
Match User nethack
|
||||||
|
ForceCommand ${pkgs.tmux}/bin/tmux attach -t nethack || \
|
||||||
|
${pkgs.tmux}/bin/tmux new -s nethack ${pkgs.nethack}/bin/nethack
|
||||||
|
AllowTcpForwarding no
|
||||||
|
X11Forwarding no
|
||||||
|
PermitTTY yes
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
|
|
||||||
{-# LANGUAGE DataKinds #-}
|
|
||||||
{-# LANGUAGE TypeFamilies #-}
|
|
||||||
{-# LANGUAGE TypeOperators #-}
|
|
||||||
{-# LANGUAGE DeriveGeneric #-}
|
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
|
||||||
|
|
||||||
module Main where
|
|
||||||
|
|
||||||
import Data.Aeson (ToJSON, FromJSON)
|
|
||||||
import GHC.Generics (Generic)
|
|
||||||
import Data.String (IsString(..))
|
|
||||||
import Network.Wai (Application)
|
|
||||||
import Network.Wai.Handler.Warp (run)
|
|
||||||
import Servant
|
|
||||||
import Servant.Client (HasClient (..))
|
|
||||||
import Servant.OpenApi (HasOpenApi(..), toOpenApi)
|
|
||||||
import qualified Data.Version as Version
|
|
||||||
import Servant.Swagger.UI (SwaggerSchemaUI, swaggerSchemaUIServer)
|
|
||||||
import Data.OpenApi (ToSchema, servers, license, info, description, version, title)
|
|
||||||
import qualified Data.OpenApi as OpenApi
|
|
||||||
import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, readMVar)
|
|
||||||
import System.Environment (getEnv)
|
|
||||||
import Control.Monad.IO.Class (liftIO)
|
|
||||||
import Control.Lens
|
|
||||||
import qualified Data.Text as T
|
|
||||||
import GHC.Generics
|
|
||||||
import GHC.TypeLits
|
|
||||||
import Data.UUID (UUID)
|
|
||||||
import Data.UUID.V4 (nextRandom)
|
|
||||||
import qualified Data.UUID as UUID
|
|
||||||
|
|
||||||
-- Define a simple data type
|
|
||||||
data User = User
|
|
||||||
{ userId :: UUID
|
|
||||||
, name :: String
|
|
||||||
, age :: Int
|
|
||||||
} deriving (Generic, Show)
|
|
||||||
|
|
||||||
instance ToJSON User
|
|
||||||
instance FromJSON User
|
|
||||||
instance ToSchema User
|
|
||||||
|
|
||||||
-- Define the API type
|
|
||||||
type API = "users" :> OperationId "getUsers" :> Get '[JSON] [User]
|
|
||||||
:<|> "users" :> OperationId "insertUser" :> ReqBody '[JSON] User :> Post '[JSON] User
|
|
||||||
:<|> "users" :> OperationId "updateUser" :> Capture "id" UUID :> ReqBody '[JSON] User :> Put '[JSON] User
|
|
||||||
:<|> "users" :> OperationId "deleteUser" :> Capture "id" UUID :> Delete '[JSON] NoContent
|
|
||||||
|
|
||||||
-- Define the API with Swagger endpoints
|
|
||||||
type APIWithSwagger = API
|
|
||||||
:<|> SwaggerSchemaUI "swagger-ui" "openapi.json"
|
|
||||||
|
|
||||||
|
|
||||||
data OperationId (name :: Symbol)
|
|
||||||
|
|
||||||
instance HasServer subApi ctx => HasServer (OperationId name :> subApi) ctx where
|
|
||||||
type ServerT (OperationId name :> subApi) m = ServerT subApi m
|
|
||||||
route _ = route (Proxy @subApi)
|
|
||||||
hoistServerWithContext _ = hoistServerWithContext (Proxy @subApi)
|
|
||||||
|
|
||||||
instance (HasOpenApi subApi, KnownSymbol name) => HasOpenApi (OperationId name :> subApi) where
|
|
||||||
toOpenApi _ = toOpenApi (Proxy @subApi) & OpenApi.allOperations . OpenApi.operationId ?~ apiName
|
|
||||||
where
|
|
||||||
apiName = T.pack $ symbolVal (Proxy @name)
|
|
||||||
|
|
||||||
instance HasClient m api => HasClient m (OperationId name :> api) where
|
|
||||||
type Client m (OperationId name :> api) = Client m api
|
|
||||||
clientWithRoute pm Proxy = clientWithRoute pm (Proxy :: Proxy api)
|
|
||||||
hoistClientMonad pm _ = hoistClientMonad pm (Proxy :: Proxy api)
|
|
||||||
|
|
||||||
-- Handlers for the API
|
|
||||||
getUsers :: MVar [User] -> Handler [User]
|
|
||||||
getUsers usersVar = liftIO $ readMVar usersVar
|
|
||||||
|
|
||||||
addUser :: MVar [User] -> User -> Handler User
|
|
||||||
addUser usersVar newUser = liftIO $ do
|
|
||||||
newId <- nextRandom
|
|
||||||
let userWithId = newUser { userId = newId }
|
|
||||||
modifyMVar usersVar $ \users -> return (userWithId : users, userWithId)
|
|
||||||
|
|
||||||
updateUser :: MVar [User] -> UUID -> User -> Handler User
|
|
||||||
updateUser usersVar uid updatedUser = liftIO $ do
|
|
||||||
modifyMVar usersVar $ \users ->
|
|
||||||
let newUsers = map (\user -> if userId user == uid then updatedUser { userId = uid } else user) users
|
|
||||||
in return (newUsers, updatedUser { userId = uid })
|
|
||||||
|
|
||||||
deleteUser :: MVar [User] -> UUID -> Handler NoContent
|
|
||||||
deleteUser usersVar uid = liftIO $ do
|
|
||||||
modifyMVar usersVar $ \users ->
|
|
||||||
let newUsers = filter (\user -> userId user /= uid) users
|
|
||||||
in return (newUsers, NoContent)
|
|
||||||
|
|
||||||
-- Implement the server
|
|
||||||
server :: OpenApi.Server -> MVar [User] -> Server APIWithSwagger
|
|
||||||
server virtualHost usersVar = (getUsers usersVar
|
|
||||||
:<|> addUser usersVar
|
|
||||||
:<|> updateUser usersVar
|
|
||||||
:<|> deleteUser usersVar)
|
|
||||||
:<|> swaggerSchemaUIServer (toOpenApi (Proxy :: Proxy API)
|
|
||||||
& info.title .~ "OpenAPI AI API"
|
|
||||||
& info.version .~ "1.0"
|
|
||||||
& info.description ?~ "This is an API for AI with OpenAPI"
|
|
||||||
& info.license ?~ "MIT"
|
|
||||||
& servers .~ [virtualHost])
|
|
||||||
|
|
||||||
-- Create the application
|
|
||||||
app :: OpenApi.Server -> MVar [User] -> Application
|
|
||||||
app virtualHost usersVar = serve (Proxy :: Proxy APIWithSwagger) (server virtualHost usersVar)
|
|
||||||
|
|
||||||
-- Main entry point
|
|
||||||
main :: IO ()
|
|
||||||
main = do
|
|
||||||
initialUsers <- mapM (\(name, age) -> nextRandom >>= \uid -> return (User uid name age)) [("Alice", 30), ("Bob", 25)]
|
|
||||||
usersVar <- newMVar initialUsers
|
|
||||||
virtualHost <- getEnv "VIRTUAL_HOST"
|
|
||||||
port <- read <$> getEnv "PORT" -- Assuming PORT is a number
|
|
||||||
run port (app (fromString virtualHost) usersVar)
|
|
||||||
|
|
||||||
@@ -45,8 +45,6 @@ in {
|
|||||||
wireguard-aether-psk.file = ../../secrets/kabsa-wireguard-aether-psk.age;
|
wireguard-aether-psk.file = ../../secrets/kabsa-wireguard-aether-psk.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.wg-quick.interfaces.aether.address = ["192.168.178.203/24"];
|
|
||||||
|
|
||||||
environment.systemPackages = [pkgs.zeroad];
|
environment.systemPackages = [pkgs.zeroad];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
../../configs/sound.nix
|
../../configs/sound.nix
|
||||||
../../configs/printing.nix
|
../../configs/printing.nix
|
||||||
../../configs/nix.nix
|
../../configs/nix.nix
|
||||||
../../configs/flix.nix
|
|
||||||
../../configs/fonts.nix
|
../../configs/fonts.nix
|
||||||
../../configs/mycelium.nix
|
../../configs/mycelium.nix
|
||||||
../../configs/retiolum.nix
|
../../configs/retiolum.nix
|
||||||
@@ -80,7 +79,6 @@
|
|||||||
niveumPackages.mpv-tv
|
niveumPackages.mpv-tv
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
(niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
|
(niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
|
||||||
niveumPackages.meteo
|
|
||||||
spotify
|
spotify
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,103 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
niveumPackages,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
system = "x86_64-darwin";
|
|
||||||
|
|
||||||
nextcloud = "${config.home.homeDirectory}/Nextcloud/ZODIAC";
|
|
||||||
|
|
||||||
hora = pkgs.callPackage ../../packages/hora.nix {
|
|
||||||
timeLedger = "${nextcloud}/hora.timeclock";
|
|
||||||
};
|
|
||||||
|
|
||||||
adminEssentials = import ../../configs/admin-essentials.nix {
|
|
||||||
inherit pkgs niveumPackages lib system;
|
|
||||||
};
|
|
||||||
|
|
||||||
stardict = import ../../configs/stardict.nix {
|
|
||||||
inherit pkgs lib inputs;
|
|
||||||
};
|
|
||||||
|
|
||||||
git = import ../../configs/git.nix {
|
|
||||||
inherit pkgs lib inputs system;
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
home.packages =
|
|
||||||
[
|
|
||||||
hora
|
|
||||||
niveumPackages.vim
|
|
||||||
pkgs.ghc
|
|
||||||
pkgs.python3
|
|
||||||
]
|
|
||||||
++ adminEssentials.environment.systemPackages
|
|
||||||
++ git.environment.systemPackages;
|
|
||||||
#++ stardict.environment.systemPackages;
|
|
||||||
|
|
||||||
home.shellAliases =
|
|
||||||
adminEssentials.environment.shellAliases
|
|
||||||
// git.environment.shellAliases;
|
|
||||||
|
|
||||||
programs.git = git.home-manager.users.me.programs.git;
|
|
||||||
|
|
||||||
programs.zsh = let
|
|
||||||
promptColours = {
|
|
||||||
success = "green";
|
|
||||||
failure = "red";
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
autocd = true;
|
|
||||||
defaultKeymap = "viins";
|
|
||||||
enableAutosuggestions = true;
|
|
||||||
enableCompletion = true;
|
|
||||||
enable = true;
|
|
||||||
historySubstringSearch.enable = true;
|
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
syntaxHighlighting.highlighters = ["main" "brackets" "pattern" "line"];
|
|
||||||
initExtra = ''
|
|
||||||
# ref https://gist.github.com/meeech/0b97a86f235d10bc4e2a1116eec38e7e
|
|
||||||
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ];
|
|
||||||
then
|
|
||||||
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
|
|
||||||
fi
|
|
||||||
|
|
||||||
precmd () {
|
|
||||||
if [[ -n $IN_NIX_SHELL ]]; then
|
|
||||||
PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})λ%f '
|
|
||||||
else
|
|
||||||
PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})%#%f '
|
|
||||||
fi
|
|
||||||
print -Pn "\e]2;%n@%M:%~\a" # title bar prompt
|
|
||||||
}
|
|
||||||
zle-keymap-select zle-line-init () {
|
|
||||||
case $KEYMAP in
|
|
||||||
vicmd) print -n '\e]12;green\a';;
|
|
||||||
viins|main) print -n '\e]12;gray\a';;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
zle -N zle-line-init
|
|
||||||
zle -N zle-keymap-select
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
home.sessionVariables.EDITOR = "${niveumPackages.vim}/bin/nvim";
|
|
||||||
home.file."Local Applications".source = pkgs.symlinkJoin {
|
|
||||||
name = "local-applications";
|
|
||||||
paths = [pkgs.anki-bin pkgs.dbeaver pkgs.vscode pkgs.stellarium];
|
|
||||||
};
|
|
||||||
home.stateVersion = "23.11";
|
|
||||||
home.username = "xm7234fu";
|
|
||||||
home.homeDirectory = "/Users/${config.home.username}";
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
nix.package = pkgs.nixVersions.stable;
|
|
||||||
nix.extraOptions = "experimental-features = nix-command flakes";
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
hora register -p weekly --depth 1 --empty
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
@@ -13,14 +13,14 @@ in {
|
|||||||
./menstruation.nix
|
./menstruation.nix
|
||||||
./moinbot.nix
|
./moinbot.nix
|
||||||
./monitoring
|
./monitoring
|
||||||
./names.nix
|
# ./names.nix
|
||||||
./nextcloud.nix
|
./nextcloud.nix
|
||||||
../../configs/mycelium.nix
|
../../configs/mycelium.nix
|
||||||
./radio-news.nix
|
./radio-news.nix
|
||||||
./scrabble.nix
|
./scrabble.nix
|
||||||
# ./onlyoffice.nix
|
# ./onlyoffice.nix
|
||||||
./retiolum-map.nix
|
./retiolum-map.nix
|
||||||
./tarot.nix
|
./oracle
|
||||||
./tt-rss.nix
|
./tt-rss.nix
|
||||||
./weechat.nix
|
./weechat.nix
|
||||||
../../configs/monitoring.nix
|
../../configs/monitoring.nix
|
||||||
@@ -48,7 +48,7 @@ in {
|
|||||||
config.services.grafana.dataDir
|
config.services.grafana.dataDir
|
||||||
config.services.gitea.stateDir
|
config.services.gitea.stateDir
|
||||||
config.services.weechat.root
|
config.services.weechat.root
|
||||||
config.services.nginx.virtualHosts."www.kmein.de".root
|
config.services.nginx.virtualHosts."www.kmein.de".locations."/".root
|
||||||
"/var/lib/weechat"
|
"/var/lib/weechat"
|
||||||
"/var/lib/codimd"
|
"/var/lib/codimd"
|
||||||
];
|
];
|
||||||
@@ -121,7 +121,22 @@ in {
|
|||||||
services.nginx.virtualHosts."www.kmein.de" = {
|
services.nginx.virtualHosts."www.kmein.de" = {
|
||||||
addSSL = true;
|
addSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
root = "/var/www/kmein.de";
|
locations."/" = {
|
||||||
|
root = "/var/www/kmein.de";
|
||||||
|
extraConfig = ''
|
||||||
|
add_header 'Access-Control-Allow-Origin' '*';
|
||||||
|
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
|
||||||
|
add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization';
|
||||||
|
|
||||||
|
# Handle preflight requests
|
||||||
|
if ($request_method = 'OPTIONS') {
|
||||||
|
add_header 'Access-Control-Allow-Origin' '*';
|
||||||
|
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
|
||||||
|
add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization';
|
||||||
|
return 204; # No Content
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
|||||||
@@ -7,8 +7,10 @@ in {
|
|||||||
defaultOptions.settings = {
|
defaultOptions.settings = {
|
||||||
USER_DEFINED_DEFAULT = true;
|
USER_DEFINED_DEFAULT = true;
|
||||||
};
|
};
|
||||||
instances = {
|
instances = let instance = "gitea"; in {
|
||||||
"gitea".settings = {
|
${instance}.settings = {
|
||||||
|
BIND = "/run/anubis/anubis-${instance}/anubis.sock";
|
||||||
|
METRICS_BIND = "/run/anubis/anubis-${instance}/anubis-metrics.sock";
|
||||||
TARGET = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
|
TARGET = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
|
||||||
USER_DEFINED_INSTANCE = true;
|
USER_DEFINED_INSTANCE = true;
|
||||||
OG_PASSTHROUGH = true;
|
OG_PASSTHROUGH = true;
|
||||||
|
|||||||
@@ -3,11 +3,13 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
lokiConfig = import ./loki.nix;
|
lokiConfig = import ./loki.nix;
|
||||||
blackboxConfig = import ./blackbox.nix;
|
blackboxConfig = import ./blackbox.nix;
|
||||||
inherit (import ../../../lib) restic;
|
inherit (import ../../../lib) restic;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.grafana = {
|
services.grafana = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
@@ -80,143 +82,150 @@ in {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
services.prometheus.rules = let
|
services.prometheus.rules =
|
||||||
diskFreeThreshold = 10;
|
let
|
||||||
in [
|
diskFreeThreshold = 10;
|
||||||
(builtins.toJSON {
|
in
|
||||||
groups = [
|
[
|
||||||
{
|
(builtins.toJSON {
|
||||||
name = "niveum";
|
groups = [
|
||||||
rules = [
|
{
|
||||||
{
|
name = "niveum";
|
||||||
alert = "HostSystemdServiceCrashed";
|
rules = [
|
||||||
expr = ''(node_systemd_unit_state{state="failed"} == 1) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'';
|
{
|
||||||
annotations = {
|
alert = "HostSystemdServiceCrashed";
|
||||||
description = "{{$labels.name}} failed on {{$labels.instance}}";
|
expr = ''(node_systemd_unit_state{state="failed"} == 1) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'';
|
||||||
};
|
annotations = {
|
||||||
}
|
description = "{{$labels.name}} failed on {{$labels.instance}}";
|
||||||
{
|
};
|
||||||
alert = "RootPartitionFull";
|
}
|
||||||
for = "10m";
|
{
|
||||||
expr = ''(node_filesystem_free_bytes{mountpoint="/"} * 100) / node_filesystem_size_bytes{mountpoint="/"} < ${toString diskFreeThreshold}'';
|
alert = "RootPartitionFull";
|
||||||
annotations = {
|
for = "10m";
|
||||||
description = ''{{ $labels.instance }} running out of space: {{ $value | printf "%.2f" }}% < ${toString diskFreeThreshold}%'';
|
expr = ''(node_filesystem_free_bytes{mountpoint="/"} * 100) / node_filesystem_size_bytes{mountpoint="/"} < ${toString diskFreeThreshold}'';
|
||||||
};
|
annotations = {
|
||||||
}
|
description = ''{{ $labels.instance }} running out of space: {{ $value | printf "%.2f" }}% < ${toString diskFreeThreshold}%'';
|
||||||
{
|
};
|
||||||
alert = "RootPartitionFullWeek";
|
}
|
||||||
for = "1h";
|
{
|
||||||
expr =
|
alert = "RootPartitionFullWeek";
|
||||||
''node_filesystem_free_bytes{mountpoint="/"} ''
|
for = "1h";
|
||||||
+ ''and predict_linear(node_filesystem_free_bytes{mountpoint="/"}[2d], 7*24*3600) <= 0'';
|
expr =
|
||||||
annotations = {
|
''node_filesystem_free_bytes{mountpoint="/"} ''
|
||||||
description = "{{$labels.instance}} running out of space in 7 days";
|
+ ''and predict_linear(node_filesystem_free_bytes{mountpoint="/"}[2d], 7*24*3600) <= 0'';
|
||||||
};
|
annotations = {
|
||||||
}
|
description = "{{$labels.instance}} running out of space in 7 days";
|
||||||
{
|
};
|
||||||
alert = "HighLoad";
|
}
|
||||||
expr = ''node_load15 / on(job) count(node_cpu_seconds_total{mode="system"}) by (job) >= 1.0'';
|
{
|
||||||
for = "10m";
|
alert = "HighLoad";
|
||||||
annotations = {
|
expr = ''node_load15 / on(job) count(node_cpu_seconds_total{mode="system"}) by (job) >= 1.0'';
|
||||||
description = "{{$labels.instance}} running on high load: {{$value}}";
|
for = "10m";
|
||||||
};
|
annotations = {
|
||||||
}
|
description = "{{$labels.instance}} running on high load: {{$value}}";
|
||||||
{
|
};
|
||||||
alert = "HostUnusualNetworkThroughputIn";
|
}
|
||||||
expr = ''(rate(node_network_receive_bytes_total[2m])) / 1024 / 1024 > 100'';
|
{
|
||||||
for = "5m";
|
alert = "HostUnusualNetworkThroughputIn";
|
||||||
annotations.description = "Host unusual network throughput in (instance {{ $labels.instance }})";
|
expr = ''(rate(node_network_receive_bytes_total[2m])) / 1024 / 1024 > 100'';
|
||||||
}
|
for = "5m";
|
||||||
{
|
annotations.description = "Host unusual network throughput in (instance {{ $labels.instance }})";
|
||||||
alert = "HostUnusualNetworkThroughputOut";
|
}
|
||||||
expr = ''(rate(node_network_transmit_bytes_total[2m])) / 1024 / 1024 > 100'';
|
{
|
||||||
for = "5m";
|
alert = "HostUnusualNetworkThroughputOut";
|
||||||
annotations.description = "Host unusual network throughput out (instance {{ $labels.instance }})";
|
expr = ''(rate(node_network_transmit_bytes_total[2m])) / 1024 / 1024 > 100'';
|
||||||
}
|
for = "5m";
|
||||||
{
|
annotations.description = "Host unusual network throughput out (instance {{ $labels.instance }})";
|
||||||
alert = "HostUnusualDiskReadRate";
|
}
|
||||||
expr = ''(rate(node_disk_read_bytes_total[2m])) / 1024 / 1024 > 50'';
|
{
|
||||||
for = "5m";
|
alert = "HostUnusualDiskReadRate";
|
||||||
annotations.description = "Host unusual disk read rate (instance {{ $labels.instance }})";
|
expr = ''(rate(node_disk_read_bytes_total[2m])) / 1024 / 1024 > 50'';
|
||||||
}
|
for = "5m";
|
||||||
{
|
annotations.description = "Host unusual disk read rate (instance {{ $labels.instance }})";
|
||||||
alert = "HostUnusualDiskWriteRate";
|
}
|
||||||
expr = ''(rate(node_disk_written_bytes_total[2m])) / 1024 / 1024 > 50'';
|
{
|
||||||
for = "2m";
|
alert = "HostUnusualDiskWriteRate";
|
||||||
annotations.description = "Host unusual disk write rate (instance {{ $labels.instance }})";
|
expr = ''(rate(node_disk_written_bytes_total[2m])) / 1024 / 1024 > 50'';
|
||||||
}
|
for = "2m";
|
||||||
{
|
annotations.description = "Host unusual disk write rate (instance {{ $labels.instance }})";
|
||||||
alert = "HostOutOfInodes";
|
}
|
||||||
expr = ''node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and ON (instance, device, mountpoint) node_filesystem_readonly == 0'';
|
{
|
||||||
for = "2m";
|
alert = "HostOutOfInodes";
|
||||||
annotations.description = "Host out of inodes (instance {{ $labels.instance }})";
|
expr = ''node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and ON (instance, device, mountpoint) node_filesystem_readonly == 0'';
|
||||||
}
|
for = "2m";
|
||||||
{
|
annotations.description = "Host out of inodes (instance {{ $labels.instance }})";
|
||||||
alert = "HostInodesWillFillIn24Hours";
|
}
|
||||||
expr = ''node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and predict_linear(node_filesystem_files_free{fstype!="msdosfs"}[1h], 24 * 3600) < 0 and ON (instance, device, mountpoint) node_filesystem_readonly{fstype!="msdosfs"} == 0'';
|
{
|
||||||
for = "2m";
|
alert = "HostInodesWillFillIn24Hours";
|
||||||
annotations.description = "Host inodes will fill in 24 hours (instance {{ $labels.instance }})";
|
expr = ''node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and predict_linear(node_filesystem_files_free{fstype!="msdosfs"}[1h], 24 * 3600) < 0 and ON (instance, device, mountpoint) node_filesystem_readonly{fstype!="msdosfs"} == 0'';
|
||||||
}
|
for = "2m";
|
||||||
{
|
annotations.description = "Host inodes will fill in 24 hours (instance {{ $labels.instance }})";
|
||||||
alert = "HighRAM";
|
}
|
||||||
expr = "node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes < node_memory_MemTotal_bytes * 0.1";
|
{
|
||||||
for = "1h";
|
alert = "HighRAM";
|
||||||
annotations.description = "{{$labels.instance}} using lots of RAM";
|
expr = "node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes < node_memory_MemTotal_bytes * 0.1";
|
||||||
}
|
for = "1h";
|
||||||
{
|
annotations.description = "{{$labels.instance}} using lots of RAM";
|
||||||
alert = "UptimeMonster";
|
}
|
||||||
expr = "time() - node_boot_time_seconds > 2592000";
|
{
|
||||||
annotations.description = "uptime monster {{$labels.instance}} up for more than 30 days";
|
alert = "UptimeMonster";
|
||||||
}
|
expr = "time() - node_boot_time_seconds > 2592000";
|
||||||
{
|
annotations.description = "uptime monster {{$labels.instance}} up for more than 30 days";
|
||||||
alert = "HostDown";
|
}
|
||||||
expr = ''up == 0'';
|
{
|
||||||
for = "5m";
|
alert = "HostDown";
|
||||||
annotations = {
|
expr = ''up == 0'';
|
||||||
description = "{{ $labels.instance }} seeming down since 5 minutes";
|
for = "5m";
|
||||||
};
|
annotations = {
|
||||||
}
|
description = "{{ $labels.instance }} seeming down since 5 minutes";
|
||||||
{
|
};
|
||||||
alert = "Reboot";
|
}
|
||||||
expr = "time() - node_boot_time_seconds < 300";
|
{
|
||||||
annotations.description = "{{$labels.instance}} rebooted";
|
alert = "Reboot";
|
||||||
}
|
expr = "time() - node_boot_time_seconds < 300";
|
||||||
{
|
annotations.description = "{{$labels.instance}} rebooted";
|
||||||
alert = "ProbeFailed";
|
}
|
||||||
expr = "probe_success == 0";
|
{
|
||||||
for = "5m";
|
alert = "Mastodon";
|
||||||
annotations.description = "HTTP probe failed for {{$labels.instance}}";
|
expr = ''probe_success{instance="https://social.krebsco.de"} == 0'';
|
||||||
}
|
for = "5m";
|
||||||
{
|
annotations.description = "Mastodon instance {{$labels.instance}} is down";
|
||||||
alert = "SlowProbe";
|
}
|
||||||
expr = "avg_over_time(probe_http_duration_seconds[1m]) > 1";
|
{
|
||||||
for = "5m";
|
alert = "ProbeFailed";
|
||||||
annotations.description = "HTTP probe slow for {{$labels.instance}}";
|
expr = "probe_success == 0";
|
||||||
}
|
for = "5m";
|
||||||
{
|
annotations.description = "HTTP probe failed for {{$labels.instance}}";
|
||||||
alert = "HttpStatusCode";
|
}
|
||||||
expr = "probe_http_status_code != 0 AND (probe_http_status_code <= 199 OR probe_http_status_code >= 400)";
|
{
|
||||||
for = "5m";
|
alert = "SlowProbe";
|
||||||
annotations.description = "status code {{$value}} for {{$labels.instance}}";
|
expr = "avg_over_time(probe_http_duration_seconds[1m]) > 1";
|
||||||
}
|
for = "5m";
|
||||||
{
|
annotations.description = "HTTP probe slow for {{$labels.instance}}";
|
||||||
alert = "SslExpirySoon";
|
}
|
||||||
expr = "probe_ssl_earliest_cert_expiry - time() < 86400 * 30";
|
{
|
||||||
for = "5m";
|
alert = "HttpStatusCode";
|
||||||
annotations.description = "SSL certificate for {{$labels.instance}} expires in 30 days";
|
expr = "probe_http_status_code != 0 AND (probe_http_status_code <= 199 OR probe_http_status_code >= 400)";
|
||||||
}
|
for = "5m";
|
||||||
{
|
annotations.description = "status code {{$value}} for {{$labels.instance}}";
|
||||||
alert = "SslExpiry";
|
}
|
||||||
expr = "probe_ssl_earliest_cert_expiry - time() <= 0";
|
{
|
||||||
for = "5m";
|
alert = "SslExpirySoon";
|
||||||
annotations.description = "SSL certificate for {{$labels.instance}} has expired";
|
expr = "probe_ssl_earliest_cert_expiry - time() < 86400 * 30";
|
||||||
}
|
for = "5m";
|
||||||
];
|
annotations.description = "SSL certificate for {{$labels.instance}} expires in 30 days";
|
||||||
}
|
}
|
||||||
];
|
{
|
||||||
})
|
alert = "SslExpiry";
|
||||||
];
|
expr = "probe_ssl_earliest_cert_expiry - time() <= 0";
|
||||||
|
for = "5m";
|
||||||
|
annotations.description = "SSL certificate for {{$labels.instance}} has expired";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# ref https://github.com/Mic92/dotfiles/blob/f44bac5dd6970ed3fbb4feb906917331ec3c2be5/machines/eva/modules/prometheus/default.nix
|
# ref https://github.com/Mic92/dotfiles/blob/f44bac5dd6970ed3fbb4feb906917331ec3c2be5/machines/eva/modules/prometheus/default.nix
|
||||||
systemd.services.matrix-hook = {
|
systemd.services.matrix-hook = {
|
||||||
@@ -246,6 +255,33 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.matrix-hook-lassulus = {
|
||||||
|
description = "Matrix Hook";
|
||||||
|
after = [ "network.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
environment = {
|
||||||
|
HTTP_ADDRESS = "[::1]";
|
||||||
|
HTTP_PORT = "9089";
|
||||||
|
MX_HOMESERVER = "https://matrix.4d2.org";
|
||||||
|
MX_ID = "@lakai:4d2.org";
|
||||||
|
MX_ROOMID = "!MJAGqBAOKZGMywzwkI:lassul.us";
|
||||||
|
MX_MSG_TEMPLATE = "${pkgs.matrix-hook}/message.html.tmpl";
|
||||||
|
};
|
||||||
|
serviceConfig = {
|
||||||
|
EnvironmentFile = [
|
||||||
|
# format: MX_TOKEN=<token>
|
||||||
|
config.age.secrets.matrix-token-lakai-env.path
|
||||||
|
];
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = "${pkgs.matrix-hook}/bin/matrix-hook";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "10";
|
||||||
|
DynamicUser = true;
|
||||||
|
User = "matrix-hook";
|
||||||
|
Group = "matrix-hook";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
matrix-token-lakai-env.file = ../../../secrets/matrix-token-lakai-env.age;
|
matrix-token-lakai-env.file = ../../../secrets/matrix-token-lakai-env.age;
|
||||||
};
|
};
|
||||||
@@ -260,8 +296,23 @@ in {
|
|||||||
group_wait = "30s";
|
group_wait = "30s";
|
||||||
repeat_interval = "24h";
|
repeat_interval = "24h";
|
||||||
receiver = "matrix";
|
receiver = "matrix";
|
||||||
|
routes = [
|
||||||
|
{
|
||||||
|
receiver = "lassulus";
|
||||||
|
matchers = [ "alertname = \"Mastodon\"" ];
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
receivers = [
|
receivers = [
|
||||||
|
{
|
||||||
|
name = "lassulus";
|
||||||
|
webhook_configs = [
|
||||||
|
{
|
||||||
|
url = "http://localhost:9089/alert";
|
||||||
|
max_alerts = 5;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
{
|
{
|
||||||
name = "matrix";
|
name = "matrix";
|
||||||
webhook_configs = [
|
webhook_configs = [
|
||||||
@@ -306,13 +357,21 @@ in {
|
|||||||
{
|
{
|
||||||
scheme = "http";
|
scheme = "http";
|
||||||
path_prefix = "/";
|
path_prefix = "/";
|
||||||
static_configs = [{targets = ["localhost:${toString config.services.prometheus.alertmanager.port}"];}];
|
static_configs = [
|
||||||
|
{ targets = [ "localhost:${toString config.services.prometheus.alertmanager.port}" ]; }
|
||||||
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
# otherwise bearer_token_file will fail
|
# otherwise bearer_token_file will fail
|
||||||
services.prometheus.checkConfig = "syntax-only";
|
services.prometheus.checkConfig = "syntax-only";
|
||||||
|
|
||||||
|
services.prometheus.extraFlags = [
|
||||||
|
"--storage.tsdb.retention.time=7d"
|
||||||
|
"--storage.tsdb.retention.size=2GB"
|
||||||
|
"--storage.tsdb.wal-compression"
|
||||||
|
];
|
||||||
|
|
||||||
services.prometheus.scrapeConfigs = [
|
services.prometheus.scrapeConfigs = [
|
||||||
{
|
{
|
||||||
job_name = "makanek";
|
job_name = "makanek";
|
||||||
@@ -328,14 +387,14 @@ in {
|
|||||||
scrape_interval = "5m";
|
scrape_interval = "5m";
|
||||||
job_name = "blackbox";
|
job_name = "blackbox";
|
||||||
metrics_path = "/probe";
|
metrics_path = "/probe";
|
||||||
params.module = ["http_2xx"];
|
params.module = [ "http_2xx" ];
|
||||||
relabel_configs = [
|
relabel_configs = [
|
||||||
{
|
{
|
||||||
source_labels = ["__address__"];
|
source_labels = [ "__address__" ];
|
||||||
target_label = "__param_target";
|
target_label = "__param_target";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
source_labels = ["__param_target"];
|
source_labels = [ "__param_target" ];
|
||||||
target_label = "instance";
|
target_label = "instance";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -393,7 +452,7 @@ in {
|
|||||||
scrape_interval = "60s";
|
scrape_interval = "60s";
|
||||||
metrics_path = "/api/prometheus";
|
metrics_path = "/api/prometheus";
|
||||||
scheme = "http";
|
scheme = "http";
|
||||||
static_configs = [{targets = ["zaatar.r:8123"];}];
|
static_configs = [ { targets = [ "zaatar.r:8123" ]; } ];
|
||||||
bearer_token_file = config.age.secrets.home-assistant-token.path;
|
bearer_token_file = config.age.secrets.home-assistant-token.path;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -410,7 +469,7 @@ in {
|
|||||||
|
|
||||||
services.prometheus.exporters.blackbox = {
|
services.prometheus.exporters.blackbox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configFile = (pkgs.formats.yaml {}).generate "blackbox.yaml" blackboxConfig;
|
configFile = (pkgs.formats.yaml { }).generate "blackbox.yaml" blackboxConfig;
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
@@ -419,6 +478,6 @@ in {
|
|||||||
|
|
||||||
services.loki = {
|
services.loki = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configFile = (pkgs.formats.yaml {}).generate "loki.yaml" lokiConfig;
|
configFile = (pkgs.formats.yaml { }).generate "loki.yaml" lokiConfig;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
95
systems/makanek/oracle/default.nix
Normal file
95
systems/makanek/oracle/default.nix
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
tarotPort = 7407;
|
||||||
|
ichingPort = 1819;
|
||||||
|
tarotFiles = pkgs.fetchzip {
|
||||||
|
url = "https://c.krebsco.de/tarot.zip";
|
||||||
|
sha256 = "0jl5vdwlj17pqp94yj02xgsb1gyvs9i08m83kac0jdnhfjl2f75a";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
tarotKey = builtins.fetchurl {
|
||||||
|
url = "http://c.krebsco.de/tarot.pdf";
|
||||||
|
sha256 = "1n2m53kjg2vj9dbr70b9jrsbqwdfrcb48l4wswn21549fi24g6dx";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
systemd.services.tarot = {
|
||||||
|
enable = true;
|
||||||
|
serviceConfig.Type = "simple";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
environment = {
|
||||||
|
TAROT_FILES = tarotFiles;
|
||||||
|
TAROT_PORT = toString tarotPort;
|
||||||
|
};
|
||||||
|
serviceConfig.ExecStart = pkgs.writers.writePython3 "tarot-server" {
|
||||||
|
libraries = py: [
|
||||||
|
py.pillow
|
||||||
|
py.flask
|
||||||
|
];
|
||||||
|
} ./tarot.py;
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.iching = {
|
||||||
|
enable = true;
|
||||||
|
serviceConfig.Type = "simple";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
environment = {
|
||||||
|
ICHING_PORT = toString ichingPort;
|
||||||
|
};
|
||||||
|
serviceConfig.ExecStart = pkgs.writers.writePython3 "iching-server" {
|
||||||
|
libraries = py: [
|
||||||
|
py.flask
|
||||||
|
];
|
||||||
|
} ./iching.py;
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
rec {
|
||||||
|
link = "https://tarot.kmein.de";
|
||||||
|
title = "Tarot";
|
||||||
|
description = "draws Tarot cards for you. See <a href=\"${link}/files/key.pdf\">here</a> for information on how to interpret them.";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
link = "https://iching.kmein.de";
|
||||||
|
title = "I Ching";
|
||||||
|
description = "draws I Ching hexagrams for you.";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."iching.kmein.de" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations = {
|
||||||
|
"/".proxyPass = "http://127.0.0.1:${toString ichingPort}/";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."tarot.kmein.de" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations = {
|
||||||
|
"/".proxyPass = "http://127.0.0.1:${toString tarotPort}/";
|
||||||
|
"/files/" = {
|
||||||
|
root = pkgs.linkFarm "tarot" [
|
||||||
|
{
|
||||||
|
name = "files/key.pdf";
|
||||||
|
path = tarotKey;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "files/cards";
|
||||||
|
path = tarotFiles;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
extraConfig = ''
|
||||||
|
autoindex on;
|
||||||
|
charset UTF-8;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
202
systems/makanek/oracle/iching.py
Normal file
202
systems/makanek/oracle/iching.py
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
from flask import Flask
|
||||||
|
import random
|
||||||
|
from typing import List
|
||||||
|
from enum import Enum
|
||||||
|
import os
|
||||||
|
|
||||||
|
app = Flask(__name__)
|
||||||
|
|
||||||
|
KING_WEN_SEQUENCE: List[int] = [
|
||||||
|
0b111111,
|
||||||
|
0b000000,
|
||||||
|
0b100010,
|
||||||
|
0b010001,
|
||||||
|
0b111010,
|
||||||
|
0b010111,
|
||||||
|
0b010000,
|
||||||
|
0b000010,
|
||||||
|
0b111011,
|
||||||
|
0b110111,
|
||||||
|
0b111000,
|
||||||
|
0b000111,
|
||||||
|
0b101111,
|
||||||
|
0b111101,
|
||||||
|
0b001000,
|
||||||
|
0b000100,
|
||||||
|
0b100110,
|
||||||
|
0b011001,
|
||||||
|
0b110000,
|
||||||
|
0b000011,
|
||||||
|
0b100101,
|
||||||
|
0b101001,
|
||||||
|
0b000001,
|
||||||
|
0b100000,
|
||||||
|
0b100111,
|
||||||
|
0b111001,
|
||||||
|
0b100001,
|
||||||
|
0b011110,
|
||||||
|
0b010010,
|
||||||
|
0b101101,
|
||||||
|
0b001110,
|
||||||
|
0b011100,
|
||||||
|
0b001111,
|
||||||
|
0b111100,
|
||||||
|
0b000101,
|
||||||
|
0b101000,
|
||||||
|
0b101011,
|
||||||
|
0b110101,
|
||||||
|
0b001010,
|
||||||
|
0b010100,
|
||||||
|
0b110001,
|
||||||
|
0b100011,
|
||||||
|
0b111110,
|
||||||
|
0b011111,
|
||||||
|
0b000110,
|
||||||
|
0b011000,
|
||||||
|
0b010110,
|
||||||
|
0b011010,
|
||||||
|
0b101110,
|
||||||
|
0b011101,
|
||||||
|
0b100100,
|
||||||
|
0b001001,
|
||||||
|
0b001011,
|
||||||
|
0b110100,
|
||||||
|
0b101100,
|
||||||
|
0b001101,
|
||||||
|
0b011011,
|
||||||
|
0b110110,
|
||||||
|
0b010011,
|
||||||
|
0b110010,
|
||||||
|
0b110011,
|
||||||
|
0b001100,
|
||||||
|
0b101010,
|
||||||
|
0b010101,
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class Line(Enum):
|
||||||
|
"""
|
||||||
|
Represents a line in an I Ching hexagram.
|
||||||
|
Each line can be one of the following:
|
||||||
|
- 6: Old Yin (changing yin)
|
||||||
|
- 7: Young Yang (static yang)
|
||||||
|
- 8: Young Yin (static yin)
|
||||||
|
- 9: Old Yang (changing yang)
|
||||||
|
"""
|
||||||
|
|
||||||
|
OLD_YIN = 6 # changing yin
|
||||||
|
YOUNG_YANG = 7 # static yang
|
||||||
|
YOUNG_YIN = 8 # static yin
|
||||||
|
OLD_YANG = 9 # changing yang
|
||||||
|
|
||||||
|
def is_changing(self) -> bool:
|
||||||
|
"""Returns True if the line is changing (old)."""
|
||||||
|
return self in [Line.OLD_YIN, Line.OLD_YANG]
|
||||||
|
|
||||||
|
def symbol(self) -> str:
|
||||||
|
"""Returns the textual representation of the line."""
|
||||||
|
symbols = {
|
||||||
|
Line.YOUNG_YANG: "───────",
|
||||||
|
Line.YOUNG_YIN: "─── ───",
|
||||||
|
Line.OLD_YANG: "───o───",
|
||||||
|
Line.OLD_YIN: "───x───",
|
||||||
|
}
|
||||||
|
return symbols[self]
|
||||||
|
|
||||||
|
def binary_value(self) -> int:
|
||||||
|
"""Returns the binary value of the line (1 for yang, 0 for yin)."""
|
||||||
|
return 1 if self in [Line.YOUNG_YANG, Line.OLD_YANG] else 0
|
||||||
|
|
||||||
|
|
||||||
|
class Hexagram:
|
||||||
|
"""
|
||||||
|
Represents an I Ching hexagram.
|
||||||
|
Each hexagram consists of six lines.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, lines: List[Line] | None = None) -> None:
|
||||||
|
"""
|
||||||
|
Initializes a Hexagram.
|
||||||
|
If lines are not provided, generates a random hexagram.
|
||||||
|
:param lines: List of six integers = the lines of the hexagram.
|
||||||
|
"""
|
||||||
|
if lines is None:
|
||||||
|
self.lines = random.choices(
|
||||||
|
[Line.OLD_YIN, Line.YOUNG_YANG, Line.YOUNG_YIN, Line.OLD_YANG],
|
||||||
|
weights=[1, 5, 7, 3],
|
||||||
|
k=6,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self.lines = lines
|
||||||
|
|
||||||
|
def print(self) -> str:
|
||||||
|
"""Prints the hexagram details."""
|
||||||
|
return "\n".join(
|
||||||
|
[
|
||||||
|
"HEXAGRAM {} {}".format(
|
||||||
|
self.king_wen_number(), self.unicode_representation()
|
||||||
|
),
|
||||||
|
"Binary: {:06b}".format(self.binary_representation()),
|
||||||
|
"Lines (bottom → top): {}".format(
|
||||||
|
" ".join(str(line.value) for line in self.lines)
|
||||||
|
),
|
||||||
|
self.render_text(),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
def render_text(self) -> str:
|
||||||
|
"""Renders the hexagram in a textual box format."""
|
||||||
|
lines = []
|
||||||
|
lines.append("┌─────────┐")
|
||||||
|
for line in reversed(self.lines):
|
||||||
|
body = line.symbol()
|
||||||
|
lines.append(f"│ {body} │")
|
||||||
|
lines.append("└─────────┘")
|
||||||
|
return "\n".join(lines)
|
||||||
|
|
||||||
|
def binary_representation(self) -> int:
|
||||||
|
"""Returns the binary representation of the hexagram."""
|
||||||
|
return sum(
|
||||||
|
val << i
|
||||||
|
for i, val in enumerate(
|
||||||
|
line.binary_value() for line in reversed(self.lines)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def king_wen_number(self) -> int:
|
||||||
|
"""Returns the King Wen number of the hexagram."""
|
||||||
|
return KING_WEN_SEQUENCE.index(self.binary_representation()) + 1
|
||||||
|
|
||||||
|
def unicode_representation(self) -> str:
|
||||||
|
"""Returns the Unicode character representing the hexagram."""
|
||||||
|
return chr(0x4DC0 + self.king_wen_number() - 1)
|
||||||
|
|
||||||
|
def changing_hexagram(self):
|
||||||
|
"""Returns the changing hexagram
|
||||||
|
if there are changing lines, else None."""
|
||||||
|
if any(line.is_changing() for line in self.lines):
|
||||||
|
new_lines = [
|
||||||
|
(
|
||||||
|
Line.YOUNG_YIN
|
||||||
|
if line == Line.OLD_YANG
|
||||||
|
else Line.YOUNG_YANG if line == Line.OLD_YIN else line
|
||||||
|
)
|
||||||
|
for line in self.lines
|
||||||
|
]
|
||||||
|
return Hexagram(new_lines)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
@app.route("/")
|
||||||
|
def main():
|
||||||
|
result = ""
|
||||||
|
hexagram = Hexagram()
|
||||||
|
result += hexagram.print()
|
||||||
|
if changing_hex := hexagram.changing_hexagram():
|
||||||
|
result += "\n"
|
||||||
|
result += changing_hex.print()
|
||||||
|
return f"<pre>{result}</pre>"
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
app.run(port=int(os.environ["ICHING_PORT"]))
|
||||||
26
systems/makanek/oracle/tarot.py
Normal file
26
systems/makanek/oracle/tarot.py
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
from flask import Flask, send_file
|
||||||
|
from pathlib import Path
|
||||||
|
from random import choice, randint
|
||||||
|
from io import BytesIO
|
||||||
|
from PIL import Image
|
||||||
|
import os
|
||||||
|
|
||||||
|
app = Flask(__name__)
|
||||||
|
TAROT_DIR = Path(os.environ["TAROT_FILES"])
|
||||||
|
|
||||||
|
|
||||||
|
@app.route("/")
|
||||||
|
def tarot():
|
||||||
|
card_path = choice(list(TAROT_DIR.glob("*")))
|
||||||
|
|
||||||
|
with Image.open(card_path) as img:
|
||||||
|
if randint(0, 1):
|
||||||
|
img = img.rotate(180)
|
||||||
|
buf = BytesIO()
|
||||||
|
img.save(buf, format="JPEG")
|
||||||
|
buf.seek(0)
|
||||||
|
return send_file(buf, mimetype="image/jpeg", as_attachment=False)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
app.run(port=int(os.environ["TAROT_PORT"]))
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user