mirror of
https://github.com/kmein/niveum
synced 2026-03-18 11:01:07 +01:00
Compare commits
1 Commits
de6e08fa23
...
feature/it
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d063b0ac8 |
@@ -1,21 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -xfu
|
|
||||||
|
|
||||||
drive="$1"
|
|
||||||
mountpoint="/media/sd-card-$(date +%s)"
|
|
||||||
backup_directory="$(pwd)"
|
|
||||||
|
|
||||||
trap clean EXIT
|
|
||||||
clean() {
|
|
||||||
umount "$mountpoint"
|
|
||||||
rmdir "$mountpoint"
|
|
||||||
fsck.exfat "$drive"
|
|
||||||
}
|
|
||||||
|
|
||||||
filenames="$(fsck.exfat "$drive" 2>&1 | sed -nE "s/.* file '(.*?)' is not allocated.*/\1/p")"
|
|
||||||
mkdir "$mountpoint"
|
|
||||||
mount "$drive" "$mountpoint"
|
|
||||||
|
|
||||||
echo "$filenames" | while read -r filename; do
|
|
||||||
find "$mountpoint" -type f -name "$filename" -exec mv {} "$backup_directory" \;
|
|
||||||
done
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Usage:
|
|
||||||
# ./mp3_transfer.sh -s 1.3 /mnt/mp3player file1.m4a file2.m4a ...
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Default speed
|
|
||||||
SPEED=1.0
|
|
||||||
|
|
||||||
# Parse options
|
|
||||||
while getopts ":s:" opt; do
|
|
||||||
case $opt in
|
|
||||||
s)
|
|
||||||
SPEED=$OPTARG
|
|
||||||
;;
|
|
||||||
\?)
|
|
||||||
echo "Invalid option: -$OPTARG" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
:)
|
|
||||||
echo "Option -$OPTARG requires a value." >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# Shift past the options
|
|
||||||
shift $((OPTIND -1))
|
|
||||||
|
|
||||||
# Check arguments
|
|
||||||
if [ "$#" -lt 2 ]; then
|
|
||||||
echo "Usage: $0 [-s speed] MOUNT_POINT FILE1 [FILE2 ...]"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
MOUNT_POINT=$1
|
|
||||||
shift
|
|
||||||
FILES=("$@")
|
|
||||||
|
|
||||||
# Check mount point exists
|
|
||||||
if [ ! -d "$MOUNT_POINT" ]; then
|
|
||||||
echo "Error: Mount point '$MOUNT_POINT' does not exist."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Estimate required space
|
|
||||||
TOTAL_SIZE=0
|
|
||||||
for f in "${FILES[@]}"; do
|
|
||||||
if [ ! -f "$f" ]; then
|
|
||||||
echo "Warning: File '$f' does not exist, skipping."
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
# Get file size in bytes
|
|
||||||
FILE_SIZE=$(stat --printf="%s" "$f")
|
|
||||||
# Estimate mp3 output size: roughly 1/2 of original m4a (adjust if needed)
|
|
||||||
TOTAL_SIZE=$((TOTAL_SIZE + FILE_SIZE / 2))
|
|
||||||
done
|
|
||||||
|
|
||||||
# Get available space in bytes
|
|
||||||
AVAILABLE=$(df --output=avail "$MOUNT_POINT" | tail -n 1)
|
|
||||||
AVAILABLE=$((AVAILABLE * 1024)) # df reports in KB
|
|
||||||
|
|
||||||
if [ "$TOTAL_SIZE" -gt "$AVAILABLE" ]; then
|
|
||||||
echo "Error: Not enough space on device. Required: $TOTAL_SIZE bytes, Available: $AVAILABLE bytes"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Enough space available. Starting conversion..."
|
|
||||||
|
|
||||||
sanitize_filename() {
|
|
||||||
local name="$1"
|
|
||||||
# Remove path, keep only base name
|
|
||||||
name=$(basename "$name" .m4a)
|
|
||||||
# Replace spaces and special chars with underscore
|
|
||||||
name=$(echo "$name" | tr ' ' '_' | tr -cd '[:alnum:]_-')
|
|
||||||
# Truncate to max 50 chars
|
|
||||||
echo "${name:0:50}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Convert and copy files
|
|
||||||
for f in "${FILES[@]}"; do
|
|
||||||
if [ ! -f "$f" ]; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Determine the next prefix
|
|
||||||
existing_prefixes=$(ls "$MOUNT_POINT" | grep -E '^[0-9].*\.mp3$' | sed -E 's/^([0-9]).*/\1/' | sort -n | uniq)
|
|
||||||
for i in {0..9}; do
|
|
||||||
if ! echo "$existing_prefixes" | grep -q "^$i$"; then
|
|
||||||
PREFIX=$i
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "Using prefix: $PREFIX"
|
|
||||||
|
|
||||||
BASENAME=$(sanitize_filename "$f")
|
|
||||||
OUT_PATTERN="$MOUNT_POINT/${PREFIX}%02d_${BASENAME}.mp3"
|
|
||||||
|
|
||||||
echo "Converting '$f' to '$OUT_PATTERN' at speed $SPEED..."
|
|
||||||
|
|
||||||
ffmpeg -i "$f" \
|
|
||||||
-filter:a "atempo=$SPEED" -ar 44100 -ac 2 -c:a libmp3lame -b:a 128k \
|
|
||||||
-f segment -segment_time 300 \
|
|
||||||
"$OUT_PATTERN"
|
|
||||||
|
|
||||||
# Update prefix for next file
|
|
||||||
# Count how many segments were created
|
|
||||||
SEG_COUNT=$(ls "$MOUNT_POINT" | grep -E "^${PREFIX}[0-9]{2}_" | wc -l)
|
|
||||||
PREFIX=$((PREFIX + SEG_COUNT))
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "All files processed successfully."
|
|
||||||
@@ -1,81 +1,50 @@
|
|||||||
let
|
let
|
||||||
lib = import <nixpkgs/lib>;
|
lib = import <nixpkgs/lib>;
|
||||||
in
|
in rec {
|
||||||
rec {
|
|
||||||
inherit lib;
|
inherit lib;
|
||||||
|
|
||||||
input = [
|
input = [
|
||||||
{
|
{
|
||||||
x = [
|
x = ["pool" "zfs"];
|
||||||
"pool"
|
y = ["mdadm" "raid1"];
|
||||||
"zfs"
|
|
||||||
];
|
|
||||||
y = [
|
|
||||||
"mdadm"
|
|
||||||
"raid1"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
x = [
|
x = ["pool" "zfs"];
|
||||||
"pool"
|
y = ["disk" "sda"];
|
||||||
"zfs"
|
|
||||||
];
|
|
||||||
y = [
|
|
||||||
"disk"
|
|
||||||
"sda"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
x = [
|
x = ["mdadm" "raid1"];
|
||||||
"mdadm"
|
y = ["disk" "sdb"];
|
||||||
"raid1"
|
|
||||||
];
|
|
||||||
y = [
|
|
||||||
"disk"
|
|
||||||
"sdb"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
x = [
|
x = ["mdadm" "raid1"];
|
||||||
"mdadm"
|
y = ["disk" "sdc"];
|
||||||
"raid1"
|
|
||||||
];
|
|
||||||
y = [
|
|
||||||
"disk"
|
|
||||||
"sdc"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
outNodes = node: graph: lib.unique (builtins.map (e: e.y) (builtins.filter (v: v.x == node) graph));
|
outNodes = node: graph:
|
||||||
|
lib.unique
|
||||||
|
(builtins.map (e: e.y)
|
||||||
|
(builtins.filter (v: v.x == node) graph));
|
||||||
|
|
||||||
vertices = graph: lib.unique (builtins.map (x: x.y) graph ++ builtins.map (x: x.x) graph);
|
vertices = graph:
|
||||||
|
lib.unique
|
||||||
|
(builtins.map (x: x.y) graph ++ builtins.map (x: x.x) graph);
|
||||||
|
|
||||||
deleteVertex = node: graph: (builtins.filter (v: v.x != node && v.y != node) graph);
|
deleteVertex = node: graph: (builtins.filter (v: v.x != node && v.y != node) graph);
|
||||||
|
|
||||||
findSink =
|
findSink = graph:
|
||||||
graph:
|
lib.findFirst
|
||||||
lib.findFirst (v: outNodes v graph == [ ]) (lib.trace graph (builtins.abort "No sink found")) (
|
(v: outNodes v graph == [])
|
||||||
vertices graph
|
(lib.trace graph (builtins.abort "No sink found"))
|
||||||
);
|
(vertices graph);
|
||||||
|
|
||||||
topSort =
|
topSort = graph:
|
||||||
graph:
|
if graph == []
|
||||||
if graph == [ ] then
|
then []
|
||||||
[ ]
|
else if builtins.length graph == 1
|
||||||
else if builtins.length graph == 1 then
|
then let only = builtins.head graph; in [only.y only.x]
|
||||||
let
|
else let sink = findSink graph; in [sink] ++ topSort (deleteVertex sink graph);
|
||||||
only = builtins.head graph;
|
|
||||||
in
|
|
||||||
[
|
|
||||||
only.y
|
|
||||||
only.x
|
|
||||||
]
|
|
||||||
else
|
|
||||||
let
|
|
||||||
sink = findSink graph;
|
|
||||||
in
|
|
||||||
[ sink ] ++ topSort (deleteVertex sink graph);
|
|
||||||
|
|
||||||
output = topSort input;
|
output = topSort input;
|
||||||
}
|
}
|
||||||
|
|||||||
33
.github/workflows/niveum.yml
vendored
33
.github/workflows/niveum.yml
vendored
@@ -7,33 +7,8 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
system: [makanek,manakish,kabsa,zaatar,ful,fatteh]
|
system: [makanek,manakish,kabsa,zaatar,ful]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v2
|
||||||
- name: Install QEMU (ARM)
|
- uses: cachix/install-nix-action@v16
|
||||||
run: |
|
- run: nix run .?submodules=1#apps.nixinate.${{matrix.system}}-dry-run
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y qemu-user-static
|
|
||||||
if: ${{ matrix.system == 'ful' }}
|
|
||||||
- name: Install Nix (ARM)
|
|
||||||
uses: cachix/install-nix-action@v16
|
|
||||||
if: ${{ matrix.system == 'ful' }}
|
|
||||||
with:
|
|
||||||
extra_nix_config: |
|
|
||||||
system = aarch64-linux
|
|
||||||
- name: Install Nix (x86_64)
|
|
||||||
uses: cachix/install-nix-action@v16
|
|
||||||
if: ${{ matrix.system != 'ful' }}
|
|
||||||
- name: nixos-rebuild dry-build
|
|
||||||
run: |
|
|
||||||
# remove secrets: ref https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule/36593218
|
|
||||||
git submodule deinit -f secrets
|
|
||||||
rm -rf .git/modules/secrets
|
|
||||||
git rm -f secrets
|
|
||||||
|
|
||||||
# recreate secrets
|
|
||||||
mkdir secrets
|
|
||||||
cat secrets.txt | while read -r path; do touch $path; done
|
|
||||||
git add secrets
|
|
||||||
|
|
||||||
nix run nixpkgs#nixos-rebuild -- dry-build --flake $GITHUB_WORKSPACE#${{matrix.system}}
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
# niveum
|
# niveum
|
||||||
|
|
||||||
> I must Create a System, or be enslav'd by another Man's. —William Blake
|
|
||||||
|
|
||||||
> [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
|
> [nĭvĕus](https://logeion.uchicago.edu/niveus), a, um, adj. [nix], _of_ or _from snow, snowy, snow-_ (poet.)
|
||||||
>
|
>
|
||||||
> 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—
|
> 1. Lit.: aggeribus niveis informis, Verg. G. 3, 354: aqua, _cooled with snow_, Mart. 12, 17, 6; cf. id. 14, 104 and 117: mons, _covered with snow_, Cat. 64, 240.—
|
||||||
@@ -9,9 +7,4 @@
|
|||||||
> 2. Transf., _snow-white, snowy_ (mostly poet.): a similitudine sic: Corpore niveum candorem, aspectu igneum ardorem assequebatur, Auct. Her. 4, 33, 44: lacerti, Verg. A. 8, 387: lac, id. E. 2, 20: hanc si capite niveae agnae exorari judicas, Sen. Q. N. 2, 36: Briseis niveo colore, Hor. C. 2, 4, 3: vestis, Ov. M. 10, 432: candidior nivei folio, Galatea, ligustri, id. ib. 13, 789: dens, id. H. 18, 18: quā notam duxit niveus videri, Hor. C. 4, 2, 59: panis, Juv. 5, 70: flumen, _clear, pellucid_, Sen. Hippol. 504: undae, Mart. 7, 32, 11: tribuni, _clothed in white togas_, Calp. Ecl. 7, 29; so, Quirites, Juv. 10, 45.
|
> 2. Transf., _snow-white, snowy_ (mostly poet.): a similitudine sic: Corpore niveum candorem, aspectu igneum ardorem assequebatur, Auct. Her. 4, 33, 44: lacerti, Verg. A. 8, 387: lac, id. E. 2, 20: hanc si capite niveae agnae exorari judicas, Sen. Q. N. 2, 36: Briseis niveo colore, Hor. C. 2, 4, 3: vestis, Ov. M. 10, 432: candidior nivei folio, Galatea, ligustri, id. ib. 13, 789: dens, id. H. 18, 18: quā notam duxit niveus videri, Hor. C. 4, 2, 59: panis, Juv. 5, 70: flumen, _clear, pellucid_, Sen. Hippol. 504: undae, Mart. 7, 32, 11: tribuni, _clothed in white togas_, Calp. Ecl. 7, 29; so, Quirites, Juv. 10, 45.
|
||||||
|
|
||||||
## Pressestimmen
|
## Pressestimmen
|
||||||
> das ist ja pure poesie —[riotbib](https://github.com/riotbib/)
|
> das ist ja pure poesie —[xkey](https://github.com/riotbib)
|
||||||
|
|
||||||
> Deine Configs sind wunderschön <3 —[flxai](https://github.com/flxai/)
|
|
||||||
|
|
||||||
## To do
|
|
||||||
- [ ] get rid of `nixinate`
|
|
||||||
|
|||||||
@@ -1,127 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
darwin = lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.htop
|
|
||||||
pkgs.w3m
|
|
||||||
pkgs.wget
|
|
||||||
# ARCHIVE TOOLS
|
|
||||||
pkgs.unzip
|
|
||||||
pkgs.unrar
|
|
||||||
pkgs.p7zip
|
|
||||||
pkgs.sshuttle
|
|
||||||
pkgs.zip
|
|
||||||
# MONITORS
|
|
||||||
pkgs.iftop # interface bandwidth monitor
|
|
||||||
pkgs.lsof # list open files
|
|
||||||
# SHELL
|
|
||||||
pkgs.sqlite
|
|
||||||
pkgs.fd # better find
|
|
||||||
pkgs.tree
|
|
||||||
pkgs.parallel # for parallel, since moreutils shadows task spooler
|
|
||||||
pkgs.ripgrep # better grep
|
|
||||||
pkgs.rlwrap
|
|
||||||
pkgs.progress # display progress bars for pipes
|
|
||||||
pkgs.file # determine file type
|
|
||||||
pkgs.gdu # ncurses disk usage (ncdu is broken)
|
|
||||||
pkgs.rmlint # remove duplicate files
|
|
||||||
pkgs.jq # json toolkit
|
|
||||||
pkgs.jless # less(1) for json
|
|
||||||
pkgs.fq # toolkit for yaml, xml and binaries
|
|
||||||
pkgs.bc # calculator
|
|
||||||
pkgs.pari # gp -- better calculator
|
|
||||||
pkgs.ts
|
|
||||||
pkgs.vimv
|
|
||||||
pkgs.vg
|
|
||||||
pkgs.fkill
|
|
||||||
pkgs.cyberlocker-tools
|
|
||||||
pkgs.untilport
|
|
||||||
pkgs.kpaste
|
|
||||||
# HARDWARE
|
|
||||||
pkgs.pciutils # for lspci
|
|
||||||
]
|
|
||||||
++ lib.optionals (!darwin) [
|
|
||||||
pkgs.usbutils # for lsusb
|
|
||||||
pkgs.lshw # for lshw
|
|
||||||
pkgs.iotop # I/O load monitor
|
|
||||||
pkgs.psmisc # for killall, pstree
|
|
||||||
];
|
|
||||||
|
|
||||||
security.wrappers = {
|
|
||||||
pmount = {
|
|
||||||
setuid = true;
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
source = "${pkgs.pmount}/bin/pmount";
|
|
||||||
};
|
|
||||||
pumount = {
|
|
||||||
setuid = true;
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
source = "${pkgs.pmount}/bin/pumount";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.interactiveShellInit = ''
|
|
||||||
# Use XDG_RUNTIME_DIR for temporary files if available
|
|
||||||
if [ -d "$XDG_RUNTIME_DIR" ]; then
|
|
||||||
export TMPDIR="$XDG_RUNTIME_DIR"
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
environment.shellAliases =
|
|
||||||
let
|
|
||||||
take = pkgs.writers.writeDash "take" ''
|
|
||||||
mkdir "$1" && cd "$1"
|
|
||||||
'';
|
|
||||||
cdt = pkgs.writers.writeDash "cdt" ''
|
|
||||||
cd $(mktemp -p "$XDG_RUNTIME_DIR" -d "cdt-XXXXXX")
|
|
||||||
pwd
|
|
||||||
'';
|
|
||||||
wcd = pkgs.writers.writeDash "wcd" ''
|
|
||||||
cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
|
|
||||||
'';
|
|
||||||
where = pkgs.writers.writeDash "where" ''
|
|
||||||
readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
nixi = "nix repl nixpkgs";
|
|
||||||
take = "source ${take}";
|
|
||||||
wcd = "source ${wcd}";
|
|
||||||
where = "source ${where}";
|
|
||||||
# temporary files and directories
|
|
||||||
cdt = "source ${cdt}";
|
|
||||||
vit = "$EDITOR $(mktemp)";
|
|
||||||
# file safety
|
|
||||||
mv = "${pkgs.coreutils}/bin/mv --interactive";
|
|
||||||
rm = "${pkgs.coreutils}/bin/rm --interactive";
|
|
||||||
cp = "${pkgs.coreutils}/bin/cp --interactive";
|
|
||||||
# colours
|
|
||||||
cat = "${pkgs.bat}/bin/bat --theme=ansi --style=plain";
|
|
||||||
l = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all";
|
|
||||||
ls = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso";
|
|
||||||
ll = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso -l";
|
|
||||||
la = "${pkgs.coreutils}/bin/ls --color=auto --time-style=long-iso --almost-all -l";
|
|
||||||
}
|
|
||||||
// (
|
|
||||||
if darwin then
|
|
||||||
{ }
|
|
||||||
else
|
|
||||||
{
|
|
||||||
"ß" = "${pkgs.util-linux}/bin/setsid";
|
|
||||||
ip = "${pkgs.iproute2}/bin/ip -c";
|
|
||||||
# systemd
|
|
||||||
s = "${pkgs.systemd}/bin/systemctl";
|
|
||||||
us = "${pkgs.systemd}/bin/systemctl --user";
|
|
||||||
j = "${pkgs.systemd}/bin/journalctl";
|
|
||||||
uj = "${pkgs.systemd}/bin/journalctl --user";
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
277
configs/aerc.nix
277
configs/aerc.nix
@@ -3,17 +3,29 @@
|
|||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
{
|
defaults = {
|
||||||
|
aerc.enable = true;
|
||||||
|
realName = "Kierán Meinhardt";
|
||||||
|
folders.inbox = "INBOX";
|
||||||
|
};
|
||||||
|
hu-defaults = {
|
||||||
|
imap.host = "mailbox.cms.hu-berlin.de";
|
||||||
|
imap.port = 993;
|
||||||
|
smtp.host = "mailhost.cms.hu-berlin.de";
|
||||||
|
smtp.port = 25;
|
||||||
|
smtp.tls.useStartTls = true;
|
||||||
|
};
|
||||||
|
in {
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
email-password-ical-ephemeris = {
|
email-password-cock = {
|
||||||
file = ../secrets/email-password-ical-ephemeris.age;
|
file = ../secrets/email-password-cock.age;
|
||||||
owner = config.users.users.me.name;
|
owner = config.users.users.me.name;
|
||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
email-password-cock = {
|
email-password-fysi = {
|
||||||
file = ../secrets/email-password-cock.age;
|
file = ../secrets/email-password-fysi.age;
|
||||||
owner = config.users.users.me.name;
|
owner = config.users.users.me.name;
|
||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
@@ -24,11 +36,33 @@
|
|||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
|
email-password-meinhark = {
|
||||||
|
file = ../secrets/email-password-meinhark.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
email-password-meinhaki = {
|
||||||
|
file = ../secrets/email-password-meinhaki.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
email-password-dslalewa = {
|
||||||
|
file = ../secrets/email-password-dslalewa.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
email-password-fsklassp = {
|
||||||
|
file = ../secrets/email-password-fsklassp.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
accounts.email.maildirBasePath = "${config.users.users.me.home}/state/Maildir";
|
|
||||||
|
|
||||||
services.mbsync = {
|
services.mbsync = {
|
||||||
enable = true;
|
enable = true;
|
||||||
frequency = "daily";
|
frequency = "daily";
|
||||||
@@ -41,15 +75,14 @@
|
|||||||
extraConfig = {
|
extraConfig = {
|
||||||
database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
|
database.path = config.home-manager.users.me.accounts.email.maildirBasePath;
|
||||||
new.tags = "";
|
new.tags = "";
|
||||||
user.name = pkgs.lib.niveum.email.defaults.realName;
|
user.name = defaults.realName;
|
||||||
user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
|
user.primary_email = config.home-manager.users.me.accounts.email.accounts.posteo.address;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.mbsync = {
|
programs.mbsync = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = lib.concatStringsSep "\n\n" (
|
extraConfig = lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: ''
|
||||||
lib.mapAttrsToList (name: account: ''
|
|
||||||
IMAPAccount ${name}
|
IMAPAccount ${name}
|
||||||
CertificateFile /etc/ssl/certs/ca-certificates.crt
|
CertificateFile /etc/ssl/certs/ca-certificates.crt
|
||||||
Host ${account.imap.host}
|
Host ${account.imap.host}
|
||||||
@@ -73,86 +106,119 @@
|
|||||||
Patterns *
|
Patterns *
|
||||||
Remove None
|
Remove None
|
||||||
SyncState *
|
SyncState *
|
||||||
'') config.home-manager.users.me.accounts.email.accounts
|
'')
|
||||||
);
|
config.home-manager.users.me.accounts.email.accounts);
|
||||||
};
|
};
|
||||||
|
|
||||||
accounts.email.accounts = {
|
accounts.email.accounts = rec {
|
||||||
|
hu-student =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
(lib.recursiveUpdate hu-defaults
|
||||||
|
rec {
|
||||||
|
userName = "meinhark";
|
||||||
|
address = "kieran.felix.meinhardt@hu-berlin.de";
|
||||||
|
aliases = ["${userName}@hu-berlin.de"];
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
|
||||||
|
});
|
||||||
|
hu-student-cs =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
(lib.recursiveUpdate hu-defaults
|
||||||
|
rec {
|
||||||
|
userName = "meinhark";
|
||||||
|
address = "kieran.felix.meinhardt@informatik.hu-berlin.de";
|
||||||
|
aliases = ["${userName}@informatik.hu-berlin.de"];
|
||||||
|
imap.host = "mailbox.informatik.hu-berlin.de";
|
||||||
|
smtp.host = "mailhost.informatik.hu-berlin.de";
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhark.path}";
|
||||||
|
});
|
||||||
|
hu-employee =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
(lib.recursiveUpdate hu-defaults
|
||||||
|
rec {
|
||||||
|
userName = "meinhaki";
|
||||||
|
address = "kieran.meinhardt@hu-berlin.de";
|
||||||
|
aliases = ["${userName}@hu-berlin.de"];
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhaki.path}";
|
||||||
|
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
|
||||||
|
signature = {
|
||||||
|
showSignature = "append";
|
||||||
|
text = ''
|
||||||
|
${defaults.realName}
|
||||||
|
Studentische Hilfskraft / Administrator ALEW
|
||||||
|
Humboldt-Universität zu Berlin
|
||||||
|
|
||||||
|
Telefon: +49 (0)30 2093 9634
|
||||||
|
Raum 3.212, Dorotheenstraße 24, 10117 Berlin-Mitte
|
||||||
|
https://alew.hu-berlin.de
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
hu-admin =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
(lib.recursiveUpdate hu-defaults
|
||||||
|
rec {
|
||||||
|
userName = "dslalewa";
|
||||||
|
address = "admin.alew.vglsprwi@hu-berlin.de";
|
||||||
|
aliases = ["${userName}@hu-berlin.de"];
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}";
|
||||||
|
inherit (hu-employee) signature;
|
||||||
|
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
|
||||||
|
});
|
||||||
|
hu-fsi =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
(lib.recursiveUpdate hu-defaults
|
||||||
|
rec {
|
||||||
|
userName = "fsklassp";
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fsklassp.path}";
|
||||||
|
address = "${userName}@hu-berlin.de";
|
||||||
|
realName = "FSI Klassische Philologie";
|
||||||
|
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
|
||||||
|
signature = {
|
||||||
|
showSignature = "append";
|
||||||
|
text = ''
|
||||||
|
Fachschafts-Initiative
|
||||||
|
|
||||||
|
Humboldt-Universität zu Berlin
|
||||||
|
Sprach- und literaturwissenschaftliche Fakultät
|
||||||
|
Institut für klassische Philologie
|
||||||
|
Unter den Linden 6
|
||||||
|
10099 Berlin
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
fysi =
|
||||||
|
lib.recursiveUpdate defaults
|
||||||
|
rec {
|
||||||
|
address = "kieran@fysi.tech";
|
||||||
|
userName = address;
|
||||||
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-fysi.path}";
|
||||||
|
flavor = "fastmail.com";
|
||||||
|
};
|
||||||
cock =
|
cock =
|
||||||
let
|
lib.recursiveUpdate defaults
|
||||||
mailhost = "mail.cock.li";
|
rec {
|
||||||
address = "2210@cock.li";
|
address = "2210@cock.li";
|
||||||
in
|
|
||||||
lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
|
|
||||||
address = address;
|
|
||||||
userName = address;
|
userName = address;
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-cock.path}";
|
||||||
realName = "2210";
|
realName = "";
|
||||||
imap.host = mailhost;
|
imap.host = "mail.cock.li";
|
||||||
imap.port = 993;
|
smtp.host = imap.host;
|
||||||
smtp.host = mailhost;
|
|
||||||
smtp.port = 25;
|
|
||||||
smtp.tls.useStartTls = true;
|
|
||||||
};
|
|
||||||
ical-ephemeris =
|
|
||||||
let
|
|
||||||
address = "ical.ephemeris@web.de";
|
|
||||||
in
|
|
||||||
lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
|
|
||||||
userName = address;
|
|
||||||
realName = "Kieran from iCal Ephemeris";
|
|
||||||
address = address;
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-ical-ephemeris.path}";
|
|
||||||
imap.host = "imap.web.de";
|
|
||||||
imap.port = 993;
|
|
||||||
smtp.host = "smtp.web.de";
|
|
||||||
smtp.port = 587;
|
|
||||||
smtp.tls.useStartTls = true;
|
|
||||||
};
|
};
|
||||||
posteo =
|
posteo =
|
||||||
let
|
lib.recursiveUpdate defaults
|
||||||
mailhost = "posteo.de";
|
rec {
|
||||||
address = "kieran.meinhardt@posteo.net";
|
address = "kieran.meinhardt@posteo.net";
|
||||||
in
|
aliases = ["kmein@posteo.de"];
|
||||||
lib.recursiveUpdate pkgs.lib.niveum.email.defaults {
|
|
||||||
address = address;
|
|
||||||
aliases = [ "kmein@posteo.de" ];
|
|
||||||
userName = address;
|
userName = address;
|
||||||
imap.host = mailhost;
|
imap.host = "posteo.de";
|
||||||
imap.port = 993;
|
smtp.host = imap.host;
|
||||||
imap.tls.enable = true;
|
|
||||||
smtp.host = mailhost;
|
|
||||||
smtp.port = 465;
|
|
||||||
smtp.tls.enable = true;
|
|
||||||
primary = true;
|
primary = true;
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
|
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
|
||||||
himalaya = {
|
# himalaya = { enable = true; backend = "imap"; sender = "smtp"; };
|
||||||
enable = true;
|
|
||||||
settings.backend = "imap";
|
|
||||||
};
|
|
||||||
aerc.extraAccounts.pgp-key-id = "9EDE82CC72A343A95266D0F444857074A3ACC8B7";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.himalaya.enable = true;
|
# programs.himalaya.enable = true;
|
||||||
|
|
||||||
programs.thunderbird = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
profiles.${pkgs.lib.niveum.email.thunderbirdProfile} = {
|
|
||||||
isDefault = true;
|
|
||||||
settings = {
|
|
||||||
"mail.default_send_format" = 1;
|
|
||||||
"msgcompose.default_colors" = false;
|
|
||||||
"msgcompose.text_color" = config.lib.stylix.colors.withHashtag.base00;
|
|
||||||
"msgcompose.background_color" = config.lib.stylix.colors.withHashtag.base05;
|
|
||||||
};
|
|
||||||
userChrome = '''';
|
|
||||||
userContent = '''';
|
|
||||||
withExternalGnupg = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.aerc = {
|
programs.aerc = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -211,7 +277,6 @@
|
|||||||
"*" = ":filter -x Flagged<Enter>";
|
"*" = ":filter -x Flagged<Enter>";
|
||||||
};
|
};
|
||||||
view = {
|
view = {
|
||||||
tr = ":pipe ${pkgs.trans}/bin/trans -show-original n -b -no-autocorrect<Enter>"; # https://man.sr.ht/~rjarry/aerc/integrations/translator.md
|
|
||||||
"/" = ":toggle-key-passthrough <Enter> /";
|
"/" = ":toggle-key-passthrough <Enter> /";
|
||||||
q = ":close<Enter>";
|
q = ":close<Enter>";
|
||||||
O = ":open<Enter>";
|
O = ":open<Enter>";
|
||||||
@@ -284,45 +349,41 @@
|
|||||||
ui.spinner = ". , .";
|
ui.spinner = ". , .";
|
||||||
general.unsafe-accounts-conf = true;
|
general.unsafe-accounts-conf = true;
|
||||||
general.pgp-provider = "gpg";
|
general.pgp-provider = "gpg";
|
||||||
viewer = {
|
viewer = {pager = "${pkgs.less}/bin/less -R";};
|
||||||
pager = "${pkgs.less}/bin/less -R";
|
|
||||||
};
|
|
||||||
compose = {
|
compose = {
|
||||||
# address-book-cmd = "khard email --remove-first-line --parsable '%s'";
|
address-book-cmd = "khard email --remove-first-line --parsable '%s'";
|
||||||
no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt|beigefügt)";
|
no-attachment-warning = "(attach|attached|attachments?|anbei|Anhang|angehängt)";
|
||||||
};
|
};
|
||||||
filters = {
|
filters = {
|
||||||
"text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
"text/plain" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
"text/calendar" = "${pkgs.aerc}/libexec/aerc/filters/calendar";
|
"text/calendar" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
|
||||||
"text/html" = "${pkgs.aerc}/libexec/aerc/filters/html"; # Requires w3m, dante
|
"text/html" = "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
|
||||||
# "text/html" =
|
# "text/html" =
|
||||||
# "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
|
# "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
# "text/*" =
|
# "text/*" =
|
||||||
# ''${pkgs.bat}/bin/bat -fP --theme=ansi --file-name="$AERC_FILENAME "'';
|
# ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
|
||||||
"message/delivery-status" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
"message/delivery-status" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
"message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
|
"message/rfc822" = "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
|
||||||
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
"application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
|
||||||
};
|
};
|
||||||
openers =
|
openers = let
|
||||||
let
|
as-pdf = pkgs.writers.writeDash "as-pdf" ''
|
||||||
as-pdf = pkgs.writers.writeDash "as-pdf" ''
|
d=$(mktemp -d)
|
||||||
d=$(mktemp -p "$XDG_RUNTIME_DIR" -d)
|
trap clean EXIT
|
||||||
trap clean EXIT
|
clean() {
|
||||||
clean() {
|
rm -rf "$d"
|
||||||
rm -rf "$d"
|
}
|
||||||
}
|
${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
|
||||||
${pkgs.libreoffice}/bin/libreoffice --headless --convert-to pdf "$1" --outdir "$d"
|
${pkgs.zathura}/bin/zathura "$d"/*.pdf
|
||||||
${pkgs.zathura}/bin/zathura "$d"/*.pdf
|
'';
|
||||||
'';
|
in {
|
||||||
in
|
"image/*" = "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
{
|
"application/pdf" = "${pkgs.zathura}/bin/zathura";
|
||||||
"image/*" = "${pkgs.nsxiv}/bin/nsxiv";
|
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
|
||||||
"application/pdf" = "${pkgs.zathura}/bin/zathura";
|
"application/vnd.oasis.opendocument.text" = toString as-pdf;
|
||||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = toString as-pdf;
|
"video/*" = "${pkgs.mpv}/bin/mpv";
|
||||||
"application/vnd.oasis.opendocument.text" = toString as-pdf;
|
"audio/*" = "${pkgs.mpv}/bin/mpv";
|
||||||
"video/*" = "${pkgs.mpv}/bin/mpv";
|
};
|
||||||
"audio/*" = "${pkgs.mpv}/bin/mpv";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
templates = {
|
templates = {
|
||||||
|
|||||||
@@ -1,35 +1,68 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
alacritty-cfg = theme:
|
||||||
in
|
(pkgs.formats.yaml {}).generate "alacritty.yml" {
|
||||||
{
|
window.opacity = 0.99;
|
||||||
environment.variables.TERMINAL = "alacritty";
|
bell = {
|
||||||
|
animation = "EaseOut";
|
||||||
home-manager.users.me = {
|
duration = 100;
|
||||||
programs.alacritty = {
|
color = "#ffffff";
|
||||||
enable = true;
|
};
|
||||||
settings = {
|
font = {
|
||||||
keyboard.bindings = [
|
normal.family = "Monospace";
|
||||||
{
|
size = 6;
|
||||||
key = "Plus";
|
};
|
||||||
mods = "Control";
|
live_config_reload = true;
|
||||||
action = "IncreaseFontSize";
|
key_bindings = [
|
||||||
}
|
{
|
||||||
{
|
key = "Plus";
|
||||||
key = "Minus";
|
mods = "Control";
|
||||||
mods = "Control";
|
action = "IncreaseFontSize";
|
||||||
action = "DecreaseFontSize";
|
}
|
||||||
}
|
{
|
||||||
{
|
key = "Minus";
|
||||||
key = "Key0";
|
mods = "Control";
|
||||||
mods = "Control";
|
action = "DecreaseFontSize";
|
||||||
action = "ResetFontSize";
|
}
|
||||||
}
|
{
|
||||||
];
|
key = "Key0";
|
||||||
|
mods = "Control";
|
||||||
|
action = "ResetFontSize";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
colors = let
|
||||||
|
colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
|
||||||
|
colourPairs = lib.getAttrs colourNames theme;
|
||||||
|
in {
|
||||||
|
primary = {inherit (theme) background foreground;};
|
||||||
|
cursor = {inherit (theme) cursor;};
|
||||||
|
normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
|
||||||
|
bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
alacritty-pkg = pkgs.symlinkJoin {
|
||||||
|
name = "alacritty";
|
||||||
|
paths = [
|
||||||
|
(pkgs.writers.writeDashBin "alacritty" ''
|
||||||
|
${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" ||
|
||||||
|
${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
|
||||||
|
'')
|
||||||
|
pkgs.alacritty
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
environment.variables.TERMINAL = "alacritty";
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
alacritty-pkg
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.etc = {
|
||||||
|
"themes/dark/alacritty.yml".source = alacritty-cfg (import ../lib/colours/owickstrom-dark.nix);
|
||||||
|
"themes/light/alacritty.yml".source = alacritty-cfg (import ../lib/colours/owickstrom-light.nix);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
programs.adb.enable = true;
|
|
||||||
|
|
||||||
users.users.me.extraGroups = [ "adbusers" ];
|
|
||||||
}
|
|
||||||
@@ -1,31 +1,32 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
lib,
|
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
{
|
inherit (import ../lib) restic;
|
||||||
|
in {
|
||||||
services.restic.backups.niveum = {
|
services.restic.backups.niveum = {
|
||||||
initialize = true;
|
initialize = true;
|
||||||
repository = pkgs.lib.niveum.restic.repository;
|
inherit (restic) repository;
|
||||||
timerConfig = {
|
timerConfig = {
|
||||||
OnCalendar = "8:00";
|
OnCalendar = "8:00";
|
||||||
RandomizedDelaySec = "1h";
|
RandomizedDelaySec = "1h";
|
||||||
};
|
};
|
||||||
passwordFile = config.age.secrets.restic.path;
|
passwordFile = config.age.secrets.restic.path;
|
||||||
extraBackupArgs = [
|
extraBackupArgs = [
|
||||||
"--exclude=/home/kfm/sync/src/nixpkgs/.git"
|
"--exclude=/home/kfm/projects/nixpkgs/.git"
|
||||||
"--exclude=node_modules"
|
"--exclude=node_modules"
|
||||||
"--exclude=.parcel-cache"
|
|
||||||
];
|
];
|
||||||
paths = [
|
paths = [
|
||||||
"/home/kfm/sync"
|
"/home/kfm/work"
|
||||||
"/home/kfm/state"
|
"/home/kfm/projects"
|
||||||
|
"/home/kfm/notes"
|
||||||
|
"/home/kfm/Maildir"
|
||||||
"/home/kfm/cloud"
|
"/home/kfm/cloud"
|
||||||
"/home/kfm/mobile"
|
|
||||||
"/home/kfm/.gnupg"
|
"/home/kfm/.gnupg"
|
||||||
"/home/kfm/.electrum"
|
|
||||||
"/home/kfm/.ssh"
|
"/home/kfm/.ssh"
|
||||||
|
"/mnt/sd-card/music"
|
||||||
|
"/mnt/sd-card/Books"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -38,15 +39,15 @@
|
|||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writers.writeDashBin "restic-niveum" ''
|
(pkgs.writers.writeDashBin "restic-niveum" ''
|
||||||
${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} "$@"
|
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} "$@"
|
||||||
'')
|
'')
|
||||||
(pkgs.writers.writeDashBin "restic-mount" ''
|
(pkgs.writers.writeDashBin "restic-mount" ''
|
||||||
mountdir=$(mktemp -p "$XDG_RUNTIME_DIR" -d "restic-mount-XXXXXXX")
|
mountdir=$(mktemp -d)
|
||||||
trap clean EXIT
|
trap clean EXIT
|
||||||
clean() {
|
clean() {
|
||||||
rm -r "$mountdir"
|
rm -r "$mountdir"
|
||||||
}
|
}
|
||||||
${pkgs.restic}/bin/restic -r ${pkgs.lib.niveum.restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
|
${pkgs.restic}/bin/restic -r ${restic.repository} -p ${config.age.secrets.restic.path} mount "$mountdir"
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
promptInit = ''PS1="$(${pkgs.ncurses}/bin/tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(${pkgs.ncurses}/bin/tput sgr0) "'';
|
promptInit = ''
|
||||||
|
PS1="$(tput bold)\w \$([[ \$? == 0 ]] && echo \"\[\033[1;32m\]\" || echo \"\[\033[1;31m\]\")\$$(tput sgr0) "'';
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
set -o vi
|
set -o vi
|
||||||
'';
|
'';
|
||||||
completion.enable = true;
|
enableCompletion = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,20 +2,13 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [
|
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||||
tp_smapi
|
tp_smapi
|
||||||
acpi_call
|
acpi_call
|
||||||
];
|
];
|
||||||
boot.kernelModules = [
|
boot.kernelModules = ["tp_smapi" "acpi_call"];
|
||||||
"tp_smapi"
|
environment.systemPackages = [pkgs.tpacpi-bat pkgs.powertop];
|
||||||
"acpi_call"
|
|
||||||
];
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.tpacpi-bat
|
|
||||||
pkgs.powertop
|
|
||||||
];
|
|
||||||
|
|
||||||
services.tlp = {
|
services.tlp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
14
configs/beets.nix
Normal file
14
configs/beets.nix
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
environment.systemPackages = [pkgs.beets];
|
||||||
|
home-manager.users.me.xdg.configFile = {
|
||||||
|
"beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {
|
||||||
|
directory = "~/cloud/syncthing/music";
|
||||||
|
library = "~/cloud/syncthing/common/music.db";
|
||||||
|
plugins = toString ["fetchart" "lastgenre"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,11 +1,17 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.general = {
|
settings.General.Enable =
|
||||||
enable = "Source,Sink,Media,Socket";
|
lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.bluetuith ];
|
services.blueman.enable = true;
|
||||||
|
|
||||||
|
# environment.systemPackages = [pkgs.blueman];
|
||||||
|
|
||||||
|
home-manager.users.me = {services.blueman-applet.enable = true;};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
autorenkalender = inputs.autorenkalender.packages.x86_64-linux.default;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
niveum.bots.autorenkalender = {
|
|
||||||
enable = true;
|
|
||||||
time = "07:00";
|
|
||||||
telegram = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
|
||||||
chatIds = [ "@autorenkalender" ];
|
|
||||||
parseMode = "Markdown";
|
|
||||||
};
|
|
||||||
command = "${autorenkalender}/bin/autorenkalender";
|
|
||||||
};
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
|
||||||
{
|
|
||||||
title = "Autorenkalender";
|
|
||||||
description = "sends <a href=\"https://www.projekt-gutenberg.org/\">Projekt Gutenberg</a>'s anniversary information to Telegram.";
|
|
||||||
link = "https://t.me/Autorenkalender";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
niveum.bots.celan = {
|
|
||||||
enable = true;
|
|
||||||
time = "08:00";
|
|
||||||
telegram = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
|
||||||
chatIds = [ "@PaulCelan" ];
|
|
||||||
};
|
|
||||||
mastodon = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.mastodon-token-celan.path;
|
|
||||||
language = "de";
|
|
||||||
};
|
|
||||||
command = toString (
|
|
||||||
pkgs.writers.writePython3 "random-celan.py" { libraries = [ pkgs.python3Packages.lxml ]; } ''
|
|
||||||
from lxml import etree
|
|
||||||
import random
|
|
||||||
|
|
||||||
|
|
||||||
def xml_text(elements):
|
|
||||||
return "".join("".join(t.itertext()) for t in elements).strip()
|
|
||||||
|
|
||||||
|
|
||||||
tree = etree.parse('${
|
|
||||||
pkgs.fetchurl {
|
|
||||||
url = "http://c.krebsco.de/celan.tei.xml";
|
|
||||||
hash = "sha256-HgNmJYfhuwyfm+FcNtnnYWpJpIIU1ElHLeLiIFjF9mE=";
|
|
||||||
}
|
|
||||||
}')
|
|
||||||
root = tree.getroot()
|
|
||||||
|
|
||||||
tei = {"tei": "http://www.tei-c.org/ns/1.0"}
|
|
||||||
|
|
||||||
poems = root.xpath(".//tei:lg[@type='poem']", namespaces=tei)
|
|
||||||
|
|
||||||
poem = random.choice(poems)
|
|
||||||
|
|
||||||
for stanza in poem.xpath("./tei:lg[@type='stanza']", namespaces=tei):
|
|
||||||
for line in stanza.xpath('./tei:l', namespaces=tei):
|
|
||||||
if line.text:
|
|
||||||
print(line.text.strip())
|
|
||||||
print()
|
|
||||||
|
|
||||||
current_element = poem
|
|
||||||
while current_element is not None:
|
|
||||||
if current_element.tag == "{http://www.tei-c.org/ns/1.0}text":
|
|
||||||
text_element = current_element
|
|
||||||
|
|
||||||
title = xml_text(text_element.xpath("./tei:front/tei:docTitle",
|
|
||||||
namespaces=tei))
|
|
||||||
print(f"Aus: #{title.replace(" ", "_")}", end=" ")
|
|
||||||
|
|
||||||
if date := xml_text(text_element.xpath("./tei:front/tei:docDate",
|
|
||||||
namespaces=tei)):
|
|
||||||
print(f"({date})")
|
|
||||||
break
|
|
||||||
current_element = current_element.getparent()
|
|
||||||
|
|
||||||
print("\n\n#PaulCelan #Celan #Lyrik #poetry")
|
|
||||||
''
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
mastodon-token-celan.file = ../../secrets/mastodon-token-celan.age;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers.bot-celan.timerConfig.RandomizedDelaySec = "10h";
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
|
||||||
{
|
|
||||||
title = "Paul Celan Bot";
|
|
||||||
description = "sends a random poem by Paul Celan to Telegram.";
|
|
||||||
link = "https://t.me/PaulCelan";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
hesychius = inputs.scripts.outPath + "/hesychius/hesychius.txt";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
niveum.bots.hesychius = {
|
|
||||||
enable = true;
|
|
||||||
time = "08:00";
|
|
||||||
mastodon = {
|
|
||||||
enable = true;
|
|
||||||
language = "el";
|
|
||||||
tokenFile = config.age.secrets.mastodon-token-hesychius.path;
|
|
||||||
};
|
|
||||||
telegram = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
|
||||||
chatIds = [ "@HesychiosAlexandreus" ];
|
|
||||||
};
|
|
||||||
command = "${pkgs.coreutils}/bin/shuf -n1 ${hesychius}";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers.bot-hesychius.timerConfig.RandomizedDelaySec = "10h";
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
mastodon-token-hesychius.file = ../../secrets/mastodon-token-hesychius.age;
|
|
||||||
};
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
|
||||||
{
|
|
||||||
title = "Hesychius of Alexandria Bot";
|
|
||||||
description = "sends a random word from Hesychius of Alexandria's lexicon to Telegram.";
|
|
||||||
link = "https://t.me/HesychiosAlexandreus";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
niveum.bots.logotheca = {
|
|
||||||
enable = true;
|
|
||||||
time = "08/6:00";
|
|
||||||
telegram = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
|
||||||
chatIds = [ "-1001760262519" ];
|
|
||||||
parseMode = "Markdown";
|
|
||||||
};
|
|
||||||
matrix = {
|
|
||||||
enable = true;
|
|
||||||
homeserver = "matrix.4d2.org";
|
|
||||||
tokenFile = config.age.secrets.matrix-token-lakai.path;
|
|
||||||
chatIds = [
|
|
||||||
"!zlwCuPiCNMSxDviFzA:4d2.org"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
command = "${pkgs.literature-quote}/bin/literature-quote";
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
matrix-token-lakai.file = ../../secrets/matrix-token-lakai.age;
|
|
||||||
};
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
|
||||||
{
|
|
||||||
title = "Literature quote bot";
|
|
||||||
description = "sends me and my friends three <a href=\"https://logotheca.xn--kiern-0qa.de/\">logotheca</a> quotes a day.";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
nachtischsatan-bot =
|
|
||||||
{ tokenFile }:
|
|
||||||
pkgs.writers.writePython3 "nachtischsatan-bot"
|
|
||||||
{
|
|
||||||
libraries = [ pkgs.python3Packages.python-telegram-bot ];
|
|
||||||
}
|
|
||||||
''
|
|
||||||
from telegram.ext import Application, ContextTypes, MessageHandler, filters
|
|
||||||
from telegram import Update
|
|
||||||
import random
|
|
||||||
import time
|
|
||||||
|
|
||||||
|
|
||||||
async def flubber(update: Update, context: ContextTypes.DEFAULT_TYPE):
|
|
||||||
time.sleep(random.randrange(4000) / 1000)
|
|
||||||
await update.message.reply_text("*flubberflubber*")
|
|
||||||
|
|
||||||
|
|
||||||
with open('${tokenFile}', 'r') as tokenFile:
|
|
||||||
token = tokenFile.read().strip()
|
|
||||||
application = Application.builder().token(token).build()
|
|
||||||
application.add_handler(MessageHandler(filters.ALL, flubber))
|
|
||||||
application.run_polling()
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
systemd.services.telegram-nachtischsatan = {
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
description = "*flubberflubber*";
|
|
||||||
enable = true;
|
|
||||||
script = toString (nachtischsatan-bot {
|
|
||||||
tokenFile = config.age.secrets.telegram-token-nachtischsatan.path;
|
|
||||||
});
|
|
||||||
serviceConfig.Restart = "always";
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets.telegram-token-nachtischsatan.file = ../../secrets/telegram-token-nachtischsatan.age;
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
|
||||||
{
|
|
||||||
title = "Nachtischsatan-Bot";
|
|
||||||
link = "https://t.me/NachtischsatanBot";
|
|
||||||
description = "*flubberflubber*";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
niveum.bots.nietzsche = {
|
|
||||||
enable = true;
|
|
||||||
time = "08:00";
|
|
||||||
mastodon = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.mastodon-token-nietzsche.path;
|
|
||||||
language = "de";
|
|
||||||
};
|
|
||||||
command = toString (
|
|
||||||
pkgs.writers.writeBash "random-nietzsche" ''
|
|
||||||
set -efu
|
|
||||||
random_number=$(( ($RANDOM % 10) + 1 ))
|
|
||||||
if [ "$random_number" -eq 1 ]; then
|
|
||||||
${pkgs.random-zeno}/bin/random-zeno "/Literatur/M/Nietzsche,+Friedrich"
|
|
||||||
else
|
|
||||||
${pkgs.random-zeno}/bin/random-zeno "/Philosophie/M/Nietzsche,+Friedrich"
|
|
||||||
fi
|
|
||||||
''
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers.bot-nietzsche.timerConfig.RandomizedDelaySec = "10h";
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
mastodon-token-nietzsche.file = ../../secrets/mastodon-token-nietzsche.age;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
niveum.bots.smyth = {
|
|
||||||
enable = true;
|
|
||||||
time = "08:00";
|
|
||||||
mastodon = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.mastodon-token-smyth.path;
|
|
||||||
language = "en";
|
|
||||||
};
|
|
||||||
telegram = {
|
|
||||||
enable = true;
|
|
||||||
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
|
||||||
chatIds = [ "@HerbertWeirSmyth" ];
|
|
||||||
};
|
|
||||||
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=$(
|
|
||||||
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"
|
|
||||||
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
|
|
||||||
|
|
||||||
printf '\n%s\n\n#AncientGreek' "$url"
|
|
||||||
''
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers.bot-smyth.timerConfig.RandomizedDelaySec = "10h";
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
mastodon-token-smyth.file = ../../secrets/mastodon-token-smyth.age;
|
|
||||||
};
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
|
||||||
{
|
|
||||||
title = "Herbert Weir Smyth Bot";
|
|
||||||
description = "sends a random section from Smyth's Ancient Greek grammar to Telegram.";
|
|
||||||
link = "https://t.me/HerbertWeirSmyth";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,176 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
mastodonEndpoint = "https://social.krebsco.de";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
systemd.services.bot-tlg-wotd = {
|
|
||||||
# TODO reenable
|
|
||||||
# once https://github.com/NixOS/nixpkgs/pull/462893 is in stable NixOS
|
|
||||||
enable = true;
|
|
||||||
wants = [ "network-online.target" ];
|
|
||||||
startAt = "9:30";
|
|
||||||
path = [
|
|
||||||
pkgs.jq
|
|
||||||
pkgs.curl
|
|
||||||
pkgs.recode
|
|
||||||
pkgs.deno
|
|
||||||
pkgs.imagemagick
|
|
||||||
pkgs.gawk
|
|
||||||
pkgs.gnugrep
|
|
||||||
pkgs.coreutils
|
|
||||||
];
|
|
||||||
environment = {
|
|
||||||
NPM_CONFIG_CACHE = "/tmp";
|
|
||||||
CLTK_DATA = "/tmp";
|
|
||||||
};
|
|
||||||
script = ''
|
|
||||||
set -efux
|
|
||||||
|
|
||||||
chat_id=@tlgwotd
|
|
||||||
|
|
||||||
export TELEGRAM_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/telegram-token")"
|
|
||||||
export MASTODON_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/mastodon-token")"
|
|
||||||
|
|
||||||
json_data=$(curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd | recode html..utf8)
|
|
||||||
|
|
||||||
word=$(echo "$json_data" | jq -r '.word')
|
|
||||||
compact_word=$(echo "$word" | sed 's/,.*$//')
|
|
||||||
definition=$(echo "$json_data" | jq -r '.definition | sub("<.*>"; "") | rtrimstr(" ")')
|
|
||||||
first_occurrence=$(echo "$json_data" | jq -r '.firstOccurrence')
|
|
||||||
total_occurrences=$(echo "$json_data" | jq -r '.totalOccurrences')
|
|
||||||
telegram_caption="*$word* ‘$definition’
|
|
||||||
|
|
||||||
First occurrence (century): $first_occurrence
|
|
||||||
Number of occurrences (in all Ancient Greek texts): $total_occurrences"
|
|
||||||
mastodon_caption="$word ‘$definition’
|
|
||||||
|
|
||||||
First occurrence (century): $first_occurrence
|
|
||||||
Number of occurrences (in all Ancient Greek texts): $total_occurrences"
|
|
||||||
|
|
||||||
#ancientgreek #classics #wotd #wordoftheday
|
|
||||||
|
|
||||||
transliteration=$(${
|
|
||||||
pkgs.writers.writePython3 "translit.py"
|
|
||||||
{
|
|
||||||
libraries = py: [ py.cltk ];
|
|
||||||
}
|
|
||||||
''
|
|
||||||
import sys
|
|
||||||
from cltk.phonology.grc.transcription import Transcriber
|
|
||||||
|
|
||||||
probert = Transcriber("Attic", "Probert")
|
|
||||||
text = " ".join(sys.argv[1:])
|
|
||||||
ipa = probert.transcribe(text)
|
|
||||||
|
|
||||||
print(ipa)
|
|
||||||
''
|
|
||||||
} "$compact_word")
|
|
||||||
|
|
||||||
|
|
||||||
photo_path=/tmp/output.png
|
|
||||||
|
|
||||||
hex_to_rgb() {
|
|
||||||
hex="$1"
|
|
||||||
r=$(printf "%d" "0x$(echo "$hex" | cut -c2-3)")
|
|
||||||
g=$(printf "%d" "0x$(echo "$hex" | cut -c4-5)")
|
|
||||||
b=$(printf "%d" "0x$(echo "$hex" | cut -c6-7)")
|
|
||||||
echo "$r $g $b"
|
|
||||||
}
|
|
||||||
|
|
||||||
calculate_luminance() {
|
|
||||||
r="$1"
|
|
||||||
g="$2"
|
|
||||||
b="$3"
|
|
||||||
|
|
||||||
r_l=$(echo "$r" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
|
|
||||||
g_l=$(echo "$g" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
|
|
||||||
b_l=$(echo "$b" | awk '{print ($1 / 255 <= 0.03928) ? $1 / 255 / 12.92 : (($1 / 255 + 0.055) / 1.055)^2.4}')
|
|
||||||
|
|
||||||
echo "$r_l $g_l $b_l" | awk '{print 0.2126*$1 + 0.7152*$2 + 0.0722*$3}'
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
hex_color="#$(echo "$compact_word" | md5sum | cut -c 1-6)"
|
|
||||||
if echo "$hex_color" | grep -qE '^#[0-9A-Fa-f]{6}$'; then
|
|
||||||
set -- $(hex_to_rgb "$hex_color")
|
|
||||||
r="$1"
|
|
||||||
g="$2"
|
|
||||||
b="$3"
|
|
||||||
fi
|
|
||||||
|
|
||||||
luminance=$(calculate_luminance "$r" "$g" "$b")
|
|
||||||
|
|
||||||
threshold="0.1"
|
|
||||||
echo "$r $g $b"
|
|
||||||
if [ "$(echo "$luminance" | awk -v threshold="$threshold" '{print ($1 > threshold)}')" -eq 1 ]; then
|
|
||||||
color1="black"
|
|
||||||
color2="#333"
|
|
||||||
else
|
|
||||||
color1="white"
|
|
||||||
color2=lightgrey
|
|
||||||
fi
|
|
||||||
|
|
||||||
magick -size 1400x846 \
|
|
||||||
xc:"$hex_color" \
|
|
||||||
-font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Bold.ttf" \
|
|
||||||
-fill "$color1" \
|
|
||||||
-pointsize 150 -gravity west \
|
|
||||||
-annotate +100-160 "$compact_word" \
|
|
||||||
-font "${pkgs.gentium}/share/fonts/truetype/GentiumBookPlus-Regular.ttf" \
|
|
||||||
-fill "$color2" \
|
|
||||||
-pointsize 60 -gravity west \
|
|
||||||
-annotate +100+00 "$transliteration" \
|
|
||||||
-fill "$color1" \
|
|
||||||
-annotate +100+120 "‘$definition’" \
|
|
||||||
-fill "$color2" \
|
|
||||||
-pointsize 40 -gravity southwest \
|
|
||||||
-annotate +100+60 "attested $total_occurrences times" \
|
|
||||||
-pointsize 40 -gravity southeast \
|
|
||||||
-annotate +100+60 "$(date -I)" \
|
|
||||||
"$photo_path"
|
|
||||||
|
|
||||||
curl -X POST "https://api.telegram.org/bot$TELEGRAM_TOKEN/sendPhoto" \
|
|
||||||
-F "chat_id=\"$chat_id\"" \
|
|
||||||
-F "photo=@$photo_path" \
|
|
||||||
-F parse_mode=Markdown \
|
|
||||||
-F caption="$telegram_caption"
|
|
||||||
|
|
||||||
mastodon_upload_response=$(curl -X POST "${mastodonEndpoint}/api/v2/media" \
|
|
||||||
-H "Authorization: Bearer $MASTODON_TOKEN" \
|
|
||||||
-F "file=@$photo_path" \
|
|
||||||
-F "description=$word ‘$definition’")
|
|
||||||
mastodon_image_id=$(echo $mastodon_upload_response | jq -r .id)
|
|
||||||
curl -X POST "${mastodonEndpoint}/api/v1/statuses" \
|
|
||||||
-H "Authorization: Bearer $MASTODON_TOKEN" \
|
|
||||||
-d "status=$mastodon_caption" \
|
|
||||||
-d "visibility=public" \
|
|
||||||
-d "media_ids[]=$mastodon_image_id"
|
|
||||||
'';
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
DynamicUser = true;
|
|
||||||
StateDirectory = "tlgwotd";
|
|
||||||
PrivateTmp = true;
|
|
||||||
LoadCredential = [
|
|
||||||
"telegram-token:${config.age.secrets.telegram-token-kmein.path}"
|
|
||||||
"mastodon-token:${config.age.secrets.mastodon-token-tlgwotd.path}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
mastodon-token-tlgwotd.file = ../../secrets/mastodon-token-tlgwotd.age;
|
|
||||||
};
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
|
||||||
{
|
|
||||||
title = "Thesaurus Linguae Graecae Word of the Day";
|
|
||||||
description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
|
|
||||||
link = "https://t.me/tlgwotd";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.cro
|
|
||||||
pkgs.tor-browser
|
|
||||||
pkgs.firefox
|
|
||||||
pkgs.brave
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.firefox = {
|
|
||||||
enable = true;
|
|
||||||
profiles =
|
|
||||||
let
|
|
||||||
defaultSettings = {
|
|
||||||
"beacon.enabled" = false;
|
|
||||||
"browser.bookmarks.showMobileBookmarks" = true;
|
|
||||||
"browser.newtab.preload" = false;
|
|
||||||
"browser.search.isUS" = false;
|
|
||||||
"browser.search.region" = "DE";
|
|
||||||
"browser.send_pings" = false;
|
|
||||||
"browser.shell.checkDefaultBrowser" = false;
|
|
||||||
"browser.startup.homepage" = "chrome://browser/content/blanktab.html";
|
|
||||||
"browser.uidensity" = 1;
|
|
||||||
"browser.urlbar.placeholderName" = "Search";
|
|
||||||
"datareporting.healthreport.service.enabled" = false;
|
|
||||||
"datareporting.healthreport.uploadEnabled" = false;
|
|
||||||
"datareporting.policy.dataSubmissionEnabled" = false;
|
|
||||||
"datareporting.sessions.current.clean" = true;
|
|
||||||
"distribution.searchplugins.defaultLocale" = "de-DE";
|
|
||||||
"general.smoothScroll" = true;
|
|
||||||
"identity.fxaccounts.account.device.name" = config.networking.hostName;
|
|
||||||
"network.cookie.cookieBehavior" = 1;
|
|
||||||
"privacy.donottrackheader.enabled" = true;
|
|
||||||
"privacy.trackingprotection.enabled" = true;
|
|
||||||
"privacy.trackingprotection.pbmode.enabled" = true;
|
|
||||||
"privacy.trackingprotection.socialtracking.enabled" = true;
|
|
||||||
"services.sync.declinedEngines" = "passwords";
|
|
||||||
"services.sync.engine.passwords" = false;
|
|
||||||
"signon.autofillForms" = false;
|
|
||||||
"signon.rememberSignons" = false;
|
|
||||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
|
||||||
"toolkit.telemetry.archive.enabled" = false;
|
|
||||||
"toolkit.telemetry.bhrPing.enabled" = false;
|
|
||||||
"toolkit.telemetry.cachedClientID" = "";
|
|
||||||
"toolkit.telemetry.enabled" = false;
|
|
||||||
"toolkit.telemetry.firstShutdownPing.enabled" = false;
|
|
||||||
"toolkit.telemetry.hybridContent.enabled" = false;
|
|
||||||
"toolkit.telemetry.newProfilePing.enabled" = false;
|
|
||||||
"toolkit.telemetry.prompted" = 2;
|
|
||||||
"toolkit.telemetry.rejected" = true;
|
|
||||||
"toolkit.telemetry.server" = "";
|
|
||||||
"toolkit.telemetry.shutdownPingSender.enabled" = false;
|
|
||||||
"toolkit.telemetry.unified" = false;
|
|
||||||
"toolkit.telemetry.unifiedIsOptIn" = false;
|
|
||||||
"toolkit.telemetry.updatePing.enabled" = false;
|
|
||||||
"ui.prefersReducedMotion" = 1;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
default = {
|
|
||||||
id = 0;
|
|
||||||
isDefault = true;
|
|
||||||
settings = defaultSettings;
|
|
||||||
# extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
|
||||||
# ublock-origin
|
|
||||||
# darkreader
|
|
||||||
# sponsorblock
|
|
||||||
# consent-o-matic
|
|
||||||
# i-dont-care-about-cookies
|
|
||||||
# # auto-tab-discard TODO what is this
|
|
||||||
# ];
|
|
||||||
userChrome = ''
|
|
||||||
#TabsToolbar {
|
|
||||||
visibility: collapse !important;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
stylix.targets.firefox.profileNames = [ "default" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.variables.BROWSER = "firefox";
|
|
||||||
}
|
|
||||||
@@ -1,38 +1,28 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}:
|
||||||
{
|
# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
|
||||||
networking.networkmanager.ensureProfiles.profiles = {
|
let
|
||||||
"39C3" = {
|
certificate = pkgs.stdenv.mkDerivation rec {
|
||||||
connection = {
|
name = "dst-root-ca-x3.pem";
|
||||||
id = "39C3";
|
src = builtins.toFile "${name}.sed" ''
|
||||||
type = "wifi";
|
1,/DST Root CA X3/d
|
||||||
};
|
1,/-----END CERTIFICATE-----/p
|
||||||
wifi = {
|
'';
|
||||||
mode = "infrastructure";
|
nativeBuildInputs = with pkgs; [cacert gnused];
|
||||||
ssid = "39C3";
|
phases = "installPhase";
|
||||||
};
|
installPhase = ''
|
||||||
wifi-security = {
|
${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
|
||||||
auth-alg = "open";
|
'';
|
||||||
key-mgmt = "wpa-eap";
|
};
|
||||||
};
|
in {
|
||||||
"802-1x" = {
|
networking.wireless.networks."36C3" = {
|
||||||
anonymous-identity = "39C3";
|
auth = ''
|
||||||
eap = "ttls;";
|
key_mgmt=WPA-EAP
|
||||||
identity = "39C3";
|
eap=TTLS
|
||||||
password = "39C3";
|
identity="kmein"
|
||||||
phase2-auth = "pap";
|
password=" "
|
||||||
altsubject-matches = "DNS:radius.c3noc.net";
|
ca_cert="${certificate}"
|
||||||
ca-cert = "${builtins.fetchurl {
|
altsubject_match="DNS:radius.c3noc.net"
|
||||||
url = "https://letsencrypt.org/certs/isrgrootx1.pem";
|
phase2="auth=PAP"
|
||||||
sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92";
|
'';
|
||||||
}}";
|
|
||||||
};
|
|
||||||
ipv4 = {
|
|
||||||
method = "auto";
|
|
||||||
};
|
|
||||||
ipv6 = {
|
|
||||||
addr-gen-mode = "default";
|
|
||||||
method = "auto";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
97
configs/chromium.nix
Normal file
97
configs/chromium.nix
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
programs.chromium = {
|
||||||
|
enable = true;
|
||||||
|
extensions = [
|
||||||
|
# "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
|
||||||
|
# "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
|
||||||
|
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
|
||||||
|
"pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
|
||||||
|
"nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
|
||||||
|
"eimadpbcbfnmbkopoojfekhnkhdbieeh" # dark reader
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
programs.firefox = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.firefox.override {
|
||||||
|
cfg = {
|
||||||
|
enableTridactylNative = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
profiles = let
|
||||||
|
defaultSettings = {
|
||||||
|
"beacon.enabled" = false;
|
||||||
|
"browser.bookmarks.showMobileBookmarks" = true;
|
||||||
|
"browser.newtab.preload" = false;
|
||||||
|
"browser.search.isUS" = false;
|
||||||
|
"browser.search.region" = "DE";
|
||||||
|
"browser.send_pings" = false;
|
||||||
|
"browser.shell.checkDefaultBrowser" = false;
|
||||||
|
"browser.startup.homepage" = "chrome://browser/content/blanktab.html";
|
||||||
|
"browser.uidensity" = 1;
|
||||||
|
"browser.urlbar.placeholderName" = "Search";
|
||||||
|
"datareporting.healthreport.service.enabled" = false;
|
||||||
|
"datareporting.healthreport.uploadEnabled" = false;
|
||||||
|
"datareporting.policy.dataSubmissionEnabled" = false;
|
||||||
|
"datareporting.sessions.current.clean" = true;
|
||||||
|
"distribution.searchplugins.defaultLocale" = "de-DE";
|
||||||
|
"general.smoothScroll" = true;
|
||||||
|
"identity.fxaccounts.account.device.name" = config.networking.hostName;
|
||||||
|
"network.cookie.cookieBehavior" = 1;
|
||||||
|
"privacy.donottrackheader.enabled" = true;
|
||||||
|
"privacy.trackingprotection.enabled" = true;
|
||||||
|
"privacy.trackingprotection.pbmode.enabled" = true;
|
||||||
|
"privacy.trackingprotection.socialtracking.enabled" = true;
|
||||||
|
"services.sync.declinedEngines" = "passwords";
|
||||||
|
"services.sync.engine.passwords" = false;
|
||||||
|
"signon.autofillForms" = false;
|
||||||
|
"signon.rememberSignons" = false;
|
||||||
|
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||||
|
"toolkit.telemetry.archive.enabled" = false;
|
||||||
|
"toolkit.telemetry.bhrPing.enabled" = false;
|
||||||
|
"toolkit.telemetry.cachedClientID" = "";
|
||||||
|
"toolkit.telemetry.enabled" = false;
|
||||||
|
"toolkit.telemetry.firstShutdownPing.enabled" = false;
|
||||||
|
"toolkit.telemetry.hybridContent.enabled" = false;
|
||||||
|
"toolkit.telemetry.newProfilePing.enabled" = false;
|
||||||
|
"toolkit.telemetry.prompted" = 2;
|
||||||
|
"toolkit.telemetry.rejected" = true;
|
||||||
|
"toolkit.telemetry.server" = "";
|
||||||
|
"toolkit.telemetry.shutdownPingSender.enabled" = false;
|
||||||
|
"toolkit.telemetry.unified" = false;
|
||||||
|
"toolkit.telemetry.unifiedIsOptIn" = false;
|
||||||
|
"toolkit.telemetry.updatePing.enabled" = false;
|
||||||
|
"ui.prefersReducedMotion" = 1;
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
default = {
|
||||||
|
id = 0;
|
||||||
|
isDefault = true;
|
||||||
|
settings = defaultSettings;
|
||||||
|
# extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
|
# ublock-origin
|
||||||
|
# darkreader
|
||||||
|
# sponsorblock
|
||||||
|
# consent-o-matic
|
||||||
|
# i-dont-care-about-cookies
|
||||||
|
# # auto-tab-discard TODO what is this
|
||||||
|
# ];
|
||||||
|
userChrome = ''
|
||||||
|
#TabsToolbar {
|
||||||
|
visibility: collapse !important;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [pkgs.brave];
|
||||||
|
|
||||||
|
environment.variables.BROWSER = "brave";
|
||||||
|
}
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
services.clipmenu.enable = true;
|
services.clipmenu.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,81 +3,58 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
{
|
inherit (import ../lib) tmpfilesConfig;
|
||||||
systemd.user.services.systemd-tmpfiles-clean = {
|
in {
|
||||||
enable = true;
|
systemd.tmpfiles.rules = map tmpfilesConfig [
|
||||||
wantedBy = [ "default.target" ];
|
{
|
||||||
startAt = "daily";
|
type = "L+";
|
||||||
script = "systemd-tmpfiles --user --clean";
|
user = config.users.users.me.name;
|
||||||
serviceConfig = {
|
group = "users";
|
||||||
Type = "oneshot";
|
mode = "0755";
|
||||||
};
|
argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
|
||||||
};
|
path = "${config.users.users.me.home}/uni";
|
||||||
|
}
|
||||||
systemd.user.tmpfiles.users.me.rules =
|
{
|
||||||
map pkgs.lib.niveum.tmpfilesConfig [
|
type = "L+";
|
||||||
{
|
user = config.users.users.me.name;
|
||||||
type = "d";
|
group = "users";
|
||||||
mode = "0755";
|
mode = "0755";
|
||||||
age = "7d";
|
argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
|
||||||
path = "${config.users.users.me.home}/sync/Downloads";
|
path = "${config.users.users.me.home}/mahlzeit";
|
||||||
}
|
}
|
||||||
{
|
];
|
||||||
type = "d";
|
|
||||||
mode = "0755";
|
|
||||||
age = "7d";
|
|
||||||
path = "${config.users.users.me.home}/cloud/nextcloud/tmp";
|
|
||||||
}
|
|
||||||
]
|
|
||||||
++
|
|
||||||
map
|
|
||||||
(
|
|
||||||
path:
|
|
||||||
pkgs.lib.niveum.tmpfilesConfig {
|
|
||||||
type = "L+";
|
|
||||||
user = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "0755";
|
|
||||||
argument = "${config.users.users.me.home}/sync/${path}";
|
|
||||||
path = "${config.users.users.me.home}/${path}";
|
|
||||||
}
|
|
||||||
)
|
|
||||||
[
|
|
||||||
".ssh"
|
|
||||||
".gnupg"
|
|
||||||
".pki"
|
|
||||||
".local/share/aerc"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
security.pam.services.lightdm.enableGnomeKeyring = true;
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
|
services.gnome-keyring.enable = false;
|
||||||
services.nextcloud-client = {
|
services.nextcloud-client = {
|
||||||
enable = true;
|
enable = false;
|
||||||
startInBackground = true;
|
startInBackground = true;
|
||||||
};
|
};
|
||||||
|
systemd.user.services.nextcloud-client = {
|
||||||
|
Unit = {
|
||||||
|
Wants = ["gnome-keyring.service"];
|
||||||
|
After = ["gnome-keyring.service"];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.nextcloud-syncer = {
|
systemd.user.services.nextcloud-syncer = {
|
||||||
enable = false;
|
enable = true;
|
||||||
wants = [ "network-online.target" ];
|
wants = ["network-online.target"];
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = ["default.target"];
|
||||||
startAt = "*:00/10";
|
startAt = "*:00/10";
|
||||||
script =
|
script = let
|
||||||
let
|
kieran = {
|
||||||
kieran = {
|
user = "kieran";
|
||||||
user = "kieran";
|
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
||||||
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
endpoint = "https://cloud.xn--kiern-0qa.de";
|
||||||
endpoint = "https://cloud.kmein.de";
|
target = "${config.users.users.me.home}/notes";
|
||||||
target = "${config.users.users.me.home}/notes";
|
};
|
||||||
};
|
in ''
|
||||||
in
|
mkdir -p ${lib.escapeShellArg kieran.target}
|
||||||
''
|
${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password "$(cat ${kieran.passwordFile})" --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
|
||||||
mkdir -p ${lib.escapeShellArg kieran.target}
|
'';
|
||||||
${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password "$(cat ${kieran.passwordFile})" --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
|
|
||||||
'';
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
@@ -89,26 +66,23 @@
|
|||||||
set -efu
|
set -efu
|
||||||
book="$({
|
book="$({
|
||||||
${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/syncthing/library -type f
|
${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/syncthing/library -type f
|
||||||
${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/nextcloud/Books -type f
|
${pkgs.findutils}/bin/find ${config.users.users.me.home}/cloud/Seafile/Books -type f
|
||||||
} | ${pkgs.fzf}/bin/fzf)"
|
} | ${pkgs.fzf}/bin/fzf)"
|
||||||
exec ${pkgs.zathura}/bin/zathura "$book"
|
exec ${pkgs.zathura}/bin/zathura "$book"
|
||||||
'')
|
'')
|
||||||
(
|
(let
|
||||||
let
|
kieran = {
|
||||||
kieran = {
|
user = "kieran.meinhardt@gmail.com";
|
||||||
user = "kieran.meinhardt@gmail.com";
|
passwordFile = config.age.secrets.mega-password.path;
|
||||||
passwordFile = config.age.secrets.mega-password.path;
|
};
|
||||||
};
|
megatools = command: ''${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password "$(cat ${kieran.passwordFile})"'';
|
||||||
megatools =
|
in
|
||||||
command:
|
|
||||||
''${pkgs.megatools}/bin/megatools ${command} --username ${lib.escapeShellArg kieran.user} --password "$(cat ${kieran.passwordFile})"'';
|
|
||||||
in
|
|
||||||
pkgs.writers.writeDashBin "book-mega" ''
|
pkgs.writers.writeDashBin "book-mega" ''
|
||||||
set -efu
|
set -efu
|
||||||
selection="$(${megatools "ls"} | ${pkgs.fzf}/bin/fzf)"
|
selection="$(${megatools "ls"} | ${pkgs.fzf}/bin/fzf)"
|
||||||
test -n "$selection" || exit 1
|
test -n "$selection" || exit 1
|
||||||
|
|
||||||
tmpdir="$(mktemp -p "$XDG_RUNTIME_DIR" -d)"
|
tmpdir="$(mktemp -d)"
|
||||||
trap clean EXIT
|
trap clean EXIT
|
||||||
clean() {
|
clean() {
|
||||||
rm -rf "$tmpdir"
|
rm -rf "$tmpdir"
|
||||||
@@ -119,8 +93,7 @@
|
|||||||
${megatools "get"} "$selection"
|
${megatools "get"} "$selection"
|
||||||
exec ${pkgs.zathura}/bin/zathura "$(basename "$selection")"
|
exec ${pkgs.zathura}/bin/zathura "$(basename "$selection")"
|
||||||
)
|
)
|
||||||
''
|
'')
|
||||||
)
|
|
||||||
];
|
];
|
||||||
|
|
||||||
age.secrets.mega-password = {
|
age.secrets.mega-password = {
|
||||||
@@ -130,7 +103,17 @@
|
|||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.syncthing = {
|
fileSystems."/media/moodle" = {
|
||||||
|
device = "zaatar.r:/moodle";
|
||||||
|
fsType = "nfs";
|
||||||
|
options = [
|
||||||
|
"x-systemd.idle-timeout=600"
|
||||||
|
"noauto"
|
||||||
|
"x-systemd.automount"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.syncthing = rec {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
openDefaultPorts = true;
|
openDefaultPorts = true;
|
||||||
@@ -138,31 +121,16 @@
|
|||||||
dataDir = "/home/kfm/.config/syncthing";
|
dataDir = "/home/kfm/.config/syncthing";
|
||||||
cert = config.age.secrets.syncthing-cert.path;
|
cert = config.age.secrets.syncthing-cert.path;
|
||||||
key = config.age.secrets.syncthing-key.path;
|
key = config.age.secrets.syncthing-key.path;
|
||||||
settings = {
|
inherit ((import ../lib).syncthing) devices;
|
||||||
devices = pkgs.lib.niveum.syncthingIds;
|
folders = let
|
||||||
folders = {
|
cloud-dir = "${config.users.users.me.home}/cloud";
|
||||||
"${config.users.users.me.home}/sync" = {
|
in {
|
||||||
devices = [
|
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
||||||
"kabsa"
|
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
||||||
"manakish"
|
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
||||||
"fatteh"
|
"${cloud-dir}/syncthing/music" = {
|
||||||
];
|
devices = ["kabsa" "manakish" "heym" "zaatar"];
|
||||||
label = "sync";
|
id = "music";
|
||||||
versioning.type = "trashcan";
|
|
||||||
versioning.params.cleanoutDays = 100;
|
|
||||||
};
|
|
||||||
"${config.users.users.me.home}/mobile" = {
|
|
||||||
devices = [
|
|
||||||
"kabsa"
|
|
||||||
"manakish"
|
|
||||||
"fatteh"
|
|
||||||
"kibbeh"
|
|
||||||
];
|
|
||||||
id = "mobile";
|
|
||||||
label = "mobile";
|
|
||||||
versioning.type = "trashcan";
|
|
||||||
versioning.params.cleanoutDays = 100;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,18 +2,20 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
|
niveumPackages,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
inherit (lib.strings) makeBinPath;
|
inherit (lib.strings) makeBinPath;
|
||||||
in
|
inherit (import ../lib) localAddresses kieran;
|
||||||
{
|
defaultApplications = (import ../lib).defaultApplications {inherit pkgs;};
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.self.nixosModules.system-dependent
|
inputs.self.nixosModules.system-dependent
|
||||||
|
inputs.self.nixosModules.traadfri
|
||||||
inputs.self.nixosModules.power-action
|
inputs.self.nixosModules.power-action
|
||||||
{
|
{
|
||||||
boot.supportedFilesystems = [ "ntfs" ];
|
boot.supportedFilesystems = ["ntfs"];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
@@ -23,12 +25,13 @@ in
|
|||||||
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||||
};
|
};
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
|
"qtwebkit-5.212.0-alpha4"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
boot.tmp.cleanOnBoot = true;
|
boot.cleanTmpDir = true;
|
||||||
boot.loader.timeout = 1;
|
boot.loader.timeout = 1;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -53,6 +56,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
options = {
|
options = {
|
||||||
selection-clipboard = "clipboard";
|
selection-clipboard = "clipboard";
|
||||||
|
recolor-keephue = true;
|
||||||
# first-page-column = "1:1"; # makes side-by-side mode start on the left side
|
# first-page-column = "1:1"; # makes side-by-side mode start on the left side
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -65,96 +69,117 @@ in
|
|||||||
|
|
||||||
users.users.me = {
|
users.users.me = {
|
||||||
name = "kfm";
|
name = "kfm";
|
||||||
description = pkgs.lib.niveum.kieran.name;
|
description = kieran.name;
|
||||||
hashedPasswordFile = config.age.secrets.kfm-password.path;
|
hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
uid = 1000;
|
uid = 1000;
|
||||||
extraGroups = [
|
|
||||||
"pipewire"
|
|
||||||
"audio"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
nix.settings.trusted-users = [ config.users.users.me.name ];
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
kfm-password.file = ../secrets/kfm-password.age;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me.xdg.enable = true;
|
home-manager.users.me.xdg.enable = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
environment.interactiveShellInit = "export PATH=$PATH";
|
environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
|
||||||
environment.shellAliases =
|
environment.shellAliases = let
|
||||||
let
|
wcd = pkgs.writers.writeDash "wcd" ''
|
||||||
swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
|
cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
|
||||||
in
|
'';
|
||||||
{
|
where = pkgs.writers.writeDash "where" ''
|
||||||
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname
|
||||||
ns = "nix-shell --run zsh";
|
'';
|
||||||
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
take = pkgs.writers.writeDash "take" ''
|
||||||
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
mkdir "$1" && cd "$1"
|
||||||
tmux = "${pkgs.tmux}/bin/tmux -2";
|
'';
|
||||||
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
cdt = pkgs.writers.writeDash "cdt" ''
|
||||||
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
cd "$(mktemp -d)"
|
||||||
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
pwd
|
||||||
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
'';
|
||||||
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic"; # Download with audio
|
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
|
||||||
};
|
in {
|
||||||
|
"ß" = "${pkgs.util-linux}/bin/setsid";
|
||||||
|
cat = "${pkgs.bat}/bin/bat --style=plain";
|
||||||
|
chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
|
||||||
|
cp = "cp --interactive";
|
||||||
|
ip = "${pkgs.iproute2}/bin/ip -c";
|
||||||
|
l = "ls --color=auto --time-style=long-iso --almost-all";
|
||||||
|
ls = "ls --color=auto --time-style=long-iso";
|
||||||
|
ll = "ls --color=auto --time-style=long-iso -l";
|
||||||
|
la = "ls --color=auto --time-style=long-iso --almost-all -l";
|
||||||
|
mv = "mv --interactive";
|
||||||
|
nixi = "nix repl '<nixpkgs>'";
|
||||||
|
ns = "nix-shell --run zsh";
|
||||||
|
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
||||||
|
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
||||||
|
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
||||||
|
rm = "rm --interactive";
|
||||||
|
s = "${pkgs.systemd}/bin/systemctl";
|
||||||
|
take = "source ${take}";
|
||||||
|
cdt = "source ${cdt}";
|
||||||
|
vit = "$EDITOR $(mktemp)";
|
||||||
|
tmux = "${pkgs.tmux}/bin/tmux -2";
|
||||||
|
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
|
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
||||||
|
us = "${pkgs.systemd}/bin/systemctl --user";
|
||||||
|
wcd = "source ${wcd}";
|
||||||
|
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
||||||
|
where = "source ${where}";
|
||||||
|
yt = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -ic"; # Download video link
|
||||||
|
yta = "${pkgs.yt-dlp}/bin/yt-dlp --add-metadata -xic"; # Download with audio
|
||||||
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
i18n = {
|
i18n = {
|
||||||
defaultLocale = "en_DK.UTF-8";
|
defaultLocale = "en_DK.UTF-8";
|
||||||
supportedLocales = [ "all" ];
|
supportedLocales = ["all"];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
services.displayManager = {
|
|
||||||
autoLogin = {
|
|
||||||
enable = true;
|
|
||||||
user = config.users.users.me.name;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
displayManager.lightdm = {
|
displayManager = {
|
||||||
enable = true;
|
autoLogin = {
|
||||||
greeters.gtk = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
indicators = [
|
user = config.users.users.me.name;
|
||||||
"~spacer"
|
};
|
||||||
"~host"
|
lightdm = {
|
||||||
"~spacer"
|
enable = true;
|
||||||
"~session"
|
greeters.gtk = {
|
||||||
"~power"
|
enable = true;
|
||||||
];
|
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
programs.gnupg = {
|
security.wrappers = {
|
||||||
agent = {
|
pmount = {
|
||||||
|
setuid = true;
|
||||||
|
owner = "root";
|
||||||
|
group = "root";
|
||||||
|
source = "${pkgs.pmount}/bin/pmount";
|
||||||
|
};
|
||||||
|
pumount = {
|
||||||
|
setuid = true;
|
||||||
|
owner = "root";
|
||||||
|
group = "root";
|
||||||
|
source = "${pkgs.pmount}/bin/pumount";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{programs.command-not-found.enable = true;}
|
||||||
|
{
|
||||||
|
home-manager.users.me = {
|
||||||
|
services.gpg-agent = rec {
|
||||||
enable = true;
|
enable = true;
|
||||||
pinentryPackage = pkgs.pinentry-qt;
|
enableZshIntegration = true;
|
||||||
settings =
|
defaultCacheTtl = 2 * 60 * 60;
|
||||||
let
|
maxCacheTtl = 4 * defaultCacheTtl;
|
||||||
defaultCacheTtl = 2 * 60 * 60;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
default-cache-ttl = defaultCacheTtl;
|
|
||||||
max-cache-ttl = 4 * defaultCacheTtl;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.gnupg
|
pkgs.gnupg
|
||||||
(pkgs.pass.withExtensions (e: [
|
(pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
|
||||||
e.pass-otp
|
|
||||||
e.pass-import
|
|
||||||
e.pass-genphrase
|
|
||||||
]))
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -162,25 +187,26 @@ in
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
services.getty = {
|
services.getty = {
|
||||||
greetingLine = lib.mkForce "As-salamu alaykum wa rahmatullahi wa barakatuh!";
|
greetingLine = lib.mkForce "";
|
||||||
helpLine = lib.mkForce "";
|
helpLine = lib.mkForce "";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
networking.hosts = lib.mapAttrs' (name: address: {
|
networking.hosts =
|
||||||
name = address;
|
lib.mapAttrs' (name: address: {
|
||||||
value = [ "${name}.local" ];
|
name = address;
|
||||||
}) pkgs.lib.niveum.localAddresses;
|
value = ["${name}.local"];
|
||||||
|
})
|
||||||
|
localAddresses;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
home-manager.users.me.home.stateVersion = "22.05";
|
home-manager.users.me.home.stateVersion = "22.05";
|
||||||
home-manager.backupFileExtension = "bak";
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
systemd.user.services.udiskie = {
|
systemd.user.services.udiskie = {
|
||||||
after = [ "udisks2.service" ];
|
after = ["udisks2.service"];
|
||||||
wants = [ "udisks2.service" ];
|
wants = ["udisks2.service"];
|
||||||
wantedBy = [ "graphical-session.target" ];
|
wantedBy = ["graphical-session.target"];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
|
ExecStart = "${pkgs.udiskie}/bin/udiskie --verbose --no-config --notify";
|
||||||
};
|
};
|
||||||
@@ -191,37 +217,33 @@ in
|
|||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
# Change the default terminal for Nemo
|
# Change the default terminal for Nemo
|
||||||
"org/cinnamon/desktop/applications/terminal".exec = lib.getExe pkgs.niveum-terminal;
|
"org/cinnamon/desktop/applications/terminal".exec = defaultApplications.terminal;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
./android.nix
|
|
||||||
./admin-essentials.nix
|
|
||||||
./stylix.nix
|
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
./backup.nix
|
./backup.nix
|
||||||
./bash.nix
|
./bash.nix
|
||||||
|
./beets.nix
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
./aerc.nix
|
./aerc.nix
|
||||||
|
./ccc.nix
|
||||||
./khal.nix
|
./khal.nix
|
||||||
./browser.nix
|
./chromium.nix
|
||||||
./clipboard.nix
|
./clipboard.nix
|
||||||
./cloud.nix
|
./cloud.nix
|
||||||
./direnv.nix
|
./direnv.nix
|
||||||
./docker.nix
|
./docker.nix
|
||||||
./dunst.nix
|
./dunst.nix
|
||||||
|
./flix.nix
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./fzf.nix
|
./fzf.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./hledger.nix
|
./hledger.nix
|
||||||
./htop.nix
|
./htop.nix
|
||||||
./uni.nix
|
./hu-berlin.nix
|
||||||
./i3.nix
|
./i3.nix
|
||||||
./i3status-rust.nix
|
./keyboard.nix
|
||||||
./keyboard
|
|
||||||
./mycelium.nix
|
|
||||||
./kdeconnect.nix
|
|
||||||
{ services.upower.enable = true; }
|
|
||||||
./lb.nix
|
./lb.nix
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./mime.nix
|
./mime.nix
|
||||||
@@ -230,48 +252,30 @@ in
|
|||||||
./newsboat.nix
|
./newsboat.nix
|
||||||
./flameshot.nix
|
./flameshot.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./virtualization.nix
|
./picom.nix
|
||||||
./stardict.nix
|
./stardict.nix
|
||||||
./polkit.nix
|
./polkit.nix
|
||||||
|
./power-action.nix
|
||||||
./printing.nix
|
./printing.nix
|
||||||
|
# ./openweathermap.nix
|
||||||
|
./wallpaper.nix
|
||||||
./redshift.nix
|
./redshift.nix
|
||||||
./retiolum.nix
|
./retiolum.nix
|
||||||
./rofi.nix
|
./rofi.nix
|
||||||
./spacetime.nix
|
./spacetime.nix
|
||||||
|
./seafile.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
./sshd.nix
|
./sshd.nix
|
||||||
./sound.nix
|
./sound.nix
|
||||||
./sudo.nix
|
./sudo.nix
|
||||||
|
./themes.nix
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
|
./traadfri.nix
|
||||||
./unclutter.nix
|
./unclutter.nix
|
||||||
./vscode.nix
|
./vscode.nix
|
||||||
./watson.nix
|
./watson.nix
|
||||||
./wallpaper.nix
|
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
{
|
|
||||||
home-manager.users.me.home.file.".zshrc".text = ''
|
|
||||||
# nothing to see here
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
./tor.nix
|
./tor.nix
|
||||||
./mastodon-bot.nix
|
./mastodon-bot.nix
|
||||||
{
|
|
||||||
home-manager.users.me = {
|
|
||||||
xdg.userDirs =
|
|
||||||
let
|
|
||||||
pictures = "${config.users.users.me.home}/cloud/nextcloud/Bilder";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
enable = true;
|
|
||||||
documents = "${config.users.users.me.home}/cloud/nextcloud/Documents";
|
|
||||||
desktop = "/tmp";
|
|
||||||
download = "${config.users.users.me.home}/sync/Downloads";
|
|
||||||
music = "${config.users.users.me.home}/mobile/audio";
|
|
||||||
publicShare = "${config.users.users.me.home}/cloud/nextcloud/tmp";
|
|
||||||
videos = pictures;
|
|
||||||
pictures = pictures;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
|
||||||
nixify = pkgs.writers.writeDashBin "nixify" ''
|
nixify = pkgs.writers.writeDashBin "nixify" ''
|
||||||
set -efuC
|
set -efuC
|
||||||
|
|
||||||
@@ -17,12 +16,8 @@ let
|
|||||||
''${EDITOR:-vim} shell.nix
|
''${EDITOR:-vim} shell.nix
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
in
|
in {
|
||||||
{
|
environment.systemPackages = [pkgs.direnv nixify];
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.direnv
|
|
||||||
nixify
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.users.me.programs.direnv = {
|
home-manager.users.me.programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
15
configs/distrobump.nix
Normal file
15
configs/distrobump.nix
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
(import <stockholm/makefu/3modules/bump-distrowatch.nix> {
|
||||||
|
inherit lib config;
|
||||||
|
pkgs = pkgs // {writeDash = pkgs.writers.writeDash;};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
makefu.distrobump.enable = false;
|
||||||
|
}
|
||||||
@@ -2,8 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c
|
# for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c
|
||||||
@@ -12,9 +11,6 @@
|
|||||||
"--fixed-cidr=172.39.1.0/25"
|
"--fixed-cidr=172.39.1.0/25"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
users.users.me.extraGroups = [ "docker" ];
|
users.users.me.extraGroups = ["docker"];
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [pkgs.docker pkgs.docker-compose];
|
||||||
pkgs.docker
|
|
||||||
pkgs.docker-compose
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +1,26 @@
|
|||||||
{
|
{
|
||||||
lib,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
inherit (import ../lib) defaultApplications colours theme;
|
||||||
sgr = code: string: ''\u001b[${code}m${string}\u001b[0m'';
|
in {
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.writers.writeDashBin "notifications" ''
|
|
||||||
${pkgs.dunst}/bin/dunstctl history \
|
|
||||||
| ${pkgs.jq}/bin/jq -r '
|
|
||||||
.data[]
|
|
||||||
| map("${sgr "90" ''\(.appname.data)''} ${sgr "1" ''\(.summary.data)''} ${sgr "31" ''\(.body.data | gsub("\n"; " | "))''}")
|
|
||||||
| join("\n")'
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.users.me.services.dunst = {
|
home-manager.users.me.services.dunst = {
|
||||||
enable = true;
|
enable = true;
|
||||||
iconTheme = pkgs.lib.niveum.theme.icon;
|
iconTheme = (theme pkgs).icon;
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
transparency = 10;
|
transparency = 10;
|
||||||
|
font = "Monospace 8";
|
||||||
geometry = "200x5-30+20";
|
geometry = "200x5-30+20";
|
||||||
|
frame_color = colours.foreground;
|
||||||
follow = "mouse";
|
follow = "mouse";
|
||||||
indicate_hidden = true;
|
indicate_hidden = true;
|
||||||
notification_height = 0;
|
notification_height = 0;
|
||||||
separator_height = 2;
|
separator_height = 2;
|
||||||
padding = 8;
|
padding = 8;
|
||||||
horizontal_padding = 8;
|
horizontal_padding = 8;
|
||||||
|
separator_color = "auto";
|
||||||
sort = true;
|
sort = true;
|
||||||
markup = "full";
|
markup = "full";
|
||||||
format = "%a\\n<b>%s</b>\\n%b";
|
format = "%a\\n<b>%s</b>\\n%b";
|
||||||
@@ -45,20 +36,29 @@ in
|
|||||||
sticky_history = true;
|
sticky_history = true;
|
||||||
history_length = 20;
|
history_length = 20;
|
||||||
dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run";
|
dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run";
|
||||||
browser = lib.getExe pkgs.niveum-browser;
|
browser = (defaultApplications pkgs).browser;
|
||||||
verbosity = "mesg";
|
verbosity = "mesg";
|
||||||
corner_radius = 0;
|
corner_radius = 0;
|
||||||
mouse_left_click = "do_action";
|
mouse_left_click = "do_action";
|
||||||
mouse_right_click = "close_current";
|
mouse_right_click = "close_current";
|
||||||
mouse_middle_click = "close_all";
|
mouse_middle_click = "close_all";
|
||||||
};
|
};
|
||||||
urgency_low = {
|
urgency_low = rec {
|
||||||
|
frame_color = background;
|
||||||
|
background = colours.foreground;
|
||||||
|
foreground = colours.background;
|
||||||
timeout = 5;
|
timeout = 5;
|
||||||
};
|
};
|
||||||
urgency_normal = {
|
urgency_normal = rec {
|
||||||
|
frame_color = background;
|
||||||
|
background = colours.foreground;
|
||||||
|
foreground = colours.background;
|
||||||
timeout = 10;
|
timeout = 10;
|
||||||
};
|
};
|
||||||
urgency_critical = {
|
urgency_critical = rec {
|
||||||
|
frame_color = background;
|
||||||
|
background = colours.red.dark;
|
||||||
|
foreground = colours.background;
|
||||||
timeout = 0;
|
timeout = 0;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
services.flameshot = {
|
services.flameshot = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -11,12 +10,13 @@
|
|||||||
autoCloseIdleDaemon = true;
|
autoCloseIdleDaemon = true;
|
||||||
drawColor = "#ff0000";
|
drawColor = "#ff0000";
|
||||||
drawThickness = 2;
|
drawThickness = 2;
|
||||||
|
checkForUpdates = false;
|
||||||
showDesktopNotification = true;
|
showDesktopNotification = true;
|
||||||
disabledTrayIcon = true;
|
disabledTrayIcon = true;
|
||||||
showHelp = false;
|
showHelp = false;
|
||||||
squareMagnifier = true;
|
squareMagnifier = true;
|
||||||
uploadWithoutConfirmation = true;
|
uploadWithoutConfirmation = true;
|
||||||
# buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
|
buttons = ''@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x10\0\0\0\x2\0\0\0\x5\0\0\0\x13\0\0\0\xa\0\0\0\x1\0\0\0\xc\0\0\0\xd\0\0\0\x6\0\0\0\x8\0\0\0\0\0\0\0\xf\0\0\0\x4\0\0\0\xb\0\0\0\x3\0\0\0\x12\0\0\0\x9)'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
98
configs/flix.nix
Normal file
98
configs/flix.nix
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
{
|
||||||
|
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 '{}'
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,32 +1,28 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
niveumPackages,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
zip-font = name: arguments: let
|
||||||
zip-font =
|
directory = pkgs.fetchzip arguments;
|
||||||
name: arguments:
|
in
|
||||||
let
|
pkgs.runCommand name {} ''
|
||||||
directory = pkgs.fetchzip arguments;
|
|
||||||
in
|
|
||||||
pkgs.runCommand name { } ''
|
|
||||||
mkdir -p $out/share/fonts/{truetype,opentype,woff}
|
mkdir -p $out/share/fonts/{truetype,opentype,woff}
|
||||||
${pkgs.findutils}/bin/find ${directory} -name '*.ttf' -exec install '{}' $out/share/fonts/truetype \;
|
${pkgs.findutils}/bin/find ${directory} -name '*.ttf' -exec install '{}' $out/share/fonts/truetype \;
|
||||||
${pkgs.findutils}/bin/find ${directory} -name '*.otf' -exec install '{}' $out/share/fonts/opentype \;
|
${pkgs.findutils}/bin/find ${directory} -name '*.otf' -exec install '{}' $out/share/fonts/opentype \;
|
||||||
${pkgs.findutils}/bin/find ${directory} -name '*.woff' -exec install '{}' $out/share/fonts/woff \;
|
${pkgs.findutils}/bin/find ${directory} -name '*.woff' -exec install '{}' $out/share/fonts/woff \;
|
||||||
'';
|
'';
|
||||||
simple-ttf =
|
simple-ttf = name: arguments: let
|
||||||
name: arguments:
|
file = pkgs.fetchurl arguments;
|
||||||
let
|
in
|
||||||
file = pkgs.fetchurl arguments;
|
pkgs.runCommand name {} ''
|
||||||
in
|
|
||||||
pkgs.runCommand name { } ''
|
|
||||||
mkdir -p $out/share/fonts/truetype
|
mkdir -p $out/share/fonts/truetype
|
||||||
install ${file} $out/share/fonts/truetype
|
install ${file} $out/share/fonts/truetype
|
||||||
'';
|
'';
|
||||||
|
|
||||||
egyptianHiero = zip-font "EgyptianHiero" {
|
egyptianHiero = zip-font "EgyptianHiero" {
|
||||||
url = "https://github.com/MKilani/Djehuty/archive/master.zip";
|
url = "https://github.com/MKilani/Djehuty/archive/master.zip";
|
||||||
sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c=";
|
sha256 = "sha256-KbY4vedm757NWfDlgmNhslbZd+2Vs+o5PjtMMGDt61Y=";
|
||||||
};
|
};
|
||||||
antinoou = zip-font "Antinoou" {
|
antinoou = zip-font "Antinoou" {
|
||||||
url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
|
url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
|
||||||
@@ -35,9 +31,13 @@ let
|
|||||||
};
|
};
|
||||||
newGardiner = zip-font "NewGardiner" {
|
newGardiner = zip-font "NewGardiner" {
|
||||||
url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
|
url = "https://mjn.host.cs.st-andrews.ac.uk/egyptian/fonts/NewGardiner.zip";
|
||||||
hash = "sha256-nP0y4ILt+0mlkDRdCNSeO2Gequ8wyix/qQdmujTNw3Y=";
|
sha256 = "1jd0qa6shh9pqqyig2w43m9l9rv1i50l73jzkhb6g6mqxbhb1mip";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
|
junicode2 = zip-font "JunicodeTwo" {
|
||||||
|
url = "https://github.com/psb1558/Junicode-font/archive/48bf476db278c844c67542b04d1e0e4c71f139d2.zip";
|
||||||
|
sha256 = "1ryicc155vkvgv3315ddliigwa01afwyb4c4f6pnqcns03af001i";
|
||||||
|
};
|
||||||
newAthenaUnicode = zip-font "NewAthenaUnicode" {
|
newAthenaUnicode = zip-font "NewAthenaUnicode" {
|
||||||
url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
|
url = "https://classicalstudies.org/sites/default/files/userfiles/files/NAU5_005.zip";
|
||||||
sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
|
sha256 = "1g7qk9gl4nq2dz41bvck1nzilhin44j8691cxax3dlp77bbn9bxr";
|
||||||
@@ -46,28 +46,15 @@ let
|
|||||||
url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
|
url = "http://files.qenherkhopeshef.org/jsesh/JSeshFont.ttf";
|
||||||
sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
|
sha256 = "1203jrk2xzvgckcc5hx88kja1i3h8gm1wiyla5j6gspc0hbv56ry";
|
||||||
};
|
};
|
||||||
egyptianTextBeta = simple-ttf "EgyptianText-1.0beta" {
|
egyptianText = simple-ttf "EgyptianText-1.0beta" {
|
||||||
url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
|
url = "http://c.krebsco.de/EgyptianText-v1.0-beta.ttf";
|
||||||
sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
|
sha256 = "0cfjbk7xxnxhlp6v922psm5j1xzrv6wfk226ji2wz2yfrnkbcbsv";
|
||||||
};
|
};
|
||||||
coranica = simple-ttf "Coranica" {
|
in {
|
||||||
url = "https://corpuscoranicum.de/fonts/coranica_1164.ttf";
|
|
||||||
sha256 = "0igi8q8b2p38x9jq8c98afsl7bf8rj32zj2052yyjgj9r88y4yi5";
|
|
||||||
};
|
|
||||||
koineGreek = simple-ttf "KoineGreek.ttf" {
|
|
||||||
url = "https://github.com/Center-for-New-Testament-Restoration/font/raw/af83eed50105344edaa5e5eddaf87696e271468c/KoineGreek.ttf";
|
|
||||||
hash = "sha256-YtC+nj7+Jl8k00rqAAqySYc8iTAOL7PixXc+LfSmnS0=";
|
|
||||||
};
|
|
||||||
egyptianText = simple-ttf "EgyptianText" {
|
|
||||||
url = "https://github.com/microsoft/font-tools/raw/1092cb23520967830001a0807eb21d6a44dda522/EgyptianOpenType/font/eot.ttf";
|
|
||||||
sha256 = "1n294vhcx90270pnsw1dbk6izd61fjvbnjrh4hcf98ff3s540x0c";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultPackages = true;
|
enableDefaultFonts = true;
|
||||||
fontDir.enable = true;
|
fontDir.enable = true;
|
||||||
packages = with pkgs; [
|
fonts = with pkgs; [
|
||||||
alegreya
|
alegreya
|
||||||
alegreya-sans
|
alegreya-sans
|
||||||
amiri
|
amiri
|
||||||
@@ -78,26 +65,22 @@ in
|
|||||||
charis-sil
|
charis-sil
|
||||||
doulos-sil
|
doulos-sil
|
||||||
newAthenaUnicode
|
newAthenaUnicode
|
||||||
coranica
|
|
||||||
corefonts
|
corefonts
|
||||||
crimson
|
crimson
|
||||||
eb-garamond
|
eb-garamond
|
||||||
ipaexfont
|
|
||||||
jsesh
|
jsesh
|
||||||
egyptianHiero
|
egyptianHiero
|
||||||
egyptianText
|
egyptianText
|
||||||
egyptianTextBeta
|
|
||||||
font-awesome_6
|
font-awesome_6
|
||||||
etBook
|
etBook
|
||||||
newGardiner
|
newGardiner
|
||||||
junicode
|
junicode2
|
||||||
koineGreek
|
|
||||||
# brill
|
|
||||||
ezra-sil
|
ezra-sil
|
||||||
fira
|
fira
|
||||||
font-awesome
|
font-awesome
|
||||||
galatia-sil
|
galatia-sil
|
||||||
gentium
|
gentium
|
||||||
|
niveumPackages.gfs-fonts
|
||||||
gyre-fonts
|
gyre-fonts
|
||||||
ibm-plex
|
ibm-plex
|
||||||
jetbrains-mono
|
jetbrains-mono
|
||||||
@@ -106,45 +89,28 @@ in
|
|||||||
lmodern
|
lmodern
|
||||||
merriweather
|
merriweather
|
||||||
ocr-a
|
ocr-a
|
||||||
montserrat
|
|
||||||
roboto
|
roboto
|
||||||
roboto-mono
|
roboto-mono
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk
|
||||||
noto-fonts-color-emoji
|
noto-fonts-emoji
|
||||||
roboto-slab
|
roboto-slab
|
||||||
scheherazade-new
|
scheherazade-new
|
||||||
source-code-pro
|
source-code-pro
|
||||||
source-sans-pro
|
source-sans-pro
|
||||||
source-serif-pro
|
source-serif-pro
|
||||||
theano
|
theano
|
||||||
tocharian-font
|
niveumPackages.tocharian-font
|
||||||
vista-fonts
|
vistafonts
|
||||||
vollkorn
|
vollkorn
|
||||||
zilla-slab
|
zilla-slab
|
||||||
]; # google-fonts league-of-moveable-type
|
]; # google-fonts league-of-moveable-type
|
||||||
fontconfig.defaultFonts =
|
fontconfig.defaultFonts = rec {
|
||||||
let
|
monospace = ["Noto Sans Mono"] ++ emoji;
|
||||||
emoji = [ "Noto Color Emoji" ];
|
serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
|
||||||
in
|
sansSerif = ["Noto Sans Display" "Noto Kufi Arabic" "Noto Sans Devanagari" "Noto Sans CJK JP"];
|
||||||
{
|
emoji = ["Noto Color Emoji"];
|
||||||
monospace = [ "Noto Sans Mono" ] ++ emoji;
|
};
|
||||||
serif = [
|
|
||||||
"Noto Serif"
|
|
||||||
"Noto Naskh Arabic"
|
|
||||||
"Noto Serif Devanagari"
|
|
||||||
];
|
|
||||||
sansSerif = [
|
|
||||||
"Noto Sans Display"
|
|
||||||
"Noto Naskh Arabic"
|
|
||||||
"Noto Sans Hebrew"
|
|
||||||
"Noto Sans Devanagari"
|
|
||||||
"Noto Sans CJK JP"
|
|
||||||
"Noto Sans Coptic"
|
|
||||||
"Noto Sans Syriac Western"
|
|
||||||
];
|
|
||||||
inherit emoji;
|
|
||||||
};
|
|
||||||
# xelatex fails with woff files
|
# xelatex fails with woff files
|
||||||
# ref https://tex.stackexchange.com/questions/392144/xelatex-and-fontspec-crash-trying-to-find-woff-file-for-some-fonts-but-not-other
|
# ref https://tex.stackexchange.com/questions/392144/xelatex-and-fontspec-crash-trying-to-find-woff-file-for-some-fonts-but-not-other
|
||||||
fontconfig.localConf = ''
|
fontconfig.localConf = ''
|
||||||
|
|||||||
@@ -1,27 +1,37 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
programs.fzf = {
|
pkgs,
|
||||||
fuzzyCompletion = true;
|
lib,
|
||||||
keybindings = true;
|
...
|
||||||
|
}: {
|
||||||
|
environment = {
|
||||||
|
systemPackages = [pkgs.fzf];
|
||||||
|
variables = rec {
|
||||||
|
FZF_DEFAULT_COMMAND = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
|
||||||
|
FZF_DEFAULT_OPTS =
|
||||||
|
lib.escapeShellArgs ["--height=40%"];
|
||||||
|
FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
|
||||||
|
FZF_ALT_C_OPTS = lib.escapeShellArgs [
|
||||||
|
"--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
|
||||||
|
"--bind=space:toggle-preview"
|
||||||
|
"--preview-window=hidden"
|
||||||
|
];
|
||||||
|
FZF_CTRL_T_COMMAND = FZF_DEFAULT_COMMAND;
|
||||||
|
FZF_CTRL_T_OPTS =
|
||||||
|
lib.escapeShellArgs ["--preview='head -$LINES {}'"];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me = {
|
programs.zsh.interactiveShellInit = ''
|
||||||
programs.fzf =
|
if [[ $options[zle] = on ]]; then
|
||||||
let
|
. ${pkgs.fzf}/share/fzf/completion.zsh
|
||||||
defaultCommand = "${pkgs.fd}/bin/fd --type f --strip-cwd-prefix --follow --no-ignore-vcs --exclude .git";
|
. ${pkgs.fzf}/share/fzf/key-bindings.zsh
|
||||||
in
|
fi
|
||||||
{
|
'';
|
||||||
enable = true;
|
|
||||||
defaultCommand = defaultCommand;
|
programs.bash.interactiveShellInit = ''
|
||||||
defaultOptions = [ "--height=40%" ];
|
if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
|
||||||
changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
|
. ${pkgs.fzf}/share/fzf/completion.bash
|
||||||
changeDirWidgetOptions = [
|
. ${pkgs.fzf}/share/fzf/key-bindings.bash
|
||||||
"--preview='${pkgs.tree}/bin/tree -L 1 {}'"
|
fi
|
||||||
"--bind=space:toggle-preview"
|
'';
|
||||||
"--preview-window=hidden"
|
|
||||||
];
|
|
||||||
fileWidgetCommand = defaultCommand;
|
|
||||||
fileWidgetOptions = [ "--preview='head -$LINES {}'" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.zeroad
|
|
||||||
pkgs.mari0
|
|
||||||
pkgs.luanti # fka minetest
|
|
||||||
# pkgs.openarena
|
|
||||||
# pkgs.teeworlds
|
|
||||||
pkgs.nethack
|
|
||||||
# pkgs.freeciv
|
|
||||||
# pkgs.lincity-ng
|
|
||||||
# pkgs.superTuxKart
|
|
||||||
|
|
||||||
pkgs.morris
|
|
||||||
pkgs.gnome-chess
|
|
||||||
pkgs.gnuchess
|
|
||||||
];
|
|
||||||
networking.firewall = {
|
|
||||||
# for 0ad multiplayer
|
|
||||||
allowedTCPPorts = [ 20595 ];
|
|
||||||
allowedUDPPorts = [ 20595 ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,21 +1,25 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
config,
|
||||||
lib,
|
lib,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
{
|
inherit (import ../lib) kieran ignorePaths;
|
||||||
|
in {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.mr
|
pkgs.mr
|
||||||
pkgs.gitFull
|
pkgs.git
|
||||||
pkgs.git-crypt
|
pkgs.git-crypt
|
||||||
pkgs.gitflow
|
pkgs.gitAndTools.gitflow
|
||||||
pkgs.gh
|
pkgs.gitAndTools.gh
|
||||||
pkgs.git-extras
|
pkgs.gitAndTools.git-extras
|
||||||
# pkgs.git-trim
|
pkgs.gitAndTools.git-trim
|
||||||
pkgs.git-absorb
|
pkgs.gitAndTools.git-absorb
|
||||||
pkgs.gitstats
|
pkgs.gitstats
|
||||||
pkgs.patch
|
pkgs.patch
|
||||||
pkgs.patchutils
|
pkgs.patchutils
|
||||||
|
inputs.self.packages.x86_64-linux.git-preview
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.shellAliases = {
|
environment.shellAliases = {
|
||||||
@@ -26,8 +30,10 @@
|
|||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.gitFull;
|
package = pkgs.gitAndTools.gitFull;
|
||||||
settings.alias = {
|
userName = kieran.name;
|
||||||
|
userEmail = kieran.email;
|
||||||
|
aliases = {
|
||||||
br = "branch";
|
br = "branch";
|
||||||
co = "checkout";
|
co = "checkout";
|
||||||
ci = "commit";
|
ci = "commit";
|
||||||
@@ -40,13 +46,19 @@
|
|||||||
logs = "log --pretty=oneline";
|
logs = "log --pretty=oneline";
|
||||||
graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
|
graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
|
||||||
};
|
};
|
||||||
ignores = pkgs.lib.niveum.ignorePaths;
|
ignores = ignorePaths;
|
||||||
settings.user.name = pkgs.lib.niveum.kieran.name;
|
extraConfig = {
|
||||||
settings.user.email = pkgs.lib.niveum.kieran.email;
|
pull.ff = "only";
|
||||||
settings.pull.ff = "only";
|
rebase.autoStash = true;
|
||||||
settings.rebase.autoStash = true;
|
merge.autoStash = true;
|
||||||
settings.merge.autoStash = true;
|
|
||||||
settings.push.autoSetupRemove = true;
|
# # ref https://github.com/dandavison/delta
|
||||||
|
# core.pager = "${pkgs.delta}/bin/delta";
|
||||||
|
# interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
||||||
|
# delta.navigate = true;
|
||||||
|
# merge.conflictStyle = "diff3";
|
||||||
|
# diff.colorMoved = "default";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
services.xserver.desktopManager.gnome.enable = true;
|
|
||||||
}
|
|
||||||
@@ -1,30 +1,39 @@
|
|||||||
{
|
{
|
||||||
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
let
|
environment.systemPackages = let
|
||||||
ledgerDirectory = "/home/kfm/sync/src/ledger";
|
ledgerDirectory = "$HOME/projects/ledger";
|
||||||
hora = pkgs.callPackage ../packages/hora.nix { timeLedger = "${ledgerDirectory}/time.timeclock"; };
|
timeLedger = "${ledgerDirectory}/time.timeclock";
|
||||||
in
|
git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
|
||||||
{
|
in [
|
||||||
environment.systemPackages =
|
pkgs.hledger
|
||||||
let
|
(pkgs.writers.writeDashBin "hora-edit" ''
|
||||||
git = "${pkgs.git}/bin/git -C ${ledgerDirectory}";
|
$EDITOR + "${timeLedger}" && ${pkgs.git}/bin/git -C "$(${pkgs.coreutils}/bin/dirname ${timeLedger})" commit --all --message "$(${pkgs.coreutils}/bin/date -Im)"
|
||||||
in
|
'')
|
||||||
[
|
(pkgs.writers.writeDashBin "hora" ''
|
||||||
hora
|
${pkgs.hledger}/bin/hledger -f "${timeLedger}" "$@"
|
||||||
pkgs.hledger
|
'')
|
||||||
(pkgs.writers.writeDashBin "hledger-git" ''
|
(pkgs.writers.writeDashBin "hora-filli" ''
|
||||||
if [ "$1" = entry ]; then
|
${pkgs.hledger}/bin/hledger -f "${timeLedger}" register fillidefilla -O csv \
|
||||||
${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
|
-b "$(date -d "$(date +%Y-%m)-20 last month" +%Y-%m-%d)" \
|
||||||
${git} add balance.txt
|
-e "$(date -d "$(date +%Y-%m)-20" +%Y-%m-%d)" \
|
||||||
${git} commit --all --message="$(date -Im)"
|
| sed 's/(fillidefilla:\(.*\))/\1/g' \
|
||||||
else
|
| xsv select date,amount,total,account,description
|
||||||
${git} $*
|
'')
|
||||||
fi
|
|
||||||
'')
|
(pkgs.writers.writeDashBin "hledger-git" ''
|
||||||
(pkgs.writers.writeDashBin "hledger-edit" ''
|
if [ "$1" = entry ]; then
|
||||||
$EDITOR ${ledgerDirectory}/current.journal
|
${pkgs.hledger}/bin/hledger balance -V > "${ledgerDirectory}/balance.txt"
|
||||||
'')
|
${git} add balance.txt
|
||||||
];
|
${git} commit --all --message="$(date -Im)"
|
||||||
|
else
|
||||||
|
${git} $*
|
||||||
|
fi
|
||||||
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "hledger-edit" ''
|
||||||
|
$EDITOR ${ledgerDirectory}/current.journal
|
||||||
|
'')
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,20 +20,10 @@
|
|||||||
show_thread_names = false;
|
show_thread_names = false;
|
||||||
sort_descending = true;
|
sort_descending = true;
|
||||||
sort_key = "PERCENT_CPU";
|
sort_key = "PERCENT_CPU";
|
||||||
tree_view = false;
|
tree_view = true;
|
||||||
update_process_names = false;
|
update_process_names = false;
|
||||||
right_meters = [
|
right_meters = ["Uptime" "Tasks" "LoadAverage" "Battery"];
|
||||||
"Uptime"
|
left_meters = ["LeftCPUs2" "RightCPUs2" "Memory" "Swap"];
|
||||||
"Tasks"
|
|
||||||
"LoadAverage"
|
|
||||||
"Battery"
|
|
||||||
];
|
|
||||||
left_meters = [
|
|
||||||
"LeftCPUs2"
|
|
||||||
"RightCPUs2"
|
|
||||||
"Memory"
|
|
||||||
"Swap"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
86
configs/hu-berlin.nix
Normal file
86
configs/hu-berlin.nix
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (lib.strings) fileContents;
|
||||||
|
inherit (import ../lib) sshPort;
|
||||||
|
eduroam = {
|
||||||
|
identity = fileContents <secrets/eduroam/identity>;
|
||||||
|
password = fileContents <secrets/eduroam/password>;
|
||||||
|
};
|
||||||
|
hu-berlin-cifs-options = [
|
||||||
|
"uid=${toString config.users.users.me.uid}"
|
||||||
|
"gid=${toString config.users.groups.users.gid}"
|
||||||
|
"sec=ntlmv2"
|
||||||
|
"workgroup=german"
|
||||||
|
"credentials=${config.age.secrets.cifs-credentials-hu-berlin.path}"
|
||||||
|
"noauto"
|
||||||
|
# "x-systemd.requires=hu-vpn.service"
|
||||||
|
"x-systemd.automount"
|
||||||
|
"x-systemd.device-timeout=1"
|
||||||
|
"x-systemd.idle-timeout=1min"
|
||||||
|
];
|
||||||
|
in {
|
||||||
|
fileSystems."/media/hu-berlin/germpro2" = {
|
||||||
|
device = "//hugerm31c.user.hu-berlin.de/germpro2/ling";
|
||||||
|
fsType = "cifs";
|
||||||
|
options = hu-berlin-cifs-options;
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/media/hu-berlin/germhome" = {
|
||||||
|
device = "//hugerm31c.user.hu-berlin.de/germhome/ling/meinhaki";
|
||||||
|
fsType = "cifs";
|
||||||
|
options = hu-berlin-cifs-options;
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets.cifs-credentials-hu-berlin.file = ../secrets/cifs-credentials-hu-berlin.age;
|
||||||
|
|
||||||
|
home-manager.users.me.programs.ssh = {
|
||||||
|
matchBlocks = {
|
||||||
|
"alew.hu-berlin.de" = {
|
||||||
|
user = "centos";
|
||||||
|
hostname = "141.20.187.219";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
(pkgs.writers.writeDashBin "hu-ip" ''
|
||||||
|
${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
|
||||||
|
'')
|
||||||
|
(
|
||||||
|
pkgs.writers.writePython3Bin "hu-eduroam-install"
|
||||||
|
{
|
||||||
|
libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
|
||||||
|
flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
|
||||||
|
}
|
||||||
|
(builtins.readFile (builtins.fetchurl {
|
||||||
|
url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/linux-installer/eduroam-linux-hub.py";
|
||||||
|
sha256 = "19x2kvwxx13265b2hj5fjf53g0liw6dw7xf9j9cav67cswmz60kf";
|
||||||
|
}))
|
||||||
|
)
|
||||||
|
];
|
||||||
|
|
||||||
|
systemd.services.hu-vpn = {
|
||||||
|
enable = true;
|
||||||
|
wants = ["network-online.target"];
|
||||||
|
serviceConfig.LoadCredential = "password:${config.age.secrets.email-password-meinhark.path}";
|
||||||
|
script = ''
|
||||||
|
if ${pkgs.wirelesstools}/bin/iwgetid | ${pkgs.gnugrep}/bin/grep --invert-match eduroam
|
||||||
|
then
|
||||||
|
${pkgs.openfortivpn}/bin/openfortivpn \
|
||||||
|
--password="$(cat "$CREDENTIALS_DIRECTORY/password")" \
|
||||||
|
--config=${
|
||||||
|
pkgs.writeText "hu-berlin.config" ''
|
||||||
|
host = forti-ssl.vpn.hu-berlin.de
|
||||||
|
port = 443
|
||||||
|
username = meinhark
|
||||||
|
trusted-cert = 9e5dea8e077970d245900839f437ef7fb9551559501c7defd70af70ea568573d
|
||||||
|
''
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
440
configs/i3.nix
440
configs/i3.nix
@@ -2,44 +2,44 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
|
niveumPackages,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
inherit (import ../lib) defaultApplications colours;
|
||||||
klem = pkgs.klem.override {
|
klem = niveumPackages.klem.override {
|
||||||
options.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
|
config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
|
||||||
options.scripts = {
|
config.scripts = {
|
||||||
"p.r paste" = pkgs.writers.writeDash "p.r" ''
|
"p.r" = pkgs.writers.writeDash "p.r" ''
|
||||||
${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
|
${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
|
||||||
| ${pkgs.coreutils}/bin/tail --lines=1 \
|
| ${pkgs.coreutils}/bin/tail --lines=1 \
|
||||||
| ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
|
| ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
|
||||||
'';
|
'';
|
||||||
"envs.sh paste" = pkgs.writers.writeDash "envs-host" ''
|
# "envs.sh host" = pkgs.writers.writeDash "envs-host" ''
|
||||||
${pkgs.curl}/bin/curl -F "file=@-" https://envs.sh
|
# ${pkgs.curl}/bin/curl -F "file=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
'';
|
|
||||||
# this segfaults
|
|
||||||
# "envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
|
|
||||||
# ${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
|
||||||
# '';
|
# '';
|
||||||
|
"envs.sh mirror" = pkgs.writers.writeDash "envs-mirror" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "url=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
|
'';
|
||||||
"envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
|
"envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
|
||||||
${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
'';
|
'';
|
||||||
"go.r shorten" = pkgs.writers.writeDash "go.r" ''
|
"ix.io" = pkgs.writers.writeDash "ix.io" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io
|
||||||
|
'';
|
||||||
|
"go.r" = pkgs.writers.writeDash "go.r" ''
|
||||||
${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
|
${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
|
||||||
'';
|
'';
|
||||||
"4d2.org paste" = pkgs.writers.writeDash "4d2-paste" ''
|
"0x0.st" = pkgs.writers.writeDash "0x0.st" ''
|
||||||
${pkgs.curl}/bin/curl -F "file=@-" https://depot.4d2.org/
|
|
||||||
'';
|
|
||||||
"0x0.st shorten" = pkgs.writers.writeDash "0x0.st" ''
|
|
||||||
${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
|
${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
|
||||||
'';
|
'';
|
||||||
"rot13" = pkgs.writers.writeDash "rot13" ''
|
"rot13" = pkgs.writers.writeDash "rot13" ''
|
||||||
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
|
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
|
||||||
'';
|
'';
|
||||||
"ipa" = pkgs.writers.writeDash "ipa" ''
|
"ipa" = pkgs.writers.writeDash "ipa" ''
|
||||||
${pkgs.ipa}/bin/ipa
|
${niveumPackages.ipa}/bin/ipa
|
||||||
'';
|
'';
|
||||||
"betacode" = pkgs.writers.writeDash "betacode" ''
|
"betacode" = pkgs.writers.writeDash "betacode" ''
|
||||||
${pkgs.betacode}/bin/betacode
|
${niveumPackages.betacode}/bin/betacode
|
||||||
'';
|
'';
|
||||||
"curl" = pkgs.writers.writeDash "curl" ''
|
"curl" = pkgs.writers.writeDash "curl" ''
|
||||||
${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
|
${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
|
||||||
@@ -52,8 +52,14 @@ let
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
|
||||||
{
|
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 {
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
github-token-i3status-rust = {
|
github-token-i3status-rust = {
|
||||||
file = ../secrets/github-token-i3status-rust.age;
|
file = ../secrets/github-token-i3status-rust.age;
|
||||||
@@ -67,28 +73,14 @@ in
|
|||||||
group = config.users.users.me.group;
|
group = config.users.users.me.group;
|
||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
miniflux-api-token = {
|
|
||||||
file = ../secrets/miniflux-api-token.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
programs.slock.enable = true;
|
||||||
pkgs.xsecurelock
|
|
||||||
];
|
|
||||||
environment.sessionVariables = {
|
|
||||||
XSECURELOCK_NO_COMPOSITE = "1";
|
|
||||||
XSECURELOCK_BACKGROUND_COLOR = "navy";
|
|
||||||
XSECURELOCK_PASSWORD_PROMPT = "time_hex";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.displayManager.defaultSession = "none+i3";
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
|
displayManager.defaultSession = "none+i3";
|
||||||
windowManager.i3 = {
|
windowManager.i3 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.i3;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -107,76 +99,38 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.me =
|
home-manager.users.me.xsession.windowManager.i3 = let
|
||||||
let
|
modifier = "Mod4";
|
||||||
modifier = "Mod4";
|
in {
|
||||||
infoWorkspace = "ℹ";
|
enable = true;
|
||||||
messageWorkspace = "✉";
|
extraConfig = ''
|
||||||
modes.resize = {
|
bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
|
||||||
"Escape" = ''mode "default"'';
|
'';
|
||||||
"Return" = ''mode "default"'';
|
config = rec {
|
||||||
"h" = "resize shrink width 10 px or 5 ppt";
|
fonts = {
|
||||||
"j" = "resize grow height 10 px or 5 ppt";
|
names = ["Sans"];
|
||||||
"k" = "resize shrink height 10 px or 5 ppt";
|
size = 10.0;
|
||||||
"l" = "resize grow width 10 px or 5 ppt";
|
|
||||||
};
|
};
|
||||||
gaps.inner = 4;
|
inherit modifier;
|
||||||
floating = {
|
|
||||||
titlebar = false;
|
|
||||||
border = 1;
|
|
||||||
};
|
|
||||||
bars =
|
|
||||||
let
|
|
||||||
position = "bottom";
|
|
||||||
in
|
|
||||||
[
|
|
||||||
(lib.recursiveUpdate config.home-manager.users.me.stylix.targets.i3.exportedBarConfig {
|
|
||||||
workspaceButtons = true;
|
|
||||||
mode = "hide"; # "dock";
|
|
||||||
inherit position;
|
|
||||||
statusCommand = toString (
|
|
||||||
pkgs.writers.writeDash "i3status-rust" ''
|
|
||||||
export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
|
|
||||||
export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
|
|
||||||
exec ${config.home-manager.users.me.programs.i3status-rust.package}/bin/i3status-rs ${config.home-manager.users.me.home.homeDirectory}/.config/i3status-rust/config-${position}.toml
|
|
||||||
''
|
|
||||||
);
|
|
||||||
fonts = {
|
|
||||||
names = [
|
|
||||||
"${config.stylix.fonts.sansSerif.name}"
|
|
||||||
"FontAwesome 6 Free"
|
|
||||||
];
|
|
||||||
size = config.stylix.fonts.sizes.desktop * 0.8;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
window = {
|
window = {
|
||||||
titlebar = false;
|
titlebar = false;
|
||||||
border = 2;
|
border = 1;
|
||||||
hideEdgeBorders = "smart";
|
hideEdgeBorders = "smart";
|
||||||
commands = [
|
commands = [
|
||||||
{
|
{
|
||||||
criteria = {
|
criteria = {class = "floating";};
|
||||||
class = "floating";
|
|
||||||
};
|
|
||||||
command = "floating enable";
|
command = "floating enable";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
criteria = {
|
criteria = {class = "fzfmenu";};
|
||||||
class = "fzfmenu";
|
|
||||||
};
|
|
||||||
command = "floating enable";
|
command = "floating enable";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
criteria = {
|
criteria = {class = ".*";};
|
||||||
class = ".*";
|
|
||||||
};
|
|
||||||
command = "border pixel 2";
|
command = "border pixel 2";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
criteria = {
|
criteria = {class = "mpv";};
|
||||||
class = "mpv";
|
|
||||||
};
|
|
||||||
command = lib.strings.concatStringsSep ", " [
|
command = lib.strings.concatStringsSep ", " [
|
||||||
"floating enable"
|
"floating enable"
|
||||||
"sticky enable"
|
"sticky enable"
|
||||||
@@ -187,146 +141,196 @@ in
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
colors =
|
floating = {
|
||||||
let
|
titlebar = false;
|
||||||
background = config.lib.stylix.colors.withHashtag.base00;
|
border = 1;
|
||||||
in
|
};
|
||||||
|
colors = let
|
||||||
|
scheme = {
|
||||||
|
background = colours.background;
|
||||||
|
text = colours.foreground;
|
||||||
|
};
|
||||||
|
in rec {
|
||||||
|
focused =
|
||||||
|
scheme
|
||||||
|
// {
|
||||||
|
border = colours.blue.bright;
|
||||||
|
indicator = colours.blue.bright;
|
||||||
|
childBorder = colours.blue.bright;
|
||||||
|
};
|
||||||
|
unfocused =
|
||||||
|
scheme
|
||||||
|
// {
|
||||||
|
border = colours.background;
|
||||||
|
indicator = colours.background;
|
||||||
|
childBorder = colours.background;
|
||||||
|
};
|
||||||
|
focusedInactive = unfocused;
|
||||||
|
urgent =
|
||||||
|
scheme
|
||||||
|
// {
|
||||||
|
border = colours.red.bright;
|
||||||
|
indicator = colours.red.bright;
|
||||||
|
childBorder = colours.red.bright;
|
||||||
|
};
|
||||||
|
placeholder =
|
||||||
|
scheme
|
||||||
|
// {
|
||||||
|
border = colours.green.bright;
|
||||||
|
indicator = colours.green.bright;
|
||||||
|
childBorder = colours.green.bright;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
bars = [
|
||||||
{
|
{
|
||||||
unfocused = {
|
workspaceButtons = false;
|
||||||
border = lib.mkForce background;
|
fonts = {
|
||||||
childBorder = lib.mkForce background;
|
names = ["Monospace" "Font Awesome 6 Free"];
|
||||||
|
size = 8.0;
|
||||||
};
|
};
|
||||||
};
|
mode = "dock"; # "hide";
|
||||||
keybindings =
|
position = "bottom";
|
||||||
lib.listToAttrs (
|
colors = rec {
|
||||||
map (
|
background = colours.background;
|
||||||
x: lib.nameValuePair "${modifier}+Shift+${toString x}" "move container to workspace ${toString x}"
|
separator = background;
|
||||||
) (lib.range 1 9)
|
statusline = colours.foreground;
|
||||||
)
|
bindingMode = {
|
||||||
// lib.listToAttrs (
|
background = colours.red.bright;
|
||||||
map (x: lib.nameValuePair "${modifier}+${toString x}" "workspace ${toString x}") (lib.range 1 9)
|
border = colours.background;
|
||||||
)
|
text = colours.foreground;
|
||||||
// {
|
};
|
||||||
"${modifier}+i" = "workspace ${infoWorkspace}";
|
};
|
||||||
"${modifier}+m" = "workspace ${messageWorkspace}";
|
statusCommand = toString (pkgs.writers.writeDash "i3status-rust" ''
|
||||||
|
export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
|
||||||
|
export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"
|
||||||
|
${pkgs.i3status-rust}/bin/i3status-rs ${
|
||||||
|
(pkgs.formats.toml {}).generate "i3status-rust.toml" (import ../lib/i3status-rust.nix {
|
||||||
|
inherit (config.niveum) batteryName wirelessInterface;
|
||||||
|
inherit (config.home-manager.users.me.accounts.email) accounts;
|
||||||
|
inherit colours;
|
||||||
|
inherit pkgs;
|
||||||
|
})
|
||||||
|
}'');
|
||||||
|
}
|
||||||
|
];
|
||||||
|
modes.resize = {
|
||||||
|
"Escape" = ''mode "default"'';
|
||||||
|
"Return" = ''mode "default"'';
|
||||||
|
"h" = "resize shrink width 10 px or 5 ppt";
|
||||||
|
"j" = "resize grow height 10 px or 5 ppt";
|
||||||
|
"k" = "resize shrink height 10 px or 5 ppt";
|
||||||
|
"l" = "resize grow width 10 px or 5 ppt";
|
||||||
|
};
|
||||||
|
keybindings = {
|
||||||
|
"${modifier}+Shift+h" = "move left 25 px";
|
||||||
|
"${modifier}+Shift+j" = "move down 25 px";
|
||||||
|
"${modifier}+Shift+k" = "move up 25 px";
|
||||||
|
"${modifier}+Shift+l" = "move right 25 px";
|
||||||
|
"${modifier}+h" = "focus left";
|
||||||
|
"${modifier}+j" = "focus down";
|
||||||
|
"${modifier}+k" = "focus up";
|
||||||
|
"${modifier}+l" = "focus right";
|
||||||
|
|
||||||
"${modifier}+Shift+h" = "move left 25 px";
|
"${modifier}+Shift+b" = "move window to workspace prev";
|
||||||
"${modifier}+Shift+j" = "move down 25 px";
|
"${modifier}+Shift+n" = "move window to workspace next";
|
||||||
"${modifier}+Shift+k" = "move up 25 px";
|
"${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
|
||||||
"${modifier}+Shift+l" = "move right 25 px";
|
"${modifier}+b" = "workspace prev";
|
||||||
"${modifier}+h" = "focus left";
|
"${modifier}+n" = "workspace next";
|
||||||
"${modifier}+j" = "focus down";
|
"${modifier}+x" = "exec ${new-workspace}";
|
||||||
"${modifier}+k" = "focus up";
|
|
||||||
"${modifier}+l" = "focus right";
|
|
||||||
|
|
||||||
# "${modifier}+Shift+b" = "move container to workspace prev";
|
"${modifier}+Shift+c" = "reload";
|
||||||
# "${modifier}+Shift+n" = "move container to workspace next";
|
"${modifier}+Shift+q" = "kill";
|
||||||
# "${modifier}+b" = "workspace prev";
|
"${modifier}+Shift+r" = "restart";
|
||||||
# "${modifier}+n" = "workspace next";
|
|
||||||
|
|
||||||
"${modifier}+Shift+c" = "reload";
|
"${modifier}+z" = "sticky toggle";
|
||||||
"${modifier}+Shift+q" = "kill";
|
"${modifier}+Shift+z" = "floating toggle";
|
||||||
"${modifier}+Shift+r" = "restart";
|
|
||||||
|
|
||||||
"${modifier}+z" = "sticky toggle";
|
"${modifier}+s" = "scratchpad show";
|
||||||
"${modifier}+Shift+z" = "floating toggle";
|
"${modifier}+Shift+s" = "move scratchpad";
|
||||||
|
|
||||||
"${modifier}+Shift+s" = "move scratchpad";
|
"${modifier}+c" = "split h";
|
||||||
"${modifier}+s" = ''[class="^(?i)(?!obsidian).*"] scratchpad show'';
|
"${modifier}+e" = "layout toggle split";
|
||||||
"${modifier}+o" = ''[class="obsidian"] scratchpad show'';
|
"${modifier}+f" = "fullscreen toggle";
|
||||||
|
"${modifier}+r" = "mode resize";
|
||||||
|
"${modifier}+v" = "split v";
|
||||||
|
"${modifier}+w" = "layout tabbed";
|
||||||
|
"${modifier}+q" = "exec ${pkgs.writers.writeDash "newsboat-sync" ''
|
||||||
|
notify-send --app-name="newsboat" "Updating ..."
|
||||||
|
newsboat -x reload
|
||||||
|
notify-send --app-name="newsboat" "Finished updating."
|
||||||
|
''}";
|
||||||
|
|
||||||
"${modifier}+c" = "split h";
|
# "${modifier}+Shift+y" = "exec ${pkgs.qutebrowser}/bin/qutebrowser";
|
||||||
"${modifier}+e" = "layout toggle split";
|
"${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
|
||||||
"${modifier}+f" = "fullscreen toggle";
|
"${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
|
||||||
"${modifier}+r" = "mode resize";
|
"${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
|
||||||
"${modifier}+v" = "split v";
|
"${modifier}+0" = "exec ${niveumPackages.menu-calc}/bin/=";
|
||||||
"${modifier}+w" = "layout tabbed";
|
|
||||||
"${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";
|
|
||||||
|
|
||||||
"${modifier}+Return" = "exec ${lib.getExe pkgs.niveum-terminal}";
|
"${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
|
||||||
"${modifier}+t" = "exec ${lib.getExe pkgs.niveum-filemanager}";
|
"${modifier}+Shift+d" = "exec ${
|
||||||
"${modifier}+y" = "exec ${lib.getExe pkgs.niveum-browser}";
|
pkgs.writers.writeDash "notemenu" ''
|
||||||
|
set -efu
|
||||||
|
PATH=$PATH:${
|
||||||
|
lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils]
|
||||||
|
}
|
||||||
|
|
||||||
"${modifier}+d" =
|
cd ~/notes
|
||||||
"exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
|
note_file=$({
|
||||||
"${modifier}+Shift+d" = "exec ${pkgs.notemenu}/bin/notemenu";
|
echo diary/$(date -I).md
|
||||||
"${modifier}+p" = "exec rofi-pass";
|
echo diary/$(date -I -d yesterday).md
|
||||||
"${modifier}+Shift+p" = "exec rofi-pass --insert";
|
find . ! -name '.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2-
|
||||||
"${modifier}+u" = "exec ${pkgs.unicodmenu}/bin/unicodmenu";
|
} | rofi -dmenu -i -p 'notes')
|
||||||
"${modifier}+Shift+u" =
|
if test "$note_file"
|
||||||
"exec ${pkgs.writers.writeDash "last-unicode" ''${pkgs.xdotool}/bin/xdotool type --delay 1000 "$(${pkgs.gawk}/bin/awk 'END{print $1}' ~/.cache/unicodmenu)"''}";
|
then
|
||||||
|
alacritty --working-directory ~/notes -e "$EDITOR" "$note_file"
|
||||||
"${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
|
|
||||||
if ${pkgs.procps}/bin/pgrep screenkey; then
|
|
||||||
exec ${pkgs.procps}/bin/pkill screenkey
|
|
||||||
else
|
|
||||||
exec ${pkgs.screenkey}/bin/screenkey
|
|
||||||
fi
|
fi
|
||||||
''}";
|
''
|
||||||
"${modifier}+F12" = "exec ${klem}/bin/klem";
|
}";
|
||||||
"XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
|
"${modifier}+p" = "exec rofi-pass";
|
||||||
"XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t";
|
"${modifier}+Shift+p" = "exec rofi-pass --insert";
|
||||||
"XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
|
"${modifier}+u" = "exec ${niveumPackages.unicodmenu}/bin/unicodmenu";
|
||||||
"XF86Calculator" = "exec ${pkgs.st}/bin/st -c floating -e ${pkgs.bc}/bin/bc";
|
|
||||||
"XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
|
||||||
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
|
||||||
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
|
||||||
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
|
||||||
"XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
|
|
||||||
|
|
||||||
# key names detected with xorg.xev:
|
"${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
|
||||||
# XF86WakeUp (fn twice)
|
"${modifier}+F7" = "exec ${pkgs.writers.writeDash "showkeys-toggle" ''
|
||||||
# XF86Battery (fn f3)
|
if ${pkgs.procps}/bin/pgrep screenkey; then
|
||||||
# XF86Sleep (fn f4) - actually suspends
|
exec ${pkgs.procps}/bin/pkill screenkey
|
||||||
# XF86WLAN
|
else
|
||||||
# XF86WebCam (fn f6)
|
exec ${pkgs.screenkey}/bin/screenkey
|
||||||
# XF86TouchpadToggle (fn f8)
|
fi
|
||||||
# XF86Suspend (fn f12) - actually suspends to disk
|
''}";
|
||||||
# Num_Lock (fn Roll) - numlocks
|
"${modifier}+F8" = "exec switch-theme toggle";
|
||||||
# XF86Audio{Prev,Next,Mute,Play,Stop}
|
"${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
|
||||||
# XF86Forward
|
"${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
|
||||||
# XF86Back
|
"${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
|
||||||
# XF86Launch1 (thinkvantage)
|
"${modifier}+F12" = "exec ${klem}/bin/klem";
|
||||||
};
|
"Print" = "exec flameshot gui";
|
||||||
in
|
"XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5";
|
||||||
{
|
"XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t";
|
||||||
stylix.targets.i3.enable = true;
|
"XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5";
|
||||||
|
"XF86Calculator" = "exec ${pkgs.st}/bin/st -c floating -e ${pkgs.bc}/bin/bc";
|
||||||
|
"XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl pause";
|
||||||
|
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
||||||
|
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
||||||
|
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||||
|
"XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
|
||||||
|
"XF86ScreenSaver" = "exec ${niveumPackages.k-lock}/bin/k-lock";
|
||||||
|
|
||||||
xsession.windowManager.i3 = {
|
"XF86Display" = "exec ${niveumPackages.dmenu-randr}/bin/dmenu-randr";
|
||||||
enable = true;
|
|
||||||
extraConfig = ''
|
|
||||||
bindsym --release ${modifier}+Shift+w exec xsecurelock
|
|
||||||
|
|
||||||
exec "${pkgs.obsidian}/bin/obsidian"
|
# key names detected with xorg.xev:
|
||||||
for_window [class="obsidian"] , move scratchpad
|
# XF86WakeUp (fn twice)
|
||||||
|
# XF86Battery (fn f3)
|
||||||
assign [class="message"] ${messageWorkspace}
|
# XF86Sleep (fn f4) - actually suspends
|
||||||
exec "${pkgs.writers.writeDash "irc" "exec ${pkgs.alacritty}/bin/alacritty --class message -e ssh weechat@makanek -t tmux attach-session -t IM"}"
|
# XF86WLAN
|
||||||
exec "${pkgs.writers.writeDash "email" "exec ${pkgs.alacritty}/bin/alacritty --class message -e aerc"}"
|
# XF86WebCam (fn f6)
|
||||||
|
# XF86TouchpadToggle (fn f8)
|
||||||
exec --no-startup-id ${pkgs.xss-lock}/bin/xss-lock -- xsecurelock
|
# XF86Suspend (fn f12) - actually suspends to disk
|
||||||
'';
|
# Num_Lock (fn Roll) - numlocks
|
||||||
config = {
|
# XF86Audio{Prev,Next,Mute,Play,Stop}
|
||||||
inherit
|
# XF86Forward
|
||||||
modifier
|
# XF86Back
|
||||||
gaps
|
# XF86Launch1 (thinkvantage)
|
||||||
modes
|
|
||||||
bars
|
|
||||||
floating
|
|
||||||
window
|
|
||||||
colors
|
|
||||||
;
|
|
||||||
keybindings = keybindings // {
|
|
||||||
"${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
|
|
||||||
"${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
|
|
||||||
"${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
|
|
||||||
"${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
|
|
||||||
"Print" = "exec flameshot gui";
|
|
||||||
# "${modifier}+Shift+x" = "exec ${move-to-new-workspace}";
|
|
||||||
# "${modifier}+x" = "exec ${new-workspace}";
|
|
||||||
"XF86Display" = "exec ${pkgs.dmenu-randr}/bin/dmenu-randr";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,85 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
age.secrets = {
|
|
||||||
miniflux-api-token = {
|
|
||||||
file = ../secrets/miniflux-api-token.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = config.users.users.me.group;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.i3status-rust = {
|
|
||||||
enable = true;
|
|
||||||
bars.bottom = {
|
|
||||||
icons = "awesome6";
|
|
||||||
settings = {
|
|
||||||
theme.overrides =
|
|
||||||
let
|
|
||||||
colours = config.lib.stylix.colors.withHashtag;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
idle_bg = colours.base00;
|
|
||||||
idle_fg = colours.base05;
|
|
||||||
good_bg = colours.base00;
|
|
||||||
good_fg = colours.base0B;
|
|
||||||
warning_bg = colours.base00;
|
|
||||||
warning_fg = colours.base0A;
|
|
||||||
critical_bg = colours.base00;
|
|
||||||
critical_fg = colours.base09;
|
|
||||||
info_bg = colours.base00;
|
|
||||||
info_fg = colours.base04;
|
|
||||||
separator_bg = colours.base00;
|
|
||||||
separator = " ";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
blocks = [
|
|
||||||
{
|
|
||||||
block = "music";
|
|
||||||
format = "{$icon $combo $play |}";
|
|
||||||
separator = " – ";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "net";
|
|
||||||
format = " $icon HU";
|
|
||||||
missing_format = "";
|
|
||||||
device = "ppp0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "net";
|
|
||||||
format = " $icon FU";
|
|
||||||
missing_format = "";
|
|
||||||
device = "tun0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "battery";
|
|
||||||
format = "$icon $percentage $time";
|
|
||||||
device = "DisplayDevice";
|
|
||||||
driver = "upower";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "sound";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "disk_space";
|
|
||||||
format = "$icon $available";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
block = "memory";
|
|
||||||
format = "$icon $mem_used.eng(prefix:G)";
|
|
||||||
}
|
|
||||||
{ block = "load"; }
|
|
||||||
{
|
|
||||||
block = "time";
|
|
||||||
format = "$icon $timestamp.datetime(f:'%Y-%m-%d (%W %a) %H:%M', l:de_DE)";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
75
configs/keyboard.nix
Normal file
75
configs/keyboard.nix
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
commaSep = builtins.concatStringsSep ",";
|
||||||
|
xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
||||||
|
languages = {
|
||||||
|
de = "T3";
|
||||||
|
gr = "polytonic";
|
||||||
|
ru = "phonetic";
|
||||||
|
ara = "buckwalter";
|
||||||
|
cop = "";
|
||||||
|
ave = "";
|
||||||
|
"in" = "san-kagapa";
|
||||||
|
il = "phonetic";
|
||||||
|
};
|
||||||
|
defaultLanguage = "de";
|
||||||
|
in {
|
||||||
|
# man 7 xkeyboard-config
|
||||||
|
services.xserver = {
|
||||||
|
layout = "de";
|
||||||
|
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
||||||
|
# buckwalter: http://www.qamus.org/transliteration.htm
|
||||||
|
xkbVariant = "T3";
|
||||||
|
xkbOptions = commaSep xkbOptions;
|
||||||
|
libinput.enable = true;
|
||||||
|
xkbDir = pkgs.symlinkJoin {
|
||||||
|
name = "x-keyboard-directory";
|
||||||
|
paths = [
|
||||||
|
"${pkgs.xkeyboard_config}/etc/X11/xkb"
|
||||||
|
(pkgs.linkFarm "custom-x-keyboards" [
|
||||||
|
{
|
||||||
|
name = "symbols/cop";
|
||||||
|
path = pkgs.fetchurl {
|
||||||
|
url = "http://www.moheb.de/download/cop";
|
||||||
|
sha256 = "1l0h6aq536hyinrh0i0ia355y229bjrlibii0sya5bmqh46vycia";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "symbols/ave";
|
||||||
|
path = pkgs.fetchurl {
|
||||||
|
url = "https://blog.simos.info/wp-content/uploads/2010/06/avestan.txt";
|
||||||
|
sha256 = "192zmmm3gxyhim39dsax7r87gsay2w5v2xkhwmvsfipjb60hwp5g";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
])
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
console.keyMap = "de";
|
||||||
|
|
||||||
|
environment.systemPackages =
|
||||||
|
lib.mapAttrsToList
|
||||||
|
(language: variant:
|
||||||
|
pkgs.writers.writeDashBin "kb-${language}" ''
|
||||||
|
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage},${language} ${languages.${defaultLanguage}},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
|
||||||
|
'')
|
||||||
|
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"];
|
||||||
|
serviceConfig = {
|
||||||
|
SyslogIdentifier = "gxkb";
|
||||||
|
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "15s";
|
||||||
|
StartLimitBurst = 0;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
# Import default rules from the system Compose file
|
|
||||||
include "%L"
|
|
||||||
|
|
||||||
# Custom definitions
|
|
||||||
<Multi_key> <U0634> <U0634> : "ژ" U0698 # ز + ز = ژ
|
|
||||||
<Multi_key> <U063A> <U063A> : "گ" U06AF # غ + غ = گ
|
|
||||||
<Multi_key> <U0641> <U0641> : "ڤ" U06A4 # ف + ف = ڤ
|
|
||||||
<Multi_key> <U062C> <U062C> : "چ" U0686 # ج + ج = چ
|
|
||||||
<Multi_key> <U0628> <U0628> : "پ" U067E # ب + ب = پ
|
|
||||||
<Multi_key> <U0643> <U0643> : "ک" U06A9 # ك + ك = ک
|
|
||||||
<Multi_key> <U064A> <U064A> : "ی" U06CC # ي + ي = ی
|
|
||||||
<Multi_key> <U0647> <U064A> : "ۀ" U06C0 # ه + ي = ۀ
|
|
||||||
<Multi_key> <E> <E> : "ɛ" U025B
|
|
||||||
<Multi_key> <O> <O> : "ɔ" U0254
|
|
||||||
<Multi_key> <s> <h> : "ʃ" U0283
|
|
||||||
<Multi_key> <g> <h> : "ɣ" U0283
|
|
||||||
<Multi_key> <b> <h> : "β" U0283
|
|
||||||
<Multi_key> <p> <h> : "ɸ" U0283
|
|
||||||
<Multi_key> <z> <h> : "ʒ" U0292
|
|
||||||
<Multi_key> <e> <i> : "ɪ" U026A
|
|
||||||
<Multi_key> <e> <u> : "ʊ" U028A
|
|
||||||
<Multi_key> <colon> <colon> : "ː" U02D0
|
|
||||||
<Multi_key> <question> <period> : "ʔ" U0294
|
|
||||||
<Multi_key> <period> <question> : "ʕ" U0295
|
|
||||||
<Multi_key> <apostrophe> <period> : "ˈ" U02C8
|
|
||||||
<Multi_key> <period> <apostrophe> : "ˌ" U02CC
|
|
||||||
<dead_belowring> <nobreakspace> : "̥" U0325 # COMBINING RING BELOW
|
|
||||||
<dead_belowbreve> <nobreakspace> : "̮" U032E # COMBINING BREVE BELOW
|
|
||||||
<dead_invertedbreve> <nobreakspace> : "̑" U0311 # COMBINING INVERTED BREVE
|
|
||||||
<dead_belowmacron> <nobreakspace> : "̱" U0331 # COMBINING MACRON BELOW
|
|
||||||
<dead_belowcircumflex> <nobreakspace> : "̯" U032F # COMBINING INVERTED BREVE BELOW
|
|
||||||
<dead_circumflex> <Multi_key> <underscore> <e> : "ᵊ" U1D4A
|
|
||||||
|
|
||||||
# TODO zwnj
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Generated keyboard layout file with the Keyboard Layout Editor.
|
|
||||||
// For more about the software, see http://code.google.com/p/keyboardlayouteditor
|
|
||||||
//
|
|
||||||
// Version 0.2, changed AD09.
|
|
||||||
|
|
||||||
partial default alphanumeric_keys
|
|
||||||
xkb_symbols "avestan"
|
|
||||||
{
|
|
||||||
name[Group1] = "Iran - Avestan";
|
|
||||||
|
|
||||||
key <AB01> { [ U10B30, U10B32 ] }; // 𬰠ð¬²
|
|
||||||
key <AB02> { [ U10B11, U10B12 ] }; // 𬑠ð¬’
|
|
||||||
key <AB03> { [ U10B17, UE102 ] }; // 𬗠
|
|
||||||
key <AB04> { [ U10B2C, U10B13 ] }; // 𬬠ð¬“
|
|
||||||
key <AB05> { [ U10B20, U10B21 ] }; // ð¬ ð¬¡
|
|
||||||
key <AB06> { [ U10B25, U10B27 ] }; // 𬥠ð¬§
|
|
||||||
key <AB07> { [ U10B28, U10B29 ] }; // 𬨠ð¬©
|
|
||||||
key <AB08> { [ U10B3C, U10B39 ] }; // 𬼠ð¬¹
|
|
||||||
key <AB09> { [ U10B3E, U10B3D ] }; // 𬾠ð¬½
|
|
||||||
key <AB10> { [ U10B3F, periodcentered ] }; // 𬿠·
|
|
||||||
|
|
||||||
key <AC01> { [ U10B00, U10B01 ] }; // 𬀠ð¬
|
|
||||||
key <AC02> { [ U10B2F, U10B31 ] }; // 𬯠ð¬±
|
|
||||||
key <AC03> { [ U10B1B, U10B1C ] }; // 𬛠ð¬œ
|
|
||||||
key <AC04> { [ U10B1F, U10B16 ] }; // 𬟠ð¬–
|
|
||||||
key <AC05> { [ U10B14, U10B15 ] }; // 𬔠ð¬•
|
|
||||||
key <AC06> { [ U10B35, UE100 ] }; // 𬵠
|
|
||||||
key <AC07> { [ U10B18, U10B24 ] }; // 𬘠ð¬¤
|
|
||||||
key <AC08> { [ U10B10, UE101 ] }; // ð¬ î„
|
|
||||||
key <AC09> { [ U10B2E, UE103 ] }; // 𬮠
|
|
||||||
key <AC10> { [ U10B3B, U10B3A ] }; // 𬻠ð¬º
|
|
||||||
key <AC11> { [ U10B1D ] }; // ð¬
|
|
||||||
|
|
||||||
key <AD01> { [ U10B22, U10B23 ] }; // 𬢠ð¬£
|
|
||||||
key <AD02> { [ U10B33, U10B34 ] }; // 𬳠ð¬´
|
|
||||||
key <AD03> { [ U10B08, U10B09 ] }; // 𬈠ð¬‰
|
|
||||||
key <AD04> { [ U10B2D, U10B26 ] }; // ð¬ ð¬¦
|
|
||||||
key <AD05> { [ U10B19, U10B1A ] }; // 𬙠ð¬š
|
|
||||||
key <AD06> { [ U10B2B, U10B2A ] }; // 𬫠ð¬ª
|
|
||||||
key <AD07> { [ U10B0E, U10B0F ] }; // 𬎠ð¬
|
|
||||||
key <AD08> { [ U10B0C, U10B0D ] }; // 𬌠ð¬
|
|
||||||
key <AD09> { [ U10B0A, U10B0B ] }; // 𬊠ð¬‹
|
|
||||||
key <AD10> { [ U10B1E ] }; // ð¬ž
|
|
||||||
key <AD11> { [ U10B06, U10B07 ] }; // 𬆠ð¬‡
|
|
||||||
key <AD12> { [ U10B02, U10B03 ] }; // 𬂠ð¬ƒ
|
|
||||||
|
|
||||||
key <AE01> { [ U10B78 ] }; // ð¸
|
|
||||||
key <AE02> { [ U10B79 ] }; // ð¹
|
|
||||||
key <AE03> { [ U10B7A ] }; // ðº
|
|
||||||
key <AE04> { [ U10B7B ] }; // ð»
|
|
||||||
key <AE05> { [ U10B7C ] }; // ð¼
|
|
||||||
key <AE06> { [ U10B7D ] }; // ð½
|
|
||||||
key <AE07> { [ U10B7E ] }; // ð¾
|
|
||||||
key <AE08> { [ U10B7F ] }; // ð¿
|
|
||||||
|
|
||||||
key <BKSL> { [ U10B04, U10B05 ] }; // 𬄠ð¬…
|
|
||||||
key <LSGT> { [ U10B04, U10B05 ] }; // 𬄠ð¬…
|
|
||||||
};
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
// Coptic keyboard symbols for XKB and PC keyboard
|
|
||||||
// based on the mapping of logos
|
|
||||||
// (C) 2006 Moheb Mekhaiel <mohebm@gmx.de>
|
|
||||||
//
|
|
||||||
// Permission is granted to anyone to use, distribute and modify
|
|
||||||
// this file in any way, provided that the above copyright notice
|
|
||||||
// is left intact and the author of the modification summarizes
|
|
||||||
// the changes in this header.
|
|
||||||
//
|
|
||||||
// This file is distributed without any expressed or implied warranty.
|
|
||||||
|
|
||||||
|
|
||||||
partial default alphanumeric_keys
|
|
||||||
xkb_symbols "basic" {
|
|
||||||
name[Group1]= "Coptic";
|
|
||||||
|
|
||||||
key <TLDE> { [ U0308, U0311, U0361, U2CE5 ] };
|
|
||||||
|
|
||||||
key <AE01> { type[Group1] = "FOUR_LEVEL",
|
|
||||||
[ 1, U0304, VoidSymbol, U2CE6 ] };
|
|
||||||
key <AE02> { [ 2, U0306, U2CFD, U2CE7 ] };
|
|
||||||
key <AE03> { [ 3, U0374, U2056, U2CE8 ] };
|
|
||||||
key <AE04> { [ 4, U0375, U2058, U2CE9 ] };
|
|
||||||
key <AE05> { [ 5, U0307, U2059, U2CEA ] };
|
|
||||||
key <AE06> { [ 6, U0323, U2C8B, U2C8A ] };
|
|
||||||
key <AE07> { [ 7, U2CE4 ] };
|
|
||||||
key <AE08> { [ 8, U002A, U2026 ] };
|
|
||||||
key <AE09> { [ 9, parenleft, U201C, plusminus ] };
|
|
||||||
key <AE10> { [ 0, parenright, U201D, degree ] };
|
|
||||||
key <AE11> { [ U00B7, underscore, U2013, U2014 ] };
|
|
||||||
key <AE12> { [ U2E17, U0305, U033F ] };
|
|
||||||
key <BKSL> { [ U0300, U007C, backslash, U007C ] };
|
|
||||||
|
|
||||||
key <AD01> { [ U2C91, U2C90 ] };
|
|
||||||
key <AD02> { [ U2CB1, U2CB0 ] };
|
|
||||||
key <AD03> { [ U2C89, U2C88 ] };
|
|
||||||
key <AD04> { [ U2CA3, U2CA2 ] };
|
|
||||||
key <AD05> { [ U2CA7, U2CA6, U03EF, U03EE ] };
|
|
||||||
key <AD06> { [ U2CAF, U2CAE ] };
|
|
||||||
key <AD07> { [ U2CA9, U2CA8 ] };
|
|
||||||
key <AD08> { [ U2C93, U2C92 ] };
|
|
||||||
key <AD09> { [ U2C9F, U2C9E ] };
|
|
||||||
key <AD10> { [ U2CA1, U2CA0 ] };
|
|
||||||
key <AD11> { [ bracketleft,braceleft, U2018 ] };
|
|
||||||
key <AD12> { [ bracketright,braceright,U2019 ] };
|
|
||||||
|
|
||||||
key <AC01> { [ U2C81, U2C80 ] };
|
|
||||||
key <AC02> { [ U2CA5, U2CA4, U03E3, U03E2 ] };
|
|
||||||
key <AC03> { [ U2C87, U2C86, U03EF, U03EE ] };
|
|
||||||
key <AC04> { [ U2CAB, U2CAA, U03E5, U03E4 ] };
|
|
||||||
key <AC05> { [ U2C85, U2C84, U03EB, U03EA ] };
|
|
||||||
key <AC06> { [ U2C8F, U2C8E, U03E9, U03E8 ] };
|
|
||||||
key <AC07> { [ U03EB, U03EA, U03EB, U03EA ] };
|
|
||||||
key <AC08> { [ U2C95, U2C94, U03E7, U03E6 ] };
|
|
||||||
key <AC09> { [ U2C97, U2C96 ] };
|
|
||||||
key <AC10> { [ semicolon, colon, U2053, dead_doubleacute ] };
|
|
||||||
key <AC11> { [ apostrophe, U2CFF, U0022 ] };
|
|
||||||
|
|
||||||
key <AB01> { [ U2C8D, U2C8C ] };
|
|
||||||
key <AB02> { [ U2C9D, U2C9C ] };
|
|
||||||
key <AB03> { [ U2CAD, U2CAC, U03ED, U03EC ] };
|
|
||||||
key <AB04> { [ U03E3, U03E2, U03E3, U03E2 ] };
|
|
||||||
key <AB05> { [ U2C83, U2C82 ] };
|
|
||||||
key <AB06> { [ U2C9B, U2C9A ] };
|
|
||||||
key <AB07> { [ U2C99, U2C98 ] };
|
|
||||||
key <AB08> { [ comma, less, U00AB, U2039 ] };
|
|
||||||
key <AB09> { [ period, greater, U00BB, U203A ] };
|
|
||||||
key <AB10> { [ U0301, U2CFE, slash, question ] };
|
|
||||||
|
|
||||||
key <RALT> { type[Group1]="TWO_LEVEL",
|
|
||||||
[ ISO_Level3_Shift, Multi_key ] };
|
|
||||||
|
|
||||||
modifier_map Mod5 { <RALT> };
|
|
||||||
|
|
||||||
//include "level3(ralt_switch_multikey)"
|
|
||||||
|
|
||||||
// End alphanumeric section
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
|
|
||||||
commaSep = builtins.concatStringsSep ",";
|
|
||||||
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";
|
|
||||||
};
|
|
||||||
coptic = ./coptic;
|
|
||||||
avestan = ./avestan;
|
|
||||||
gothic = ./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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
defaultLanguage = languages.deutsch;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.libinput.enable = true;
|
|
||||||
|
|
||||||
# man 7 xkeyboard-config
|
|
||||||
services.xserver = {
|
|
||||||
exportConfiguration = lib.mkForce true; # link /usr/share/X11 properly
|
|
||||||
xkb.layout = defaultLanguage.code;
|
|
||||||
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
|
||||||
# buckwalter: http://www.qamus.org/transliteration.htm
|
|
||||||
xkb.variant = defaultLanguage.variant;
|
|
||||||
xkb.options = commaSep xkbOptions;
|
|
||||||
xkb.extraLayouts = {
|
|
||||||
coptic = {
|
|
||||||
languages = [ "cop" ];
|
|
||||||
description = "Coptic is the latest stage of the Egyptian language and was used by Egyptian Christians. The Coptic script is based on the Greek alphabet with some letters borrowed from Demotic Egyptian.";
|
|
||||||
symbolsFile = ./coptic;
|
|
||||||
};
|
|
||||||
avestan = {
|
|
||||||
languages = [ "ave" ];
|
|
||||||
description = "Avestan is an ancient Iranian language known primarily from its use in the sacred texts of Zoroastrianism, the Avesta. It is an Indo-Iranian language that was spoken in ancient Persia.";
|
|
||||||
symbolsFile = ./avestan;
|
|
||||||
};
|
|
||||||
gothic = {
|
|
||||||
languages = [ "got" ];
|
|
||||||
description = "Gothic is an extinct East Germanic language that was spoken by the Goths. It is known primarily from the Codex Argenteus, a 6th-century manuscript containing a translation of the Bible into Gothic.";
|
|
||||||
symbolsFile = ./gothic;
|
|
||||||
};
|
|
||||||
farsi = {
|
|
||||||
languages = [ "fas" ];
|
|
||||||
description = "Farsi, also known as Persian, is an Indo-Iranian language spoken primarily in Iran, Afghanistan (where it is known as Dari), and Tajikistan (where it is called Tajik). It has a rich literary tradition and is written in a modified Arabic script.";
|
|
||||||
symbolsFile = ./farsi;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.etc."x11-locale".source = toString pkgs.xorg.libX11 + "share/X11/locale";
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
home.file = {
|
|
||||||
".XCompose".source = ./XCompose;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
console.keyMap = "de";
|
|
||||||
|
|
||||||
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}" ''
|
|
||||||
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 // config.services.xserver.xkb.extraLayouts);
|
|
||||||
|
|
||||||
# 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" ];
|
|
||||||
serviceConfig = {
|
|
||||||
SyslogIdentifier = "gxkb";
|
|
||||||
ExecStart = "${pkgs.gxkb}/bin/gxkb";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "15s";
|
|
||||||
StartLimitBurst = 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
// https://github.com/gpuminingir/Farsi-Phonetic-Keyboard-Linux
|
|
||||||
// by @gpuminingir
|
|
||||||
|
|
||||||
partial alphanumeric_keys
|
|
||||||
xkb_symbols "qwerty" {
|
|
||||||
// Classic Finnish keyboard layout without dead keys and {[]} on asdf + AltG
|
|
||||||
name[Group1]="Persian (QWERTY)";
|
|
||||||
include "ir(pesq_part_basic)"
|
|
||||||
include "ir(pesq_part_ext)"
|
|
||||||
include "ir(pesq_part_keypad)"
|
|
||||||
include "nbsp(zwnj2nb3nnb4)"
|
|
||||||
include "level3(ralt_switch)"
|
|
||||||
};
|
|
||||||
|
|
||||||
hidden partial alphanumeric_keys
|
|
||||||
xkb_symbols "pesq_part_basic" {
|
|
||||||
// Persian digits
|
|
||||||
key <AE01> { [ Arabic_1, exclam, exclam ] }; // ١ ! !
|
|
||||||
key <AE02> { [ Arabic_2, at, at ] }; // ٢ @ @
|
|
||||||
key <AE03> { [ Arabic_3, numbersign, numbersign ] }; // ٣ # #
|
|
||||||
key <AE04> { [ Farsi_4, dollar, dollar ] }; // ۴ $ $
|
|
||||||
key <AE05> { [ Farsi_5, percent, percent ] }; // ۵ % %
|
|
||||||
key <AE06> { [ Farsi_6, asciicircum, asciicircum ] }; // ۶ ^ ^
|
|
||||||
key <AE07> { [ Arabic_7, ampersand, ampersand ] }; // ٧ & &
|
|
||||||
key <AE08> { [ Arabic_8, KP_Multiply, KP_Multiply ] }; // ٨ * *
|
|
||||||
key <AE09> { [ Arabic_9, Armenian_parenright, Armenian_parenright, Armenian_parenleft ] }; // ٩ ) ) (
|
|
||||||
key <AE10> { [ Farsi_0, Armenian_parenleft, Armenian_parenleft ] }; // ۰ ( (
|
|
||||||
key <AE11> { [ underbar, KP_Subtract, KP_Subtract ] }; // _ – –
|
|
||||||
key <AE12> { [ KP_Equal, KP_Add, KP_Add ] }; // = + +
|
|
||||||
|
|
||||||
// Persian letters and symbols
|
|
||||||
key <AD01> { [ Arabic_qaf, Arabic_ghain ] }; // ق غ
|
|
||||||
key <AD02> { [ Arabic_sheen ] }; // ش
|
|
||||||
key <AD03> { [ Arabic_ain ] }; // ع
|
|
||||||
key <AD04> { [ Arabic_ra ] }; // ر
|
|
||||||
key <AD05> { [ Arabic_teh, Arabic_tah ] }; // ت ط
|
|
||||||
key <AD06> { [ Farsi_yeh ] }; // ى
|
|
||||||
key <AD07> { [ Arabic_waw ] }; // و
|
|
||||||
key <AD08> { [ Farsi_yeh ] }; // ى
|
|
||||||
key <AD09> { [ Arabic_waw ] }; // و
|
|
||||||
key <AD10> { [ Arabic_peh ] }; // پ
|
|
||||||
key <AD11> { [ bracketright, braceleft ] }; // ] } {
|
|
||||||
key <AD12> { [ bracketleft, braceright ] }; // [ { }
|
|
||||||
|
|
||||||
key <AC01> { [ Arabic_alef, Arabic_maddaonalef, Arabic_maddaonalef ] }; // ا آ آ
|
|
||||||
key <AC02> { [ Arabic_seen, Arabic_sad, Arabic_sheen, Arabic_sheen ] }; // س ص ش
|
|
||||||
key <AC03> { [ Arabic_dal, Arabic_thal ] }; // د ذ ذ
|
|
||||||
key <AC04> { [ Arabic_feh ] }; // ف
|
|
||||||
key <AC05> { [ Arabic_gaf, Arabic_ghain ] }; // گ
|
|
||||||
key <AC06> { [ Arabic_heh, Arabic_hah ] }; // ە ح ه
|
|
||||||
key <AC07> { [ Arabic_jeem, Arabic_jeh ] }; // ج ژ ژ
|
|
||||||
key <AC08> { [ Arabic_keheh ] }; // ک
|
|
||||||
key <AC09> { [ Arabic_lam ] }; // ل
|
|
||||||
key <AC10> { [ Arabic_semicolon, colon ] }; // ؛ : ։
|
|
||||||
key <AC11> { [ Arabic_comma, quotedbl, quotedbl ] }; // ، ” ”
|
|
||||||
|
|
||||||
key <AB01> { [ Arabic_zain, Arabic_dad, Arabic_zah, Arabic_zah ] }; // ض ض ز خ
|
|
||||||
key <AB02> { [ Arabic_khah, Arabic_zah ] }; // ظ خ
|
|
||||||
key <AB03> { [ Arabic_theh, Arabic_tcheh ] }; // چ ث
|
|
||||||
key <AB04> { [ Arabic_hamza, Arabic_waw ] }; // و
|
|
||||||
key <AB05> { [ Arabic_beh ] }; // ب
|
|
||||||
key <AB06> { [ Arabic_noon ] }; // ن
|
|
||||||
key <AB07> { [ Arabic_meem ] }; // م
|
|
||||||
key <AB08> { [ Arabic_comma, rightcaret, leftcaret ] }; // , > <
|
|
||||||
key <AB09> { [ period, leftcaret, rightcaret ] }; // . < >
|
|
||||||
key <AB10> { [ slash, Arabic_question_mark, question ] }; // / ?
|
|
||||||
|
|
||||||
key <AE11> { [ minus, underscore ] };
|
|
||||||
key <AE12> { [ equal, plus, 0x1002212 ] };
|
|
||||||
key <BKSL> { [ backslash, bar, 0x1002010 ] };
|
|
||||||
key <TLDE> { [ U02DC, UFDFC, UFDF2 ] }; // ˜ ﷼ ﷲ
|
|
||||||
};
|
|
||||||
|
|
||||||
hidden partial alphanumeric_keys
|
|
||||||
xkb_symbols "pesq_part_ext" {
|
|
||||||
// Persian and ASCII digits
|
|
||||||
key <AE01> { [ Farsi_1, exclam, grave, 1 ] };
|
|
||||||
key <AE02> { [ Farsi_2, 0x100066c, at, 2 ] };
|
|
||||||
key <AE03> { [ Farsi_3, 0x100066b, numbersign, 3 ] };
|
|
||||||
key <AE04> { [ Farsi_4, 0x100fdfc, dollar, 4 ] };
|
|
||||||
key <AE05> { [ Farsi_5, 0x100066a, percent, 5 ] };
|
|
||||||
key <AE06> { [ Farsi_6, multiply, asciicircum, 6 ] };
|
|
||||||
key <AE07> { [ Farsi_7, Arabic_comma, ampersand, 7 ] };
|
|
||||||
key <AE08> { [ Farsi_8, asterisk, enfilledcircbullet, 8 ] };
|
|
||||||
key <AE09> { [ Farsi_9, parenright, 0x100200e, 9 ] };
|
|
||||||
key <AE10> { [ Farsi_0, parenleft, 0x100200f, 0 ] };
|
|
||||||
};
|
|
||||||
|
|
||||||
hidden partial alphanumeric_keys
|
|
||||||
xkb_symbols "pesq_part_keypad" {
|
|
||||||
// Persian digits and Mathematical operators
|
|
||||||
key <KPDV> { [ division, XF86_Ungrab ] };
|
|
||||||
key <KPMU> { [ multiply, XF86_ClearGrab ] };
|
|
||||||
key <KPSU> { [ 0x1002212, XF86_Prev_VMode ] };
|
|
||||||
key <KPAD> { [ plus, XF86_Next_VMode ] };
|
|
||||||
|
|
||||||
key <KPEN> { [ KP_Enter ] };
|
|
||||||
key <KPEQ> { [ equal ] };
|
|
||||||
|
|
||||||
key <KP7> { [ KP_Home, Farsi_7 ] };
|
|
||||||
key <KP8> { [ KP_Up, Farsi_8 ] };
|
|
||||||
key <KP9> { [ KP_Prior, Farsi_9 ] };
|
|
||||||
|
|
||||||
key <KP4> { [ KP_Left, Farsi_4 ] };
|
|
||||||
key <KP5> { [ KP_Begin, Farsi_5 ] };
|
|
||||||
key <KP6> { [ KP_Right, Farsi_6 ] };
|
|
||||||
|
|
||||||
key <KP1> { [ KP_End, Farsi_1 ] };
|
|
||||||
key <KP2> { [ KP_Down, Farsi_2 ] };
|
|
||||||
key <KP3> { [ KP_Next, Farsi_3 ] };
|
|
||||||
|
|
||||||
key <KP0> { [ KP_Insert, Farsi_0 ] };
|
|
||||||
key <KPDL> { [ KP_Delete, 0x100066b ] };
|
|
||||||
};
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Generated keyboard layout file with the Keyboard Layout Editor.
|
|
||||||
// For more about the software, see http://code.google.com/p/keyboardlayouteditor
|
|
||||||
//
|
|
||||||
// Version 0.2, changed AD09.
|
|
||||||
|
|
||||||
partial default alphanumeric_keys
|
|
||||||
xkb_symbols "Gothic"
|
|
||||||
{
|
|
||||||
name[Group1] = "Gothic";
|
|
||||||
|
|
||||||
key <AB01> { [ U10336, U10336 ] }; // Z: 𐌶
|
|
||||||
key <AB02> { [ U10347, U10347 ] }; // X: 𐍇
|
|
||||||
key <AB03> { [ U10343, U10343 ] }; // C: 𐍃
|
|
||||||
key <AB04> { [ U10338, U10338 ] }; // V: 𐌸
|
|
||||||
key <AB05> { [ U10331, U10331 ] }; // B: 𐌱
|
|
||||||
key <AB06> { [ U1033D, U10341 ] }; // n: 𐌽 N: 𐍁
|
|
||||||
key <AB07> { [ U1033C, U1033C ] }; // M: 𐌼
|
|
||||||
key <AB08> { [ U10B3C, U10B39 ] };
|
|
||||||
key <AB09> { [ U10349, U10349 ] };
|
|
||||||
key <AB10> { [ U10B3F, periodcentered ] };
|
|
||||||
|
|
||||||
key <AC01> { [ U10330, U10330 ] }; // A: 𐌰
|
|
||||||
key <AC02> { [ U10343, U10343 ] }; // S: 𐍃
|
|
||||||
key <AC03> { [ U10333, U10338 ] }; // d: 𐌳 D: 𐌸
|
|
||||||
key <AC04> { [ U10346, U10346 ] }; // F: 𐍆
|
|
||||||
key <AC05> { [ U10332, U10332 ] }; // G: 𐌲
|
|
||||||
key <AC06> { [ U10337, U10337 ] }; // H: 𐌷
|
|
||||||
key <AC07> { [ U1033E, U1033E ] }; // J: 𐌾
|
|
||||||
key <AC08> { [ U1033A, U1033A ] }; // K: 𐌺
|
|
||||||
key <AC09> { [ U1033B, U1033B ] }; // L: 𐌻
|
|
||||||
key <AC10> { [ semicolon, colon ] };
|
|
||||||
key <AC11> { [ apostrophe, quotedbl ] };
|
|
||||||
|
|
||||||
key <AD01> { [ U10335, U10335 ] }; // Q: 𐌵
|
|
||||||
key <AD02> { [ U10345, U10345 ] }; // W: 𐍅
|
|
||||||
key <AD03> { [ U10334, U10334 ] }; // E: 𐌴
|
|
||||||
key <AD04> { [ U10342, U10342 ] }; // R: 𐍂
|
|
||||||
key <AD05> { [ U10344, U10338 ] }; // t: 𐍄 T: 𐌸
|
|
||||||
key <AD06> { [ U10348, U1034A ] }; // y: 𐍈 Y: 𐍊
|
|
||||||
key <AD07> { [ U1033F, U1033F ] }; // U: 𐌿
|
|
||||||
key <AD08> { [ U10339, U10339 ] }; // I: 𐌹
|
|
||||||
key <AD09> { [ U10349, U10349 ] }; // O: 𐍉
|
|
||||||
key <AD10> { [ U10340, U10340 ] }; // P: 𐍀
|
|
||||||
key <AD11> { [ bracketleft, braceleft ] };
|
|
||||||
key <AD12> { [ bracketright, braceright ] };
|
|
||||||
|
|
||||||
key <TLDE> { [ grave, asciitilde ] };
|
|
||||||
key <AE01> { [ 1, exclam ] };
|
|
||||||
key <AE02> { [ 2, at ] };
|
|
||||||
key <AE03> { [ 3, numbersign ] };
|
|
||||||
key <AE04> { [ 4, dollar ] };
|
|
||||||
key <AE05> { [ 5, percent ] };
|
|
||||||
key <AE06> { [ 6, asciicircum ] };
|
|
||||||
key <AE07> { [ 7, ampersand ] };
|
|
||||||
key <AE08> { [ 8, asterisk ] };
|
|
||||||
key <AE09> { [ 9, parenleft ] };
|
|
||||||
key <AE10> { [ 0, parenright ] };
|
|
||||||
key <AE11> { [ minus, underscore ] };
|
|
||||||
key <AE12> { [ equal, plus ] };
|
|
||||||
|
|
||||||
key <AB08> { [ comma, less ] };
|
|
||||||
key <AB09> { [ period, greater ] };
|
|
||||||
key <AB10> { [ slash, question ] };
|
|
||||||
|
|
||||||
key <BKSL> { [ U10B04, U10B05 ] };
|
|
||||||
key <LSGT> { [ U10B04, U10B05 ] };
|
|
||||||
};
|
|
||||||
@@ -3,16 +3,19 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
davHome = "~/.local/share/dav";
|
davHome = "~/.local/share/dav";
|
||||||
kmeinCloud = {
|
kmeinCloud = {
|
||||||
davEndpoint = "https://cloud.kmein.de/remote.php/dav";
|
davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
|
||||||
username = "kieran";
|
username = "kieran";
|
||||||
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
passwordFile = config.age.secrets.nextcloud-password-kieran.path;
|
||||||
};
|
};
|
||||||
in
|
fysiCloud = {
|
||||||
{
|
davEndpoint = "https://nextcloud.fysi.dev/remote.php/dav";
|
||||||
|
username = "kmein";
|
||||||
|
passwordFile = config.age.secrets.nextcloud-password-fysi.path;
|
||||||
|
};
|
||||||
|
in {
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
nextcloud-password-kieran = {
|
nextcloud-password-kieran = {
|
||||||
file = ../secrets/nextcloud-password-kieran.age;
|
file = ../secrets/nextcloud-password-kieran.age;
|
||||||
@@ -47,11 +50,12 @@ in
|
|||||||
|
|
||||||
systemd.user.services.vdirsyncer = {
|
systemd.user.services.vdirsyncer = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wants = [ "network-online.target" ];
|
wants = ["network-online.target"];
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = ["default.target"];
|
||||||
startAt = "*:00/10";
|
startAt = "*:00/10";
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.vdirsyncer}/bin/vdirsyncer sync && ${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
|
${pkgs.vdirsyncer}/bin/vdirsyncer sync
|
||||||
|
${pkgs.khal}/bin/khal printcalendars # https://lostpackets.de/khal/configure.html#syncing
|
||||||
'';
|
'';
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
@@ -100,9 +104,30 @@ in
|
|||||||
"khal/config".text = ''
|
"khal/config".text = ''
|
||||||
[calendars]
|
[calendars]
|
||||||
|
|
||||||
[[kalender_local]]
|
[[alew]]
|
||||||
path = ${davHome}/calendar/*
|
path = ${davHome}/calendar/alew
|
||||||
type = discover
|
color = "light gray"
|
||||||
|
|
||||||
|
[[personal]]
|
||||||
|
path = ${davHome}/calendar/personal
|
||||||
|
color = "light cyan"
|
||||||
|
|
||||||
|
[[uni]]
|
||||||
|
path = ${davHome}/calendar/uni-1
|
||||||
|
color = "yellow"
|
||||||
|
|
||||||
|
[[fysi]]
|
||||||
|
path = ${davHome}/calendar/fysi-1
|
||||||
|
color = "light magenta"
|
||||||
|
|
||||||
|
[[fysi_team]]
|
||||||
|
path = ${davHome}/calendar/personal_shared_by_fdf
|
||||||
|
color = "light red"
|
||||||
|
|
||||||
|
[[birthdays]]
|
||||||
|
path = ${davHome}/contacts/contacts
|
||||||
|
type = birthdays
|
||||||
|
color = "light green"
|
||||||
|
|
||||||
[default]
|
[default]
|
||||||
highlight_event_days = True
|
highlight_event_days = True
|
||||||
@@ -134,7 +159,13 @@ in
|
|||||||
[pair kalender]
|
[pair kalender]
|
||||||
a = "kalender_local"
|
a = "kalender_local"
|
||||||
b = "kalender_cloud"
|
b = "kalender_cloud"
|
||||||
collections = ["from b"]
|
collections = ["personal", "alew", "uni-1"]
|
||||||
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
|
[pair fysi]
|
||||||
|
a = "kalender_local"
|
||||||
|
b = "fysi_cloud"
|
||||||
|
collections = ["fysi-1", "personal_shared_by_fdf"]
|
||||||
conflict_resolution = "b wins"
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
[storage kontakte_local]
|
[storage kontakte_local]
|
||||||
@@ -158,6 +189,12 @@ in
|
|||||||
url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
|
url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
|
||||||
username = "${kmeinCloud.username}"
|
username = "${kmeinCloud.username}"
|
||||||
password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
|
password.fetch = ["command", "cat", "${kmeinCloud.passwordFile}"]
|
||||||
|
|
||||||
|
[storage fysi_cloud]
|
||||||
|
type = "caldav"
|
||||||
|
url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
|
||||||
|
username = "${fysiCloud.username}"
|
||||||
|
password.fetch = ["command", "cat", "${fysiCloud.passwordFile}"]
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,15 +2,14 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
systemd.services.lb-subscription = {
|
systemd.services.lb-subscription = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wants = [ "network-online.target" ];
|
wants = ["network-online.target"];
|
||||||
startAt = "weekly";
|
startAt = "weekly";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
WorkingDirectory = "/home/kfm/cloud/nextcloud/Books/Germanistik/LB";
|
WorkingDirectory = "/home/kfm/cloud/Seafile/Books/Germanistik/LB";
|
||||||
};
|
};
|
||||||
script = ''
|
script = ''
|
||||||
first_year=2019
|
first_year=2019
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
{
|
|
||||||
systemd.services.imaginary-illuminations = {
|
systemd.services.imaginary-illuminations = {
|
||||||
enable = false;
|
enable = false;
|
||||||
wants = [ "network-online.target" ];
|
wants = ["network-online.target"];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = "kfm";
|
User = "kfm";
|
||||||
Group = "users";
|
Group = "users";
|
||||||
|
|||||||
@@ -2,13 +2,6 @@
|
|||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
associations = {
|
|
||||||
added = {
|
|
||||||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
|
||||||
};
|
|
||||||
removed = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
defaultApplications = {
|
defaultApplications = {
|
||||||
"application/epub+zip" = "org.pwmt.zathura.desktop";
|
"application/epub+zip" = "org.pwmt.zathura.desktop";
|
||||||
"application/pdf" = "org.pwmt.zathura.desktop";
|
"application/pdf" = "org.pwmt.zathura.desktop";
|
||||||
@@ -26,7 +19,7 @@
|
|||||||
"x-scheme-handler/mailto" = "firefox.desktop";
|
"x-scheme-handler/mailto" = "firefox.desktop";
|
||||||
"x-scheme-handler/unknown" = "firefox.desktop";
|
"x-scheme-handler/unknown" = "firefox.desktop";
|
||||||
"x-scheme-handler/webcal" = "firefox.desktop";
|
"x-scheme-handler/webcal" = "firefox.desktop";
|
||||||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
"inode/directory" = "pcmanfm.desktop";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
services.nginx.virtualHosts.default = {
|
services.nginx.virtualHosts.default = {
|
||||||
locations."= /stub_status".extraConfig = "stub_status;";
|
locations."= /stub_status".extraConfig = "stub_status;";
|
||||||
};
|
};
|
||||||
@@ -42,12 +41,12 @@
|
|||||||
|
|
||||||
systemd.services.promtail = {
|
systemd.services.promtail = {
|
||||||
description = "Promtail service for Loki";
|
description = "Promtail service for Loki";
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = ["multi-user.target"];
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.grafana-loki}/bin/promtail --config.file ${
|
${pkgs.grafana-loki}/bin/promtail --config.file ${
|
||||||
(pkgs.formats.yaml { }).generate "promtail.yaml" {
|
(pkgs.formats.yaml {}).generate "promtail.yaml" {
|
||||||
server = {
|
server = {
|
||||||
http_listen_port = 28183;
|
http_listen_port = 28183;
|
||||||
grpc_listen_port = 0;
|
grpc_listen_port = 0;
|
||||||
@@ -56,7 +55,9 @@
|
|||||||
clients = [
|
clients = [
|
||||||
{
|
{
|
||||||
url = "http://${
|
url = "http://${
|
||||||
if config.networking.hostName == "makanek" then "127.0.0.1" else "makanek.r"
|
if config.networking.hostName == "makanek"
|
||||||
|
then "127.0.0.1"
|
||||||
|
else "makanek.r"
|
||||||
}:3100/loki/api/v1/push";
|
}:3100/loki/api/v1/push";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@@ -70,7 +71,7 @@
|
|||||||
};
|
};
|
||||||
relabel_configs = [
|
relabel_configs = [
|
||||||
{
|
{
|
||||||
source_labels = [ "__journal__systemd_unit" ];
|
source_labels = ["__journal__systemd_unit"];
|
||||||
target_label = "unit";
|
target_label = "unit";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,12 +2,11 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
|
niveumPackages,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
swallow = command: "${niveumPackages.swallow}/bin/swallow ${command}";
|
||||||
swallow = command: "${pkgs.swallow}/bin/swallow ${command}";
|
in {
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.shellAliases.smpv = swallow "mpv";
|
environment.shellAliases.smpv = swallow "mpv";
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
@@ -21,11 +20,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
|
ytdl-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
|
||||||
ytdl-raw-options = lib.concatStringsSep "," [
|
ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
|
||||||
''sub-lang="de,en"''
|
|
||||||
"write-sub="
|
|
||||||
"write-auto-sub="
|
|
||||||
];
|
|
||||||
screenshot-template = "%F-%wH%wM%wS-%#04n";
|
screenshot-template = "%F-%wH%wM%wS-%#04n";
|
||||||
script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
|
script-opts = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
|
||||||
ao = "pulse"; # no pipewire for me :(
|
ao = "pulse"; # no pipewire for me :(
|
||||||
@@ -41,8 +36,8 @@ in
|
|||||||
"Alt+j" = "add video-pan-y -0.05";
|
"Alt+j" = "add video-pan-y -0.05";
|
||||||
};
|
};
|
||||||
scripts = [
|
scripts = [
|
||||||
pkgs.mpvScripts.quality-menu
|
pkgs.mpvScripts.youtube-quality
|
||||||
pkgs.mpvScripts.visualizer
|
niveumPackages.mpv-visualizer
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
services.mycelium = {
|
|
||||||
enable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.hosts = lib.mapAttrs' (name: address: {
|
|
||||||
name = address;
|
|
||||||
value = [ "${name}.m" ];
|
|
||||||
}) pkgs.lib.niveum.myceliumAddresses;
|
|
||||||
}
|
|
||||||
@@ -1,65 +1,73 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
niveumPackages,
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
let
|
environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
|
||||||
vim-kmein = (
|
|
||||||
pkgs.vim-kmein.override {
|
|
||||||
# stylixColors = config.lib.stylix.colors;
|
|
||||||
colorscheme = "base16-gruvbox-dark-medium";
|
|
||||||
}
|
|
||||||
);
|
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.variables.EDITOR = lib.getExe vim-kmein;
|
|
||||||
environment.shellAliases.vi = "nvim";
|
environment.shellAliases.vi = "nvim";
|
||||||
environment.shellAliases.vim = "nvim";
|
environment.shellAliases.vim = "nvim";
|
||||||
environment.shellAliases.view = "nvim -R";
|
environment.shellAliases.view = "nvim -R";
|
||||||
|
|
||||||
home-manager.users.me = {
|
environment.systemPackages = [
|
||||||
editorconfig = {
|
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
||||||
enable = true;
|
(pkgs.neovim.override {
|
||||||
settings = {
|
configure = {
|
||||||
"*" = {
|
customRC = ''
|
||||||
charset = "utf-8";
|
source ${../lib/vim/init.vim}
|
||||||
end_of_line = "lf";
|
|
||||||
trim_trailing_whitespace = true;
|
luafile ${../lib/vim/init.lua}
|
||||||
insert_final_newline = true;
|
'';
|
||||||
indent_style = "space";
|
packages.nvim = with pkgs.vimPlugins; {
|
||||||
indent_size = 2;
|
start = [
|
||||||
};
|
ale
|
||||||
"*.py" = {
|
fzf-vim
|
||||||
indent_size = 4;
|
fzfWrapper
|
||||||
};
|
supertab
|
||||||
Makefile = {
|
undotree
|
||||||
indent_style = "tab";
|
tabular
|
||||||
};
|
# vimwiki
|
||||||
"*.md" = {
|
niveumPackages.vimPlugins-vim-colors-paramount
|
||||||
trim_trailing_whitespace = false;
|
nvim-lspconfig
|
||||||
|
vim-commentary
|
||||||
|
vim-css-color
|
||||||
|
vim-eunuch
|
||||||
|
niveumPackages.vimPlugins-vim-fetch
|
||||||
|
vim-fugitive
|
||||||
|
vim-gitgutter
|
||||||
|
vim-repeat
|
||||||
|
vim-sensible
|
||||||
|
vim-surround
|
||||||
|
(pkgs.vimUtils.buildVimPlugin rec {
|
||||||
|
pname = "vim-dim";
|
||||||
|
version = "1.1.0";
|
||||||
|
name = "${pname}-${version}";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "jeffkreeftmeijer";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
opt = [
|
||||||
|
csv
|
||||||
|
elm-vim
|
||||||
|
emmet-vim
|
||||||
|
haskell-vim
|
||||||
|
niveumPackages.vimPlugins-icalendar-vim
|
||||||
|
niveumPackages.vimPlugins-jq-vim
|
||||||
|
rust-vim
|
||||||
|
typescript-vim
|
||||||
|
vim-javascript
|
||||||
|
vim-ledger
|
||||||
|
vim-nix
|
||||||
|
vimtex
|
||||||
|
vim-pandoc
|
||||||
|
vim-pandoc-syntax
|
||||||
|
niveumPackages.vimPlugins-vim-256noir
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
})
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.vim-typewriter
|
|
||||||
vim-kmein
|
|
||||||
|
|
||||||
# language servers
|
|
||||||
pkgs.pyright
|
|
||||||
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 # XML LSP
|
|
||||||
pkgs.jq-lsp
|
|
||||||
pkgs.dhall-lsp-server
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,47 @@
|
|||||||
{
|
{
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
{
|
profile = name: custom:
|
||||||
|
lib.recursiveUpdate {
|
||||||
|
connection.id = name;
|
||||||
|
connection.type = "wifi";
|
||||||
|
connection.interface-name = "wlp3s0";
|
||||||
|
connection.permissions = "";
|
||||||
|
wifi.mac-address-blacklist = "";
|
||||||
|
wifi.ssid = name;
|
||||||
|
wifi.mode = "infrastructure";
|
||||||
|
ipv4.dns-search = "";
|
||||||
|
ipv4.method = "auto";
|
||||||
|
ipv6.addr-gen-mode = "stable-privacy";
|
||||||
|
ipv6.dns-search = "";
|
||||||
|
ipv6.method = "auto";
|
||||||
|
proxy = {};
|
||||||
|
}
|
||||||
|
custom;
|
||||||
|
eduroamProfile = {
|
||||||
|
connection.uuid = "eae9fee6-a7d2-4120-a609-440b457d6fcf";
|
||||||
|
wifi-security = {
|
||||||
|
group = "ccmp;tkip;";
|
||||||
|
key-mgmt = "wpa-eap";
|
||||||
|
pairwise = "ccmp;";
|
||||||
|
proto = "rsn;";
|
||||||
|
};
|
||||||
|
"802-1x" = {
|
||||||
|
altsubject-matches = "DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de;";
|
||||||
|
anonymous-identity = "anonymous@wlan.hu-berlin.de";
|
||||||
|
ca-cert = pkgs.fetchurl {
|
||||||
|
url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem";
|
||||||
|
sha256 = "0if8aqd06sid7a0vw009zpa087wxcgdd2x6z2zs4pis5kvyqj2dk";
|
||||||
|
};
|
||||||
|
eap = "ttls;";
|
||||||
|
identity = lib.strings.fileContents <secrets/eduroam/identity>;
|
||||||
|
password = lib.strings.fileContents <secrets/eduroam/password>;
|
||||||
|
phase2-auth = "pap";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in {
|
||||||
programs.nm-applet.enable = true;
|
programs.nm-applet.enable = true;
|
||||||
|
|
||||||
networking.networkmanager = {
|
networking.networkmanager = {
|
||||||
@@ -13,10 +52,10 @@
|
|||||||
];
|
];
|
||||||
wifi.macAddress = "random";
|
wifi.macAddress = "random";
|
||||||
ethernet.macAddress = "random";
|
ethernet.macAddress = "random";
|
||||||
unmanaged = [ "docker*" ];
|
unmanaged = ["docker*"];
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.me.extraGroups = [ "networkmanager" ];
|
users.users.me.extraGroups = ["networkmanager"];
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.speedtest-cli
|
pkgs.speedtest-cli
|
||||||
|
|||||||
@@ -1,18 +1,118 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
{
|
ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
|
||||||
|
|
||||||
|
youtube-download = "${pkgs.ts}/bin/ts ${pkgs.yt-dlp}/bin/yt-dlp -f ${ytdl-format} --add-metadata";
|
||||||
|
|
||||||
|
newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
|
||||||
|
linkhandler = pkgs.writers.writeDash "linkhandler" ''
|
||||||
|
# Feed script a url or file location.
|
||||||
|
# If an image, it will view in sxiv,
|
||||||
|
# if a video or gif, it will view in mpv
|
||||||
|
# if a music file or pdf, it will download,
|
||||||
|
# otherwise it opens link in browser.
|
||||||
|
|
||||||
|
# If no url given. Opens browser. For using script as $BROWSER.
|
||||||
|
[ -z "$1" ] && { "$BROWSER"; exit; }
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
*mkv|*webm|*mp4|*youtube.com/watch*|*youtube.com/playlist*|*youtu.be*|*bitchute.com*|*videos.lukesmith.xyz*|*odysee.com*)
|
||||||
|
setsid -f ${pkgs.mpv}/bin/mpv -quiet "$1" >/dev/null 2>&1 ;;
|
||||||
|
*png|*jpg|*jpe|*jpeg|*gif)
|
||||||
|
curl -sL "$1" > "/tmp/$(echo "$1" | sed "s/.*\///")" && sxiv -a "/tmp/$(echo "$1" | sed "s/.*\///")" >/dev/null 2>&1 & ;;
|
||||||
|
*mp3|*flac|*opus|*mp3?source*)
|
||||||
|
setsid -f tsp curl -LO "$1" >/dev/null 2>&1 ;;
|
||||||
|
*)
|
||||||
|
if [ -f "$1" ]; then "$TERMINAL" -e "$EDITOR" "$1"
|
||||||
|
else setsid -f "$BROWSER" "$1" >/dev/null 2>&1; fi ;;
|
||||||
|
esac
|
||||||
|
'';
|
||||||
|
|
||||||
|
newsboat-config = pkgs.writeText "config" ''
|
||||||
|
auto-reload no
|
||||||
|
reload-threads 8
|
||||||
|
prepopulate-query-feeds yes
|
||||||
|
|
||||||
|
# dont keep a search history
|
||||||
|
history-limit 0
|
||||||
|
|
||||||
|
datetime-format %F
|
||||||
|
|
||||||
|
text-width 85
|
||||||
|
|
||||||
|
external-url-viewer "${pkgs.urlscan}/bin/urlscan -dc -r '${linkhandler} {}'"
|
||||||
|
browser ${linkhandler}
|
||||||
|
macro , open-in-browser
|
||||||
|
macro c set browser "${pkgs.xsel}/bin/xsel -b <<<" ; open-in-browser ; set browser ${linkhandler}
|
||||||
|
macro v set browser "${pkgs.util-linux}/bin/setsid -f ${pkgs.mpv}/bin/mpv" ; open-in-browser ; set browser ${linkhandler}
|
||||||
|
macro y set browser "${youtube-download}" ; open-in-browser ; set browser ${linkhandler}
|
||||||
|
|
||||||
|
bind-key j down
|
||||||
|
bind-key k up
|
||||||
|
bind-key j next articlelist
|
||||||
|
bind-key k prev articlelist
|
||||||
|
bind-key J next-feed articlelist
|
||||||
|
bind-key K prev-feed articlelist
|
||||||
|
bind-key G end
|
||||||
|
bind-key g home
|
||||||
|
bind-key d pagedown
|
||||||
|
bind-key u pageup
|
||||||
|
bind-key l open
|
||||||
|
bind-key h quit
|
||||||
|
bind-key a toggle-article-read
|
||||||
|
bind-key n next-unread
|
||||||
|
bind-key N prev-unread
|
||||||
|
bind-key D pb-download
|
||||||
|
bind-key U show-urls
|
||||||
|
bind-key x pb-delete
|
||||||
|
|
||||||
|
save-path ${newsboat-home}/saved/
|
||||||
|
|
||||||
|
highlight all "---.*---" yellow default
|
||||||
|
# highlight feedlist ".*(0/0))" default default
|
||||||
|
highlight article "^Title:.*" yellow default bold
|
||||||
|
highlight article "^Author:.*" yellow default
|
||||||
|
highlight article "^Flags:.*" red default
|
||||||
|
highlight article "\\[[0-9][0-9]*\\]" color66 default bold
|
||||||
|
highlight article "\\[image [0-9][0-9]*\\]" color109 default bold
|
||||||
|
highlight article "\\[embedded flash: [0-9][0-9]*\\]" color66 default bold
|
||||||
|
|
||||||
|
color listfocus blue default
|
||||||
|
color listfocus_unread blue default bold
|
||||||
|
color info red default bold
|
||||||
|
|
||||||
|
urls-source "miniflux"
|
||||||
|
miniflux-url "https://feed.kmein.de"
|
||||||
|
miniflux-login "kfm"
|
||||||
|
miniflux-password "${lib.strings.fileContents <secrets/miniflux/password>}"
|
||||||
|
'';
|
||||||
|
|
||||||
|
newsboat-sql = "${pkgs.sqlite}/bin/sqlite3 ${newsboat-home}/cache.db";
|
||||||
|
in {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writers.writeDashBin "miniflux-watch-later" ''
|
pkgs.newsboat
|
||||||
miniflux_api_token=$(cat ${config.age.secrets.miniflux-api-token.path})
|
(pkgs.writers.writeDashBin "newsboat-unread-count" ''
|
||||||
random_feed_item=$(
|
if [ -f ${newsboat-home}/cache.db.lock ]; then
|
||||||
${pkgs.curl}/bin/curl -u "$miniflux_api_token" --basic -s 'https://feed.kmein.de/v1/entries?starred=true&limit=0' \
|
${pkgs.jq}/bin/jq -n '{state: "Info", text: "↻", icon: "rss"}'
|
||||||
| ${pkgs.jq}/bin/jq -r '.entries[].id' \
|
else
|
||||||
| ${pkgs.coreutils}/bin/shuf -n1
|
|
||||||
)
|
${pkgs.jq}/bin/jq -n \
|
||||||
${pkgs.xdg-utils}/bin/xdg-open "https://feed.kmein.de/starred/entry/$random_feed_item"
|
--argjson unread "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE unread=1")" \
|
||||||
|
--argjson watchLater "$(${newsboat-sql} "SELECT COUNT(DISTINCT id) FROM rss_item WHERE flags='e' AND deleted=0")" \
|
||||||
|
'{
|
||||||
|
state: (if $unread > 0 then "Good" else "Idle" end),
|
||||||
|
text: (if $unread > 0 then "\($unread)" else "[\($watchLater)]" end),
|
||||||
|
icon: "rss"
|
||||||
|
}'
|
||||||
|
fi
|
||||||
|
'')
|
||||||
|
(pkgs.writers.writeDashBin "mpv-watch-later" ''
|
||||||
|
${newsboat-sql} "SELECT url FROM rss_item WHERE flags='e' AND deleted=0 ORDER BY pubDate DESC" \
|
||||||
|
| ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,9 @@
|
|||||||
{
|
{pkgs, ...}: {
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixVersions.stable;
|
package = pkgs.nixFlakes;
|
||||||
extraOptions = "experimental-features = nix-command flakes";
|
extraOptions = "experimental-features = nix-command flakes";
|
||||||
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,23 +2,21 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
openweathermap-repo = pkgs.fetchFromGitHub {
|
openweathermap-repo = pkgs.fetchFromGitHub {
|
||||||
owner = "ip1981";
|
owner = "ip1981";
|
||||||
repo = "openweathermap";
|
repo = "openweathermap";
|
||||||
rev = "9cfef7b14ac5af7109449b54b1cb352b4c76167a";
|
rev = "9cfef7b14ac5af7109449b54b1cb352b4c76167a";
|
||||||
sha256 = "0sm43wicvw2fy7nq65s8vch6jjb5bszqr4ilnhibayamj4jcpw53";
|
sha256 = "0sm43wicvw2fy7nq65s8vch6jjb5bszqr4ilnhibayamj4jcpw53";
|
||||||
};
|
};
|
||||||
openweathermap = pkgs.haskellPackages.callCabal2nix "openweathermap" openweathermap-repo { };
|
openweathermap = pkgs.haskellPackages.callCabal2nix "openweathermap" openweathermap-repo {};
|
||||||
openweathermap-key = lib.strings.fileContents <secrets/openweathermap.key>;
|
openweathermap-key = lib.strings.fileContents <secrets/openweathermap.key>;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
weather = pkgs.writers.writeDashBin "weather" ''
|
weather = pkgs.writers.writeDashBin "weather" ''
|
||||||
${openweathermap}/bin/openweathermap --api-key ${openweathermap-key} "$@"
|
${openweathermap}/bin/openweathermap --api-key ${openweathermap-key} "$@"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.weather ];
|
environment.systemPackages = [pkgs.weather];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,23 +3,21 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
inputs,
|
||||||
|
niveumPackages,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
worldradio = pkgs.callPackage ../packages/worldradio.nix {};
|
||||||
worldradio = pkgs.callPackage ../packages/worldradio.nix { };
|
|
||||||
|
|
||||||
zoteroStyle =
|
zoteroStyle = {
|
||||||
{
|
name,
|
||||||
name,
|
sha256,
|
||||||
sha256,
|
}: {
|
||||||
}:
|
name = "${name}.csl";
|
||||||
{
|
path = pkgs.fetchurl {
|
||||||
name = "${name}.csl";
|
url = "https://www.zotero.org/styles/${name}";
|
||||||
path = pkgs.fetchurl {
|
inherit sha256;
|
||||||
url = "https://www.zotero.org/styles/${name}";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
cslDirectory = pkgs.linkFarm "citation-styles" [
|
cslDirectory = pkgs.linkFarm "citation-styles" [
|
||||||
(zoteroStyle {
|
(zoteroStyle {
|
||||||
name = "chicago-author-date-de";
|
name = "chicago-author-date-de";
|
||||||
@@ -31,12 +29,11 @@ let
|
|||||||
})
|
})
|
||||||
(zoteroStyle {
|
(zoteroStyle {
|
||||||
name = "apa";
|
name = "apa";
|
||||||
sha256 = "sha256-sUf0Ov5c9aTUoLsYSRbQl3Qs9ELkb5/Tky35kH7pKuE=";
|
sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
astrolog = pkgs.astrolog.overrideAttrs (
|
astrolog = pkgs.astrolog.overrideAttrs (old:
|
||||||
old:
|
|
||||||
old
|
old
|
||||||
// {
|
// {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
@@ -55,142 +52,145 @@ let
|
|||||||
/^:I /s/80/120/ # wider text output
|
/^:I /s/80/120/ # wider text output
|
||||||
' $out/astrolog/astrolog.as
|
' $out/astrolog/astrolog.as
|
||||||
'';
|
'';
|
||||||
}
|
});
|
||||||
);
|
in {
|
||||||
in
|
|
||||||
{
|
|
||||||
home-manager.users.me.home.file = {
|
home-manager.users.me.home.file = {
|
||||||
".csl".source = cslDirectory;
|
".csl".source = cslDirectory;
|
||||||
".local/share/pandoc/csl".source = cslDirectory; # as of pandoc 2.11, it includes citeproc
|
".local/share/pandoc/csl".source = cslDirectory; # as of pandoc 2.11, it includes citeproc
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
(pkgs.writers.writeDashBin "amfora" ''
|
|
||||||
${pkgs.st}/bin/st -e ${pkgs.amfora}/bin/amfora
|
|
||||||
'')
|
|
||||||
(pkgs.writers.writeDashBin "gpodder" ''
|
|
||||||
GPODDER_DOWNLOAD_DIR=${config.users.users.me.home}/mobile/audio/Text/podcasts exec ${pkgs.gpodder}/bin/gpodder "$@"
|
|
||||||
'')
|
|
||||||
# INTERNET
|
# INTERNET
|
||||||
aria2
|
aria2
|
||||||
telegram-desktop
|
firefox
|
||||||
|
tdesktop
|
||||||
|
w3m
|
||||||
|
wget
|
||||||
whois
|
whois
|
||||||
dnsutils
|
dnsutils
|
||||||
# FILE MANAGERS
|
# FILE MANAGERS
|
||||||
lf
|
lf
|
||||||
pcmanfm
|
cinnamon.nemo
|
||||||
# MEDIA
|
# MEDIA
|
||||||
ffmpeg
|
ffmpeg
|
||||||
simplescreenrecorder
|
|
||||||
imagemagick
|
imagemagick
|
||||||
exiftool
|
exiftool
|
||||||
nsxiv
|
nsxiv
|
||||||
graphviz
|
# ARCHIVE TOOLS
|
||||||
|
unzip
|
||||||
|
unrar
|
||||||
|
p7zip
|
||||||
|
zip
|
||||||
|
# MONITORS
|
||||||
|
htop
|
||||||
|
iotop # I/O load monitor
|
||||||
|
iftop # interface bandwidth monitor
|
||||||
|
lsof # list open files
|
||||||
|
psmisc # for killall, pstree
|
||||||
# SHELL
|
# SHELL
|
||||||
bat # better cat
|
bat # better cat
|
||||||
|
fd # better find
|
||||||
|
file # determine file type
|
||||||
dos2unix
|
dos2unix
|
||||||
genpass # generate passwords
|
genpass # generate passwords
|
||||||
(pkgs.writers.writeDashBin "genpassphrase" ''${pkgs.genpass}/bin/genpass --passphrase | ${pkgs.gnused}/bin/sed 's/ /-/g;s/\(^\|-\)\([a-z]\)/\1\U\2/g;s/$/-'$(${pkgs.coreutils}/bin/date +%Y)'/' '')
|
gdu # ncurses disk usage (ncdu is broken)
|
||||||
gcc
|
rmlint # remove duplicate files
|
||||||
python3Packages.jsonschema # json validation
|
python3Packages.jsonschema # json validation
|
||||||
|
jq # json toolkit
|
||||||
pup # html toolkit
|
pup # html toolkit
|
||||||
xan # csv toolkit
|
htmlq
|
||||||
magic-wormhole-rs # file transfer
|
xsv # csv toolkit
|
||||||
|
fq # toolkit for yaml, xml and binaries
|
||||||
man-pages
|
man-pages
|
||||||
man-pages-posix
|
man-pages-posix
|
||||||
|
tree
|
||||||
exfat # to mount windows drives
|
exfat # to mount windows drives
|
||||||
|
parallel # for parallel, since moreutils shadows task spooler
|
||||||
|
ripgrep # better grep
|
||||||
|
rlwrap
|
||||||
|
progress # display progress bars for pipes
|
||||||
# HARDWARE TOOLS
|
# HARDWARE TOOLS
|
||||||
gnome-disk-utility
|
usbutils # for lsusb
|
||||||
|
pciutils # for lspci
|
||||||
|
lshw # for lshw
|
||||||
arandr # xrandr for noobs
|
arandr # xrandr for noobs
|
||||||
wdisplays
|
|
||||||
libnotify # for notify-send
|
libnotify # for notify-send
|
||||||
xclip # clipboard CLI
|
xclip # clipboard CLI
|
||||||
dragon-drop # drag and drop
|
xdragon # drag and drop
|
||||||
xorg.xkill # kill by clicking
|
xorg.xkill # kill by clicking
|
||||||
portfolio # personal finance overview
|
|
||||||
audacity
|
audacity
|
||||||
calibre
|
calibre
|
||||||
electrum
|
electrum
|
||||||
inkscape
|
inkscape
|
||||||
gimp
|
|
||||||
gthumb
|
|
||||||
astrolog
|
astrolog
|
||||||
obsidian
|
|
||||||
lemmeknow # identify strings
|
|
||||||
aichat # chat with llms
|
|
||||||
anki-bin # flashcards
|
anki-bin # flashcards
|
||||||
jbofihe # lojbanic software
|
jbofihe # lojbanic software
|
||||||
zoom-us # video conferencing
|
zoom-us # video conferencing
|
||||||
(pkgs.writers.writeDashBin "im" ''
|
|
||||||
weechat_password=$(${pkgs.pass}/bin/pass weechat)
|
|
||||||
exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${pkgs.lib.niveum.systems.makanek.externalIp}:8002 -password='"$weechat_password"'; /remote connect makanek'
|
|
||||||
'')
|
|
||||||
alejandra # nix formatter
|
alejandra # nix formatter
|
||||||
pdfgrep # search in pdf
|
pdfgrep # search in pdf
|
||||||
pdftk # pdf toolkit
|
pdftk # pdf toolkit
|
||||||
mupdf
|
mupdf
|
||||||
poppler-utils # pdf toolkit
|
poppler_utils # pdf toolkit
|
||||||
kdePackages.okular # the word is nucular
|
okular # the word is nucular
|
||||||
xournalpp # for annotating pdfs
|
xournalpp # for annotating pdfs
|
||||||
pdfpc # presenter console for pdf slides
|
pdfpc # presenter console for pdf slides
|
||||||
hc # print files as qr codes
|
niveumPackages.hc # print files as qr codes
|
||||||
yt-dlp
|
yt-dlp
|
||||||
espeak
|
espeak
|
||||||
|
bc # calculator
|
||||||
|
pari # gp -- better calculator
|
||||||
rink # unit converter
|
rink # unit converter
|
||||||
auc
|
niveumPackages.auc
|
||||||
noise-waves
|
niveumPackages.cheat-sh
|
||||||
stag
|
niveumPackages.infschmv
|
||||||
cheat-sh
|
niveumPackages.qrpaste
|
||||||
polyglot
|
niveumPackages.ttspaste
|
||||||
qrpaste
|
niveumPackages.new-mac # get a new mac address
|
||||||
ttspaste
|
niveumPackages.scanned
|
||||||
new-mac # get a new mac address
|
niveumPackages.default-gateway
|
||||||
scanned
|
niveumPackages.kirciuoklis
|
||||||
default-gateway
|
niveumPackages.image-convert-favicon
|
||||||
kirciuoklis
|
niveumPackages.heuretes
|
||||||
image-convert-favicon
|
niveumPackages.ipa # XSAMPA to IPA converter
|
||||||
heuretes
|
niveumPackages.pls
|
||||||
ipa # XSAMPA to IPA converter
|
niveumPackages.mpv-tv
|
||||||
pls
|
niveumPackages.devanagari
|
||||||
mpv-tv
|
niveumPackages.betacode # ancient greek betacode to unicode converter
|
||||||
mpv-iptv
|
niveumPackages.meteo
|
||||||
devanagari
|
niveumPackages.mahlzeit
|
||||||
betacode # ancient greek betacode to unicode converter
|
niveumPackages.vimv
|
||||||
jq-lsp
|
niveumPackages.swallow # window swallowing
|
||||||
swallow # window swallowing
|
niveumPackages.literature-quote
|
||||||
literature-quote
|
jless # less(1) for json
|
||||||
booksplit
|
niveumPackages.booksplit
|
||||||
dmenu-randr
|
niveumPackages.dmenu-randr
|
||||||
manual-sort
|
niveumPackages.dmenu-bluetooth
|
||||||
wttr
|
niveumPackages.manual-sort
|
||||||
unicodmenu
|
niveumPackages.dns-sledgehammer
|
||||||
emailmenu
|
ts
|
||||||
closest
|
niveumPackages.vg
|
||||||
trans
|
niveumPackages.fkill
|
||||||
(mpv-radio.override {
|
niveumPackages.wttr
|
||||||
di-fm-key-file = config.age.secrets.di-fm-key.path;
|
niveumPackages.unicodmenu
|
||||||
})
|
niveumPackages.closest
|
||||||
(mpv-radio.override {
|
niveumPackages.trans
|
||||||
di-fm-key-file = config.age.secrets.di-fm-key.path;
|
(niveumPackages.mpv-radio.override {
|
||||||
executableName = "cro-radio";
|
|
||||||
mpvCommand = "${cro}/bin/cro";
|
|
||||||
})
|
|
||||||
(mpv-tuner.override {
|
|
||||||
di-fm-key-file = config.age.secrets.di-fm-key.path;
|
di-fm-key-file = config.age.secrets.di-fm-key.path;
|
||||||
})
|
})
|
||||||
# kmein.slide
|
# kmein.slide
|
||||||
termdown
|
termdown
|
||||||
image-convert-tolino
|
niveumPackages.image-convert-tolino
|
||||||
rfc
|
niveumPackages.rfc
|
||||||
tag
|
niveumPackages.tag
|
||||||
timer
|
niveumPackages.timer
|
||||||
|
niveumPackages.menu-calc
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
nix-git
|
niveumPackages.nix-git
|
||||||
nixfmt-rfc-style
|
nixfmt
|
||||||
par
|
par
|
||||||
qrencode
|
qrencode
|
||||||
|
|
||||||
# inputs.menstruation-backend.defaultPackage.x86_64-linux
|
inputs.menstruation-backend.defaultPackage.x86_64-linux
|
||||||
inputs.agenix.packages.x86_64-linux.default
|
inputs.agenix.packages.x86_64-linux.default
|
||||||
inputs.recht.defaultPackage.x86_64-linux
|
inputs.recht.defaultPackage.x86_64-linux
|
||||||
|
|
||||||
@@ -202,20 +202,24 @@ in
|
|||||||
${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
|
${pkgs.openssh}/bin/ssh makanek "cd /var/lib/weechat/logs && grep --ignore-case --color=always --recursive $@" | ${pkgs.less}/bin/less --raw-control-chars
|
||||||
'')
|
'')
|
||||||
|
|
||||||
|
(pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
|
||||||
|
(pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import ../lib/local-network.nix).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
|
||||||
|
|
||||||
inputs.scripts.packages.x86_64-linux.alarm
|
inputs.scripts.packages.x86_64-linux.alarm
|
||||||
|
|
||||||
spotify
|
spotify
|
||||||
ncspot
|
ncspot
|
||||||
playerctl
|
playerctl
|
||||||
|
|
||||||
#krebs
|
nix-index
|
||||||
pkgs.nur.repos.mic92.ircsink
|
niveumPackages.nix-index-update
|
||||||
|
|
||||||
(haskellPackages.ghcWithHoogle (hs: [
|
#krebs
|
||||||
hs.text
|
niveumPackages.dic
|
||||||
hs.lens
|
niveumPackages.cyberlocker-tools
|
||||||
hs.bytestring
|
niveumPackages.untilport
|
||||||
]))
|
niveumPackages.kpaste
|
||||||
|
config.nur.repos.mic92.ircsink
|
||||||
|
|
||||||
(python3.withPackages (py: [
|
(python3.withPackages (py: [
|
||||||
py.black
|
py.black
|
||||||
@@ -229,32 +233,34 @@ in
|
|||||||
]))
|
]))
|
||||||
# python3Packages.poetry
|
# python3Packages.poetry
|
||||||
|
|
||||||
dhall-nix
|
# language servers
|
||||||
dhall-bash
|
pyright
|
||||||
dhall-json
|
haskell-language-server
|
||||||
dhall
|
texlab
|
||||||
|
nil
|
||||||
|
rust-analyzer
|
||||||
|
|
||||||
html-tidy
|
html-tidy
|
||||||
|
nodePackages.csslint
|
||||||
|
nodePackages.jsonlint
|
||||||
|
nodePackages.prettier
|
||||||
|
nodePackages.typescript
|
||||||
|
nodePackages.yarn
|
||||||
deno # better node.js
|
deno # better node.js
|
||||||
go
|
nodejs
|
||||||
|
nodePackages.javascript-typescript-langserver
|
||||||
texlive.combined.scheme-full
|
texlive.combined.scheme-full
|
||||||
latexrun
|
latexrun
|
||||||
(aspellWithDicts (dict: [
|
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
||||||
dict.de
|
|
||||||
dict.en
|
|
||||||
dict.en-computers
|
|
||||||
]))
|
|
||||||
# haskellPackages.pandoc-citeproc
|
# haskellPackages.pandoc-citeproc
|
||||||
text2pdf
|
niveumPackages.text2pdf
|
||||||
lowdown
|
lowdown
|
||||||
glow # markdown to term
|
glow # markdown to term
|
||||||
libreoffice
|
libreoffice
|
||||||
# gnumeric
|
# gnumeric
|
||||||
dia
|
dia
|
||||||
pandoc
|
pandoc
|
||||||
librsvg # pandoc depends on this to include SVG in documents
|
niveumPackages.man-pandoc
|
||||||
# man-pandoc
|
|
||||||
typst
|
|
||||||
# proselint
|
# proselint
|
||||||
asciidoctor
|
asciidoctor
|
||||||
wordnet
|
wordnet
|
||||||
@@ -264,18 +270,9 @@ in
|
|||||||
# nightly.rust
|
# nightly.rust
|
||||||
shellcheck
|
shellcheck
|
||||||
|
|
||||||
# photography
|
|
||||||
gphoto2
|
|
||||||
darktable
|
|
||||||
|
|
||||||
(pkgs.writers.writeDashBin "hass-cli" ''
|
(pkgs.writers.writeDashBin "hass-cli" ''
|
||||||
HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN="$(cat ${config.age.secrets.home-assistant-token.path})" exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
|
HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN="$(cat ${config.age.secrets.home-assistant-token.path})" exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
|
||||||
'')
|
'')
|
||||||
|
|
||||||
# xml
|
|
||||||
saxonb_9_1
|
|
||||||
libxml2
|
|
||||||
zotero
|
|
||||||
];
|
];
|
||||||
|
|
||||||
age.secrets.home-assistant-token = {
|
age.secrets.home-assistant-token = {
|
||||||
|
|||||||
25
configs/picom.nix
Normal file
25
configs/picom.nix
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
services.picom = {
|
||||||
|
enable = true;
|
||||||
|
activeOpacity = 1;
|
||||||
|
fade = true;
|
||||||
|
fadeDelta = 1;
|
||||||
|
inactiveOpacity = 0.9;
|
||||||
|
shadow = true;
|
||||||
|
menuOpacity = 0.9;
|
||||||
|
shadowOpacity = 0.3;
|
||||||
|
fadeExclude = [
|
||||||
|
"class_g = 'slock'" # don't want a transparent lock screen!
|
||||||
|
"name *?= 'slock'"
|
||||||
|
"focused = 1"
|
||||||
|
];
|
||||||
|
opacityRules = [
|
||||||
|
# opacity-rule overrides both inactive and active opacity
|
||||||
|
|
||||||
|
# video in browser tabs
|
||||||
|
# substring /regex match of title bar text
|
||||||
|
"99:name *?= 'Youtube'"
|
||||||
|
"99:WM_CLASS@:s *= 'mpv$'"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
{ config, ... }:
|
{config, ...}: let
|
||||||
let
|
|
||||||
user = config.users.users.me.name;
|
user = config.users.users.me.name;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
security.polkit.extraConfig = ''
|
security.polkit.extraConfig = ''
|
||||||
polkit.addRule(function(action, subject) {
|
polkit.addRule(function(action, subject) {
|
||||||
if (subject.user == "${user}" && action.id == "org.freedesktop.systemd1.manage-units") {
|
if (subject.user == "${user}" && action.id == "org.freedesktop.systemd1.manage-units") {
|
||||||
|
|||||||
@@ -2,11 +2,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
|
suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.power-action = {
|
services.power-action = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plans.suspend = {
|
plans.suspend = {
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
{ pkgs, lib, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
inherit (import ../lib) localAddresses;
|
||||||
hp-driver = pkgs.hplip;
|
hp-driver = pkgs.hplip;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.printing = {
|
services.printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
drivers = [ hp-driver ];
|
drivers = [hp-driver];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
@@ -13,13 +12,13 @@ in
|
|||||||
];
|
];
|
||||||
|
|
||||||
# allow connecting to .local printers
|
# allow connecting to .local printers
|
||||||
services.avahi.nssmdns4 = true;
|
services.avahi.nssmdns = true;
|
||||||
|
|
||||||
hardware.printers.ensurePrinters = [
|
hardware.printers.ensurePrinters = [
|
||||||
{
|
{
|
||||||
name = "OfficeJet";
|
name = "OfficeJet";
|
||||||
location = "Zimmer";
|
location = "Zimmer";
|
||||||
deviceUri = "https://${pkgs.lib.niveum.localAddresses.officejet}";
|
deviceUri = "https://${localAddresses.officejet}";
|
||||||
model = "drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd";
|
model = "drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd";
|
||||||
ppdOptions = {
|
ppdOptions = {
|
||||||
Duplex = "DuplexNoTumble"; # DuplexNoTumble DuplexTumble None
|
Duplex = "DuplexNoTumble"; # DuplexNoTumble DuplexTumble None
|
||||||
@@ -32,6 +31,7 @@ in
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
HP/hp-officejet_4650_series.ppd.gz
|
HP/hp-officejet_4650_series.ppd.gz
|
||||||
drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
|
drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{ services.redshift.enable = true; }
|
{services.redshift.enable = false;}
|
||||||
|
|||||||
@@ -2,11 +2,8 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
networking.hosts = {"42:0:ca48:f98f:63d7:31ce:922b:245d" = ["go"];};
|
||||||
networking.hosts = {
|
|
||||||
"42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.tinc.networks.retiolum = {
|
services.tinc.networks.retiolum = {
|
||||||
rsaPrivateKeyFile = config.age.secrets.retiolum-rsa.path;
|
rsaPrivateKeyFile = config.age.secrets.retiolum-rsa.path;
|
||||||
|
|||||||
@@ -1,7 +1,14 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import <niveum/lib>) colours;
|
||||||
|
in {
|
||||||
home-manager.users.me.programs.rofi = {
|
home-manager.users.me.programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
font = "Monospace 10";
|
||||||
|
theme = "${pkgs.rofi}/share/rofi/themes/Arc.rasi";
|
||||||
pass = {
|
pass = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
@@ -14,6 +21,6 @@
|
|||||||
help_color="#FF0000"
|
help_color="#FF0000"
|
||||||
''; # help_color set by https://github.com/mrossinek/dotfiles/commit/13fc5f24caa78c8f20547bf473266879507f13bf
|
''; # help_color set by https://github.com/mrossinek/dotfiles/commit/13fc5f24caa78c8f20547bf473266879507f13bf
|
||||||
};
|
};
|
||||||
plugins = [ pkgs.rofi-calc ];
|
plugins = [pkgs.rofi-calc];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
23
configs/seafile.nix
Normal file
23
configs/seafile.nix
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
|
||||||
|
|
||||||
|
home-manager.users.me.xdg.configFile = {
|
||||||
|
"Seafile/Seafile Client.conf".source = (pkgs.formats.ini {}).generate "Seafile Client.conf" {
|
||||||
|
Behavior = {
|
||||||
|
hideDockIcon = false;
|
||||||
|
hideMainWindowWhenStarted = true;
|
||||||
|
};
|
||||||
|
Settings = {
|
||||||
|
computerName = config.networking.hostName;
|
||||||
|
lastShiburl = "https://box.hu-berlin.de";
|
||||||
|
};
|
||||||
|
UsedServerAddresses.main = "https://box.hu-berlin.de";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [pkgs.seafile-client];
|
||||||
|
}
|
||||||
@@ -1,7 +1,12 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
{
|
sound.enable = true;
|
||||||
|
|
||||||
|
# realtime audio for pulseaudio
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = false;
|
||||||
|
systemWide = false;
|
||||||
alsa = {
|
alsa = {
|
||||||
enable = true;
|
enable = true;
|
||||||
support32Bit = true;
|
support32Bit = true;
|
||||||
@@ -10,14 +15,26 @@
|
|||||||
jack.enable = true;
|
jack.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.pipewire-pulse.path = [ pkgs.pulseaudio ];
|
hardware.pulseaudio = {
|
||||||
|
|
||||||
services.avahi = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
publish.enable = true;
|
package = pkgs.pulseaudioFull;
|
||||||
publish.userServices = true;
|
# copy server:/run/pulse/.config/pulse/cookie to client:~/.config/pulse/cookie to authenticate a client machine
|
||||||
|
zeroconf.discovery.enable = true;
|
||||||
|
extraConfig = ''
|
||||||
|
load-module ${
|
||||||
|
toString [
|
||||||
|
"module-tunnel-sink-new"
|
||||||
|
"server=zaatar.r"
|
||||||
|
"sink_name=zaatar"
|
||||||
|
"channels=2"
|
||||||
|
"rate=44100"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users.users.me.extraGroups = ["pipewire" "audio"];
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.pavucontrol
|
pkgs.pavucontrol
|
||||||
pkgs.ncpamixer
|
pkgs.ncpamixer
|
||||||
|
|||||||
@@ -3,6 +3,5 @@
|
|||||||
location = {
|
location = {
|
||||||
latitude = 52.517;
|
latitude = 52.517;
|
||||||
longitude = 13.3872;
|
longitude = 13.3872;
|
||||||
provider = "geoclue2";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,46 @@
|
|||||||
{ pkgs, lib, ... }:
|
|
||||||
{
|
{
|
||||||
users.users.me.openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys;
|
pkgs,
|
||||||
programs.ssh.startAgent = true;
|
config,
|
||||||
services.gnome.gcr-ssh-agent.enable = false;
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../lib) sshPort kieran;
|
||||||
|
externalNetwork = import ../lib/external-network.nix;
|
||||||
|
sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
|
||||||
|
in {
|
||||||
|
users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
# https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663
|
services.gpg-agent = rec {
|
||||||
xsession.profileExtra = ''
|
enable = true;
|
||||||
eval $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --daemonize --components=ssh,secrets)
|
enableSshSupport = true;
|
||||||
export SSH_AUTH_SOCK
|
defaultCacheTtlSsh = 2 * 60 * 60;
|
||||||
'';
|
maxCacheTtlSsh = 4 * defaultCacheTtlSsh;
|
||||||
|
sshKeys = [
|
||||||
|
"568047C91DE03A23883E340F15A9C24D313E847C"
|
||||||
|
"BB3EE102DB8CD45540A78A6B18B511B67061F6B4" # kfm@manakish ed25519
|
||||||
|
"3F8986755818B5762A096BE212777EAAC441DD9D" # fysiweb rsa
|
||||||
|
"0E4ABD229432486CC432639BB0986B2CDE365105" # agenix ed25519
|
||||||
|
"A1E8D32CBFCDBD2DE798E2298D795CCFD785AE06" # kfm@kabsa ed25519
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment.extraInit = ''
|
||||||
|
if [[ -z "$SSH_AUTH_SOCK" ]]; then
|
||||||
|
export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
|
||||||
|
environment.interactiveShellInit = ''
|
||||||
|
GPG_TTY="$(tty)"
|
||||||
|
export GPG_TTY
|
||||||
|
${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
|
||||||
|
'';
|
||||||
|
|
||||||
home-manager.users.me.programs.ssh = {
|
home-manager.users.me.programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableDefaultConfig = false;
|
matchBlocks = rec {
|
||||||
matchBlocks = {
|
|
||||||
"github.com" = {
|
"github.com" = {
|
||||||
hostname = "ssh.github.com";
|
hostname = "ssh.github.com";
|
||||||
port = 443;
|
port = 443;
|
||||||
@@ -23,42 +48,58 @@
|
|||||||
zaatar = {
|
zaatar = {
|
||||||
hostname = "zaatar.r";
|
hostname = "zaatar.r";
|
||||||
user = "root";
|
user = "root";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
makanek = {
|
makanek = {
|
||||||
hostname = pkgs.lib.niveum.externalNetwork.makanek;
|
hostname = externalNetwork.makanek;
|
||||||
user = "root";
|
user = "root";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
ful = {
|
ful = {
|
||||||
hostname = pkgs.lib.niveum.externalNetwork.ful;
|
hostname = externalNetwork.ful;
|
||||||
user = "root";
|
user = "root";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
tahina = {
|
tahina = {
|
||||||
hostname = "tahina.r";
|
hostname = "tahina.r";
|
||||||
user = "root";
|
user = "root";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
tabula = {
|
tabula = {
|
||||||
hostname = "tabula.r";
|
hostname = "tabula.r";
|
||||||
user = "root";
|
user = "root";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
manakish = {
|
manakish = {
|
||||||
hostname = "manakish.r";
|
hostname = "manakish.r";
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
kabsa = {
|
kabsa = {
|
||||||
hostname = "kabsa.r";
|
hostname = "kabsa.r";
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
port = sshPort;
|
||||||
};
|
};
|
||||||
fatteh = {
|
"nextcloud.fysi.dev" = {
|
||||||
hostname = "fatteh.r";
|
hostname = "116.203.82.203";
|
||||||
user = "kfm";
|
user = "root";
|
||||||
port = pkgs.lib.niveum.sshPort;
|
};
|
||||||
|
"lingua.miaengiadina.ch" = {
|
||||||
|
hostname = "135.181.85.233";
|
||||||
|
user = "root";
|
||||||
|
};
|
||||||
|
"cms-dev.woc2023.app".identityFile = sshIdentity "fysiweb";
|
||||||
|
"cms-master.woc2023.app".identityFile = sshIdentity "fysiweb";
|
||||||
|
"fysi-dev1" = {
|
||||||
|
hostname = "94.130.229.139";
|
||||||
|
user = "root";
|
||||||
|
identityFile = sshIdentity "fysiweb";
|
||||||
|
};
|
||||||
|
${fysi-dev1.hostname} = fysi-dev1;
|
||||||
|
"fysi-shared0" = {
|
||||||
|
hostname = "49.12.205.235";
|
||||||
|
user = "root";
|
||||||
|
identityFile = sshIdentity "fysiweb";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,21 +1,19 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
{
|
inherit (import ../lib) sshPort kieran;
|
||||||
|
in {
|
||||||
users.motd = "Welcome to ${config.networking.hostName}!";
|
users.motd = "Welcome to ${config.networking.hostName}!";
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ports = [ pkgs.lib.niveum.sshPort ];
|
ports = [sshPort];
|
||||||
settings = {
|
passwordAuthentication = false;
|
||||||
PasswordAuthentication = false;
|
forwardX11 = true;
|
||||||
X11Forwarding = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.root.openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys ++ [
|
users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoiRIn1dBUtpApcUyGbZKN+m5KBSgKIDQjdnQ8vU0xU kfm@kibbeh" # travel laptop
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
{
|
{
|
||||||
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
locker = x: "https://c.krebsco.de/${x}";
|
|
||||||
dictionaries = {
|
dictionaries = {
|
||||||
lojban = {
|
lojban = {
|
||||||
jbo-deu = pkgs.fetchzip {
|
jbo-deu = pkgs.fetchzip {
|
||||||
@@ -31,7 +29,7 @@ let
|
|||||||
sha256 = "1kmbdjqinrcxkc6jdyyrq5rl2wzhnrychyynnh91yhrjwjxlh44k";
|
sha256 = "1kmbdjqinrcxkc6jdyyrq5rl2wzhnrychyynnh91yhrjwjxlh44k";
|
||||||
};
|
};
|
||||||
Woodhouse = pkgs.fetchzip {
|
Woodhouse = pkgs.fetchzip {
|
||||||
url = locker "Woodhouse.zip";
|
url = "https://c.krebsco.de/Woodhouse.zip";
|
||||||
sha256 = "1dvnc2679yb048q2f3hr2h34acvhan0n3iir6h9ajlrdzz48mlkq";
|
sha256 = "1dvnc2679yb048q2f3hr2h34acvhan0n3iir6h9ajlrdzz48mlkq";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
@@ -70,122 +68,111 @@ let
|
|||||||
sha256 = "1bjja3n3layfd08xa1r0a6375dxh5zi6hlv7chkhgnx800cx7hxn";
|
sha256 = "1bjja3n3layfd08xa1r0a6375dxh5zi6hlv7chkhgnx800cx7hxn";
|
||||||
};
|
};
|
||||||
Roget = pkgs.fetchzip {
|
Roget = pkgs.fetchzip {
|
||||||
url = locker "stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/bigdict/stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
|
||||||
hash = "sha256-f2GcNf3+dqZ/sKBpywjdHHC7Rp6FJseY93edRJK3/us=";
|
sha256 = "1szyny9497bpyyccf9l5kr3bnw0wvl4cnsd0n1zscxpyzlsrqqbz";
|
||||||
};
|
};
|
||||||
JargonFile = pkgs.fetchzip {
|
JargonFile = pkgs.fetchzip {
|
||||||
url = locker "stardict-dictd-jargon-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/dict.org/stardict-dictd-jargon-2.4.2.tar.bz2";
|
||||||
hash = "sha256-RFEcz8XzNO+Yk5s8dKSzvF+aOvq2bKysA7VenLKC1yQ=";
|
sha256 = "096phar9qpmm0fnaqv5nz8x9lpxwnfj78g4vjfcfyd7kqp7iqla4";
|
||||||
};
|
};
|
||||||
Oxford-Collocations = pkgs.fetchzip {
|
Oxford-Collocations = pkgs.fetchzip {
|
||||||
url = locker "stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/bigdict/stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
|
||||||
sha256 = "1zkfs0zxkcn21z2lhcabrs77v4ma9hpv7qm119hpyi1d8ajcw07q";
|
sha256 = "1zkfs0zxkcn21z2lhcabrs77v4ma9hpv7qm119hpyi1d8ajcw07q";
|
||||||
};
|
};
|
||||||
Langenscheidt-Deu-En = pkgs.fetchzip {
|
Langenscheidt-Deu-En = pkgs.fetchzip {
|
||||||
url = locker "stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
|
||||||
sha256 = "12q9i5azq7ylyrpb6jqbaf1rxalc3kzcwjvbinvb0yabdxb80y30";
|
sha256 = "12q9i5azq7ylyrpb6jqbaf1rxalc3kzcwjvbinvb0yabdxb80y30";
|
||||||
};
|
};
|
||||||
Langenscheidt-En-Deu = pkgs.fetchzip {
|
Langenscheidt-En-Deu = pkgs.fetchzip {
|
||||||
url = locker "stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
|
||||||
sha256 = "087b05h155j5ldshfgx91pz81h6ijq2zaqjirg7ma8ig3l96zb59";
|
sha256 = "087b05h155j5ldshfgx91pz81h6ijq2zaqjirg7ma8ig3l96zb59";
|
||||||
};
|
};
|
||||||
Duden_Das_Fremdworterbuch = pkgs.fetchzip {
|
Duden_Das_Fremdworterbuch = pkgs.fetchzip {
|
||||||
url = locker "stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/german/stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
|
||||||
sha256 = "1zrcay54ccl031s6dvjwsah5slhanmjab87d81rxlcy8fx0xd8wq";
|
sha256 = "1zrcay54ccl031s6dvjwsah5slhanmjab87d81rxlcy8fx0xd8wq";
|
||||||
};
|
};
|
||||||
Duden_De_De = pkgs.fetchzip {
|
Duden_De_De = pkgs.fetchzip {
|
||||||
url = locker "stardict-Duden_De_De-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/german/stardict-Duden_De_De-2.4.2.tar.bz2";
|
||||||
sha256 = "1fhay04w5aaj83axfmla2ql34nb60gb05dgv0k94ig7p8x4yxxlf";
|
sha256 = "1fhay04w5aaj83axfmla2ql34nb60gb05dgv0k94ig7p8x4yxxlf";
|
||||||
};
|
};
|
||||||
ConciseOED = pkgs.fetchzip {
|
ConciseOED = pkgs.fetchzip {
|
||||||
url = locker "stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/bigdict/stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
|
||||||
sha256 = "19kpcxbhqzpmhi94mp48nalgmsh6s7rsx1gb4kwkhirp2pbjcyl7";
|
sha256 = "19kpcxbhqzpmhi94mp48nalgmsh6s7rsx1gb4kwkhirp2pbjcyl7";
|
||||||
};
|
};
|
||||||
Duden_Synonym = pkgs.fetchzip {
|
Duden_Synonym = pkgs.fetchzip {
|
||||||
url = locker "stardict-Duden_Synonym-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/german/stardict-Duden_Synonym-2.4.2.tar.bz2";
|
||||||
sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
|
sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
sanskrit =
|
sanskrit = let
|
||||||
let
|
repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f";
|
||||||
repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f";
|
in {
|
||||||
in
|
BoehtlingkRoth = pkgs.fetchzip {
|
||||||
{
|
url = "${repo}/sa-head/german-entries/tars/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch__2021-10-05_14-23-18Z__19MB.tar.gz";
|
||||||
BoehtlingkRoth = pkgs.fetchzip {
|
sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
|
||||||
url = "${repo}/sa-head/german-entries/tars/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch__2021-10-05_14-23-18Z__19MB.tar.gz";
|
stripRoot = false;
|
||||||
sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
BoehtlingkRothKurz = pkgs.fetchzip {
|
|
||||||
url = "${repo}/sa-head/german-entries/tars/Bohtlingk-Sanskrit-Worterbuch-in-kurzerer-Fassung__2021-10-05_14-23-18Z__10MB.tar.gz";
|
|
||||||
sha256 = "15yx31yrk40k9nn6kaysp4pprzj8dpd13dj3wafklc3izm8lr2wq";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
MonierWilliams = pkgs.fetchzip {
|
|
||||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/mw-cologne__2021-10-06_00-16-23Z__16MB.tar.gz";
|
|
||||||
sha256 = "0p99ybxwxmmd94hf035hvm2hhnfy84av7qq79xf28bh2rbx6s9ng";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
MonierWilliamsEnglish = pkgs.fetchzip {
|
|
||||||
url = "${repo}/en-head/tars/mw-english-sanskrit__2021-10-05_14-23-18Z__3MB.tar.gz";
|
|
||||||
sha256 = "09a61hhii4b1m2fkrlh4rm2xnlgwrllh84iypbc6wyj00w9jkl3x";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
Borooah = pkgs.fetchzip {
|
|
||||||
url = "${repo}/en-head/tars/borooah__2021-10-05_14-23-18Z__2MB.tar.gz";
|
|
||||||
sha256 = "0qmmfbynqgv125v48383i51ky9yi69zibhh7vwk95gyar2yrprn2";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
ApteEnglish = pkgs.fetchzip {
|
|
||||||
url = "${repo}/en-head/tars/apte-english-sanskrit-cologne__2021-10-06_00-12-51Z__1MB.tar.gz";
|
|
||||||
sha256 = "064ysm24ydc534ca689y5i2flnra8jkmh8zn0gsb6n8hdsb0d1lq";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
BoehtlingkRothKurz = pkgs.fetchzip {
|
||||||
|
url = "${repo}/sa-head/german-entries/tars/Bohtlingk-Sanskrit-Worterbuch-in-kurzerer-Fassung__2021-10-05_14-23-18Z__10MB.tar.gz";
|
||||||
|
sha256 = "15yx31yrk40k9nn6kaysp4pprzj8dpd13dj3wafklc3izm8lr2wq";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
MonierWilliams = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/mw-cologne__2021-10-06_00-16-23Z__16MB.tar.gz";
|
||||||
|
sha256 = "0p99ybxwxmmd94hf035hvm2hhnfy84av7qq79xf28bh2rbx6s9ng";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
MonierWilliamsEnglish = pkgs.fetchzip {
|
||||||
|
url = "${repo}/en-head/tars/mw-english-sanskrit__2021-10-05_14-23-18Z__3MB.tar.gz";
|
||||||
|
sha256 = "09a61hhii4b1m2fkrlh4rm2xnlgwrllh84iypbc6wyj00w9jkl3x";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
Borooah = pkgs.fetchzip {
|
||||||
|
url = "${repo}/en-head/tars/borooah__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||||
|
sha256 = "0qmmfbynqgv125v48383i51ky9yi69zibhh7vwk95gyar2yrprn2";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
ApteEnglish = pkgs.fetchzip {
|
||||||
|
url = "${repo}/en-head/tars/apte-english-sanskrit-cologne__2021-10-06_00-12-51Z__1MB.tar.gz";
|
||||||
|
sha256 = "064ysm24ydc534ca689y5i2flnra8jkmh8zn0gsb6n8hdsb0d1lq";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
oed = {
|
oed = {
|
||||||
OED1 = pkgs.fetchzip {
|
OED1 = pkgs.fetchzip {
|
||||||
url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
|
||||||
sha256 = "0i5vv1rv44yfwyf9bfbdrb9brzhhpvz2jnh39fv8hh107nkv2vcf";
|
sha256 = "0i5vv1rv44yfwyf9bfbdrb9brzhhpvz2jnh39fv8hh107nkv2vcf";
|
||||||
};
|
};
|
||||||
OED2 = pkgs.fetchzip {
|
OED2 = pkgs.fetchzip {
|
||||||
url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
|
||||||
sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
|
sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
coptic = {
|
|
||||||
dictionary = inputs.coptic-dictionary.packages.x86_64-linux.coptic-stardict;
|
|
||||||
Crum = pkgs.fetchzip {
|
|
||||||
url = locker "stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
|
|
||||||
sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
russian = {
|
russian = {
|
||||||
LingvoGermanRussian = pkgs.fetchzip {
|
LingvoGermanRussian = pkgs.fetchzip {
|
||||||
url = locker "stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/lingvo/stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
|
||||||
sha256 = "0p353gs2z4vj70hqsdhffjaaw3a4zlmcs46flipmf35lm5wmaj0g";
|
sha256 = "0p353gs2z4vj70hqsdhffjaaw3a4zlmcs46flipmf35lm5wmaj0g";
|
||||||
};
|
};
|
||||||
LingvoRussianGerman = pkgs.fetchzip {
|
LingvoRussianGerman = pkgs.fetchzip {
|
||||||
url = locker "stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/lingvo/stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
|
||||||
sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
|
sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
turkish = {
|
turkish = {
|
||||||
BabylonTurkishEnglish = pkgs.fetchzip {
|
BabylonTurkishEnglish = pkgs.fetchzip {
|
||||||
url = locker "stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
|
||||||
sha256 = "1zpzgk3w0536gww31bj58cmn3imnkndyjwbcr7bay8ibq2kzv44z";
|
sha256 = "17rv46r95nkikg7aszqmfrbgdhz9ny52w423m8n01g3p93shdb4i";
|
||||||
};
|
};
|
||||||
BabylonEnglishTurkish = pkgs.fetchzip {
|
BabylonEnglishTurkish = pkgs.fetchzip {
|
||||||
url = locker "stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
|
||||||
sha256 = "0myx31xzb7nrn5m657h0bwdgm5xp93ccwp6lcpbxgjxdjm3q0hc5";
|
sha256 = "063dl02s8ii8snsxgma8wi49xwr6afk6ysq0v986fygx5511353f";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
makeStardictDataDir =
|
makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: {inherit name path;}) dicts);
|
||||||
dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: { inherit name path; }) dicts);
|
|
||||||
|
|
||||||
makeStardict =
|
makeStardict = name: dicts:
|
||||||
name: dicts:
|
|
||||||
pkgs.writers.writeDashBin name ''
|
pkgs.writers.writeDashBin name ''
|
||||||
set -efu
|
set -efu
|
||||||
export SDCV_PAGER=${toString sdcvPager}
|
export SDCV_PAGER=${toString sdcvPager}
|
||||||
@@ -193,13 +180,7 @@ let
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
sdcvPager = pkgs.writers.writeDash "sdcvPager" ''
|
sdcvPager = pkgs.writers.writeDash "sdcvPager" ''
|
||||||
export PATH=${
|
export PATH=${lib.makeBinPath [pkgs.gnused pkgs.ncurses pkgs.less]}
|
||||||
lib.makeBinPath [
|
|
||||||
pkgs.gnused
|
|
||||||
pkgs.ncurses
|
|
||||||
pkgs.less
|
|
||||||
]
|
|
||||||
}
|
|
||||||
sed "
|
sed "
|
||||||
s!<sup>1</sup>!¹!gI
|
s!<sup>1</sup>!¹!gI
|
||||||
s!<sup>2</sup>!²!gI
|
s!<sup>2</sup>!²!gI
|
||||||
@@ -302,98 +283,98 @@ let
|
|||||||
s!</\?p[^>]*>!!gI
|
s!</\?p[^>]*>!!gI
|
||||||
" | less -FR
|
" | less -FR
|
||||||
'';
|
'';
|
||||||
in
|
in {
|
||||||
{
|
environment.etc.stardict.source = toString (makeStardictDataDir ({
|
||||||
# environment.etc.stardict.source = toString (makeStardictDataDir ({
|
Crum = pkgs.fetchzip {
|
||||||
# Crum = pkgs.fetchzip {
|
url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
|
||||||
# url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
|
sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
|
||||||
# sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
|
};
|
||||||
# };
|
SmithBiographyMythology = pkgs.fetchzip {
|
||||||
# SmithBiographyMythology = pkgs.fetchzip {
|
url = "https://github.com/latin-dict/Smith1873/releases/download/v1.0/Smith1873-stardict.zip";
|
||||||
# url = "https://github.com/latin-dict/Smith1873/releases/download/v1.0/Smith1873-stardict.zip";
|
sha256 = "01h5fxacp2m60xir8kzslkfy772vs3vmz07zhdwfhcwdaxif2af2";
|
||||||
# sha256 = "01h5fxacp2m60xir8kzslkfy772vs3vmz07zhdwfhcwdaxif2af2";
|
};
|
||||||
# };
|
SmithAntiquities = pkgs.fetchzip {
|
||||||
# SmithAntiquities = pkgs.fetchzip {
|
url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
|
||||||
# url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
|
sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
|
||||||
# sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
|
};
|
||||||
# };
|
}
|
||||||
# }
|
// dictionaries.classics
|
||||||
# // dictionaries.classics
|
// dictionaries.sanskrit
|
||||||
# // dictionaries.sanskrit
|
// dictionaries.oed
|
||||||
# // dictionaries.oed
|
// dictionaries.russian
|
||||||
# // dictionaries.russian
|
// dictionaries.englishGerman
|
||||||
# // dictionaries.englishGerman
|
// dictionaries.turkish));
|
||||||
# // dictionaries.turkish));
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
# pkgs.goldendict
|
||||||
(makeStardict "lsj" dictionaries.classics)
|
(makeStardict "lsj" dictionaries.classics)
|
||||||
(makeStardict "sa" dictionaries.sanskrit)
|
(makeStardict "sa" dictionaries.sanskrit)
|
||||||
(makeStardict "oed" dictionaries.oed)
|
(makeStardict "oed" dictionaries.oed)
|
||||||
(makeStardict "sd-russian" dictionaries.russian)
|
(makeStardict "sd-russian" dictionaries.russian)
|
||||||
(makeStardict "sd" dictionaries.englishGerman)
|
(makeStardict "sd" dictionaries.englishGerman)
|
||||||
(makeStardict "jbo" dictionaries.lojban)
|
(makeStardict "jbo" dictionaries.lojban)
|
||||||
(makeStardict "cop" dictionaries.coptic)
|
|
||||||
(makeStardict "sd-turkish" dictionaries.turkish)
|
(makeStardict "sd-turkish" dictionaries.turkish)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
|
https://github.com/latin-dict/Georges1910/releases/download/v1.0/Georges1910-stardict.zip
|
||||||
https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
|
https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip
|
||||||
http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
|
http://download.huzheng.org/bigdict/stardict-Cambridge_Dictionary_of_American_Idioms-2.4.2.tar.bz2
|
||||||
http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
|
http://download.huzheng.org/bigdict/stardict-Concise_Oxford_Thesaurus_2nd_Ed-2.4.2.tar.bz2
|
||||||
http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
|
http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P1-2.4.2.tar.bz2
|
||||||
http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
|
http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
|
||||||
|
|
||||||
Duden_Rechtschreibung = pkgs.fetchzip {
|
Duden_Rechtschreibung = pkgs.fetchzip {
|
||||||
url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
|
||||||
sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
|
sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
|
||||||
};
|
};
|
||||||
Duden = pkgs.fetchzip {
|
Duden = pkgs.fetchzip {
|
||||||
url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
|
||||||
sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
|
sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
|
||||||
};
|
};
|
||||||
FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
|
FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
|
||||||
url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
|
url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
|
||||||
sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
|
sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
|
||||||
};
|
};
|
||||||
Cappeller = pkgs.fetchzip {
|
Cappeller = pkgs.fetchzip {
|
||||||
url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
|
url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
|
||||||
sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
|
sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
Yates = pkgs.fetchzip {
|
Yates = pkgs.fetchzip {
|
||||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
|
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||||
sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
|
sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
Wilson = pkgs.fetchzip {
|
Wilson = pkgs.fetchzip {
|
||||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
|
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
|
||||||
sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
|
sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
SpokenSanskrit = pkgs.fetchzip {
|
SpokenSanskrit = pkgs.fetchzip {
|
||||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
|
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
|
||||||
sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
|
sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
Grassmann = pkgs.fetchzip {
|
Grassmann = pkgs.fetchzip {
|
||||||
url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
|
url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||||
sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
|
sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
Benfey = pkgs.fetchzip {
|
Benfey = pkgs.fetchzip {
|
||||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
|
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||||
sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
|
sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
ApteSa = pkgs.fetchzip {
|
ApteSa = pkgs.fetchzip {
|
||||||
url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
|
url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
|
||||||
sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
|
sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
MacDonell = pkgs.fetchzip {
|
MacDonell = pkgs.fetchzip {
|
||||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
|
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||||
sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
|
sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -1,84 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
generatedWallpaper = pkgs.runCommand "wallpaper.png" { } ''
|
|
||||||
${inputs.wallpaper-generator.packages.x86_64-linux.wp-gen}/bin/wallpaper-generator lines \
|
|
||||||
--output $out \
|
|
||||||
${lib.concatMapStringsSep " " (
|
|
||||||
n: "--base0${lib.toHexString n}=${config.lib.stylix.colors.withHashtag."base0${lib.toHexString n}"}"
|
|
||||||
) (lib.range 0 15)}
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
# https://danth.github.io/stylix/tricks.html
|
|
||||||
# stylix.image = inputs.wallpapers.outPath + "/meteora/rodrigo-soares-250630.jpg";
|
|
||||||
stylix.enable = true;
|
|
||||||
stylix.image = generatedWallpaper;
|
|
||||||
|
|
||||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
|
|
||||||
|
|
||||||
stylix.cursor = {
|
|
||||||
name = "capitaine-cursors-white";
|
|
||||||
package = pkgs.capitaine-cursors;
|
|
||||||
size = 12;
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager.users.me = {
|
|
||||||
stylix.autoEnable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# environment.etc."stylix/wallpaper.png".source = generatedWallpaper;
|
|
||||||
|
|
||||||
# stylix.polarity = "either";
|
|
||||||
# stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/${
|
|
||||||
# onedark
|
|
||||||
# synth-midnight-dark
|
|
||||||
# apprentice # https://romainl.github.io/Apprentice/
|
|
||||||
# one-light
|
|
||||||
# onedark
|
|
||||||
# material # https://github.com/ntpeters/base16-materialtheme-scheme
|
|
||||||
# material-palenight
|
|
||||||
# material-lighter
|
|
||||||
# tomorrow # https://github.com/chriskempson/tomorrow-theme
|
|
||||||
# tomorrow-night
|
|
||||||
# gruvbox-light-medium # https://github.com/dawikur/base16-gruvbox-scheme
|
|
||||||
# gruvbox-dark-medium
|
|
||||||
# selenized-light # https://github.com/jan-warchol/selenized
|
|
||||||
# selenized-dark
|
|
||||||
# papercolor-light
|
|
||||||
# papercolor-dark
|
|
||||||
# dracula # https://draculatheme.com/
|
|
||||||
# }.yaml";
|
|
||||||
|
|
||||||
stylix.fonts = {
|
|
||||||
serif = {
|
|
||||||
package = pkgs.noto-fonts;
|
|
||||||
name = "Noto Serif";
|
|
||||||
};
|
|
||||||
|
|
||||||
sansSerif = {
|
|
||||||
package = pkgs.noto-fonts;
|
|
||||||
name = "Noto Sans";
|
|
||||||
};
|
|
||||||
|
|
||||||
monospace = {
|
|
||||||
package = pkgs.noto-fonts;
|
|
||||||
name = "Noto Sans Mono";
|
|
||||||
};
|
|
||||||
|
|
||||||
emoji = {
|
|
||||||
package = pkgs.noto-fonts-color-emoji;
|
|
||||||
name = "Noto Color Emoji";
|
|
||||||
};
|
|
||||||
|
|
||||||
sizes = {
|
|
||||||
terminal = 6;
|
|
||||||
applications = 10;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -6,5 +6,5 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.me.extraGroups = [ "wheel" ];
|
users.users.me.extraGroups = ["wheel"];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,7 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
toSymbols = pkgs.writers.writeDash "to-symbols" ''
|
toSymbols = pkgs.writers.writeDash "to-symbols" ''
|
||||||
${pkgs.gnused}/bin/sed '
|
${pkgs.gnused}/bin/sed '
|
||||||
s/\bTri\b/△/;
|
s/\bTri\b/△/;
|
||||||
@@ -41,36 +40,19 @@ let
|
|||||||
s/^\s*//
|
s/^\s*//
|
||||||
'
|
'
|
||||||
'';
|
'';
|
||||||
in
|
in {
|
||||||
{
|
niveum.telegramBots.transits = {
|
||||||
niveum.bots.transits = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
time = "*:0/1";
|
time = "*:0/1";
|
||||||
mastodon = {
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
enable = true;
|
chatIds = ["-1001796440545"];
|
||||||
tokenFile = config.age.secrets.mastodon-token-transits.path;
|
command = toString (pkgs.writers.writeDash "common-transits" ''
|
||||||
};
|
now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
|
||||||
telegram = {
|
date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
|
||||||
enable = true;
|
{
|
||||||
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
${pkgs.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
|
||||||
chatIds = [ "-1001796440545" ];
|
${pkgs.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
|
||||||
};
|
} | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
|
||||||
command = toString (
|
'');
|
||||||
pkgs.writers.writeDash "common-transits" ''
|
|
||||||
set -efu
|
|
||||||
|
|
||||||
now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
|
|
||||||
date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
|
|
||||||
(
|
|
||||||
cd ${pkgs.astrolog}/bin
|
|
||||||
# ./astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
|
|
||||||
./astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" -A 2
|
|
||||||
) | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
|
|
||||||
''
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
mastodon-token-transits.file = ../../secrets/mastodon-token-transits.age;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
34
configs/telegram-bots/autorenkalender.nix
Normal file
34
configs/telegram-bots/autorenkalender.nix
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
autorenkalender-package = pkgs.fetchFromGitHub {
|
||||||
|
owner = "kmein";
|
||||||
|
repo = "autorenkalender";
|
||||||
|
rev = "cf49a7b057301332d980eb47042a626add93db66";
|
||||||
|
sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
|
||||||
|
};
|
||||||
|
autorenkalender =
|
||||||
|
pkgs.python3Packages.callPackage autorenkalender-package {};
|
||||||
|
in {
|
||||||
|
niveum.telegramBots.autorenkalender = {
|
||||||
|
enable = true;
|
||||||
|
time = "07:00";
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = ["@autorenkalender"];
|
||||||
|
parseMode = "Markdown";
|
||||||
|
command = "${autorenkalender}/bin/autorenkalender";
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets.telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Autorenkalender";
|
||||||
|
description = "sends <a href=\"https://www.projekt-gutenberg.org/\">Projekt Gutenberg</a>'s anniversary information to Telegram.";
|
||||||
|
link = "https://t.me/Autorenkalender";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
36
configs/telegram-bots/celan.nix
Normal file
36
configs/telegram-bots/celan.nix
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
celan = pkgs.fetchzip {
|
||||||
|
url = "http://c.krebsco.de/celan.tar.gz";
|
||||||
|
sha256 = "sha256-nA+EwAH2vkeolsy9AoPLEMt1uGKDZe/aPrS95CZvuus=";
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
niveum.telegramBots.celan = {
|
||||||
|
enable = true;
|
||||||
|
time = "08:00";
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = ["@PaulCelan"];
|
||||||
|
command = toString (pkgs.writers.writeDash "random-celan" ''
|
||||||
|
cd ${celan}
|
||||||
|
poem="$(${pkgs.findutils}/bin/find . -type f | ${pkgs.coreutils}/bin/shuf -n1)"
|
||||||
|
source="$(${pkgs.coreutils}/bin/dirname "$poem" | ${pkgs.gnused}/bin/sed 's#^\./##;s/[-_]/ /g;s!/! › !g;s/0\([0-9]\+\)/\1/g')"
|
||||||
|
cat "$poem"
|
||||||
|
echo
|
||||||
|
printf "Aus: %s\n" "$source"
|
||||||
|
'');
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.telegram-bot-celan.timerConfig.RandomizedDelaySec = "10h";
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Paul Celan Bot";
|
||||||
|
description = "sends a random poem by Paul Celan to Telegram.";
|
||||||
|
link = "https://t.me/PaulCelan";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -4,44 +4,30 @@
|
|||||||
lib,
|
lib,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
telebots = inputs.telebots.defaultPackage.x86_64-linux;
|
telebots = inputs.telebots.defaultPackage.x86_64-linux;
|
||||||
reverseDirectory = "/run/telegram-reverse";
|
reverseDirectory = "/run/telegram-reverse";
|
||||||
proverbDirectory = "/run/telegram-proverb";
|
proverbDirectory = "/run/telegram-proverb";
|
||||||
in
|
inherit (import ../../lib) tmpfilesConfig;
|
||||||
{
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./logotheca.nix
|
./literature-quote.nix
|
||||||
./transits.nix
|
./astrology.nix
|
||||||
./autorenkalender.nix
|
./autorenkalender.nix
|
||||||
./hesychius.nix
|
./hesychius.nix
|
||||||
./smyth.nix
|
./smyth.nix
|
||||||
./nachtischsatan.nix
|
./nachtischsatan.nix
|
||||||
# ./tlg-wotd.nix TODO reenable
|
./tlg-wotd.nix
|
||||||
./celan.nix
|
./celan.nix
|
||||||
./nietzsche.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
age.secrets = {
|
systemd.tmpfiles.rules = map (path:
|
||||||
telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
|
tmpfilesConfig {
|
||||||
};
|
type = "d";
|
||||||
|
mode = "0750";
|
||||||
systemd.tmpfiles.rules =
|
age = "1h";
|
||||||
map
|
inherit path;
|
||||||
(
|
}) [reverseDirectory proverbDirectory];
|
||||||
path:
|
|
||||||
pkgs.lib.niveum.tmpfilesConfig {
|
|
||||||
type = "d";
|
|
||||||
mode = "0750";
|
|
||||||
age = "1h";
|
|
||||||
inherit path;
|
|
||||||
}
|
|
||||||
)
|
|
||||||
[
|
|
||||||
reverseDirectory
|
|
||||||
proverbDirectory
|
|
||||||
];
|
|
||||||
|
|
||||||
niveum.passport.services = [
|
niveum.passport.services = [
|
||||||
{
|
{
|
||||||
@@ -65,13 +51,12 @@ in
|
|||||||
telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
|
telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
|
||||||
telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
|
telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
|
||||||
telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
|
telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
|
||||||
telegram-token-streaming-link.file = ../../secrets/telegram-token-streaming-link.age;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.telegram-reverse = {
|
systemd.services.telegram-reverse = {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = ["multi-user.target"];
|
||||||
description = "Telegram reverse bot";
|
description = "Telegram reverse bot";
|
||||||
path = [ pkgs.ffmpeg ];
|
path = [pkgs.ffmpeg];
|
||||||
enable = true;
|
enable = true;
|
||||||
script = ''
|
script = ''
|
||||||
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-reverse
|
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-reverse
|
||||||
@@ -81,19 +66,8 @@ in
|
|||||||
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-reverse.path}";
|
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-reverse.path}";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.telegram-streaming-link = {
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
description = "Telegram bot converting YouTube Music <-> Spotify";
|
|
||||||
enable = true;
|
|
||||||
script = ''
|
|
||||||
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-streaming-link
|
|
||||||
'';
|
|
||||||
serviceConfig.Restart = "always";
|
|
||||||
serviceConfig.LoadCredential = "token:${config.age.secrets.telegram-token-streaming-link.path}";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.telegram-betacode = {
|
systemd.services.telegram-betacode = {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = ["multi-user.target"];
|
||||||
description = "Telegram beta code bot";
|
description = "Telegram beta code bot";
|
||||||
enable = true;
|
enable = true;
|
||||||
script = ''
|
script = ''
|
||||||
@@ -104,7 +78,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.telegram-proverb = {
|
systemd.services.telegram-proverb = {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = ["multi-user.target"];
|
||||||
description = "Telegram proverb bot";
|
description = "Telegram proverb bot";
|
||||||
enable = true;
|
enable = true;
|
||||||
script = ''
|
script = ''
|
||||||
27
configs/telegram-bots/hesychius.nix
Normal file
27
configs/telegram-bots/hesychius.nix
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
hesychius = inputs.scripts.outPath + "/hesychius/hesychius.txt";
|
||||||
|
in {
|
||||||
|
niveum.telegramBots.hesychius = {
|
||||||
|
enable = true;
|
||||||
|
time = "08:00";
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = ["@HesychiosAlexandreus"];
|
||||||
|
command = "${pkgs.coreutils}/bin/shuf -n1 ${hesychius}";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.telegram-bot-hesychius.timerConfig.RandomizedDelaySec = "10h";
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Hesychius of Alexandria Bot";
|
||||||
|
description = "sends a random word from Hesychius of Alexandria's lexicon to Telegram.";
|
||||||
|
link = "https://t.me/HesychiosAlexandreus";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
23
configs/telegram-bots/literature-quote.nix
Normal file
23
configs/telegram-bots/literature-quote.nix
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
niveumPackages,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
niveum.telegramBots.quotebot = {
|
||||||
|
enable = true;
|
||||||
|
time = "08/6:00";
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = ["-1001760262519"];
|
||||||
|
command = "${niveumPackages.literature-quote}/bin/literature-quote";
|
||||||
|
parseMode = "Markdown";
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Literature quote bot";
|
||||||
|
description = "sends me and my friends three <a href=\"https://logotheca.xn--kiern-0qa.de/\">logotheca</a> quotes a day.";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
49
configs/telegram-bots/nachtischsatan.nix
Normal file
49
configs/telegram-bots/nachtischsatan.nix
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
nachtischsatan-bot = {tokenFile}:
|
||||||
|
pkgs.writers.writePython3 "nachtischsatan-bot" {
|
||||||
|
libraries = [pkgs.python3Packages.python-telegram-bot];
|
||||||
|
} ''
|
||||||
|
from telegram.ext import Updater, MessageHandler
|
||||||
|
from telegram.ext.filters import Filters
|
||||||
|
import random
|
||||||
|
import time
|
||||||
|
|
||||||
|
|
||||||
|
def flubber(update, context):
|
||||||
|
time.sleep(random.randrange(4000) / 1000)
|
||||||
|
update.message.reply_text("*flubberflubber*")
|
||||||
|
|
||||||
|
|
||||||
|
with open('${tokenFile}', 'r') as tokenFile:
|
||||||
|
updater = Updater(tokenFile.read().strip())
|
||||||
|
|
||||||
|
updater.dispatcher.add_handler(MessageHandler(Filters.all, flubber))
|
||||||
|
updater.start_polling()
|
||||||
|
updater.idle()
|
||||||
|
'';
|
||||||
|
in {
|
||||||
|
systemd.services.telegram-nachtischsatan = {
|
||||||
|
wantedBy = ["multi-user.target"];
|
||||||
|
description = "*flubberflubber*";
|
||||||
|
enable = true;
|
||||||
|
script = toString (nachtischsatan-bot {
|
||||||
|
tokenFile = config.age.secrets.telegram-token-nachtischsatan.path;
|
||||||
|
});
|
||||||
|
serviceConfig.Restart = "always";
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets.telegram-token-nachtischsatan.file = ../../secrets/telegram-token-nachtischsatan.age;
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Nachtischsatan-Bot";
|
||||||
|
link = "https://t.me/NachtischsatanBot";
|
||||||
|
description = "*flubberflubber*";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
38
configs/telegram-bots/smyth.nix
Normal file
38
configs/telegram-bots/smyth.nix
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
niveum.telegramBots.smyth = {
|
||||||
|
enable = true;
|
||||||
|
time = "08:00";
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
chatIds = ["@HerbertWeirSmyth"];
|
||||||
|
command = toString (pkgs.writers.writeDash "random-smyth" ''
|
||||||
|
set -efu
|
||||||
|
|
||||||
|
RANDOM_SECTION=$(
|
||||||
|
${pkgs.curl}/bin/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/"$//'
|
||||||
|
)
|
||||||
|
|
||||||
|
${pkgs.curl}/bin/curl -sSL http://www.perseus.tufts.edu/hopper/text?doc=$RANDOM_SECTION\
|
||||||
|
| ${pkgs.htmlq}/bin/htmlq '#text_main' \
|
||||||
|
| ${pkgs.gnused}/bin/sed 's/<\/\?hr>//g' \
|
||||||
|
| ${pkgs.pandoc}/bin/pandoc -f html -t plain --wrap=none
|
||||||
|
'');
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers.telegram-bot-smyth.timerConfig.RandomizedDelaySec = "10h";
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Herbert Weir Smyth Bot";
|
||||||
|
description = "sends a random section from Smyth's Ancient Greek grammar to Telegram.";
|
||||||
|
link = "https://t.me/HerbertWeirSmyth";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
29
configs/telegram-bots/tlg-wotd.nix
Normal file
29
configs/telegram-bots/tlg-wotd.nix
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
niveum.telegramBots.tlg-wotd = {
|
||||||
|
enable = true;
|
||||||
|
time = "9:30";
|
||||||
|
chatIds = ["@tlgwotd"];
|
||||||
|
tokenFile = config.age.secrets.telegram-token-kmein.path;
|
||||||
|
command = toString (pkgs.writers.writeDash "tlg-wotd" ''
|
||||||
|
${pkgs.curl}/bin/curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd \
|
||||||
|
| ${pkgs.recode}/bin/recode html..utf8 \
|
||||||
|
| ${pkgs.jq}/bin/jq -r '
|
||||||
|
"*\(.word)* '\'''\(.definition | sub("<.*>"; "") | rtrimstr(" "))'\'''\n\nFirst occurrence: \(.firstOccurrence)\nNumber of occurrences: \(.totalOccurrences)"
|
||||||
|
'
|
||||||
|
'');
|
||||||
|
parseMode = "Markdown";
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.passport.services = [
|
||||||
|
{
|
||||||
|
title = "Thesaurus Linguae Graecae Word of the Day";
|
||||||
|
description = "sends <a href=\"https://stephanus.tlg.uci.edu/\">TLG</a>'s word of the day to Telegram.";
|
||||||
|
link = "https://t.me/tlgwotd";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
82
configs/themes.nix
Normal file
82
configs/themes.nix
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
switch-theme = pkgs.writers.writeDashBin "switch-theme" ''
|
||||||
|
set -efux
|
||||||
|
if [ "$1" = toggle ]; then
|
||||||
|
if [ "$(${pkgs.coreutils}/bin/cat /var/theme/current_theme)" = dark ]; then
|
||||||
|
${placeholder "out"}/bin/switch-theme light
|
||||||
|
else
|
||||||
|
${placeholder "out"}/bin/switch-theme dark
|
||||||
|
fi
|
||||||
|
elif test -e "/etc/themes/$1"; then
|
||||||
|
mkdir -p /var/theme/config
|
||||||
|
${pkgs.rsync}/bin/rsync --chown=${config.users.users.me.name}:users -a --delete "/etc/themes/$1/" /var/theme/config/
|
||||||
|
echo "$1" > /var/theme/current_theme
|
||||||
|
${pkgs.coreutils}/bin/chown ${config.users.users.me.name}:users /var/theme/current_theme
|
||||||
|
${pkgs.xorg.xrdb}/bin/xrdb -merge /var/theme/config/xresources
|
||||||
|
${pkgs.procps}/bin/pkill -HUP xsettingsd
|
||||||
|
else
|
||||||
|
echo "theme $1 not found"
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
in {
|
||||||
|
systemd.services.xsettingsd = {
|
||||||
|
wantedBy = ["multi-user.target"];
|
||||||
|
after = ["display-manager.service"];
|
||||||
|
environment.DISPLAY = ":0";
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${pkgs.xsettingsd}/bin/xsettingsd -c /var/theme/config/xsettings.conf";
|
||||||
|
User = config.users.users.me.name;
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "15s";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d /var/theme/ 755 ${config.users.users.me.name} users"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
switch-theme
|
||||||
|
pkgs.capitaine-cursors
|
||||||
|
];
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
home.pointerCursor = {
|
||||||
|
name = "capitaine-cursors-white";
|
||||||
|
package = pkgs.capitaine-cursors;
|
||||||
|
size = 16;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.etc = {
|
||||||
|
"themes/light/xsettings.conf".text = ''
|
||||||
|
Net/ThemeName "Adwaita"
|
||||||
|
'';
|
||||||
|
"themes/light/xresources".text = ''
|
||||||
|
*background: #ffffff
|
||||||
|
*foreground: #000000
|
||||||
|
'';
|
||||||
|
"themes/dark/xsettings.conf".text = ''
|
||||||
|
Net/ThemeName "Adwaita-dark"
|
||||||
|
'';
|
||||||
|
"themes/dark/xresources".text = ''
|
||||||
|
*background: #000000
|
||||||
|
*foreground: #ffffff
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
system.activationScripts.theme.text = ''
|
||||||
|
export DISPLAY=:0
|
||||||
|
if test -e /var/theme/current_theme; then
|
||||||
|
${switch-theme}/bin/switch-theme "$(cat /var/theme/current_theme)" ||
|
||||||
|
${switch-theme}/bin/switch-theme dark
|
||||||
|
else
|
||||||
|
${switch-theme}/bin/switch-theme dark
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
}
|
||||||
33
configs/theming.nix
Normal file
33
configs/theming.nix
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
theme = (import <niveum/lib>).theme pkgs;
|
||||||
|
in {
|
||||||
|
environment.systemPackages = [theme.gtk.package theme.icon.package theme.cursor.package];
|
||||||
|
|
||||||
|
services.xserver.displayManager.lightdm.greeters.gtk = {
|
||||||
|
theme = {inherit (theme.gtk) name package;};
|
||||||
|
iconTheme = {inherit (theme.icon) name package;};
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
gtk = {
|
||||||
|
enable = true;
|
||||||
|
iconTheme = theme.icon;
|
||||||
|
theme = theme.gtk;
|
||||||
|
};
|
||||||
|
qt = {
|
||||||
|
enable = true;
|
||||||
|
platformTheme = "gtk";
|
||||||
|
};
|
||||||
|
home.pointerCursor =
|
||||||
|
theme.cursor
|
||||||
|
// {
|
||||||
|
size = 16;
|
||||||
|
x11.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
{
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.tmuxp
|
pkgs.tmuxp
|
||||||
pkgs.reptyr # move programs over to a tmux session
|
pkgs.reptyr # move programs over to a tmux session
|
||||||
@@ -14,7 +13,7 @@
|
|||||||
aggressiveResize = true;
|
aggressiveResize = true;
|
||||||
escapeTime = 50;
|
escapeTime = 50;
|
||||||
historyLimit = 7000;
|
historyLimit = 7000;
|
||||||
shortcut = "b";
|
shortcut = "a";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set -g mouse on
|
set -g mouse on
|
||||||
|
|
||||||
@@ -38,6 +37,15 @@
|
|||||||
set -g status-left-length 32
|
set -g status-left-length 32
|
||||||
set -g status-right-length 150
|
set -g status-right-length 150
|
||||||
|
|
||||||
|
set -g status-bg colour242
|
||||||
|
|
||||||
|
setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
|
||||||
|
setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
|
||||||
|
|
||||||
|
set -g status-left ""
|
||||||
|
set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
|
||||||
|
set -g status-justify left
|
||||||
|
|
||||||
set -g status-position bottom
|
set -g status-position bottom
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
{
|
|
||||||
services.tor.enable = true;
|
services.tor.enable = true;
|
||||||
services.tor.client.enable = true;
|
services.tor.client.enable = true;
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [pkgs.tor pkgs.torsocks];
|
||||||
pkgs.tor
|
|
||||||
pkgs.torsocks
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
43
configs/traadfri.nix
Normal file
43
configs/traadfri.nix
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (import ../lib) localAddresses;
|
||||||
|
living-room-id = 131090;
|
||||||
|
in {
|
||||||
|
environment.systemPackages = [
|
||||||
|
(pkgs.writers.writeDashBin "traadfri-party" ''
|
||||||
|
while true; do
|
||||||
|
for color in $(traadfri colours | shuf); do
|
||||||
|
echo "$color"
|
||||||
|
traadfri group "''${2:-${toString living-room-id}}" --on --colour="$color"
|
||||||
|
sleep "''${1:-2}"
|
||||||
|
done
|
||||||
|
done
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
|
||||||
|
age.secrets.traadfri-key = {
|
||||||
|
file = ../secrets/traadfri-key.age;
|
||||||
|
owner = config.users.users.me.name;
|
||||||
|
group = config.users.users.me.group;
|
||||||
|
mode = "400";
|
||||||
|
};
|
||||||
|
|
||||||
|
niveum.traadfri = {
|
||||||
|
enable = true;
|
||||||
|
user = "kmein";
|
||||||
|
host = localAddresses.tradfri;
|
||||||
|
keyFile = config.age.secrets.traadfri-key.path;
|
||||||
|
rooms = {
|
||||||
|
corridor = 131080;
|
||||||
|
kitchen = 131081;
|
||||||
|
bedroom = 131082;
|
||||||
|
living-room = living-room-id;
|
||||||
|
bedside = 131087;
|
||||||
|
chain = 131089;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
155
configs/uni.nix
155
configs/uni.nix
@@ -1,155 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
username = "meinhak99";
|
|
||||||
fu-defaults =
|
|
||||||
let
|
|
||||||
mailhost = "mail.zedat.fu-berlin.de";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imap.host = mailhost;
|
|
||||||
imap.port = 993;
|
|
||||||
imap.tls.enable = true;
|
|
||||||
smtp.host = mailhost;
|
|
||||||
smtp.port = 465;
|
|
||||||
smtp.tls.enable = true;
|
|
||||||
folders.drafts = "Entwürfe";
|
|
||||||
folders.sent = "Gesendet";
|
|
||||||
folders.trash = "Papierkorb";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
home-manager.users.me = {
|
|
||||||
programs.ssh = {
|
|
||||||
matchBlocks = {
|
|
||||||
fu-berlin = {
|
|
||||||
user = username;
|
|
||||||
hostname = "login.zedat.fu-berlin.de";
|
|
||||||
setEnv.TERM = "xterm";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
accounts.email.accounts = {
|
|
||||||
letos = lib.recursiveUpdate pkgs.lib.niveum.email.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 pkgs.lib.niveum.email.defaults (
|
|
||||||
lib.recursiveUpdate fu-defaults (
|
|
||||||
let
|
|
||||||
userName = "meinhak99";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
userName = userName;
|
|
||||||
address = "kieran.meinhardt@fu-berlin.de";
|
|
||||||
aliases = [ "${userName}@fu-berlin.de" ];
|
|
||||||
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-meinhak99.path}";
|
|
||||||
himalaya = {
|
|
||||||
enable = true;
|
|
||||||
settings.backend = "imap";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
)
|
|
||||||
);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
email-password-meinhak99 = {
|
|
||||||
file = ../secrets/email-password-meinhak99.age;
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
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";
|
|
||||||
group = "root";
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# if it fails with "connection reset by peer" run `sudo sshfs ... ... -o ...` manually
|
|
||||||
# it needs to say 'yes' to the server's fingerprint
|
|
||||||
system.fsPackages = [ pkgs.sshfs ];
|
|
||||||
|
|
||||||
# https://www.zedat.fu-berlin.de/tip4u_157.pdf
|
|
||||||
fileSystems =
|
|
||||||
let
|
|
||||||
fu-berlin-cifs-options = [
|
|
||||||
"uid=${toString config.users.users.me.uid}"
|
|
||||||
"gid=${toString config.users.groups.users.gid}"
|
|
||||||
"rw"
|
|
||||||
"nounix"
|
|
||||||
"domain=fu-berlin"
|
|
||||||
"noauto"
|
|
||||||
"x-systemd.automount"
|
|
||||||
"x-systemd.device-timeout=1"
|
|
||||||
"x-systemd.idle-timeout=1min"
|
|
||||||
];
|
|
||||||
|
|
||||||
firstCharacter = lib.strings.substring 0 1;
|
|
||||||
|
|
||||||
home-directory-mount = user: {
|
|
||||||
"${pkgs.lib.niveum.remoteDir}/fu/${user}/home" = {
|
|
||||||
device = "${user}@login.zedat.fu-berlin.de:/home/${firstCharacter user}/${user}";
|
|
||||||
fsType = "sshfs";
|
|
||||||
options = [
|
|
||||||
"allow_other"
|
|
||||||
"_netdev"
|
|
||||||
"x-systemd.automount"
|
|
||||||
"reconnect"
|
|
||||||
"ServerAliveInterval=15"
|
|
||||||
"IdentityFile=${config.age.secrets.fu-sftp-key.path}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
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
|
|
||||||
# root firefox will not open login window unless root owns Xauthority
|
|
||||||
sudo cp $XAUTHORITY /root/.Xauthority
|
|
||||||
sudo chown root: /root/.Xauthority
|
|
||||||
XAUTHORITY=/root/.Xauthority sudo ${pkgs.openconnect}/bin/openconnect vpn.fu-berlin.de --useragent=AnyConnect
|
|
||||||
fi
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{ 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,4 +1 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: {environment.systemPackages = [pkgs.vscode];}
|
||||||
{
|
|
||||||
environment.systemPackages = [ pkgs.vscode ];
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,16 +2,13 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
url = "http://prism.r/realwallpaper-krebs-stars-berlin.png";
|
||||||
# url = "http://wallpaper.r/realwallpaper-krebs-stars-berlin.png";
|
|
||||||
url = "http://wallpaper.r/realwallpaper-krebs.png";
|
|
||||||
stateDir = "~/.cache/wallpaper";
|
stateDir = "~/.cache/wallpaper";
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
systemd.user.services.wallpaper = {
|
systemd.user.services.wallpaper = {
|
||||||
wantedBy = [ "graphical-session.target" ];
|
wantedBy = ["graphical-session.target"];
|
||||||
after = [ "network.target" ];
|
after = ["network.target"];
|
||||||
script = ''
|
script = ''
|
||||||
set -euf
|
set -euf
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,8 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
environment.systemPackages = [pkgs.watson];
|
||||||
environment.systemPackages = [ pkgs.watson ];
|
|
||||||
|
|
||||||
environment.variables.WATSON_DIR = "${config.users.users.me.home}/cloud/Seafile/Documents/watson";
|
environment.variables.WATSON_DIR = "${config.users.users.me.home}/cloud/Seafile/Documents/watson";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
{ config, ... }:
|
|
||||||
{
|
{
|
||||||
networking.wireless = {
|
networking.wireless = {
|
||||||
enable = true;
|
enable = true;
|
||||||
secretsFile = config.age.secrets.wifi.path;
|
networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
|
||||||
# networks.Aether.pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
|
|
||||||
networks.Schilfpalast.pskRaw = "ext:schilfpalast";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
186
configs/zsh.nix
186
configs/zsh.nix
@@ -2,97 +2,103 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
let
|
home-manager.users.me.home.file.".zshrc".text = ''
|
||||||
promptColours.success = "cyan";
|
# nothing to see here
|
||||||
promptColours.failure = "red";
|
'';
|
||||||
in
|
|
||||||
{
|
|
||||||
programs.zsh =
|
|
||||||
let
|
|
||||||
zsh-completions = pkgs.fetchFromGitHub {
|
|
||||||
owner = "zsh-users";
|
|
||||||
repo = "zsh-completions";
|
|
||||||
rev = "cf565254e26bb7ce03f51889e9a29953b955b1fb";
|
|
||||||
sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
enable = true;
|
|
||||||
enableCompletion = true;
|
|
||||||
autosuggestions.enable = true;
|
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
syntaxHighlighting.highlighters = [
|
|
||||||
"main"
|
|
||||||
"brackets"
|
|
||||||
"pattern"
|
|
||||||
"line"
|
|
||||||
];
|
|
||||||
interactiveShellInit = ''
|
|
||||||
setopt INTERACTIVE_COMMENTS CORRECT
|
|
||||||
setopt MULTIOS
|
|
||||||
setopt AUTO_NAME_DIRS
|
|
||||||
setopt AUTOCD CDABLE_VARS
|
|
||||||
setopt HIST_IGNORE_ALL_DUPS
|
|
||||||
setopt VI
|
|
||||||
setopt AUTO_MENU
|
|
||||||
setopt COMPLETE_IN_WORD
|
|
||||||
setopt ALWAYS_TO_END
|
|
||||||
unsetopt NOMATCH
|
|
||||||
unsetopt MENU_COMPLETE
|
|
||||||
|
|
||||||
zstyle ':completion:*:*:*:*:*' menu select
|
environment.systemPackages = [pkgs.atuin];
|
||||||
zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|=*' 'l:|=* r:|=*'
|
environment.variables.ATUIN_CONFIG_DIR = toString (pkgs.writeTextDir "/config.toml" ''
|
||||||
zstyle ':completion:*' special-dirs true
|
auto_sync = true
|
||||||
zstyle ':completion:*' list-colors \'\'
|
update_check = false
|
||||||
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
|
sync_address = "http://zaatar.r:8888"
|
||||||
zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
|
sync_frequency = 0
|
||||||
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
|
style = "compact"
|
||||||
|
'');
|
||||||
|
|
||||||
export KEYTIMEOUT=1
|
programs.zsh = let
|
||||||
|
zsh-completions = pkgs.fetchFromGitHub {
|
||||||
hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/sync/src/niveum
|
owner = "zsh-users";
|
||||||
|
repo = "zsh-completions";
|
||||||
autoload -U zmv run-help edit-command-line
|
rev = "cf565254e26bb7ce03f51889e9a29953b955b1fb";
|
||||||
|
sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
|
||||||
fpath=(${zsh-completions}/src $fpath)
|
|
||||||
'';
|
|
||||||
promptInit = ''
|
|
||||||
autoload -Uz vcs_info
|
|
||||||
zstyle ':vcs_info:*' enable git
|
|
||||||
zstyle ':vcs_info:*' check-for-changes true
|
|
||||||
zstyle ':vcs_info:*' stagedstr '%F{green}+%f'
|
|
||||||
zstyle ':vcs_info:*' unstagedstr '%F{red}~%f'
|
|
||||||
zstyle ':vcs_info:*' use-prompt-escapes true
|
|
||||||
zstyle ':vcs_info:*' formats "%c%u%F{cyan}%b%f"
|
|
||||||
zstyle ':vcs_info:*' actionformats "(%a) %c%u%F{cyan}%b%f"
|
|
||||||
|
|
||||||
precmd () {
|
|
||||||
vcs_info
|
|
||||||
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] || [ -n "$SSH_CONNECTION" ]; then
|
|
||||||
RPROMPT="$(hostname)"
|
|
||||||
else
|
|
||||||
RPROMPT="$vcs_info_msg_0_"
|
|
||||||
fi
|
|
||||||
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
|
|
||||||
zle -N edit-command-line
|
|
||||||
bindkey -M vicmd v edit-command-line
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
in {
|
||||||
|
enable = true;
|
||||||
|
enableCompletion = true;
|
||||||
|
autosuggestions.enable = true;
|
||||||
|
syntaxHighlighting.enable = true;
|
||||||
|
syntaxHighlighting.highlighters = ["main" "brackets" "pattern" "line"];
|
||||||
|
interactiveShellInit = ''
|
||||||
|
setopt INTERACTIVE_COMMENTS CORRECT
|
||||||
|
setopt MULTIOS
|
||||||
|
setopt AUTO_NAME_DIRS
|
||||||
|
setopt AUTOCD CDABLE_VARS
|
||||||
|
setopt HIST_IGNORE_ALL_DUPS
|
||||||
|
setopt VI
|
||||||
|
setopt AUTO_MENU
|
||||||
|
setopt COMPLETE_IN_WORD
|
||||||
|
setopt ALWAYS_TO_END
|
||||||
|
unsetopt NOMATCH
|
||||||
|
unsetopt MENU_COMPLETE
|
||||||
|
|
||||||
|
zstyle ':completion:*:*:*:*:*' menu select
|
||||||
|
zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|=*' 'l:|=* r:|=*'
|
||||||
|
zstyle ':completion:*' special-dirs true
|
||||||
|
zstyle ':completion:*' list-colors \'\'
|
||||||
|
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
|
||||||
|
zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
|
||||||
|
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
|
||||||
|
|
||||||
|
export KEYTIMEOUT=1
|
||||||
|
|
||||||
|
hash -d nixos=/etc/nixos niveum=${config.users.users.me.home}/projects/niveum
|
||||||
|
|
||||||
|
autoload -U zmv run-help
|
||||||
|
|
||||||
|
fpath=(${zsh-completions}/src $fpath)
|
||||||
|
'';
|
||||||
|
promptInit = with config.niveum; ''
|
||||||
|
autoload -Uz vcs_info
|
||||||
|
zstyle ':vcs_info:*' enable git
|
||||||
|
zstyle ':vcs_info:*' check-for-changes true
|
||||||
|
zstyle ':vcs_info:*' stagedstr '%F{green}+%f'
|
||||||
|
zstyle ':vcs_info:*' unstagedstr '%F{red}~%f'
|
||||||
|
zstyle ':vcs_info:*' use-prompt-escapes true
|
||||||
|
zstyle ':vcs_info:*' formats "%c%u%F{cyan}%b%f"
|
||||||
|
zstyle ':vcs_info:*' actionformats "(%a) %c%u%F{cyan}%b%f"
|
||||||
|
|
||||||
|
# atuin distributed shell history
|
||||||
|
export ATUIN_NOBIND="true" # disable all keybdinings of atuin
|
||||||
|
eval "$(atuin init zsh)"
|
||||||
|
bindkey '^r' _atuin_search_widget # bind ctrl+r to atuin
|
||||||
|
# use zsh only session history
|
||||||
|
fc -p
|
||||||
|
|
||||||
|
precmd () {
|
||||||
|
vcs_info
|
||||||
|
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] || [ -n "$SSH_CONNECTION" ]; then
|
||||||
|
RPROMPT="$(hostname)"
|
||||||
|
else
|
||||||
|
RPROMPT="$vcs_info_msg_0_"
|
||||||
|
fi
|
||||||
|
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
|
||||||
|
'';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user