mirror of
https://github.com/kmein/niveum
synced 2026-03-17 02:31:09 +01:00
Compare commits
86 Commits
wayland
...
18603a5682
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
@@ -1,5 +1,7 @@
|
||||
# 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.)
|
||||
>
|
||||
> 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.—
|
||||
|
||||
8
configs/0ad.nix
Normal file
8
configs/0ad.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.zeroad ];
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [ 20595 ];
|
||||
allowedUDPPorts = [ 20595 ];
|
||||
};
|
||||
}
|
||||
@@ -8,14 +8,14 @@
|
||||
inherit (import ../lib/email.nix) defaults thunderbirdProfile;
|
||||
in {
|
||||
age.secrets = {
|
||||
email-password-cock = {
|
||||
file = ../secrets/email-password-cock.age;
|
||||
email-password-ical-ephemeris = {
|
||||
file = ../secrets/email-password-ical-ephemeris.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
email-password-letos = {
|
||||
file = ../secrets/email-password-letos.age;
|
||||
email-password-cock = {
|
||||
file = ../secrets/email-password-cock.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
@@ -92,16 +92,17 @@ in {
|
||||
smtp.port = 25;
|
||||
smtp.tls.useStartTls = true;
|
||||
};
|
||||
letos =
|
||||
ical-ephemeris =
|
||||
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";
|
||||
rec {
|
||||
userName = "ical.ephemeris@web.de";
|
||||
realName = "Kieran from iCal Ephemeris";
|
||||
address = userName;
|
||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-ical-ephemeris.path}";
|
||||
imap.host = "imap.web.de";
|
||||
imap.port = 993;
|
||||
smtp.host = "mailhost.cms.hu-berlin.de";
|
||||
smtp.port = 25;
|
||||
smtp.host = "smtp.web.de";
|
||||
smtp.port = 587;
|
||||
smtp.tls.useStartTls = true;
|
||||
};
|
||||
posteo =
|
||||
|
||||
@@ -5,6 +5,6 @@
|
||||
interactiveShellInit = ''
|
||||
set -o vi
|
||||
'';
|
||||
enableCompletion = true;
|
||||
completion.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,17 +1,9 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
autorenkalender-package = pkgs.fetchFromGitHub {
|
||||
owner = "kmein";
|
||||
repo = "autorenkalender";
|
||||
rev = "cf49a7b057301332d980eb47042a626add93db66";
|
||||
sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
|
||||
};
|
||||
autorenkalender =
|
||||
pkgs.python3Packages.callPackage autorenkalender-package {};
|
||||
autorenkalender = inputs.autorenkalender.packages.x86_64-linux.default;
|
||||
in {
|
||||
niveum.bots.autorenkalender = {
|
||||
enable = true;
|
||||
|
||||
@@ -20,15 +20,31 @@
|
||||
command = toString (pkgs.writers.writeDash "random-smyth" ''
|
||||
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=$(
|
||||
${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.coreutils}/bin/shuf -n1 \
|
||||
| ${pkgs.gnused}/bin/sed 's/^ref="//;s/"$//'
|
||||
)
|
||||
|
||||
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.gnused}/bin/sed 's/<\/\?hr>//g' \
|
||||
| ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}: {
|
||||
environment.systemPackages = [
|
||||
niveumPackages.cro
|
||||
pkgs.tor-browser-bundle-bin
|
||||
pkgs.tor-browser
|
||||
pkgs.firefox
|
||||
pkgs.brave
|
||||
];
|
||||
@@ -82,5 +82,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
home-manager.users.me = {
|
||||
stylix.targets.firefox.profileNames = ["default"];
|
||||
};
|
||||
|
||||
environment.variables.BROWSER = "firefox";
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
lib,
|
||||
config,
|
||||
niveumPackages,
|
||||
unstablePackages,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
@@ -27,9 +26,6 @@ in
|
||||
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||
};
|
||||
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";
|
||||
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
|
||||
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 = {
|
||||
agent = {
|
||||
@@ -215,13 +210,12 @@ in
|
||||
./direnv.nix
|
||||
./docker.nix
|
||||
./dunst.nix
|
||||
./flix.nix
|
||||
./fonts.nix
|
||||
./fzf.nix
|
||||
./git.nix
|
||||
./hledger.nix
|
||||
./htop.nix
|
||||
./fu-berlin.nix
|
||||
./uni.nix
|
||||
./i3.nix
|
||||
./i3status-rust.nix
|
||||
./keyboard.nix
|
||||
@@ -236,8 +230,8 @@ in
|
||||
./nix.nix
|
||||
./newsboat.nix
|
||||
./flameshot.nix
|
||||
./fritzbox.nix
|
||||
./packages.nix
|
||||
./virtualization.nix
|
||||
./picom.nix
|
||||
./stardict.nix
|
||||
./polkit.nix
|
||||
@@ -262,7 +256,6 @@ in
|
||||
'';
|
||||
}
|
||||
./tor.nix
|
||||
./stw-berlin.nix
|
||||
./mastodon-bot.nix
|
||||
{
|
||||
fileSystems."${remoteDir}/fritz" = {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
showHelp = false;
|
||||
squareMagnifier = 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
|
||||
merriweather
|
||||
ocr-a
|
||||
montserrat
|
||||
roboto
|
||||
roboto-mono
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
roboto-slab
|
||||
scheherazade-new
|
||||
source-code-pro
|
||||
@@ -114,7 +115,7 @@ in {
|
||||
source-serif-pro
|
||||
theano
|
||||
niveumPackages.tocharian-font
|
||||
vistafonts
|
||||
vista-fonts
|
||||
vollkorn
|
||||
zilla-slab
|
||||
]; # 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=";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,6 @@ in {
|
||||
pkgs.gitstats
|
||||
pkgs.patch
|
||||
pkgs.patchutils
|
||||
inputs.self.packages.${pkgs.system}.git-preview
|
||||
];
|
||||
|
||||
environment.shellAliases = {
|
||||
@@ -29,9 +28,7 @@ in {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
package = pkgs.gitFull;
|
||||
userName = kieran.name;
|
||||
userEmail = kieran.email;
|
||||
aliases = {
|
||||
settings.alias = {
|
||||
br = "branch";
|
||||
co = "checkout";
|
||||
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";
|
||||
};
|
||||
ignores = ignorePaths;
|
||||
extraConfig = {
|
||||
pull.ff = "only";
|
||||
rebase.autoStash = true;
|
||||
merge.autoStash = true;
|
||||
push.autoSetupRemote = 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";
|
||||
};
|
||||
settings.user.name = kieran.name;
|
||||
settings.user.email = kieran.email;
|
||||
settings.pull.ff = "only";
|
||||
settings.rebase.autoStash = true;
|
||||
settings.merge.autoStash = true;
|
||||
settings.push.autoSetupRemove = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ in {
|
||||
services.xserver = {
|
||||
windowManager.i3 = {
|
||||
enable = true;
|
||||
package = pkgs.i3-gaps;
|
||||
package = pkgs.i3;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -113,6 +113,7 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
home-manager.users.me = let
|
||||
modifier = "Mod4";
|
||||
infoWorkspace = "ℹ";
|
||||
@@ -131,7 +132,7 @@ in {
|
||||
border = 1;
|
||||
};
|
||||
bars = [
|
||||
(config.home-manager.users.me.lib.stylix.i3.bar
|
||||
(config.home-manager.users.me.stylix.targets.i3.exportedBarConfig
|
||||
// rec {
|
||||
workspaceButtons = true;
|
||||
mode = "hide"; # "dock";
|
||||
@@ -269,32 +270,7 @@ in {
|
||||
# XF86Launch1 (thinkvantage)
|
||||
};
|
||||
in {
|
||||
wayland.windowManager.sway = {
|
||||
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";}
|
||||
];
|
||||
};
|
||||
};
|
||||
stylix.targets.i3.enable = true;
|
||||
|
||||
xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
@@ -311,19 +287,9 @@ in {
|
||||
assign [class="dashboard"] ${infoWorkspace}
|
||||
exec ${dashboard}/bin/dashboard
|
||||
'';
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
inherit modifier gaps modes bars floating window colors 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 {
|
||||
config = {
|
||||
inherit modifier gaps modes bars floating window colors;
|
||||
keybindings = keybindings // {
|
||||
"${modifier}+ß" = "exec ${niveumPackages.menu-calc}/bin/=";
|
||||
"${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
|
||||
"${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
|
||||
@@ -334,8 +300,7 @@ in {
|
||||
# "${modifier}+x" = "exec ${new-workspace}";
|
||||
"XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,27 +2,63 @@
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
|
||||
commaSep = builtins.concatStringsSep ",";
|
||||
xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
||||
xkbOptions = [
|
||||
"compose:caps"
|
||||
"terminate:ctrl_alt_bksp"
|
||||
"grp:ctrls_toggle"
|
||||
];
|
||||
languages = {
|
||||
deutsch = { code = "de"; variant = "T3"; };
|
||||
greek = { code = "gr"; variant = "polytonic"; };
|
||||
russian = { code = "ru"; variant = "phonetic"; };
|
||||
arabic = { code = "ara"; variant = "buckwalter"; }; # ../lib/keyboards/arabic;
|
||||
deutsch = {
|
||||
code = "de";
|
||||
variant = "T3";
|
||||
};
|
||||
greek = {
|
||||
code = "gr";
|
||||
variant = "polytonic";
|
||||
};
|
||||
russian = {
|
||||
code = "ru";
|
||||
variant = "phonetic";
|
||||
};
|
||||
arabic = {
|
||||
code = "ara";
|
||||
variant = "buckwalter";
|
||||
}; # ../lib/keyboards/arabic;
|
||||
coptic = ../lib/keyboards/coptic;
|
||||
avestan = ../lib/keyboards/avestan;
|
||||
gothic = ../lib/keyboards/gothic;
|
||||
farsi = { code = "ir"; variant = "qwerty"; };
|
||||
syriac = { 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";};
|
||||
farsi = {
|
||||
code = "ir";
|
||||
variant = "qwerty";
|
||||
};
|
||||
syriac = {
|
||||
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;
|
||||
in {
|
||||
in
|
||||
{
|
||||
services.libinput.enable = true;
|
||||
|
||||
# man 7 xkeyboard-config
|
||||
@@ -41,7 +77,8 @@ in {
|
||||
lib.mapAttrsToList (name: value: {
|
||||
name = "symbols/${name}";
|
||||
path = value;
|
||||
}) (lib.filterAttrs (_: value: !(value ? "code")) languages) ++ [
|
||||
}) (lib.filterAttrs (_: value: !(value ? "code")) languages)
|
||||
++ [
|
||||
{
|
||||
name = "symbols/ir";
|
||||
path = ../lib/keyboards/farsi;
|
||||
@@ -54,25 +91,40 @@ in {
|
||||
|
||||
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";
|
||||
|
||||
environment.systemPackages =
|
||||
lib.mapAttrsToList
|
||||
(language: settings:
|
||||
environment.systemPackages = lib.mapAttrsToList (
|
||||
language: settings:
|
||||
let
|
||||
code = if settings ? "code" then settings.code else language;
|
||||
variant = if settings ? "variant" then settings.variant else "";
|
||||
in
|
||||
pkgs.writers.writeDashBin "kb-${language}" ''
|
||||
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
|
||||
'')
|
||||
languages;
|
||||
pkgs.writers.writeDashBin "kb-${language}" ''
|
||||
if [ -z $SWAYSOCK ]; then
|
||||
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${
|
||||
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
|
||||
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||
|
||||
systemd.user.services.gxkb = {
|
||||
wantedBy = ["graphical-session.target"];
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
serviceConfig = {
|
||||
SyslogIdentifier = "gxkb";
|
||||
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
||||
|
||||
@@ -37,7 +37,7 @@ in {
|
||||
};
|
||||
scripts = [
|
||||
pkgs.mpvScripts.quality-menu
|
||||
niveumPackages.mpv-visualizer
|
||||
pkgs.mpvScripts.visualizer
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
||||
(niveumPackages.vim.override {
|
||||
# stylixColors = config.lib.stylix.colors;
|
||||
colorscheme = "base16-gruvbox-light-medium";
|
||||
colorscheme = "base16-gruvbox-dark-medium";
|
||||
})
|
||||
|
||||
# language servers
|
||||
@@ -46,13 +46,14 @@
|
||||
pkgs.haskellPackages.haskell-language-server
|
||||
pkgs.texlab
|
||||
pkgs.nil
|
||||
pkgs.gopls
|
||||
pkgs.nixfmt-rfc-style
|
||||
pkgs.rust-analyzer
|
||||
pkgs.nodePackages.typescript-language-server
|
||||
pkgs.lua-language-server
|
||||
pkgs.nodePackages.vscode-langservers-extracted
|
||||
pkgs.lemminx
|
||||
niveumPackages.jq-lsp
|
||||
pkgs.lemminx # XML LSP
|
||||
pkgs.jq-lsp
|
||||
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,
|
||||
inputs,
|
||||
niveumPackages,
|
||||
unstablePackages,
|
||||
...
|
||||
}: let
|
||||
worldradio = pkgs.callPackage ../packages/worldradio.nix {};
|
||||
@@ -63,9 +62,15 @@ in {
|
||||
};
|
||||
|
||||
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
|
||||
aria2
|
||||
tdesktop
|
||||
telegram-desktop
|
||||
whois
|
||||
dnsutils
|
||||
# FILE MANAGERS
|
||||
@@ -94,9 +99,10 @@ in {
|
||||
# HARDWARE TOOLS
|
||||
gnome-disk-utility
|
||||
arandr # xrandr for noobs
|
||||
wdisplays
|
||||
libnotify # for notify-send
|
||||
xclip # clipboard CLI
|
||||
xdragon # drag and drop
|
||||
dragon-drop # drag and drop
|
||||
xorg.xkill # kill by clicking
|
||||
portfolio # personal finance overview
|
||||
audacity
|
||||
@@ -114,13 +120,13 @@ in {
|
||||
zoom-us # video conferencing
|
||||
(pkgs.writers.writeDashBin "im" ''
|
||||
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
|
||||
pdfgrep # search in pdf
|
||||
pdftk # pdf toolkit
|
||||
mupdf
|
||||
poppler_utils # pdf toolkit
|
||||
poppler-utils # pdf toolkit
|
||||
kdePackages.okular # the word is nucular
|
||||
xournalpp # for annotating pdfs
|
||||
pdfpc # presenter console for pdf slides
|
||||
@@ -130,6 +136,7 @@ in {
|
||||
rink # unit converter
|
||||
niveumPackages.auc
|
||||
niveumPackages.noise-waves
|
||||
niveumPackages.stag
|
||||
niveumPackages.cheat-sh
|
||||
niveumPackages.polyglot
|
||||
niveumPackages.qrpaste
|
||||
@@ -144,18 +151,14 @@ in {
|
||||
niveumPackages.pls
|
||||
niveumPackages.mpv-tv
|
||||
niveumPackages.mpv-iptv
|
||||
jellyfin-media-player
|
||||
niveumPackages.devanagari
|
||||
niveumPackages.betacode # ancient greek betacode to unicode converter
|
||||
niveumPackages.meteo
|
||||
niveumPackages.jq-lsp
|
||||
pkgs.jq-lsp
|
||||
niveumPackages.swallow # window swallowing
|
||||
niveumPackages.literature-quote
|
||||
niveumPackages.booksplit
|
||||
niveumPackages.dmenu-randr
|
||||
niveumPackages.dmenu-bluetooth
|
||||
niveumPackages.manual-sort
|
||||
niveumPackages.dns-sledgehammer
|
||||
niveumPackages.wttr
|
||||
niveumPackages.unicodmenu
|
||||
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.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
|
||||
|
||||
spotify
|
||||
ncspot
|
||||
playerctl
|
||||
|
||||
nix-index
|
||||
niveumPackages.nix-index-update
|
||||
|
||||
#krebs
|
||||
niveumPackages.dic
|
||||
pkgs.nur.repos.mic92.ircsink
|
||||
|
||||
(haskellPackages.ghcWithHoogle (hs: [
|
||||
@@ -237,9 +233,8 @@ in {
|
||||
dhall
|
||||
|
||||
html-tidy
|
||||
nodePackages.csslint
|
||||
nodePackages.jsonlint
|
||||
deno # better node.js
|
||||
go
|
||||
texlive.combined.scheme-full
|
||||
latexrun
|
||||
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
||||
|
||||
@@ -3,5 +3,6 @@
|
||||
location = {
|
||||
latitude = 52.517;
|
||||
longitude = 13.3872;
|
||||
provider = "geoclue2";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
in {
|
||||
users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;
|
||||
programs.ssh.startAgent = true;
|
||||
services.gnome.gcr-ssh-agent.enable = false;
|
||||
|
||||
home-manager.users.me = {
|
||||
# https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
|
||||
@@ -40,6 +41,7 @@ in {
|
||||
|
||||
home-manager.users.me.programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
matchBlocks = {
|
||||
"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.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 = {
|
||||
name = "capitaine-cursors-white";
|
||||
@@ -26,6 +26,9 @@ in {
|
||||
size = 12;
|
||||
};
|
||||
|
||||
home-manager.users.me = {
|
||||
stylix.autoEnable = true;
|
||||
};
|
||||
|
||||
# environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
|
||||
|
||||
@@ -67,7 +70,7 @@ in {
|
||||
};
|
||||
|
||||
emoji = {
|
||||
package = pkgs.noto-fonts-emoji;
|
||||
package = pkgs.noto-fonts-color-emoji;
|
||||
name = "Noto Color Emoji";
|
||||
};
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
aggressiveResize = true;
|
||||
escapeTime = 50;
|
||||
historyLimit = 7000;
|
||||
shortcut = "a";
|
||||
shortcut = "b";
|
||||
extraConfig = ''
|
||||
set -g mouse on
|
||||
|
||||
@@ -37,15 +37,6 @@
|
||||
set -g status-left-length 32
|
||||
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
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -30,7 +30,19 @@ in {
|
||||
};
|
||||
};
|
||||
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 fu-defaults
|
||||
rec {
|
||||
@@ -38,21 +50,6 @@ in {
|
||||
address = "kieran.meinhardt@fu-berlin.de";
|
||||
aliases = ["${userName}@fu-berlin.de"];
|
||||
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 = {
|
||||
enable = true;
|
||||
settings.backend = "imap";
|
||||
@@ -68,6 +65,12 @@ in {
|
||||
group = config.users.users.me.group;
|
||||
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 = {
|
||||
file = ../secrets/fu-sftp-key.age;
|
||||
owner = "root";
|
||||
@@ -110,24 +113,31 @@ in {
|
||||
];
|
||||
};
|
||||
};
|
||||
in {
|
||||
"${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;
|
||||
};
|
||||
in home-directory-mount "meinhak99";
|
||||
|
||||
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" ''
|
||||
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
||||
then
|
||||
@@ -138,16 +148,4 @@ in {
|
||||
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 = {
|
||||
enable = true;
|
||||
networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
|
||||
secretsFile = config.age.secrets.wifi.path;
|
||||
# networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
|
||||
networks.Schilfpalast.pskRaw = "ext:schilfpalast";
|
||||
};
|
||||
}
|
||||
|
||||
468
flake.lock
generated
468
flake.lock
generated
@@ -12,11 +12,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750173260,
|
||||
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
|
||||
"lastModified": 1762618334,
|
||||
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
|
||||
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -53,6 +53,26 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"autorenkalender": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764859438,
|
||||
"narHash": "sha256-OahcfG2AH4ackDw/xamqwVnZr+pFSIk/hBaYmy4bALI=",
|
||||
"owner": "kmein",
|
||||
"repo": "autorenkalender",
|
||||
"rev": "b06647b0ead5157a9bd8bbd2c66a8b2367c6f123",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kmein",
|
||||
"repo": "autorenkalender",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16": {
|
||||
"inputs": {
|
||||
"fromYaml": "fromYaml"
|
||||
@@ -74,27 +94,28 @@
|
||||
"base16-fish": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1622559957,
|
||||
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
|
||||
"lastModified": 1754405784,
|
||||
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1736852337,
|
||||
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -125,11 +146,11 @@
|
||||
"fromYaml": "fromYaml_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746562888,
|
||||
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
|
||||
"lastModified": 1755819240,
|
||||
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
|
||||
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -178,14 +199,14 @@
|
||||
"stockholm",
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746626503,
|
||||
"narHash": "sha256-mRnIdJLP+0NSim9ao30ue0Z3ttSuxzXwQG7UN1KuKfU=",
|
||||
"lastModified": 1760516981,
|
||||
"narHash": "sha256-4AYTAH7WDL6C6WKktc9UEQRiav6oPzVpKuFWRyYeuTQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "buildbot-nix",
|
||||
"rev": "7ad9b4886eccb5eecc0686a16266ddabf6cbefe9",
|
||||
"rev": "01dfc9a07c070092e3187be8edbd2243a9e301a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -307,11 +328,11 @@
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744642301,
|
||||
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
|
||||
"lastModified": 1764724327,
|
||||
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
|
||||
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -336,21 +357,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"locked": {
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
@@ -381,11 +387,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"lastModified": 1756770412,
|
||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -402,11 +408,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -461,36 +467,20 @@
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
"id": "flake-utils",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701680307,
|
||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_5": {
|
||||
"locked": {
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -531,69 +521,23 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"stylix",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744584021,
|
||||
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1764524476,
|
||||
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
|
||||
"type": "github"
|
||||
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"owner": "GNOME",
|
||||
"ref": "48.1",
|
||||
"ref": "gnome-49",
|
||||
"repo": "gnome-shell",
|
||||
"type": "github"
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"hercules-ci-effects": {
|
||||
@@ -610,11 +554,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744693102,
|
||||
"narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
|
||||
"lastModified": 1758022363,
|
||||
"narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
|
||||
"rev": "1a3667d33e247ad35ca250698d63f49a5453d824",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -653,16 +597,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749154018,
|
||||
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
|
||||
"lastModified": 1765170903,
|
||||
"narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
|
||||
"rev": "20561be440a11ec57a89715480717baf19fe6343",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -734,15 +678,14 @@
|
||||
"menstruation-backend_2": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1702906210,
|
||||
"narHash": "sha256-V/nSui5BkCg0zX6uaIeax/Jrl8voxd0r7FUQRMVrHN0=",
|
||||
"lastModified": 1765657254,
|
||||
"narHash": "sha256-9kZdra5Bx3sfkcZW0eRULsWwloigv7+xQfr+JL0kX6s=",
|
||||
"owner": "kmein",
|
||||
"repo": "menstruation.rs",
|
||||
"rev": "1c8d6f4463fb746eb6c9855d2419cb4e8f48ac50",
|
||||
"rev": "cc7278fc187f1d4b1f802fbde926a6195a7a0d47",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -785,9 +728,6 @@
|
||||
},
|
||||
"menstruation-telegram_2": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"menstruation-backend": [
|
||||
"menstruation-backend"
|
||||
],
|
||||
@@ -796,11 +736,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1677075205,
|
||||
"narHash": "sha256-2+xuAhsS3y2qB0ObVPCHXrmnTsIZ8uI5HFI4+Ash8PY=",
|
||||
"lastModified": 1765657432,
|
||||
"narHash": "sha256-gzoBH783lFsQocSwjp2d6v778sWcLnKXIQPnkVTx+qU=",
|
||||
"owner": "kmein",
|
||||
"repo": "menstruation-telegram",
|
||||
"rev": "f7ddb6d9610aacb50ec66a3ce1bdc49fe4664a49",
|
||||
"rev": "63ff6b28e0609f470b63813b37320188fff7e95d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1108,11 +1048,11 @@
|
||||
},
|
||||
"nixpkgs-unstable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1750553127,
|
||||
"narHash": "sha256-zgPnxYqkf/CEl5m/lx02D+FaLWPRUM/RLo/qekTuu8Q=",
|
||||
"lastModified": 1765369061,
|
||||
"narHash": "sha256-VPyShT4DyGtXH2wsD8yAVvvvi9OILUHTqNxWQd/6yZA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ba476a871a35075644c3340b3651101ddf77ee0d",
|
||||
"rev": "aaa6c85f51f9333738c170ccc55b5fe5f55938f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1123,6 +1063,22 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1760878510,
|
||||
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1659446231,
|
||||
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
||||
@@ -1138,7 +1094,23 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1744536153,
|
||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1615532953,
|
||||
"narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
|
||||
@@ -1230,27 +1202,27 @@
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1750400657,
|
||||
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
|
||||
"lastModified": 1764983851,
|
||||
"narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
|
||||
"rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1750365781,
|
||||
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
|
||||
"lastModified": 1765186076,
|
||||
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
|
||||
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1262,16 +1234,16 @@
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1746904237,
|
||||
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
|
||||
"lastModified": 1744536153,
|
||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
|
||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -1390,15 +1362,14 @@
|
||||
"nur_2": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750553086,
|
||||
"narHash": "sha256-rtItxhQM+Zkd2ys/lT2MoXCUVEhyj51Em5o9Wd6qqGU=",
|
||||
"lastModified": 1765367248,
|
||||
"narHash": "sha256-JyVUlh5wINjw29Ops7ZjRrzw+55r5GpCHjO0TCsoowc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "8d68e170fd6f9e8b8921db79419c209a1aeabc36",
|
||||
"rev": "6af054d2762ef52fad9943d490708f937008cca4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1416,15 +1387,14 @@
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix_3"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746056780,
|
||||
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
|
||||
"lastModified": 1764773531,
|
||||
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "d476cd0972dd6242d76374fcc277e6735715c167",
|
||||
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1464,19 +1434,16 @@
|
||||
"recht_2": {
|
||||
"inputs": {
|
||||
"blessings": "blessings_2",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736882697,
|
||||
"narHash": "sha256-G++JyQ6GJlQ8T/R18xb02HhSE1NWfpAboUEBleaadd8=",
|
||||
"lastModified": 1765658439,
|
||||
"narHash": "sha256-7u21xVZBEYhgEd4UX+nG86oDblxCJtG/eYT1g2S45nc=",
|
||||
"owner": "kmein",
|
||||
"repo": "recht",
|
||||
"rev": "dd49a91b1e611920889680aa2c9101166b0ce83e",
|
||||
"rev": "dbdd8fd69d6b82bce1132ceb8dd2f5715887e6ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1502,11 +1469,11 @@
|
||||
},
|
||||
"retiolum_2": {
|
||||
"locked": {
|
||||
"lastModified": 1740597428,
|
||||
"narHash": "sha256-WyGfu6MvNXrkcbUCwNGX59UvIj38+xvIgZEZRdp49lI=",
|
||||
"lastModified": 1756302470,
|
||||
"narHash": "sha256-uPxzGBAugKayJywTixtipZ6UmoyEwu9t1hwV8PebzS0=",
|
||||
"owner": "krebs",
|
||||
"repo": "retiolum",
|
||||
"rev": "1fa596dc8b176c9ea35823b33f8579c6d96fb7f9",
|
||||
"rev": "17d947cc08bb17ee979e6332e35f89d64033e204",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1518,6 +1485,7 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"autorenkalender": "autorenkalender",
|
||||
"coptic-dictionary": "coptic-dictionary",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"home-manager": "home-manager_2",
|
||||
@@ -1531,7 +1499,6 @@
|
||||
"nur": "nur_2",
|
||||
"recht": "recht_2",
|
||||
"retiolum": "retiolum_2",
|
||||
"rust-overlay": "rust-overlay_2",
|
||||
"scripts": "scripts_2",
|
||||
"stockholm": "stockholm",
|
||||
"stylix": "stylix_2",
|
||||
@@ -1588,16 +1555,32 @@
|
||||
},
|
||||
"rust-overlay_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750473400,
|
||||
"narHash": "sha256-wiW2j63MyGQyyijRF25hf7Ab7vx4G8pCiGjUe3OGV4c=",
|
||||
"lastModified": 1765593578,
|
||||
"narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "3d7d4c4e284f26d6dc4840491c66884912be0062",
|
||||
"rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765593578,
|
||||
"narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1640,22 +1623,17 @@
|
||||
},
|
||||
"scripts_2": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"rust-overlay"
|
||||
]
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748892379,
|
||||
"narHash": "sha256-mDDxMwKFURX1K1Z8X/kmt+jYjswofDf0br+Mkw2tmSE=",
|
||||
"lastModified": 1765657698,
|
||||
"narHash": "sha256-Ic5lcBZQKw9kOU6BUl3w+r1zCj9hveHyaHsOAYB7Yhg=",
|
||||
"owner": "kmein",
|
||||
"repo": "scripts",
|
||||
"rev": "f44c7a4a6caa1ef5d6b7bf7e93acea0d96f30c21",
|
||||
"rev": "aeea5b4cdaf39169ab469a7c31269c8360b9c403",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1668,14 +1646,14 @@
|
||||
"inputs": {
|
||||
"buildbot-nix": "buildbot-nix",
|
||||
"nix-writers": "nix-writers",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747157099,
|
||||
"narHash": "sha256-i2s6jU+8GLKVjhWDyvFYxmXI7A44c9p6apPPyKt0ETk=",
|
||||
"lastModified": 1763891069,
|
||||
"narHash": "sha256-GzxFKwCfzmdCk5j+fNznXdse0rKIqZ5nBPmO4mZ0wj0=",
|
||||
"owner": "krebs",
|
||||
"repo": "stockholm",
|
||||
"rev": "d4abc837cc7b87b4f23fe48cc306df26e3de7aab",
|
||||
"rev": "13d07fa93aeb1394db269d7110da13e596e868a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1721,18 +1699,13 @@
|
||||
"base16-helix": "base16-helix",
|
||||
"base16-vim": "base16-vim",
|
||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"git-hooks": "git-hooks",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": [
|
||||
"home-manager"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nur": "nur_3",
|
||||
"systems": "systems_5",
|
||||
"systems": "systems_4",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-schemes": "tinted-schemes",
|
||||
@@ -1740,16 +1713,16 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750370365,
|
||||
"narHash": "sha256-Yblt2LusglzBXlg+ekckztIUgvl1WQwJ7gLRJEt/IHE=",
|
||||
"lastModified": 1765065096,
|
||||
"narHash": "sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0+/DxfAU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "cc82dae884f45ffeb996d2b5116afa70933e507f",
|
||||
"rev": "84d9d55885d463d461234f3aac07b2389a2577d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -1850,15 +1823,14 @@
|
||||
},
|
||||
"telebots_2": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_5",
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1703313352,
|
||||
"narHash": "sha256-EV1hfkxEn6L+z6A9rcyfkmBGzu0VwA2rF1iA32nfXW8=",
|
||||
"lastModified": 1765657917,
|
||||
"narHash": "sha256-buujY0TRj+Skg1Uo8ut7kUKHDfOtsvxt/LEOiO+ehvA=",
|
||||
"owner": "kmein",
|
||||
"repo": "telebots",
|
||||
"rev": "534221956e6d9dc5528d94247dd35e9f597de169",
|
||||
"rev": "1232c6f82e7cdf80b6b76a992544db42a293f7b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1901,22 +1873,17 @@
|
||||
},
|
||||
"tinc-graph_2": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"rust-overlay"
|
||||
]
|
||||
"rust-overlay": "rust-overlay_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748887042,
|
||||
"narHash": "sha256-WWQxnmKyQm/iccHxDdobdGOPfcVNf+PQwy9HQ2b9W8g=",
|
||||
"lastModified": 1765658153,
|
||||
"narHash": "sha256-cNTBy57MGlRBY9211prc/wau+CbwoJo0mydgGva1/LQ=",
|
||||
"owner": "kmein",
|
||||
"repo": "tinc-graph",
|
||||
"rev": "8847b2d0e69065bf4bbb9885fbd465f3b1b2369a",
|
||||
"rev": "119c9486460f90c45d4a157ea9b9f1cd2901d176",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1961,11 +1928,11 @@
|
||||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744974599,
|
||||
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
|
||||
"lastModified": 1763914658,
|
||||
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
|
||||
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1977,11 +1944,11 @@
|
||||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1745111349,
|
||||
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
|
||||
"lastModified": 1764465359,
|
||||
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
|
||||
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1993,11 +1960,11 @@
|
||||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1725758778,
|
||||
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
|
||||
"lastModified": 1764464512,
|
||||
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
|
||||
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -2007,27 +1974,6 @@
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stockholm",
|
||||
@@ -2036,33 +1982,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746216483,
|
||||
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
|
||||
"lastModified": 1758728421,
|
||||
"narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -2090,11 +2014,11 @@
|
||||
"voidrice_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744355318,
|
||||
"narHash": "sha256-9U1Do0w2oT5E6uZxSKoHAzbGbSLQRQlT65KcPGzwhW8=",
|
||||
"lastModified": 1763008506,
|
||||
"narHash": "sha256-0LYBMIKXZjoM4VPasWCwBwpUxgV2FpjRde4NYyvRyOA=",
|
||||
"owner": "Lukesmithxyz",
|
||||
"repo": "voidrice",
|
||||
"rev": "f853f1884a8f0c244765192dc6f5a910a7e2b8e5",
|
||||
"rev": "4a3ad91070328668cd3c8c375e38843f21506e7a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -2129,10 +2053,8 @@
|
||||
},
|
||||
"wallpaper-generator_2": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1615819231,
|
||||
|
||||
362
flake.nix
362
flake.nix
@@ -2,25 +2,25 @@
|
||||
description = "niveum: packages, modules, systems";
|
||||
|
||||
inputs = {
|
||||
self.submodules = true;
|
||||
|
||||
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";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
||||
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
||||
menstruation-backend.url = "github:kmein/menstruation.rs";
|
||||
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";
|
||||
nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
|
||||
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";
|
||||
recht.url = "github:kmein/recht";
|
||||
retiolum.url = "github:krebs/retiolum";
|
||||
rust-overlay.url = "github:oxalica/rust-overlay";
|
||||
scripts.url = "github:kmein/scripts";
|
||||
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";
|
||||
tinc-graph.url = "github:kmein/tinc-graph";
|
||||
voidrice.url = "github:Lukesmithxyz/voidrice";
|
||||
@@ -29,114 +29,106 @@
|
||||
|
||||
agenix.inputs.home-manager.follows = "home-manager";
|
||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
|
||||
coptic-dictionary.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.nixpkgs.follows = "nixpkgs-old";
|
||||
nix-on-droid.inputs.home-manager.follows = "home-manager";
|
||||
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
|
||||
recht.inputs.flake-utils.follows = "flake-utils";
|
||||
nix-index-database.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.rust-overlay.follows = "rust-overlay";
|
||||
stylix.inputs.home-manager.follows = "home-manager";
|
||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
tinc-graph.inputs.flake-utils.follows = "flake-utils";
|
||||
tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
|
||||
tinc-graph.inputs.rust-overlay.follows = "rust-overlay";
|
||||
voidrice.flake = false;
|
||||
wallpaper-generator.inputs.flake-utils.follows = "flake-utils";
|
||||
wallpapers.flake = false;
|
||||
};
|
||||
|
||||
nixConfig = {
|
||||
extra-substituters = [ "https://kmein.cachix.org" ];
|
||||
extra-trusted-public-keys = [ "kmein.cachix.org-1:rsJ2b6++VQHJ1W6rGuDUYsK/qUkFA3bNpO6PyEyJ9Ls=" ];
|
||||
};
|
||||
|
||||
outputs = inputs @ {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
nur,
|
||||
home-manager,
|
||||
agenix,
|
||||
retiolum,
|
||||
nixinate,
|
||||
flake-utils,
|
||||
nix-on-droid,
|
||||
stylix,
|
||||
...
|
||||
}:
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
nur,
|
||||
home-manager,
|
||||
agenix,
|
||||
retiolum,
|
||||
nixinate,
|
||||
flake-utils,
|
||||
nix-index-database,
|
||||
stylix,
|
||||
...
|
||||
}:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
eachSupportedSystem = lib.genAttrs lib.systems.flakeExposed;
|
||||
in
|
||||
{
|
||||
apps = {
|
||||
x86_64-darwin = let
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-darwin;
|
||||
in {
|
||||
deploy-maakaron = {
|
||||
type = "app";
|
||||
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
|
||||
x86_64-linux =
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
lib = nixpkgs.lib;
|
||||
in
|
||||
nixinate.nixinate.x86_64-linux self
|
||||
// {
|
||||
mock-secrets = {
|
||||
type = "app";
|
||||
program = toString (pkgs.writers.writeDash "mock-secrets" ''
|
||||
${pkgs.findutils}/bin/find secrets -not -path '*/.*' -type f | ${pkgs.coreutils}/bin/sort > secrets.txt
|
||||
'');
|
||||
program = toString (
|
||||
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
|
||||
// builtins.listToAttrs (map (hostname: let
|
||||
externalNetwork = import ./lib/external-network.nix;
|
||||
targets = {
|
||||
ful = "root@ful";
|
||||
zaatar = "root@zaatar";
|
||||
makanek = "root@makanek";
|
||||
manakish = "root@manakish";
|
||||
tahina = "root@tahina";
|
||||
tabula = "root@tabula";
|
||||
kabsa = "root@kabsa";
|
||||
fatteh = "root@fatteh";
|
||||
kibbeh = "root@kibbeh";
|
||||
};
|
||||
in
|
||||
lib.attrsets.nameValuePair "deploy-${hostname}" {
|
||||
type = "app";
|
||||
program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
|
||||
exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
|
||||
--max-jobs 2 \
|
||||
--log-format internal-json \
|
||||
--flake .?submodules=1#${hostname} \
|
||||
--target-host ${targets.${hostname}} 2>&1 \
|
||||
| ${pkgs.nix-output-monitor}/bin/nom --json
|
||||
'');
|
||||
}) (builtins.attrNames self.nixosConfigurations))
|
||||
// builtins.listToAttrs (
|
||||
map (
|
||||
hostname:
|
||||
let
|
||||
targets = {
|
||||
ful = "root@ful";
|
||||
zaatar = "root@zaatar";
|
||||
makanek = "root@makanek";
|
||||
manakish = "root@manakish";
|
||||
tahina = "root@tahina";
|
||||
tabula = "root@tabula";
|
||||
kabsa = "root@kabsa";
|
||||
fatteh = "root@fatteh";
|
||||
kibbeh = "root@kibbeh";
|
||||
};
|
||||
in
|
||||
lib.attrsets.nameValuePair "deploy-${hostname}" {
|
||||
type = "app";
|
||||
program = toString (
|
||||
pkgs.writers.writeDash "deploy-${hostname}" ''
|
||||
exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
|
||||
--max-jobs 2 \
|
||||
--log-format internal-json \
|
||||
--flake .#${hostname} \
|
||||
--target-host ${targets.${hostname}} 2>&1 \
|
||||
| ${pkgs.nix-output-monitor}/bin/nom --json
|
||||
''
|
||||
);
|
||||
}
|
||||
) (builtins.attrNames self.nixosConfigurations)
|
||||
)
|
||||
// {
|
||||
deploy-ful = {
|
||||
type = "app";
|
||||
program = toString (pkgs.writers.writeDash "deploy-ful" ''
|
||||
exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful \
|
||||
--log-format internal-json 2>&1 \
|
||||
| ${pkgs.nix-output-monitor}/bin/nom --json
|
||||
'');
|
||||
program = toString (
|
||||
pkgs.writers.writeDash "deploy-ful" ''
|
||||
exec ${pkgs.nix}/bin/nix run .#nixinate.ful \
|
||||
--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 = {
|
||||
htgen = import modules/htgen.nix;
|
||||
moodle-dl = import modules/moodle-dl.nix;
|
||||
@@ -146,43 +138,13 @@
|
||||
power-action = import modules/power-action.nix;
|
||||
system-dependent = import modules/system-dependent.nix;
|
||||
telegram-bot = import modules/telegram-bot.nix;
|
||||
go-webring = import modules/go-webring.nix;
|
||||
};
|
||||
|
||||
lib = {
|
||||
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
|
||||
niveumSpecialArgs = system: {
|
||||
unstablePackages = import nixpkgs-unstable {
|
||||
@@ -207,6 +169,7 @@
|
||||
agenix.nixosModules.default
|
||||
inputs.self.nixosModules.passport
|
||||
inputs.self.nixosModules.panoptikon
|
||||
inputs.self.nixosModules.go-webring
|
||||
inputs.self.nixosModules.htgen
|
||||
inputs.stockholm.nixosModules.reaktor2
|
||||
retiolum.nixosModules.retiolum
|
||||
@@ -239,6 +202,7 @@
|
||||
systems/kibbeh/configuration.nix
|
||||
agenix.nixosModules.default
|
||||
retiolum.nixosModules.retiolum
|
||||
home-manager.nixosModules.home-manager
|
||||
];
|
||||
};
|
||||
makanek = nixpkgs.lib.nixosSystem rec {
|
||||
@@ -281,6 +245,7 @@
|
||||
agenix.nixosModules.default
|
||||
retiolum.nixosModules.retiolum
|
||||
home-manager.nixosModules.home-manager
|
||||
nix-index-database.nixosModules.default
|
||||
nur.modules.nixos.default
|
||||
stylix.nixosModules.stylix
|
||||
];
|
||||
@@ -294,6 +259,7 @@
|
||||
retiolum.nixosModules.retiolum
|
||||
home-manager.nixosModules.home-manager
|
||||
nur.modules.nixos.default
|
||||
nix-index-database.nixosModules.default
|
||||
stylix.nixosModules.stylix
|
||||
];
|
||||
};
|
||||
@@ -306,143 +272,135 @@
|
||||
retiolum.nixosModules.retiolum
|
||||
home-manager.nixosModules.home-manager
|
||||
nur.modules.nixos.default
|
||||
nix-index-database.nixosModules.default
|
||||
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
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
nur.overlays.default
|
||||
(self: super: {
|
||||
mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
|
||||
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||
})
|
||||
];
|
||||
};
|
||||
unstablePackages = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
};
|
||||
wrapScript = {
|
||||
packages ? [],
|
||||
name,
|
||||
script,
|
||||
}:
|
||||
pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
|
||||
in {
|
||||
packages = rec {
|
||||
|
||||
packages = eachSupportedSystem (system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
overlays = [
|
||||
nur.overlays.default
|
||||
(self: super: {
|
||||
mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];};
|
||||
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||
})
|
||||
];
|
||||
};
|
||||
wrapScript = {
|
||||
packages ? [],
|
||||
name,
|
||||
script,
|
||||
}:
|
||||
pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
|
||||
in {
|
||||
# linguistics and ancient world
|
||||
auc = pkgs.callPackage packages/auc.nix {};
|
||||
betacode = pkgs.callPackage packages/betacode.nix {};
|
||||
brainmelter = pkgs.callPackage packages/brainmelter.nix {};
|
||||
brassica = pkgs.callPackage packages/brassica.nix {};
|
||||
cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
|
||||
brassica = pkgs.callPackage packages/brassica.nix {}; # TODO upstream
|
||||
devanagari = pkgs.callPackage packages/devanagari {};
|
||||
stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
|
||||
heuretes = pkgs.callPackage packages/heuretes.nix {};
|
||||
ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
|
||||
jsesh = pkgs.callPackage packages/jsesh.nix {}; # TODO upstream
|
||||
kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
|
||||
polyglot = pkgs.callPackage packages/polyglot.nix {};
|
||||
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
|
||||
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
|
||||
closest = pkgs.callPackage packages/closest {};
|
||||
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 {};
|
||||
htgen = pkgs.callPackage packages/htgen.nix {};
|
||||
hc = pkgs.callPackage packages/hc.nix {};
|
||||
kpaste = pkgs.callPackage packages/kpaste.nix {};
|
||||
pls = pkgs.callPackage packages/pls.nix {};
|
||||
untilport = pkgs.callPackage packages/untilport.nix {};
|
||||
radio-news = pkgs.callPackage packages/radio-news.nix {};
|
||||
|
||||
# window manager
|
||||
swallow = pkgs.callPackage packages/swallow.nix {};
|
||||
devour = pkgs.callPackage packages/devour.nix {};
|
||||
|
||||
cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
|
||||
vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {}; # TODO upstream
|
||||
cro = pkgs.callPackage packages/cro.nix {};
|
||||
default-gateway = pkgs.callPackage packages/default-gateway.nix {};
|
||||
depp = pkgs.callPackage packages/depp.nix {};
|
||||
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 {};
|
||||
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";};
|
||||
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-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 {};
|
||||
kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
|
||||
klem = pkgs.callPackage packages/klem.nix {};
|
||||
kpaste = pkgs.callPackage packages/kpaste.nix {};
|
||||
literature-quote = pkgs.callPackage packages/literature-quote.nix {};
|
||||
mahlzeit = pkgs.haskellPackages.callPackage packages/mahlzeit.nix {};
|
||||
man-pandoc = pkgs.callPackage packages/man/pandoc.nix {};
|
||||
man-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream
|
||||
man-pdf = pkgs.callPackage packages/man-pdf.nix {};
|
||||
mansplain = pkgs.callPackage packages/mansplain.nix {};
|
||||
manual-sort = pkgs.callPackage packages/manual-sort.nix {};
|
||||
menu-calc = pkgs.callPackage packages/menu-calc.nix {};
|
||||
meteo = pkgs.callPackage packages/meteo.nix {};
|
||||
noise-waves = pkgs.callPackage packages/noise-waves.nix {};
|
||||
mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
|
||||
mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
|
||||
mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
|
||||
mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
|
||||
mpv-visualizer = unstablePackages.mpvScripts.visualizer;
|
||||
new-mac = pkgs.callPackage packages/new-mac.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};};
|
||||
opustags = pkgs.callPackage packages/opustags.nix {};
|
||||
pls = pkgs.callPackage packages/pls.nix {};
|
||||
polyglot = pkgs.callPackage packages/polyglot.nix {};
|
||||
opustags = pkgs.callPackage packages/opustags.nix {}; # TODO upstream
|
||||
q = pkgs.callPackage packages/q.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 {};
|
||||
gimp = pkgs.callPackage packages/gimp.nix {};
|
||||
scanned = pkgs.callPackage packages/scanned.nix {};
|
||||
swallow = pkgs.callPackage packages/swallow.nix {};
|
||||
text2pdf = pkgs.callPackage packages/text2pdf.nix {};
|
||||
text2pdf = pkgs.callPackage packages/text2pdf.nix {}; # TODO upstream
|
||||
timer = pkgs.callPackage packages/timer.nix {};
|
||||
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
|
||||
trans = pkgs.callPackage packages/trans.nix {};
|
||||
trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream
|
||||
ttspaste = pkgs.callPackage packages/ttspaste.nix {};
|
||||
unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
|
||||
emailmenu = pkgs.callPackage packages/emailmenu.nix {};
|
||||
untilport = pkgs.callPackage packages/untilport.nix {};
|
||||
stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream
|
||||
vg = pkgs.callPackage packages/vg.nix {};
|
||||
vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
|
||||
obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
|
||||
radio-news = pkgs.callPackage packages/radio-news.nix {};
|
||||
vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
|
||||
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
|
||||
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
|
||||
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
|
||||
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
|
||||
vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
|
||||
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
|
||||
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
|
||||
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
|
||||
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
|
||||
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream
|
||||
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream
|
||||
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream
|
||||
vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream
|
||||
vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream
|
||||
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream
|
||||
vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream
|
||||
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream
|
||||
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream
|
||||
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream
|
||||
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream
|
||||
vimv = pkgs.callPackage packages/vimv.nix {};
|
||||
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
|
||||
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
|
||||
wttr = pkgs.callPackage packages/wttr.nix {};
|
||||
|
||||
itl = pkgs.callPackage packages/itl.nix {};
|
||||
itools = pkgs.callPackage packages/itools.nix {itl = itl;};
|
||||
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {}; # TODO upstream
|
||||
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream
|
||||
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
|
||||
wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream
|
||||
|
||||
booksplit = wrapScript {
|
||||
script = inputs.voidrice.outPath + "/.local/bin/booksplit";
|
||||
name = "booksplit";
|
||||
packages = [pkgs.ffmpeg pkgs.glibc.bin];
|
||||
};
|
||||
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
|
||||
tag = wrapScript {
|
||||
script = inputs.voidrice.outPath + "/.local/bin/tag";
|
||||
name = "tag";
|
||||
packages = [pkgs.ffmpeg];
|
||||
};
|
||||
};
|
||||
});
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,4 @@
|
||||
{
|
||||
toum = "192.168.178.24";
|
||||
zaatar = "192.168.178.21";
|
||||
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";
|
||||
officejet = "192.168.0.251";
|
||||
router = "192.168.0.1";
|
||||
}
|
||||
|
||||
@@ -2029,6 +2029,14 @@ in
|
||||
stream = "av://lavfi:anoisesrc=color=brown";
|
||||
station = "Brownian 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: {
|
||||
stream = "https://${name}.stream.publicradio.org/${name}.aac";
|
||||
|
||||
@@ -91,6 +91,7 @@ local language_servers = {
|
||||
-- tsserver = {}, -- typescript-language-server
|
||||
cssls = {},
|
||||
elmls = {}, -- elm-language-server
|
||||
gopls = {}, -- gopls
|
||||
denols = {}, -- deno built in
|
||||
bashls = {}, -- bash-language-server
|
||||
lua_ls = {
|
||||
@@ -154,10 +155,11 @@ local language_servers = {
|
||||
}
|
||||
|
||||
for server, settings in pairs(language_servers) do
|
||||
require('lspconfig')[server].setup{
|
||||
vim.lsp.config(server, {
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
settings = settings,
|
||||
capabilities = capabilities
|
||||
}
|
||||
})
|
||||
vim.lsp.enable(server)
|
||||
end
|
||||
|
||||
@@ -102,6 +102,7 @@ augroup filetypes
|
||||
autocmd bufnewfile,bufread urls,config set filetype=conf
|
||||
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 *.ex,*.exs packadd vim-elixir | set filetype=elixir
|
||||
autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
|
||||
autocmd filetype javascript packadd vim-javascript
|
||||
autocmd filetype make setlocal noexpandtab
|
||||
@@ -124,3 +125,12 @@ set complete+=kspell
|
||||
let g:pandoc#syntax#conceal#use = 0
|
||||
let g:pandoc#modules#disabled = []
|
||||
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 ];
|
||||
};
|
||||
}
|
||||
@@ -29,7 +29,7 @@
|
||||
default = "daily";
|
||||
};
|
||||
loadCredential = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.string;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
This can be used to pass secrets to the systemd service without adding them to the nix store.
|
||||
'';
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
writers,
|
||||
curl,
|
||||
}:
|
||||
writers.writeDashBin "so" ''
|
||||
writers.writeDashBin "cht.sh" ''
|
||||
IFS=+
|
||||
${curl}/bin/curl -sSL http://cht.sh/"$*"
|
||||
''
|
||||
|
||||
@@ -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,
|
||||
qrencode,
|
||||
texlive,
|
||||
utillinux,
|
||||
util-linux,
|
||||
zbar,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
gnugrep
|
||||
qrencode
|
||||
texlive.combined.scheme-full
|
||||
utillinux
|
||||
util-linux
|
||||
zbar
|
||||
]}
|
||||
'';
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
writers,
|
||||
fetchurl,
|
||||
xan,
|
||||
util-linux,
|
||||
}: let
|
||||
database = fetchurl {
|
||||
url = "http://c.krebsco.de/greek.csv";
|
||||
@@ -9,5 +10,5 @@
|
||||
};
|
||||
in
|
||||
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,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}',
|
||||
\ 'syntax': 'markdown',
|
||||
\ 'ext': '.md',
|
||||
\ 'diary_rel_path' '.',
|
||||
\ 'diary_rel_path': '.',
|
||||
\}]
|
||||
|
||||
let NERDTreeSortOrder = ['[[-timestamp]]']
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
writers,
|
||||
yt-dlp,
|
||||
miller,
|
||||
gnused,
|
||||
curl,
|
||||
@@ -95,6 +96,10 @@
|
||||
"ich kann damit leben"
|
||||
"es ist was es ist"
|
||||
];
|
||||
|
||||
download = writers.writeDash "download" ''
|
||||
${yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic "$@"
|
||||
'';
|
||||
in
|
||||
writers.writeDashBin "pls" ''
|
||||
case "$1" in
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
{
|
||||
writers,
|
||||
curl,
|
||||
pup,
|
||||
gawk,
|
||||
gnused,
|
||||
gnugrep,
|
||||
less,
|
||||
fzf,
|
||||
}:
|
||||
|
||||
@@ -2,8 +2,12 @@
|
||||
{
|
||||
writers,
|
||||
imagemagick,
|
||||
ghostscript,
|
||||
lib
|
||||
}:
|
||||
writers.writeDashBin "scanned" ''
|
||||
export PATH=${lib.makeBinPath [ imagemagick ghostscript ]}:$PATH
|
||||
|
||||
[ $# -eq 1 -a -f "$1" -a -r "$1" ] || exit 1
|
||||
|
||||
${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
|
||||
|
||||
copilot-vim
|
||||
|
||||
goyo
|
||||
limelight-vim
|
||||
niveumPackages.vimPlugins-mdwa-nvim
|
||||
niveumPackages.vimPlugins-vim-ernest
|
||||
|
||||
fzf-vim
|
||||
fzfWrapper
|
||||
supertab
|
||||
@@ -74,6 +81,7 @@
|
||||
dhall-vim
|
||||
elm-vim
|
||||
emmet-vim
|
||||
vim-elixir
|
||||
haskell-vim
|
||||
niveumPackages.vimPlugins-icalendar-vim
|
||||
niveumPackages.vimPlugins-jq-vim
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}: (vimUtils.buildVimPluginFrom2Nix {
|
||||
}: (vimUtils.buildVimPlugin {
|
||||
pname = "cheat.sh-vim";
|
||||
version = "826219d1";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}: (vimUtils.buildVimPluginFrom2Nix {
|
||||
}: (vimUtils.buildVimPlugin {
|
||||
pname = "icalendar.vim";
|
||||
version = "542fff45";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
vimUtils.buildVimPluginFrom2Nix {
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "jq.vim";
|
||||
version = "5baf8ed1";
|
||||
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,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
vimUtils.buildVimPluginFrom2Nix {
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "typst.vim";
|
||||
version = "2882f21";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
vimUtils.buildVimPluginFrom2Nix {
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "vim-256noir";
|
||||
version = "e8668a18";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
vimUtils.buildVimPluginFrom2Nix rec {
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "vim-colors-paramount";
|
||||
version = "a5601d36";
|
||||
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,
|
||||
fetchFromGitHub,
|
||||
}: (vimUtils.buildVimPluginFrom2Nix rec {
|
||||
}: (vimUtils.buildVimPlugin {
|
||||
pname = "vim-fetch";
|
||||
version = "76c08586";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
vimUtils.buildVimPluginFrom2Nix {
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "vim-fsharp";
|
||||
version = "627db7d7";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
vimUtils.buildVimPluginFrom2Nix {
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "vim-mail";
|
||||
version = "acdbb5bd";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}: (vimUtils.buildVimPluginFrom2Nix {
|
||||
}: (vimUtils.buildVimPlugin {
|
||||
pname = "vim-reason-plus";
|
||||
version = "c11a2940";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
unstablePackages,
|
||||
...
|
||||
} @ args: let
|
||||
# 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 = _: {
|
||||
init = "/exec -oc cat ${setFile}";
|
||||
|
||||
@@ -163,14 +162,14 @@
|
||||
cfg.files
|
||||
)
|
||||
}
|
||||
exec ${weechat}/bin/weechat "$@"
|
||||
exec ${weechatPkg}/bin/weechat "$@"
|
||||
'';
|
||||
in
|
||||
pkgs.symlinkJoin {
|
||||
name = "weechat-configured";
|
||||
paths = [
|
||||
wrapper
|
||||
unstablePackages.weechat
|
||||
weechatPkg
|
||||
];
|
||||
postBuild = ''
|
||||
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/brevo-key.age
|
||||
secrets/cifs-credentials-zodiac.age
|
||||
secrets/copecart-ipn.age
|
||||
secrets/di-fm-key.age
|
||||
secrets/email-password-cock.age
|
||||
secrets/email-password-fysi.age
|
||||
secrets/email-password-ical-ephemeris.age
|
||||
secrets/email-password-letos.age
|
||||
secrets/email-password-meinhak99.age
|
||||
secrets/email-password-posteo.age
|
||||
@@ -76,6 +79,7 @@ secrets/telegram-token-proverb.age
|
||||
secrets/telegram-token-reverse.age
|
||||
secrets/telegram-token-streaming-link.age
|
||||
secrets/weechat-sec.conf.age
|
||||
secrets/wifi.age
|
||||
secrets/zaatar-moodle-dl-basicAuth.age
|
||||
secrets/zaatar-moodle-dl-tokens.json.age
|
||||
secrets/zaatar-retiolum-privateKey-ed25519.age
|
||||
|
||||
@@ -9,6 +9,7 @@ in {
|
||||
./hardware-configuration.nix
|
||||
../../configs/networkmanager.nix
|
||||
../../configs/default.nix
|
||||
../../configs/0ad.nix
|
||||
# ../../configs/gnome.nix
|
||||
];
|
||||
|
||||
@@ -40,8 +41,6 @@ in {
|
||||
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.retiolum = retiolumAddresses.fatteh;
|
||||
|
||||
|
||||
@@ -12,8 +12,9 @@ in {
|
||||
./radio.nix
|
||||
./panoptikon.nix
|
||||
./hledger.nix
|
||||
./go-webring.nix
|
||||
./gemini.nix
|
||||
./wallabag.nix
|
||||
./alew.nix
|
||||
../../configs/monitoring.nix
|
||||
../../configs/mycelium.nix
|
||||
../../configs/tor.nix
|
||||
@@ -69,65 +70,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 = {
|
||||
firewall.allowedTCPPorts = [80 443];
|
||||
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 = {
|
||||
serverName = "matomo.kmein.de";
|
||||
};
|
||||
package = pkgs.matomo_5;
|
||||
package = pkgs.matomo;
|
||||
};
|
||||
|
||||
services.mysql = {
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
networking.wg-quick.interfaces.aether.address = ["192.168.178.203/24"];
|
||||
|
||||
environment.systemPackages = [pkgs.zeroad];
|
||||
|
||||
networking = {
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
../../configs/sound.nix
|
||||
../../configs/printing.nix
|
||||
../../configs/nix.nix
|
||||
../../configs/flix.nix
|
||||
../../configs/fonts.nix
|
||||
../../configs/mycelium.nix
|
||||
../../configs/retiolum.nix
|
||||
@@ -80,7 +79,6 @@
|
||||
niveumPackages.mpv-tv
|
||||
telegram-desktop
|
||||
(niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
|
||||
niveumPackages.meteo
|
||||
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,7 +13,7 @@ in {
|
||||
./menstruation.nix
|
||||
./moinbot.nix
|
||||
./monitoring
|
||||
./names.nix
|
||||
# ./names.nix
|
||||
./nextcloud.nix
|
||||
../../configs/mycelium.nix
|
||||
./radio-news.nix
|
||||
@@ -48,7 +48,7 @@ in {
|
||||
config.services.grafana.dataDir
|
||||
config.services.gitea.stateDir
|
||||
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/codimd"
|
||||
];
|
||||
@@ -121,7 +121,22 @@ in {
|
||||
services.nginx.virtualHosts."www.kmein.de" = {
|
||||
addSSL = 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 = [
|
||||
|
||||
@@ -3,11 +3,13 @@
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
lokiConfig = import ./loki.nix;
|
||||
blackboxConfig = import ./blackbox.nix;
|
||||
inherit (import ../../../lib) restic;
|
||||
in {
|
||||
in
|
||||
{
|
||||
services.grafana = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -80,143 +82,150 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
services.prometheus.rules = let
|
||||
diskFreeThreshold = 10;
|
||||
in [
|
||||
(builtins.toJSON {
|
||||
groups = [
|
||||
{
|
||||
name = "niveum";
|
||||
rules = [
|
||||
{
|
||||
alert = "HostSystemdServiceCrashed";
|
||||
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}'';
|
||||
annotations = {
|
||||
description = ''{{ $labels.instance }} running out of space: {{ $value | printf "%.2f" }}% < ${toString diskFreeThreshold}%'';
|
||||
};
|
||||
}
|
||||
{
|
||||
alert = "RootPartitionFullWeek";
|
||||
for = "1h";
|
||||
expr =
|
||||
''node_filesystem_free_bytes{mountpoint="/"} ''
|
||||
+ ''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";
|
||||
annotations = {
|
||||
description = "{{$labels.instance}} running on high load: {{$value}}";
|
||||
};
|
||||
}
|
||||
{
|
||||
alert = "HostUnusualNetworkThroughputIn";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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 = "HostDown";
|
||||
expr = ''up == 0'';
|
||||
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 = "ProbeFailed";
|
||||
expr = "probe_success == 0";
|
||||
for = "5m";
|
||||
annotations.description = "HTTP probe failed for {{$labels.instance}}";
|
||||
}
|
||||
{
|
||||
alert = "SlowProbe";
|
||||
expr = "avg_over_time(probe_http_duration_seconds[1m]) > 1";
|
||||
for = "5m";
|
||||
annotations.description = "HTTP probe slow 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";
|
||||
annotations.description = "status code {{$value}} for {{$labels.instance}}";
|
||||
}
|
||||
{
|
||||
alert = "SslExpirySoon";
|
||||
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";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
services.prometheus.rules =
|
||||
let
|
||||
diskFreeThreshold = 10;
|
||||
in
|
||||
[
|
||||
(builtins.toJSON {
|
||||
groups = [
|
||||
{
|
||||
name = "niveum";
|
||||
rules = [
|
||||
{
|
||||
alert = "HostSystemdServiceCrashed";
|
||||
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}'';
|
||||
annotations = {
|
||||
description = ''{{ $labels.instance }} running out of space: {{ $value | printf "%.2f" }}% < ${toString diskFreeThreshold}%'';
|
||||
};
|
||||
}
|
||||
{
|
||||
alert = "RootPartitionFullWeek";
|
||||
for = "1h";
|
||||
expr =
|
||||
''node_filesystem_free_bytes{mountpoint="/"} ''
|
||||
+ ''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";
|
||||
annotations = {
|
||||
description = "{{$labels.instance}} running on high load: {{$value}}";
|
||||
};
|
||||
}
|
||||
{
|
||||
alert = "HostUnusualNetworkThroughputIn";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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";
|
||||
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 = "HostDown";
|
||||
expr = ''up == 0'';
|
||||
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 = "Mastodon";
|
||||
expr = ''probe_success{instance="https://social.krebsco.de"} == 0'';
|
||||
for = "5m";
|
||||
annotations.description = "Mastodon instance {{$labels.instance}} is down";
|
||||
}
|
||||
{
|
||||
alert = "ProbeFailed";
|
||||
expr = "probe_success == 0";
|
||||
for = "5m";
|
||||
annotations.description = "HTTP probe failed for {{$labels.instance}}";
|
||||
}
|
||||
{
|
||||
alert = "SlowProbe";
|
||||
expr = "avg_over_time(probe_http_duration_seconds[1m]) > 1";
|
||||
for = "5m";
|
||||
annotations.description = "HTTP probe slow 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";
|
||||
annotations.description = "status code {{$value}} for {{$labels.instance}}";
|
||||
}
|
||||
{
|
||||
alert = "SslExpirySoon";
|
||||
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
|
||||
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 = {
|
||||
matrix-token-lakai-env.file = ../../../secrets/matrix-token-lakai-env.age;
|
||||
};
|
||||
@@ -260,8 +296,23 @@ in {
|
||||
group_wait = "30s";
|
||||
repeat_interval = "24h";
|
||||
receiver = "matrix";
|
||||
routes = [
|
||||
{
|
||||
receiver = "lassulus";
|
||||
matchers = [ "alertname = \"Mastodon\"" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
receivers = [
|
||||
{
|
||||
name = "lassulus";
|
||||
webhook_configs = [
|
||||
{
|
||||
url = "http://localhost:9089/alert";
|
||||
max_alerts = 5;
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "matrix";
|
||||
webhook_configs = [
|
||||
@@ -306,13 +357,21 @@ in {
|
||||
{
|
||||
scheme = "http";
|
||||
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
|
||||
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 = [
|
||||
{
|
||||
job_name = "makanek";
|
||||
@@ -328,14 +387,14 @@ in {
|
||||
scrape_interval = "5m";
|
||||
job_name = "blackbox";
|
||||
metrics_path = "/probe";
|
||||
params.module = ["http_2xx"];
|
||||
params.module = [ "http_2xx" ];
|
||||
relabel_configs = [
|
||||
{
|
||||
source_labels = ["__address__"];
|
||||
source_labels = [ "__address__" ];
|
||||
target_label = "__param_target";
|
||||
}
|
||||
{
|
||||
source_labels = ["__param_target"];
|
||||
source_labels = [ "__param_target" ];
|
||||
target_label = "instance";
|
||||
}
|
||||
{
|
||||
@@ -393,7 +452,7 @@ in {
|
||||
scrape_interval = "60s";
|
||||
metrics_path = "/api/prometheus";
|
||||
scheme = "http";
|
||||
static_configs = [{targets = ["zaatar.r:8123"];}];
|
||||
static_configs = [ { targets = [ "zaatar.r:8123" ]; } ];
|
||||
bearer_token_file = config.age.secrets.home-assistant-token.path;
|
||||
}
|
||||
{
|
||||
@@ -410,7 +469,7 @@ in {
|
||||
|
||||
services.prometheus.exporters.blackbox = {
|
||||
enable = true;
|
||||
configFile = (pkgs.formats.yaml {}).generate "blackbox.yaml" blackboxConfig;
|
||||
configFile = (pkgs.formats.yaml { }).generate "blackbox.yaml" blackboxConfig;
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
@@ -419,6 +478,6 @@ in {
|
||||
|
||||
services.loki = {
|
||||
enable = true;
|
||||
configFile = (pkgs.formats.yaml {}).generate "loki.yaml" lokiConfig;
|
||||
configFile = (pkgs.formats.yaml { }).generate "loki.yaml" lokiConfig;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
unstablePackages,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../lib) kieran;
|
||||
weechatHome = "/var/lib/weechat";
|
||||
weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {
|
||||
inherit unstablePackages;
|
||||
};
|
||||
weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {};
|
||||
in {
|
||||
systemd.services.weechat = let
|
||||
tmux = pkgs.writers.writeDash "tmux" ''
|
||||
|
||||
@@ -36,8 +36,6 @@ in {
|
||||
wireguard-aether-psk.file = ../../secrets/manakish-wireguard-aether-psk.age;
|
||||
};
|
||||
|
||||
networking.wg-quick.interfaces.aether.address = ["192.168.178.204/24"];
|
||||
|
||||
niveum = {
|
||||
batteryName = "BAT0";
|
||||
wirelessInterface = "wlp3s0";
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
niveumPackages,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
sshPort = 8022;
|
||||
in {
|
||||
environment.packages = with pkgs; [
|
||||
nil
|
||||
bzip2
|
||||
coreutils
|
||||
curl
|
||||
diffutils
|
||||
findutils
|
||||
git
|
||||
gnugrep
|
||||
gnupg
|
||||
gnused
|
||||
gnutar
|
||||
gzip
|
||||
hostname
|
||||
iproute2
|
||||
man
|
||||
openssh
|
||||
procps
|
||||
tzdata
|
||||
unzip
|
||||
utillinux
|
||||
vim
|
||||
which
|
||||
xz
|
||||
zip
|
||||
hledger
|
||||
hledger-ui
|
||||
niveumPackages.vim
|
||||
gitAndTools.gh
|
||||
ripgrep
|
||||
(pkgs.writers.writeDashBin "start-ssh" ''
|
||||
${pkgs.openssh}/bin/sshd -f ${pkgs.writeText "sshd_config" ''
|
||||
HostKey /data/data/com.termux.nix/files/home/.ssh/ssh_host_rsa_key
|
||||
Port ${toString sshPort}
|
||||
''}
|
||||
'')
|
||||
];
|
||||
|
||||
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "hm-bak";
|
||||
config = {pkgs, ...}: {
|
||||
home.stateVersion = "23.05";
|
||||
programs.tmux.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
LEDGER_FILE = "/data/data/com.termux.nix/files/home/src/ledger/privat.journal";
|
||||
};
|
||||
|
||||
user.shell = "${pkgs.fish}/bin/fish";
|
||||
|
||||
environment.etcBackupExtension = ".bak";
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
nix.extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
}
|
||||
@@ -28,6 +28,9 @@ in {
|
||||
services.pipewire.systemWide = true;
|
||||
|
||||
age.secrets = {
|
||||
wifi = {
|
||||
file = ../../secrets/wifi.age;
|
||||
};
|
||||
retiolum-rsa = {
|
||||
file = ../../secrets/zaatar-retiolum-privateKey-rsa.age;
|
||||
mode = "400";
|
||||
|
||||
Reference in New Issue
Block a user