mirror of
https://github.com/kmein/niveum
synced 2026-03-19 11:31:09 +01:00
Compare commits
54 Commits
flakes-2
...
7c36ea2995
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c36ea2995 | |||
| 185f752de1 | |||
| 6cb800f024 | |||
| 2217128f32 | |||
| 3ed79dbbfc | |||
| 6c7fa8c1b5 | |||
| c36dc50369 | |||
| 0656b0eaa3 | |||
| 5051938679 | |||
| a3464f3328 | |||
| 9b10c883a5 | |||
| 7c42be3475 | |||
| bee1389d7f | |||
| 508ed2f573 | |||
| 8b605d31a3 | |||
| 8502b2966b | |||
| 79b231e1b6 | |||
| 500a0741d3 | |||
| 53b91eb522 | |||
| 25d2294abc | |||
| f0924d7d57 | |||
| 9ebcf731df | |||
| 49f3d9bdf1 | |||
| 4a56ba5bec | |||
| f4383937a8 | |||
| 04a2c83eb8 | |||
| 0e43cee95f | |||
| 1405c2ca98 | |||
| 072c0a09df | |||
| a0fdfbef2b | |||
| a6792399f1 | |||
| 12cd6230fe | |||
| e800cca766 | |||
| b7646b0500 | |||
| 749582bc9b | |||
| e9ae2ddd59 | |||
| e6462e0c34 | |||
| 127cb41e60 | |||
| a77cbcf919 | |||
| 62fbad949a | |||
| 087c9c0b94 | |||
| 74a437af22 | |||
| e431a89ab2 | |||
| 0d6c540143 | |||
| 5b3aea782b | |||
| 913f60a7f5 | |||
| b877eaa1b7 | |||
| ed788d318f | |||
| 2283dd67c6 | |||
| 8b8e0078c1 | |||
| f7763cb99b | |||
| 58d39aa41a | |||
| 383fb35837 | |||
| 3cb561e6cc |
1
.bin/mud.sh
Executable file
1
.bin/mud.sh
Executable file
@@ -0,0 +1 @@
|
|||||||
|
ssh mud@hotdog.r -t "MUD_NICKNAME=$LOGNAME mud"
|
||||||
49
.bin/space.py
Normal file
49
.bin/space.py
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
import ephem
|
||||||
|
from datetime import datetime, date, timedelta
|
||||||
|
|
||||||
|
now = datetime.now()
|
||||||
|
limit = now + timedelta(days=365)
|
||||||
|
|
||||||
|
|
||||||
|
def events_until(limit):
|
||||||
|
initial_date = ephem.Date(datetime.now())
|
||||||
|
events = {}
|
||||||
|
|
||||||
|
now = initial_date
|
||||||
|
while ephem.localtime(now) <= limit:
|
||||||
|
now = ephem.next_full_moon(now)
|
||||||
|
events[now] = "🌕"
|
||||||
|
|
||||||
|
now = initial_date
|
||||||
|
while ephem.localtime(now) <= limit:
|
||||||
|
now = ephem.next_new_moon(now)
|
||||||
|
events[now] = "🌑"
|
||||||
|
|
||||||
|
now = initial_date
|
||||||
|
while ephem.localtime(now) <= limit:
|
||||||
|
now = ephem.next_vernal_equinox(now)
|
||||||
|
events[now] = "spring equinox"
|
||||||
|
|
||||||
|
now = initial_date
|
||||||
|
while ephem.localtime(now) <= limit:
|
||||||
|
now = ephem.next_autumnal_equinox(now)
|
||||||
|
events[now] = "fall equinox"
|
||||||
|
|
||||||
|
now = initial_date
|
||||||
|
while ephem.localtime(now) <= limit:
|
||||||
|
now = ephem.next_winter_solstice(now)
|
||||||
|
events[now] = "winter solstice"
|
||||||
|
|
||||||
|
now = initial_date
|
||||||
|
while ephem.localtime(now) <= limit:
|
||||||
|
now = ephem.next_summer_solstice(now)
|
||||||
|
events[now] = "summer solstice"
|
||||||
|
return events
|
||||||
|
|
||||||
|
|
||||||
|
events = events_until(limit)
|
||||||
|
|
||||||
|
|
||||||
|
for date, event in sorted(events.items(), key=lambda x: x[0]):
|
||||||
|
if ephem.localtime(date) < limit:
|
||||||
|
print(ephem.localtime(date), event)
|
||||||
14
.github/workflows/niveum.yml
vendored
Normal file
14
.github/workflows/niveum.yml
vendored
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
name: CI
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
system: [makanek,manakish,kabsa,zaatar]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: cachix/install-nix-action@v16
|
||||||
|
- run: nix run .#build-${{matrix.system}}
|
||||||
9
.gitmodules
vendored
9
.gitmodules
vendored
@@ -1,9 +0,0 @@
|
|||||||
[submodule "submodules/menstruation-telegram"]
|
|
||||||
path = submodules/menstruation-telegram
|
|
||||||
url = https://github.com/kmein/menstruation-telegram
|
|
||||||
[submodule "submodules/menstruation-backend"]
|
|
||||||
path = submodules/menstruation-backend
|
|
||||||
url = https://github.com/kmein/menstruation.rs
|
|
||||||
[submodule "submodules/nur-packages"]
|
|
||||||
path = submodules/nur-packages
|
|
||||||
url = git@github.com:kmein/nur-packages.git
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/nix-community/home-manager.git",
|
|
||||||
"rev": "697cc8c68ed6a606296efbbe9614c32537078756",
|
|
||||||
"date": "2021-12-19T00:59:29+01:00",
|
|
||||||
"path": "/nix/store/fb46bv10azrag2jjlzhil6j11f4x8glw-home-manager",
|
|
||||||
"sha256": "1c8gxm86zshr2zj9dvr02qs7y3m46gqavr6wyv01r09jfd99dxz9",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://cgit.krebsco.de/krops",
|
|
||||||
"rev": "cccebf3ff7a53336b3f106cb96dddd5892d427ed",
|
|
||||||
"date": "2021-03-23T22:47:37+01:00",
|
|
||||||
"path": "/nix/store/mz13xxnil35lwsf90hwnrm2agir7hb51-krops",
|
|
||||||
"sha256": "07mg3iaqjf1w49vmwfchi7b1w55bh7rvsbgicp2m47gnj9alwdb6",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://cgit.krebsco.de/nix-writers",
|
|
||||||
"rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
|
|
||||||
"date": "2019-04-02T20:05:33+02:00",
|
|
||||||
"path": "/nix/store/wm5zhsha1a2iy0d582nlfi7604ayd1vz-nix-writers",
|
|
||||||
"sha256": "0xdivaca1hgbxs79jw9sv4gk4f81vy8kcyaff56hh2dgq2awyvw4",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/mozilla/nixpkgs-mozilla",
|
|
||||||
"rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f",
|
|
||||||
"date": "2021-12-07T09:28:33-05:00",
|
|
||||||
"path": "/nix/store/pqwcw589i2y2w2116wn3ifl834adjsa0-nixpkgs-mozilla",
|
|
||||||
"sha256": "1a71nfw7d36vplf89fp65vgj3s66np1dc0hqnqgj5gbdnpm1bihl",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs.git",
|
|
||||||
"rev": "f01adc7b35a8f80e82f3466e6d873b8b9c8f1b28",
|
|
||||||
"date": "2021-12-22T23:05:28+01:00",
|
|
||||||
"path": "/nix/store/zhfrvg77dzpc3hq02v9zv20dfgqwpzk6-nixpkgs",
|
|
||||||
"sha256": "17iyf2iiizi7c1wr71day3wvgalbkkm2zgc9lpy7y42rl4frq9sf",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs.git",
|
|
||||||
"rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77",
|
|
||||||
"date": "2021-12-21T10:09:48+01:00",
|
|
||||||
"path": "/nix/store/minmlh0avkwvvc3p7flhpbglp13kr585-nixpkgs",
|
|
||||||
"sha256": "0bbd2pgcyavqn5wgq0xp8p67lha0kv9iqnh49i9w5fb5g29q7i30",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://github.com/krebs/retiolum",
|
|
||||||
"rev": "b72b0a987767b587c79cba8499b5114d69fceeef",
|
|
||||||
"date": "2021-12-28T19:46:45+00:00",
|
|
||||||
"path": "/nix/store/kyaqwf89v6id9mda92x4b0hf778j987x-retiolum",
|
|
||||||
"sha256": "19hjzzlfk1m9ign33w4ppqgmg23v7c6k8l0fm7f33spq8982w7rb",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"url": "https://cgit.lassul.us/stockholm",
|
|
||||||
"rev": "576c05cf3a0ceddefa29c2d0073108177c3cfa52",
|
|
||||||
"date": "2021-12-22T13:59:46+01:00",
|
|
||||||
"path": "/nix/store/yx1j5pardgd9114f0cf3c4xjfq6r4yfv-stockholm",
|
|
||||||
"sha256": "18napi4k8i2iizrismlp9ha3ga6c3n2dvrhijy59kl1jxqrsaq9l",
|
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"deepClone": false,
|
|
||||||
"leaveDotGit": false
|
|
||||||
}
|
|
||||||
64
ci.nix
Normal file
64
ci.nix
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
{ inputs, system, name }:
|
||||||
|
let
|
||||||
|
inherit (inputs) nixpkgs;
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
ensureFiles = paths: pkgs.runCommand "directory" {} ''
|
||||||
|
set -efu
|
||||||
|
mkdir $out
|
||||||
|
cd $out
|
||||||
|
${nixpkgs.lib.concatMapStringsSep "\n" (path: ''
|
||||||
|
mkdir -p "$(dirname ${nixpkgs.lib.escapeShellArg path})"
|
||||||
|
echo foo > ${nixpkgs.lib.escapeShellArg path}
|
||||||
|
'') paths}
|
||||||
|
'';
|
||||||
|
nixPath = nixpkgs.lib.concatStringsSep ":" ([
|
||||||
|
"niveum=${toString ./.}"
|
||||||
|
"nixos-config=${toString ./.}/systems/${name}/configuration.nix"
|
||||||
|
"system-secrets=${systemSecrets}"
|
||||||
|
"secrets=${sharedSecrets}"
|
||||||
|
] ++ nixpkgs.lib.mapAttrsToList (name: value: "${name}=${value}") inputs);
|
||||||
|
# cd ~/.password-store/shared && find * -type f | sed 's/.gpg$//'
|
||||||
|
sharedSecrets = ensureFiles [
|
||||||
|
"di.fm/key"
|
||||||
|
"eduroam/identity"
|
||||||
|
"eduroam/password"
|
||||||
|
"mail/cock"
|
||||||
|
"mail/fastmail"
|
||||||
|
"mail/gmail/amroplay"
|
||||||
|
"mail/gmail/kieran.meinhardt"
|
||||||
|
"mail/meinhaki"
|
||||||
|
"mail/posteo"
|
||||||
|
"nextcloud-fysi/password"
|
||||||
|
"nextcloud/password"
|
||||||
|
"openweathermap.key"
|
||||||
|
"traadfri.key"
|
||||||
|
"wifi/Aether.psk"
|
||||||
|
];
|
||||||
|
systemSecrets = let basic = [ "retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"]; in {
|
||||||
|
zaatar = ensureFiles ([ "moodle.token" "telegram/moodle-dl.token" ] ++ basic);
|
||||||
|
kabsa = ensureFiles basic;
|
||||||
|
manakish = ensureFiles basic;
|
||||||
|
makanek = ensureFiles ([
|
||||||
|
"irc/retiolum"
|
||||||
|
"irc/hackint"
|
||||||
|
"irc/libera"
|
||||||
|
"irc/oftc"
|
||||||
|
"matrix/nibbana"
|
||||||
|
"maxmind/license.key"
|
||||||
|
"moodle-dl/faye.token"
|
||||||
|
"nextcloud/admin"
|
||||||
|
"nextcloud/database"
|
||||||
|
"telegram/nachtischsatan.token"
|
||||||
|
"telegram/reverse.token"
|
||||||
|
"telegram/odyssey.token"
|
||||||
|
"telegram/betacode.token"
|
||||||
|
"telegram/moodle-dl.token"
|
||||||
|
"telegram/proverb.token"
|
||||||
|
"telegram/menstruation.token"
|
||||||
|
"telegram/cool_village.token"
|
||||||
|
"telegram/kmein.token"
|
||||||
|
"telegram/prometheus.token"
|
||||||
|
"weechat/relay"
|
||||||
|
] ++ basic);
|
||||||
|
}.${name};
|
||||||
|
in toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
{ pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) serveHtml;
|
|
||||||
stations = [
|
|
||||||
900068204 # A/M
|
|
||||||
900068302 # KAS
|
|
||||||
900068203 # B-P
|
|
||||||
];
|
|
||||||
fahrplan = pkgs.writeText "fahrplan.html" ''
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<title>Fahrplan</title>
|
|
||||||
<link
|
|
||||||
rel="icon"
|
|
||||||
type="image/x-icon"
|
|
||||||
href="https://mobil.bvg.de/Fahrinfo/img/ua_xhtml/logo.gif"
|
|
||||||
/>
|
|
||||||
<style>
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
--bvg-yellow: #f0d722;
|
|
||||||
}
|
|
||||||
#fahrplan {
|
|
||||||
display: flex;
|
|
||||||
height: 100vh;
|
|
||||||
width: 100%;
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
#fahrplan iframe {
|
|
||||||
flex-grow: 1;
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
#fahrplan iframe + iframe {
|
|
||||||
border-left: 2px solid var(--bvg-yellow);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<body>
|
|
||||||
<div id="fahrplan">
|
|
||||||
${lib.concatMapStrings (station: ''
|
|
||||||
<iframe scrolling="no" src="https://mobil.bvg.de/Fahrinfo/bin/stboard.bin/dox?ld=0.1&input=${toString station}&boardType=depRT&start=yes"></iframe>
|
|
||||||
'') stations}
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.nginx = {
|
|
||||||
enable = true;
|
|
||||||
recommendedGzipSettings = true;
|
|
||||||
recommendedOptimisation = true;
|
|
||||||
recommendedProxySettings = true;
|
|
||||||
recommendedTlsSettings = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."bvg.kmein.r" = {
|
|
||||||
locations."/".extraConfig = serveHtml fahrplan pkgs;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.chromium pkgs.brave ];
|
environment.systemPackages = [ pkgs.brave ];
|
||||||
|
|
||||||
environment.variables.BROWSER = "brave";
|
environment.variables.BROWSER = "brave";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,16 +20,12 @@ in {
|
|||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
packageOverrides = pkgs: {
|
packageOverrides = pkgs: {
|
||||||
writeDashBin = pkgs.writers.writeDashBin;
|
|
||||||
writeDash = pkgs.writers.writeDash;
|
|
||||||
gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
|
gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
|
||||||
iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };
|
iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };
|
||||||
ix = pkgs.callPackage <niveum/packages/ix.nix> { };
|
ix = pkgs.callPackage <niveum/packages/ix.nix> { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
overlays = [
|
overlays = [
|
||||||
(import <nix-writers/pkgs>)
|
|
||||||
(import <stockholm/krebs/5pkgs>)
|
|
||||||
(self: super: {
|
(self: super: {
|
||||||
scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
|
scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
|
||||||
})
|
})
|
||||||
@@ -201,9 +197,7 @@ in {
|
|||||||
./beets.nix
|
./beets.nix
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
./ccc.nix
|
./ccc.nix
|
||||||
# ./kleiter.nix
|
|
||||||
./khal.nix
|
./khal.nix
|
||||||
./engiadina.nix
|
|
||||||
./chromium.nix
|
./chromium.nix
|
||||||
./cloud.nix
|
./cloud.nix
|
||||||
./copyq.nix
|
./copyq.nix
|
||||||
@@ -215,7 +209,6 @@ in {
|
|||||||
./flix.nix
|
./flix.nix
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./fzf.nix
|
./fzf.nix
|
||||||
./gaslight.nix
|
|
||||||
./git.nix
|
./git.nix
|
||||||
./hledger.nix
|
./hledger.nix
|
||||||
./htop.nix
|
./htop.nix
|
||||||
@@ -225,13 +218,13 @@ in {
|
|||||||
./lb.nix
|
./lb.nix
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./mime.nix
|
./mime.nix
|
||||||
./nano.nix
|
|
||||||
./neovim.nix
|
./neovim.nix
|
||||||
./neomutt.nix
|
./neomutt.nix
|
||||||
./nix.nix
|
./nix.nix
|
||||||
./newsboat.nix
|
./newsboat.nix
|
||||||
./flameshot-once.nix
|
./flameshot-once.nix
|
||||||
./packages
|
./packages.nix
|
||||||
|
./stardict.nix
|
||||||
./power-action.nix
|
./power-action.nix
|
||||||
./printing.nix
|
./printing.nix
|
||||||
./openweathermap.nix
|
./openweathermap.nix
|
||||||
@@ -247,10 +240,8 @@ in {
|
|||||||
./sxiv.nix
|
./sxiv.nix
|
||||||
./theming.nix
|
./theming.nix
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
# ./tor.nix
|
|
||||||
./traadfri.nix
|
./traadfri.nix
|
||||||
./unclutter.nix
|
./unclutter.nix
|
||||||
./version.nix
|
|
||||||
./vscode.nix
|
./vscode.nix
|
||||||
./watson.nix
|
./watson.nix
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
{ config, pkgs, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) tmpfilesConfig;
|
|
||||||
cdnRoot = "/var/lib/engiadina";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [ <stockholm/krebs/3modules/permown.nix> ];
|
|
||||||
|
|
||||||
krebs.permown.${cdnRoot} = {
|
|
||||||
owner = config.users.users.me.name;
|
|
||||||
group = "users";
|
|
||||||
umask = "0002";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx = {
|
|
||||||
enable = true;
|
|
||||||
virtualHosts.default = {
|
|
||||||
root = cdnRoot;
|
|
||||||
listen = [{
|
|
||||||
addr = "0.0.0.0";
|
|
||||||
port = 3333;
|
|
||||||
}];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.shellAliases = {
|
|
||||||
engiadina-watch = "${pkgs.findutils}/bin/find extra-src src | ${pkgs.entr}/bin/entr -s 'build-component && ${pkgs.rsync}/bin/rsync -avu dist/*.js ${cdnRoot}/'";
|
|
||||||
engiadina-edit = "$EDITOR ${cdnRoot}/index.html";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -12,13 +12,36 @@ in {
|
|||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(flameshot-once.override {
|
(flameshot-once.override {
|
||||||
config.imgur = {
|
config = {
|
||||||
enable = true;
|
imgur = {
|
||||||
createUrl = "http://p.r/image";
|
enable = true;
|
||||||
deleteUrl = "http://p.r/image/delete/%1";
|
createUrl = "http://p.r/image";
|
||||||
xdg-open.browser = (defaultApplications pkgs).browser;
|
deleteUrl = "http://p.r/image/delete/%1";
|
||||||
|
xdg-open.browser = (defaultApplications pkgs).browser;
|
||||||
|
};
|
||||||
|
timeout = 1000;
|
||||||
|
drawColor = "#ff0000";
|
||||||
|
drawThickness = 2;
|
||||||
|
showDesktopNotification = true;
|
||||||
|
buttons = [
|
||||||
|
"ARROW"
|
||||||
|
"BLUR"
|
||||||
|
"CIRCLE"
|
||||||
|
"CIRCLECOUNT"
|
||||||
|
"COPY"
|
||||||
|
"DRAWER"
|
||||||
|
"EXIT"
|
||||||
|
"MARKER"
|
||||||
|
"MOVESELECTION"
|
||||||
|
"PENCIL"
|
||||||
|
"RECTANGLE"
|
||||||
|
"SAVE"
|
||||||
|
"SELECTION"
|
||||||
|
"SELECTIONINDICATOR"
|
||||||
|
"TEXT"
|
||||||
|
"UNDO"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
config.timeout = 1000;
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import ./lib.nix) triggers;
|
|
||||||
inherit (import <niveum/lib>) localAddresses;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./zigbee.nix
|
|
||||||
./frontend.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
services.home-assistant = {
|
|
||||||
enable = true;
|
|
||||||
configWritable = true;
|
|
||||||
lovelaceConfigWritable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
config = {
|
|
||||||
homeassistant = {
|
|
||||||
name = "Toum";
|
|
||||||
latitude = config.location.latitude;
|
|
||||||
longitude = config.location.longitude;
|
|
||||||
elevation = 90; # TODO find out how high I live
|
|
||||||
unit_system = "metric";
|
|
||||||
time_zone = config.time.timeZone;
|
|
||||||
};
|
|
||||||
config = {};
|
|
||||||
discovery = {};
|
|
||||||
system_health = {};
|
|
||||||
history = {};
|
|
||||||
# tradfri.host = localAddresses.tradfri; # dont use until python3Packages.pytradfri is packaged
|
|
||||||
sun = {};
|
|
||||||
mobile_app = {};
|
|
||||||
shopping_list = {};
|
|
||||||
sensor = [
|
|
||||||
{
|
|
||||||
platform = "dwd_weather_warnings";
|
|
||||||
region_name = "Berlin";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
mqtt = {
|
|
||||||
broker = "localhost";
|
|
||||||
port = 1883;
|
|
||||||
client_id = "home-assistant";
|
|
||||||
username = "albrecht";
|
|
||||||
password = lib.strings.fileContents <system-secrets/mosquitto>;
|
|
||||||
keepalive = 60;
|
|
||||||
protocol = "3.1";
|
|
||||||
|
|
||||||
discovery = true;
|
|
||||||
birth_message = {
|
|
||||||
topic = "/hass/status";
|
|
||||||
payload = "online";
|
|
||||||
};
|
|
||||||
will_message = {
|
|
||||||
topic = "/hass/status";
|
|
||||||
payload = "offline";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
let
|
|
||||||
inherit (import ./lib.nix) triggers;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.home-assistant.config = {
|
|
||||||
frontend = {
|
|
||||||
themes = {
|
|
||||||
day_theme = import ./themes/clear.nix;
|
|
||||||
night_theme = import ./themes/clear-dark.nix;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
automation = [
|
|
||||||
{
|
|
||||||
alias = "Night Theme";
|
|
||||||
hide_entity = true;
|
|
||||||
trigger = triggers.night;
|
|
||||||
action = [
|
|
||||||
{
|
|
||||||
service = "frontend.set_theme";
|
|
||||||
data.name = "night_theme";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
alias = "Day Theme";
|
|
||||||
hide_entity = true;
|
|
||||||
trigger = triggers.day;
|
|
||||||
action = [
|
|
||||||
{
|
|
||||||
service = "frontend.set_theme";
|
|
||||||
data.name = "day_theme";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
triggers = {
|
|
||||||
night = {
|
|
||||||
platform = "numeric_state";
|
|
||||||
entity_id = "sun.sun";
|
|
||||||
value_template = "{{ state.attributes.elevation }}";
|
|
||||||
below = -4.0;
|
|
||||||
};
|
|
||||||
day = {
|
|
||||||
platform = "numeric_state";
|
|
||||||
entity_id = "sun.sun";
|
|
||||||
value_template = "{{ state.attributes.elevation }}";
|
|
||||||
above = 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
rec {
|
|
||||||
# Colors
|
|
||||||
text-color = "#DADADB"; # Grey text
|
|
||||||
text-medium-light-color = "#A0A2A8"; # Medium-light grey text
|
|
||||||
text-medium-color = "#80828A"; # Medium grey text
|
|
||||||
text-dark-color = "#6A6B74"; # Dark grey text
|
|
||||||
accent-color = "#008bef"; # Blue
|
|
||||||
accent-medium-color = "#2484C9"; # Decent blue
|
|
||||||
background-color = "#3b4049"; # Dark grey background
|
|
||||||
background-color-2 = "#484E59"; # Light grey background
|
|
||||||
background-card-color = "#434952"; # Grey background
|
|
||||||
border-color = "#383C46"; # Grey border
|
|
||||||
|
|
||||||
# Header
|
|
||||||
app-header-background-color = "#363941"; # Background color
|
|
||||||
|
|
||||||
# Text
|
|
||||||
primary-color = text-color;
|
|
||||||
text-primary-color = text-color;
|
|
||||||
|
|
||||||
# Left Menu
|
|
||||||
paper-listbox-background-color = background-color; # Background
|
|
||||||
sidebar-icon-color = text-medium-color; # icons
|
|
||||||
sidebar-selected-icon-color = text-medium-light-color; # Selected row icon and background (15%)
|
|
||||||
sidebar-selected-text-color = text-color; # Selected row label
|
|
||||||
|
|
||||||
# UI
|
|
||||||
paper-card-header-color = text-color; # Title in settings
|
|
||||||
primary-background-color = background-color; # Background (also title background in left menu)
|
|
||||||
mdc-theme-primary = accent-medium-color; # Action Buttons (save, restart etc.)
|
|
||||||
card-background-color = background-card-color; # Entity Registry Background
|
|
||||||
|
|
||||||
# Card
|
|
||||||
paper-card-background-color = background-card-color; # Background
|
|
||||||
dark-primary-color = text-color;
|
|
||||||
primary-text-color = text-color;
|
|
||||||
paper-listbox-color = text-color;
|
|
||||||
light-primary-color = text-dark-color;
|
|
||||||
secondary-text-color = text-medium-color;
|
|
||||||
disabled-text-color = text-dark-color;
|
|
||||||
paper-dialog-button-color = text-color;
|
|
||||||
secondary-background-color = background-color-2; # Background more info title
|
|
||||||
|
|
||||||
# Icons
|
|
||||||
paper-item-icon-color = text-dark-color; # Off
|
|
||||||
paper-item-icon-active-color = accent-color; # On
|
|
||||||
|
|
||||||
# Switches
|
|
||||||
switch-checked-button-color = text-medium-light-color; # Knob On
|
|
||||||
switch-unchecked-button-color = text-medium-light-color; # Knob Off
|
|
||||||
switch-checked-track-color = "#009FFF"; # Background On
|
|
||||||
switch-unchecked-track-color = "#767682"; # Background Off
|
|
||||||
|
|
||||||
# Slider
|
|
||||||
paper-slider-active-color = accent-color; # Line On
|
|
||||||
paper-slider-knob-color = text-medium-light-color; # Knob On
|
|
||||||
paper-slider-container-color = text-dark-color; # Line Off
|
|
||||||
paper-slider-knob-start-color = text-medium-light-color; # Knob Off
|
|
||||||
|
|
||||||
# Badges
|
|
||||||
label-badge-text-color = text-color;
|
|
||||||
label-badge-background-color = "rgba(54, 57, 65, 0.6)";
|
|
||||||
|
|
||||||
# Shadows
|
|
||||||
ha-card-box-shadow = "inset 0px 0px 0px 1px var(--border-color)";
|
|
||||||
|
|
||||||
# HACS
|
|
||||||
hacs-badge-color = accent-color; # New Badge
|
|
||||||
hacs-status-installed = text-color; # Installed Icon
|
|
||||||
hacs-status-pending-restart = text-dark-color; # Restart Icon
|
|
||||||
hacs-status-pending-update = accent-color;
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
rec {
|
|
||||||
text-color = "#636B75"; # Grey text
|
|
||||||
text-medium-color = "#8c96a5"; # Medium grey text
|
|
||||||
text-light-color = "#BAC0C6"; # Light grey text
|
|
||||||
accent-color = "#00a1ff"; # Blue
|
|
||||||
background-color = "#F7F8F9"; # Light grey background
|
|
||||||
background-color-2 = "#F4F5F6"; # Light grey background
|
|
||||||
background-card-color = "rgba(255,255,255,1.0)"; # White background
|
|
||||||
border-color = "#E8E8E8"; # Light grey border
|
|
||||||
|
|
||||||
# Header
|
|
||||||
primary-color = text-color; # Background
|
|
||||||
text-primary-color = "#FFF"; # Text
|
|
||||||
|
|
||||||
# Left Menu
|
|
||||||
paper-listbox-background-color = background-color; # Background
|
|
||||||
# TODO = Text and Icons
|
|
||||||
|
|
||||||
# UI
|
|
||||||
paper-card-header-color = text-color; # Title in settings
|
|
||||||
primary-background-color = background-color; # Background color (also title background in left menu)
|
|
||||||
|
|
||||||
# Card
|
|
||||||
paper-card-background-color = background-card-color; # Background
|
|
||||||
dark-primary-color = text-color;
|
|
||||||
primary-text-color = text-color;
|
|
||||||
paper-listbox-color = text-color;
|
|
||||||
light-primary-color = text-light-color;
|
|
||||||
secondary-text-color = text-medium-color;
|
|
||||||
disabled-text-color = text-light-color;
|
|
||||||
paper-dialog-button-color = text-color;
|
|
||||||
secondary-background-color = background-color-2; # Background more info title
|
|
||||||
|
|
||||||
# Icons
|
|
||||||
paper-item-icon-color = text-light-color; # Off
|
|
||||||
paper-item-icon-active-color = accent-color; # On
|
|
||||||
|
|
||||||
# Switches
|
|
||||||
switch-checked-button-color = "#FFF"; # Knob On
|
|
||||||
switch-unchecked-button-color = "#FFF"; # Knob Off
|
|
||||||
switch-checked-track-color = "#0077FF"; # Background On
|
|
||||||
switch-unchecked-track-color = disabled-text-color; # Background Off
|
|
||||||
|
|
||||||
# Slider
|
|
||||||
paper-slider-active-color = accent-color; # Line On
|
|
||||||
paper-slider-container-color = "#e5e7ea"; # Line Off
|
|
||||||
paper-slider-knob-color = text-light-color; # Knob On
|
|
||||||
paper-slider-knob-start-color = text-light-color; # Knob Off
|
|
||||||
|
|
||||||
# Shadows
|
|
||||||
ha-card-box-shadow = "inset 0px 0px 0px 1px var(--border-color)";
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) localAddresses;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.zigbee2mqtt = {
|
|
||||||
enable = true;
|
|
||||||
config = {
|
|
||||||
permit_join = false;
|
|
||||||
homeassistant = true;
|
|
||||||
serial = {
|
|
||||||
port = "/dev/ttyACM0";
|
|
||||||
disable_led = true;
|
|
||||||
};
|
|
||||||
mqtt = {
|
|
||||||
discovery = true;
|
|
||||||
base_topic = "zigbee";
|
|
||||||
server = "mqtt://${localAddresses.toum}";
|
|
||||||
user = "albrecht";
|
|
||||||
password = lib.strings.fileContents <system-secrets/mosquitto>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.mosquitto = {
|
|
||||||
enable = true;
|
|
||||||
host = "0.0.0.0";
|
|
||||||
allowAnonymous = false;
|
|
||||||
checkPasswords = true;
|
|
||||||
users."albrecht" = {
|
|
||||||
password = lib.strings.fileContents <system-secrets/mosquitto>;
|
|
||||||
acl = [ "topic readwrite #" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 1883 ];
|
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.mosquitto ];
|
|
||||||
|
|
||||||
services.home-assistant = {
|
|
||||||
config = {
|
|
||||||
switch = [
|
|
||||||
{
|
|
||||||
platform = "mqtt";
|
|
||||||
name = "zigbee2mqtt_join";
|
|
||||||
state_topic = "/zigbee2mqtt/bridge/config/permit_join";
|
|
||||||
command_topic = "/zigbee2mqtt/bridge/config/permit_join";
|
|
||||||
payload_on = "true";
|
|
||||||
payload_off = "false";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
timer.zigbee_permit_join = {
|
|
||||||
name = "Zigbee Time remaining";
|
|
||||||
duration = 120;
|
|
||||||
};
|
|
||||||
automation = [
|
|
||||||
# Automation to start timer when enable join is turned on
|
|
||||||
{
|
|
||||||
id = "zigbee_join_enabled";
|
|
||||||
alias = "";
|
|
||||||
hide_entity = "true";
|
|
||||||
trigger = {
|
|
||||||
platform = "state";
|
|
||||||
entity_id = "switch.zigbee2mqtt_join";
|
|
||||||
to = "on";
|
|
||||||
};
|
|
||||||
action = {
|
|
||||||
service = "timer.start";
|
|
||||||
entity_id = "timer.zigbee_permit_join";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
# Automation to stop timer when switch turned off and turn off switch when timer finished
|
|
||||||
{
|
|
||||||
id = "zigbee_join_disabled";
|
|
||||||
hide_entity = "true";
|
|
||||||
trigger = [
|
|
||||||
{
|
|
||||||
platform = "event";
|
|
||||||
event_type = "timer.finished";
|
|
||||||
event_data.entity_id = "timer.zigbee_permit_join";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
platform = "state";
|
|
||||||
entity_id = "switch.zigbee2mqtt_join";
|
|
||||||
to = "off";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
action = [
|
|
||||||
{
|
|
||||||
service = "timer.cancel";
|
|
||||||
data.entity_id = "timer.zigbee_permit_join";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
service = "switch.turn_off";
|
|
||||||
entity_id = "switch.zigbee2mqtt_join";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -33,6 +33,9 @@ let
|
|||||||
"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)"
|
||||||
'';
|
'';
|
||||||
|
ocr = pkgs.writers.writeDash "ocr" ''
|
||||||
|
${pkgs.tesseract4}/bin/tesseract -l eng+deu - stdout
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
programs.nano.nanorc = ''
|
|
||||||
set autoindent
|
|
||||||
set boldtext
|
|
||||||
set morespace
|
|
||||||
set smarthome
|
|
||||||
set tabsize 4
|
|
||||||
set tabstospaces
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
supertab
|
supertab
|
||||||
undotree
|
undotree
|
||||||
tabular
|
tabular
|
||||||
vimwiki
|
# vimwiki
|
||||||
vim-colors-paramount
|
vim-colors-paramount
|
||||||
vim-commentary
|
vim-commentary
|
||||||
vim-css-color
|
vim-css-color
|
||||||
@@ -45,26 +45,19 @@
|
|||||||
];
|
];
|
||||||
opt = [
|
opt = [
|
||||||
csv
|
csv
|
||||||
dhall-vim
|
|
||||||
elm-vim
|
elm-vim
|
||||||
emmet-vim
|
emmet-vim
|
||||||
haskell-vim
|
haskell-vim
|
||||||
icalendar-vim
|
icalendar-vim
|
||||||
idris-vim
|
|
||||||
nim-vim
|
|
||||||
jq-vim
|
jq-vim
|
||||||
purescript-vim
|
|
||||||
rust-vim
|
rust-vim
|
||||||
typescript-vim
|
typescript-vim
|
||||||
vim-fsharp
|
|
||||||
vim-javascript
|
vim-javascript
|
||||||
vim-ledger
|
vim-ledger
|
||||||
vim-nix
|
vim-nix
|
||||||
vim-reason-plus
|
|
||||||
vim-toml
|
|
||||||
vimtex
|
vimtex
|
||||||
vim-pandoc
|
vim-pandoc
|
||||||
vim-pandoc-syntax # vim-pandoc-after
|
vim-pandoc-syntax
|
||||||
vim-256noir
|
vim-256noir
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
autowifi = pkgs.writers.writePython3Bin "autowifi" { flakeIgnore = [ "E501" ]; } <stockholm/lass/5pkgs/autowifi/autowifi.py>;
|
|
||||||
profile = name: custom: lib.recursiveUpdate {
|
profile = name: custom: lib.recursiveUpdate {
|
||||||
connection.id = name;
|
connection.id = name;
|
||||||
connection.type = "wifi";
|
connection.type = "wifi";
|
||||||
@@ -83,18 +82,5 @@ in
|
|||||||
|
|
||||||
users.users.me.extraGroups = [ "networkmanager" ];
|
users.users.me.extraGroups = [ "networkmanager" ];
|
||||||
|
|
||||||
systemd.services.autowifi = {
|
|
||||||
enable = false;
|
|
||||||
description = "Automatic wifi connector";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
path = [ pkgs.networkmanager ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "10s";
|
|
||||||
ExecStart = "${autowifi}/bin/autowifi";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.speedtest-cli ];
|
environment.systemPackages = [ pkgs.speedtest-cli ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
# enable `nix flake`
|
nixpkgs = {
|
||||||
|
config.allowUnfree = true;
|
||||||
|
overlays = [
|
||||||
|
(import <nix-writers/pkgs>)
|
||||||
|
(import <stockholm/krebs/5pkgs>)
|
||||||
|
];
|
||||||
|
};
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixFlakes;
|
package = pkgs.nixUnstable;
|
||||||
extraOptions = "experimental-features = nix-command flakes";
|
extraOptions = "experimental-features = nix-command flakes";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,34 @@
|
|||||||
let
|
let
|
||||||
hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
|
hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
|
||||||
worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
|
worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
|
||||||
menstruation = pkgs.callPackage <niveum/submodules/menstruation-backend> {};
|
menstruation = pkgs.callPackage <menstruation-backend> {};
|
||||||
|
pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
|
||||||
|
|
||||||
nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
|
nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
|
||||||
|
|
||||||
|
zoteroStyle = { name, sha256 }: {
|
||||||
|
name = "${name}.csl";
|
||||||
|
path = pkgs.fetchurl {
|
||||||
|
url = "https://www.zotero.org/styles/${name}";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
cslDirectory = pkgs.linkFarm "citation-styles" [
|
||||||
|
(zoteroStyle {
|
||||||
|
name = "chicago-author-date-de";
|
||||||
|
sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
|
||||||
|
})
|
||||||
|
(zoteroStyle {
|
||||||
|
name = "din-1505-2";
|
||||||
|
sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
|
||||||
|
})
|
||||||
|
(zoteroStyle {
|
||||||
|
name = "apa";
|
||||||
|
sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old: old // {
|
astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old: old // {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
${old.installPhase}
|
${old.installPhase}
|
||||||
@@ -25,42 +49,13 @@ let
|
|||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
recht = pkgs.callPackage (pkgs.fetchFromGitHub {
|
recht = pkgs.callPackage <recht> {};
|
||||||
owner = "kmein";
|
|
||||||
repo = "recht";
|
|
||||||
rev = "0.6.2";
|
|
||||||
sha256 = "08gnrnz3lwh8h6fyga56yfy9qryzm89xbshm7wpxfyxf2pmp1qfx";
|
|
||||||
}) {};
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
imports = [
|
home-manager.users.me.home.file = {
|
||||||
./writing.nix
|
".csl".source = cslDirectory;
|
||||||
./python.nix
|
".local/share/pandoc/csl".source = cslDirectory; # as of pandoc 2.11, it includes citeproc
|
||||||
./haskell
|
};
|
||||||
{
|
|
||||||
environment.systemPackages = let
|
|
||||||
# nightly = pkgs.rustChannelOf {
|
|
||||||
# date = "2019-12-27";
|
|
||||||
# channel = "nightly";
|
|
||||||
# };
|
|
||||||
in with pkgs; [
|
|
||||||
htmlTidy
|
|
||||||
nodePackages.csslint
|
|
||||||
nodePackages.jsonlint
|
|
||||||
nodePackages.prettier
|
|
||||||
nodePackages.typescript
|
|
||||||
nodePackages.yarn
|
|
||||||
nodejs
|
|
||||||
nodePackages.javascript-typescript-langserver
|
|
||||||
|
|
||||||
tokei # count lines of code
|
|
||||||
gnumake
|
|
||||||
binutils # for strip, ld, ...
|
|
||||||
# nightly.rust
|
|
||||||
shellcheck
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# INTERNET
|
# INTERNET
|
||||||
@@ -70,9 +65,7 @@ in {
|
|||||||
w3m
|
w3m
|
||||||
wget
|
wget
|
||||||
whois
|
whois
|
||||||
ix
|
|
||||||
dnsutils
|
dnsutils
|
||||||
# mtr # my traceroute
|
|
||||||
# FILE MANAGERS
|
# FILE MANAGERS
|
||||||
ranger
|
ranger
|
||||||
pcmanfm
|
pcmanfm
|
||||||
@@ -80,7 +73,6 @@ in {
|
|||||||
ffmpeg
|
ffmpeg
|
||||||
imagemagick
|
imagemagick
|
||||||
exiftool
|
exiftool
|
||||||
scrot
|
|
||||||
# ARCHIVE TOOLS
|
# ARCHIVE TOOLS
|
||||||
unzip
|
unzip
|
||||||
unrar
|
unrar
|
||||||
@@ -106,14 +98,12 @@ in {
|
|||||||
xmlstarlet # xml toolkit
|
xmlstarlet # xml toolkit
|
||||||
manpages
|
manpages
|
||||||
posix_man_pages
|
posix_man_pages
|
||||||
# moreutils # for parallel, sponge, combine
|
|
||||||
tree
|
tree
|
||||||
fuse_exfat # to mount windows drives
|
fuse_exfat # to mount windows drives
|
||||||
parallel # for parallel, since moreutils shadows task spooler
|
parallel # for parallel, since moreutils shadows task spooler
|
||||||
ripgrep # better grep
|
ripgrep # better grep
|
||||||
rlwrap
|
rlwrap
|
||||||
progress # display progress bars for pipes
|
progress # display progress bars for pipes
|
||||||
up # universal plumber (piping tool)
|
|
||||||
# HARDWARE TOOLS
|
# HARDWARE TOOLS
|
||||||
usbutils # for lsusb
|
usbutils # for lsusb
|
||||||
pciutils # for lspci
|
pciutils # for lspci
|
||||||
@@ -126,7 +116,7 @@ in {
|
|||||||
audacity
|
audacity
|
||||||
calibre
|
calibre
|
||||||
inkscape
|
inkscape
|
||||||
astrolog # astrolog
|
astrolog
|
||||||
anki # flashcards
|
anki # flashcards
|
||||||
nixpkgs-unstable.zoom-us # video conferencing
|
nixpkgs-unstable.zoom-us # video conferencing
|
||||||
pdfgrep # search in pdf
|
pdfgrep # search in pdf
|
||||||
@@ -142,6 +132,7 @@ in {
|
|||||||
scripts.auc
|
scripts.auc
|
||||||
scripts.infschmv
|
scripts.infschmv
|
||||||
scripts.qrpaste
|
scripts.qrpaste
|
||||||
|
scripts.ttspaste
|
||||||
scripts.new-mac # get a new mac address
|
scripts.new-mac # get a new mac address
|
||||||
scripts.scanned
|
scripts.scanned
|
||||||
scripts.default-gateway
|
scripts.default-gateway
|
||||||
@@ -158,11 +149,8 @@ in {
|
|||||||
recht
|
recht
|
||||||
scripts.vimv
|
scripts.vimv
|
||||||
scripts.swallow # window swallowing
|
scripts.swallow # window swallowing
|
||||||
scripts.genius
|
|
||||||
scripts.instaget
|
|
||||||
scripts.literature-quote
|
scripts.literature-quote
|
||||||
scripts.nav # json navigation
|
scripts.nav # json navigation
|
||||||
scripts.n
|
|
||||||
scripts.notetags
|
scripts.notetags
|
||||||
scripts.booksplit
|
scripts.booksplit
|
||||||
scripts.dmenurandr
|
scripts.dmenurandr
|
||||||
@@ -192,7 +180,6 @@ in {
|
|||||||
nixfmt
|
nixfmt
|
||||||
par
|
par
|
||||||
qrencode
|
qrencode
|
||||||
wtf
|
|
||||||
|
|
||||||
menstruation
|
menstruation
|
||||||
|
|
||||||
@@ -222,6 +209,53 @@ in {
|
|||||||
irc-announce
|
irc-announce
|
||||||
git-preview
|
git-preview
|
||||||
ircaids
|
ircaids
|
||||||
|
|
||||||
|
(python3.withPackages (py: [
|
||||||
|
py.black
|
||||||
|
# py.python-language-server
|
||||||
|
# py.pyls-mypy
|
||||||
|
# py.pyls-black
|
||||||
|
# py.pyls-isort
|
||||||
|
py.flake8
|
||||||
|
py.pygments
|
||||||
|
py.schema
|
||||||
|
]))
|
||||||
|
python3Packages.poetry
|
||||||
|
|
||||||
|
htmlTidy
|
||||||
|
nodePackages.csslint
|
||||||
|
nodePackages.jsonlint
|
||||||
|
nodePackages.prettier
|
||||||
|
nodePackages.typescript
|
||||||
|
nodePackages.yarn
|
||||||
|
nodejs
|
||||||
|
nodePackages.javascript-typescript-langserver
|
||||||
|
texlive.combined.scheme-full
|
||||||
|
latexrun
|
||||||
|
(aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ]))
|
||||||
|
# haskellPackages.pandoc-citeproc
|
||||||
|
scripts.text2pdf
|
||||||
|
lowdown
|
||||||
|
glow # markdown to term
|
||||||
|
libreoffice
|
||||||
|
# gnumeric
|
||||||
|
dia
|
||||||
|
pandoc
|
||||||
|
pandoc-doc
|
||||||
|
# proselint
|
||||||
|
asciidoctor
|
||||||
|
wordnet
|
||||||
|
tokei # count lines of code
|
||||||
|
gnumake
|
||||||
|
binutils # for strip, ld, ...
|
||||||
|
# nightly.rust
|
||||||
|
shellcheck
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
home-manager.users.me.xdg.configFile."pycodestyle".text = ''
|
||||||
|
[pycodestyle]
|
||||||
|
max-line-length = 110
|
||||||
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
{ config, pkgs, ... }: {
|
|
||||||
home-manager.users.me.home.file = {
|
|
||||||
".ghc/ghci.conf".text = ''
|
|
||||||
:set editor vim
|
|
||||||
:def hoogle \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --count=15 \"" ++ s ++ "\""
|
|
||||||
:def doc \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --info \"" ++ s ++ "\""
|
|
||||||
:set prompt "\o033[1m%s\o033[1;34m λ\o033[0m "
|
|
||||||
:set -Wall
|
|
||||||
:set -XOverloadedStrings
|
|
||||||
'';
|
|
||||||
# :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
|
|
||||||
# :def pl \x -> return $ ":!${pkgs.haskellPackages.pointfree}/bin/pointfree -v \"" ++ x ++ "\""
|
|
||||||
".stack/config.yaml".source =
|
|
||||||
let inherit (import <niveum/lib>) kieran;
|
|
||||||
in (pkgs.formats.yaml {}).generate "config.yaml" {
|
|
||||||
templates.params = {
|
|
||||||
author-name = kieran.name;
|
|
||||||
author-email = kieran.email;
|
|
||||||
copyright = "Copyright: (c) 2020 ${kieran.name}";
|
|
||||||
github-username = kieran.github;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.hoogle = {
|
|
||||||
enable = false;
|
|
||||||
packages = import ./packages.nix;
|
|
||||||
port = 8091;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs;
|
|
||||||
[
|
|
||||||
cabal2nix
|
|
||||||
cabal-install
|
|
||||||
hlint
|
|
||||||
haskellPackages.ormolu
|
|
||||||
(haskellPackages.ghcWithHoogle (import ./packages.nix))
|
|
||||||
] ++ map haskell.lib.justStaticExecutables [
|
|
||||||
haskellPackages.ghcid
|
|
||||||
haskellPackages.hasktags
|
|
||||||
# haskellPackages.hindent
|
|
||||||
# haskellPackages.pointfree
|
|
||||||
# haskellPackages.pointful
|
|
||||||
haskellPackages.hpack
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
haskellPackages:
|
|
||||||
with haskellPackages; [
|
|
||||||
HTTP
|
|
||||||
HUnit
|
|
||||||
MissingH
|
|
||||||
QuickCheck
|
|
||||||
ad
|
|
||||||
adjunctions
|
|
||||||
aeson
|
|
||||||
# algebra
|
|
||||||
ansi-terminal
|
|
||||||
async
|
|
||||||
attoparsec
|
|
||||||
base-orphans
|
|
||||||
bifunctors
|
|
||||||
binary
|
|
||||||
blaze-html
|
|
||||||
blaze-markup
|
|
||||||
brick
|
|
||||||
bytes
|
|
||||||
bytestring
|
|
||||||
case-insensitive
|
|
||||||
cassava
|
|
||||||
cereal
|
|
||||||
clock
|
|
||||||
comonad
|
|
||||||
comonad-transformers
|
|
||||||
conduit
|
|
||||||
conduit-extra
|
|
||||||
constraints
|
|
||||||
containers
|
|
||||||
contravariant
|
|
||||||
criterion
|
|
||||||
data-default
|
|
||||||
diagrams
|
|
||||||
directory
|
|
||||||
dlist
|
|
||||||
either
|
|
||||||
edit-distance
|
|
||||||
exceptions
|
|
||||||
extra
|
|
||||||
filepath
|
|
||||||
foundation
|
|
||||||
free
|
|
||||||
haskeline
|
|
||||||
hedgehog
|
|
||||||
hourglass
|
|
||||||
hspec
|
|
||||||
http-client
|
|
||||||
http-conduit
|
|
||||||
kan-extensions
|
|
||||||
lens
|
|
||||||
linear
|
|
||||||
lucid
|
|
||||||
megaparsec
|
|
||||||
microlens
|
|
||||||
monad-logger
|
|
||||||
monad-memo
|
|
||||||
mono-traversable
|
|
||||||
mtl
|
|
||||||
network
|
|
||||||
parallel
|
|
||||||
parsec
|
|
||||||
persistent
|
|
||||||
pipes
|
|
||||||
pointed
|
|
||||||
pretty
|
|
||||||
pretty-show
|
|
||||||
prettyprinter
|
|
||||||
primitive
|
|
||||||
process
|
|
||||||
profunctors
|
|
||||||
regex-tdfa
|
|
||||||
safe
|
|
||||||
scalpel
|
|
||||||
semigroupoids
|
|
||||||
semigroups
|
|
||||||
servant
|
|
||||||
servant-blaze
|
|
||||||
servant-client
|
|
||||||
servant-docs
|
|
||||||
servant-server
|
|
||||||
servant-swagger
|
|
||||||
split
|
|
||||||
stm
|
|
||||||
tagsoup
|
|
||||||
tasty
|
|
||||||
text
|
|
||||||
time
|
|
||||||
transformers
|
|
||||||
turtle
|
|
||||||
unix-time
|
|
||||||
unordered-containers
|
|
||||||
vector
|
|
||||||
void
|
|
||||||
vty
|
|
||||||
warp
|
|
||||||
wreq
|
|
||||||
yaml
|
|
||||||
]
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
{ pkgs, ... }: {
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.python3.withPackages (py: [
|
|
||||||
py.black
|
|
||||||
# py.python-language-server
|
|
||||||
# py.pyls-mypy
|
|
||||||
# py.pyls-black
|
|
||||||
# py.pyls-isort
|
|
||||||
py.flake8
|
|
||||||
py.pygments
|
|
||||||
py.schema
|
|
||||||
]))
|
|
||||||
pkgs.python3Packages.poetry
|
|
||||||
];
|
|
||||||
|
|
||||||
home-manager.users.me.xdg.configFile."pycodestyle".text = ''
|
|
||||||
[pycodestyle]
|
|
||||||
max-line-length = 110
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
{ pkgs, lib, config, ... }:
|
|
||||||
let
|
|
||||||
pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
|
|
||||||
|
|
||||||
zoteroStyle = { name, sha256 }: {
|
|
||||||
name = "${name}.csl";
|
|
||||||
path = pkgs.fetchurl {
|
|
||||||
url = "https://www.zotero.org/styles/${name}";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
cslDirectory = pkgs.linkFarm "citation-styles" [
|
|
||||||
(zoteroStyle {
|
|
||||||
name = "chicago-author-date-de";
|
|
||||||
sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
|
|
||||||
})
|
|
||||||
(zoteroStyle {
|
|
||||||
name = "din-1505-2";
|
|
||||||
sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
|
|
||||||
})
|
|
||||||
(zoteroStyle {
|
|
||||||
name = "apa";
|
|
||||||
sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
makeStardictDataDir = dicts:
|
|
||||||
pkgs.linkFarm "dictionaries" (map ({ name, path }: {
|
|
||||||
name = "dic/${name}";
|
|
||||||
inherit path;
|
|
||||||
}) dicts);
|
|
||||||
in {
|
|
||||||
environment.variables.STARDICT_DATA_DIR = toString (makeStardictDataDir [
|
|
||||||
{
|
|
||||||
name = "gr-de";
|
|
||||||
path = pkgs.fetchurl {
|
|
||||||
url = "http://tovotu.de/data/stardict/pape_gr-de.zip";
|
|
||||||
sha256 = "1d705y47b40vp0mg79vbwasw4y0i8fmnlwvf4x4ri0dkfqng9sky";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "la-de";
|
|
||||||
path = pkgs.fetchurl {
|
|
||||||
url = "http://tovotu.de/data/stardict/georges_lat-de.zip";
|
|
||||||
sha256 = "12n26nzwg28wn4zwv45mv0wkgy1jh1d8p0k6haamz9601cqq7hkj";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "de-la";
|
|
||||||
path = pkgs.fetchurl {
|
|
||||||
url = "http://tovotu.de/data/stardict/georges_de-lat.zip";
|
|
||||||
sha256 = "0inm6xn1lcnb851cj329n0v2vbfc1z1bxwhgsd8fnm0zxy3f3ifq";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
|
|
||||||
home-manager.users.me.home.file = {
|
|
||||||
".csl".source = cslDirectory;
|
|
||||||
".local/share/pandoc/csl".source = cslDirectory; # as of pandoc 2.11, it includes citeproc
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
texlive.combined.scheme-full
|
|
||||||
latexrun
|
|
||||||
(aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ]))
|
|
||||||
# haskellPackages.pandoc-citeproc
|
|
||||||
scripts.text2pdf
|
|
||||||
lowdown
|
|
||||||
glow # markdown to term
|
|
||||||
libreoffice
|
|
||||||
# gnumeric
|
|
||||||
dia
|
|
||||||
pandoc
|
|
||||||
pandoc-doc
|
|
||||||
# proselint
|
|
||||||
asciidoctor
|
|
||||||
wordnet
|
|
||||||
# sdcv # stardict cli
|
|
||||||
];
|
|
||||||
}
|
|
||||||
187
configs/stardict.nix
Normal file
187
configs/stardict.nix
Normal file
@@ -0,0 +1,187 @@
|
|||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
let
|
||||||
|
classicsDictionaries = {
|
||||||
|
Pape = pkgs.fetchzip {
|
||||||
|
url = "http://tovotu.de/data/stardict/pape_gr-de.zip";
|
||||||
|
sha256 = "1kmbdjqinrcxkc6jdyyrq5rl2wzhnrychyynnh91yhrjwjxlh44k";
|
||||||
|
};
|
||||||
|
Woodhouse = pkgs.fetchzip {
|
||||||
|
url = "https://c.krebsco.de/Woodhouse.zip";
|
||||||
|
sha256 = "1dvnc2679yb048q2f3hr2h34acvhan0n3iir6h9ajlrdzz48mlkq";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
LSJ = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/nikita-moor/latin-dictionary/releases/download/2020-02-14/LiddellScott1940-stardict.zip";
|
||||||
|
sha256 = "13rprgd9jvnhxk9735c91xr6ywr0j5jiwkjnpm3qpvy93isyjbys";
|
||||||
|
};
|
||||||
|
GreekMorphology = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/latin-dict/Morphologia-Graeca/releases/download/v0.5/morphology-mobile-goldendict.oxia.zip";
|
||||||
|
sha256 = "0m75cppjjjmvv18cs7yh9f4p7ckqzxfznnndgkiw3yrfd50k8p96";
|
||||||
|
};
|
||||||
|
Frisk = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/latin-dict/Frisk1960/releases/download/v1.1/Frisk1960-stardict.zip";
|
||||||
|
sha256 = "1rk5a3n3fpfdcmg4bc5945m88s6ldxql8cjn4jqs33rgklh7n046";
|
||||||
|
};
|
||||||
|
Georges-De-Lat = pkgs.fetchzip {
|
||||||
|
url = "http://tovotu.de/data/stardict/georges_de-lat.zip";
|
||||||
|
sha256 = "1gx4vv64bi9lxw2zgd861j469jvw4f2hhfwy1gglb12id8r7rdrl";
|
||||||
|
};
|
||||||
|
Georges-Lat-De = pkgs.fetchzip { # TODO find out why this does not work with sdcv
|
||||||
|
url = "http://tovotu.de/data/stardict/georges_lat-de.zip";
|
||||||
|
# "http://download.huzheng.org/de/stardict-georges_lat-de-2.4.2.tar.bz2";
|
||||||
|
sha256 = "0cc5xipn60anxvq8z2mw53d4gi1k92wbrj9m4ws3g9rh87fmkvgz";
|
||||||
|
};
|
||||||
|
SmithBiographyMythology = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/latin-dict/Smith1873/releases/download/v1.0/Smith1873-stardict.zip";
|
||||||
|
sha256 = "01h5fxacp2m60xir8kzslkfy772vs3vmz07zhdwfhcwdaxif2af2";
|
||||||
|
};
|
||||||
|
SmithAntiquities = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
|
||||||
|
sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
|
||||||
|
};
|
||||||
|
LewisShort = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/latin-dict/LewisShort1879/releases/download/v1.3/LewisShort1879-stardict.zip";
|
||||||
|
sha256 = "1y3ans47iv8bzzb1paimdqvcid8ms04ikjbqy3iw077i2js3qbjk";
|
||||||
|
};
|
||||||
|
DoederleinSynonymes = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/latin-dict/Doederlein1874/releases/download/v1.1/Doederlein1875-stardict.zip";
|
||||||
|
sha256 = "0mhik7gjxl8ncr9g5z2l4pfk60k1c5n0gc1w0cnp2x1v6lqvb57h";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
englishGermanDictionaries = {
|
||||||
|
Etymonline = pkgs.fetchzip {
|
||||||
|
url = "http://tovotu.de/data/stardict/etymonline.zip";
|
||||||
|
sha256 = "1bjja3n3layfd08xa1r0a6375dxh5zi6hlv7chkhgnx800cx7hxn";
|
||||||
|
};
|
||||||
|
Roget = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/bigdict/stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
|
||||||
|
sha256 = "1szyny9497bpyyccf9l5kr3bnw0wvl4cnsd0n1zscxpyzlsrqqbz";
|
||||||
|
};
|
||||||
|
OED1 = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
|
||||||
|
sha256 = "0i5vv1rv44yfwyf9bfbdrb9brzhhpvz2jnh39fv8hh107nkv2vcf";
|
||||||
|
};
|
||||||
|
OED2 = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
|
||||||
|
sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
|
||||||
|
};
|
||||||
|
JargonFile = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/dict.org/stardict-dictd-jargon-2.4.2.tar.bz2";
|
||||||
|
sha256 = "096phar9qpmm0fnaqv5nz8x9lpxwnfj78g4vjfcfyd7kqp7iqla4";
|
||||||
|
};
|
||||||
|
Oxford-Collocations = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/bigdict/stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
|
||||||
|
sha256 = "1zkfs0zxkcn21z2lhcabrs77v4ma9hpv7qm119hpyi1d8ajcw07q";
|
||||||
|
};
|
||||||
|
Langenscheidt-Deu-En = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
|
||||||
|
sha256 = "12q9i5azq7ylyrpb6jqbaf1rxalc3kzcwjvbinvb0yabdxb80y30";
|
||||||
|
};
|
||||||
|
Langenscheidt-En-Deu = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
|
||||||
|
sha256 = "087b05h155j5ldshfgx91pz81h6ijq2zaqjirg7ma8ig3l96zb59";
|
||||||
|
};
|
||||||
|
Duden_Das_Fremdworterbuch = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/babylon/german/stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
|
||||||
|
sha256 = "1zrcay54ccl031s6dvjwsah5slhanmjab87d81rxlcy8fx0xd8wq";
|
||||||
|
};
|
||||||
|
Duden_De_De = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/babylon/german/stardict-Duden_De_De-2.4.2.tar.bz2";
|
||||||
|
sha256 = "1fhay04w5aaj83axfmla2ql34nb60gb05dgv0k94ig7p8x4yxxlf";
|
||||||
|
};
|
||||||
|
# Duden_Rechtschreibung = builtins.fetchTarball {
|
||||||
|
# url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
|
||||||
|
# sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
|
||||||
|
# };
|
||||||
|
Duden_Synonym = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/babylon/german/stardict-Duden_Synonym-2.4.2.tar.bz2";
|
||||||
|
sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
|
||||||
|
};
|
||||||
|
# Duden = builtins.fetchTarball {
|
||||||
|
# url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
|
||||||
|
# sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
|
||||||
|
# };
|
||||||
|
# ConciseOED = builtins.fetchTarball {
|
||||||
|
# url = "http://download.huzheng.org/bigdict/stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
|
||||||
|
# sha256 = "19kpcxbhqzpmhi94mp48nalgmsh6s7rsx1gb4kwkhirp2pbjcyl7";
|
||||||
|
# };
|
||||||
|
# FreeOnlineDictionaryOfComputing = builtins.fetchTarball {
|
||||||
|
# url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
|
||||||
|
# sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
|
||||||
|
# };
|
||||||
|
};
|
||||||
|
|
||||||
|
sanskritDictionaries = {
|
||||||
|
BoehtlingkRoth = pkgs.fetchzip {
|
||||||
|
url = "https://c.krebsco.de/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch.zip";
|
||||||
|
sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
MonierWilliams = pkgs.fetchzip {
|
||||||
|
url = "https://c.krebsco.de/mw-cologne.zip";
|
||||||
|
sha256 = "0p99ybxwxmmd94hf035hvm2hhnfy84av7qq79xf28bh2rbx6s9ng";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
MonierWilliamsEnglish = pkgs.fetchzip {
|
||||||
|
url = "https://c.krebsco.de/mw-english-sanskrit.zip";
|
||||||
|
sha256 = "09a61hhii4b1m2fkrlh4rm2xnlgwrllh84iypbc6wyj00w9jkl3x";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: { inherit name path; }) dicts);
|
||||||
|
in
|
||||||
|
{
|
||||||
|
# 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
|
||||||
|
# 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-Urban_Dictionary_P1-2.4.2.tar.bz2
|
||||||
|
# http://download.huzheng.org/bigdict/stardict-Urban_Dictionary_P2-2.4.2.tar.bz2
|
||||||
|
environment.etc.stardict.source = toString (makeStardictDataDir (classicsDictionaries // {
|
||||||
|
Crum = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
|
||||||
|
sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
|
||||||
|
};
|
||||||
|
LingvoGermanRussian = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/lingvo/stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
|
||||||
|
sha256 = "0p353gs2z4vj70hqsdhffjaaw3a4zlmcs46flipmf35lm5wmaj0g";
|
||||||
|
};
|
||||||
|
LingvoRussianGerman = builtins.fetchTarball {
|
||||||
|
url = "http://download.huzheng.org/lingvo/stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
|
||||||
|
sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
|
||||||
|
};
|
||||||
|
} // sanskritDictionaries // englishGermanDictionaries));
|
||||||
|
|
||||||
|
environment.variables = {
|
||||||
|
SDCV_PAGER = "${pkgs.w3m}/bin/w3m -T text/html -dump";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.user.services.goldendict = {
|
||||||
|
wantedBy = [ "graphical-session.target" ];
|
||||||
|
environment = {
|
||||||
|
DISPLAY = ":${toString config.services.xserver.display}";
|
||||||
|
};
|
||||||
|
serviceConfig = {
|
||||||
|
SyslogIdentifier = "goldendict";
|
||||||
|
ExecStart = "${pkgs.goldendict}/bin/goldendict";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "15s";
|
||||||
|
StartLimitBurst = 0;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.users.me = {
|
||||||
|
home.file.".goldendict/config".text = import <niveum/lib/goldendict-config.nix> {
|
||||||
|
path = "/etc/stardict";
|
||||||
|
inherit pkgs;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.goldendict
|
||||||
|
(pkgs.writers.writeDashBin "sd-classics" ''${pkgs.sdcv}/bin/sdcv --data-dir ${makeStardictDataDir classicsDictionaries} "$@"'')
|
||||||
|
(pkgs.writers.writeDashBin "sd-sanskrit" ''${pkgs.sdcv}/bin/sdcv --data-dir ${makeStardictDataDir sanskritDictionaries} "$@"'')
|
||||||
|
(pkgs.writers.writeDashBin "sd" ''${pkgs.sdcv}/bin/sdcv --data-dir ${makeStardictDataDir englishGermanDictionaries} "$@"'')
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -40,14 +40,16 @@ let
|
|||||||
in {
|
in {
|
||||||
niveum.telegramBots.transits = {
|
niveum.telegramBots.transits = {
|
||||||
enable = true;
|
enable = true;
|
||||||
time = "4:00";
|
time = "*:0/1";
|
||||||
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
||||||
chatIds = [ "18980945" ];
|
chatIds = [ "-1001796440545" ];
|
||||||
command = toString (pkgs.writers.writeDash "common-transits" ''
|
command = toString (pkgs.writers.writeDash "common-transits" ''
|
||||||
|
now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
|
||||||
|
date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
|
||||||
{
|
{
|
||||||
${nixpkgs-unstable.astrolog}/bin/astrolog -n -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto
|
${nixpkgs-unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d
|
||||||
${nixpkgs-unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $(${pkgs.coreutils}/bin/date +'%m %d %Y') -R Uranus Neptune Pluto
|
${nixpkgs-unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date
|
||||||
} | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n
|
} | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
|
||||||
'');
|
'');
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,6 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
telebots = let
|
telebots = pkgs.callPackage <telebots> {};
|
||||||
telebots-package = pkgs.fetchFromGitHub {
|
|
||||||
owner = "kmein";
|
|
||||||
repo = "telebots";
|
|
||||||
rev = "22931c9457e092c4e413555dbe61819d77844246";
|
|
||||||
sha256 = "0byp3w6li3fin7ry0ki4rmgkaajdil424y5pc1j7ci9mpws0s5ik";
|
|
||||||
};
|
|
||||||
in pkgs.callPackage telebots-package {};
|
|
||||||
reverseDirectory = "/run/telegram-reverse";
|
reverseDirectory = "/run/telegram-reverse";
|
||||||
proverbDirectory = "/run/telegram-proverb";
|
proverbDirectory = "/run/telegram-proverb";
|
||||||
inherit (import <niveum/lib>) tmpfilesConfig;
|
inherit (import <niveum/lib>) tmpfilesConfig;
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
{ lib, config, ... }:
|
|
||||||
{
|
|
||||||
environment.etc."niveum/version".text = lib.sources.commitIdFromGitRepo <niveum/.git>;
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,18 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
environment.systemPackages = [ pkgs.watson ];
|
environment.systemPackages = [ pkgs.watson ];
|
||||||
|
|
||||||
|
home-manager.users.me.xdg.configFile."watson/config".text = ''
|
||||||
|
[options]
|
||||||
|
confirm_new_project = true
|
||||||
|
confirm_new_tag = true
|
||||||
|
date_format = %Y-%m-%d
|
||||||
|
log_current = true
|
||||||
|
report_current = true
|
||||||
|
'';
|
||||||
|
|
||||||
|
system.activationScripts.watson-home = ''
|
||||||
|
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Documents/watson/frames ${config.users.users.me.home}/.config/watson/frames
|
||||||
|
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Documents/watson/state ${config.users.users.me.home}/.config/watson/state
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,119 +0,0 @@
|
|||||||
{ lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) kieran;
|
|
||||||
relayPassword = lib.fileContents <system-secrets/weechat/relay>;
|
|
||||||
in {
|
|
||||||
systemd.services.weechat =
|
|
||||||
let
|
|
||||||
tmux = pkgs.writers.writeDash "tmux" ''
|
|
||||||
exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
|
|
||||||
set-option -g prefix `
|
|
||||||
unbind-key C-b
|
|
||||||
bind ` send-prefix
|
|
||||||
|
|
||||||
set-option -g status off
|
|
||||||
set-option -g default-terminal screen-256color
|
|
||||||
|
|
||||||
#use session instead of windows
|
|
||||||
bind-key c new-session
|
|
||||||
bind-key p switch-client -p
|
|
||||||
bind-key n switch-client -n
|
|
||||||
bind-key C-s switch-client -l
|
|
||||||
''} "$@"
|
|
||||||
'';
|
|
||||||
weechat = pkgs.weechat.override {
|
|
||||||
configure = { ... }: {
|
|
||||||
scripts = [ pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.colorize_nicks pkgs.weechatScripts.weechat-matrix ];
|
|
||||||
init = let
|
|
||||||
coolColors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254);
|
|
||||||
nick = "kmein";
|
|
||||||
in ''
|
|
||||||
/mouse enable
|
|
||||||
/set irc.server_default.nicks "${nick}"
|
|
||||||
/set irc.server_default.msg_part "tschö mit ö"
|
|
||||||
/set irc.server_default.msg_quit "ciao kakao"
|
|
||||||
/set irc.server_default.msg_kick "warum machst du diese?"
|
|
||||||
/set irc.server_default.realname "${kieran.name}"
|
|
||||||
|
|
||||||
/set irc.look.color_nicks_in_nicklist "on"
|
|
||||||
/set weechat.color.chat_nick_colors "${lib.concatMapStringsSep "," toString coolColors}"
|
|
||||||
|
|
||||||
/server add hackint irc.hackint.org/6697 -ipv6 -ssl
|
|
||||||
/server add libera irc.libera.chat/6697 -ssl
|
|
||||||
/server add oftc irc.oftc.net/6697 -ssl -ipv6
|
|
||||||
/server add retiolum irc.r
|
|
||||||
/server add news news.r
|
|
||||||
/matrix server add nibbana nibbana.jp
|
|
||||||
|
|
||||||
/alias add mod /quote omode $channel +o $nick
|
|
||||||
|
|
||||||
/relay add weechat 9000
|
|
||||||
/set relay.network.password ${relayPassword}
|
|
||||||
|
|
||||||
/set matrix.server.nibbana.username ${nick}
|
|
||||||
/set matrix.server.nibbana.password "${lib.strings.fileContents <system-secrets/matrix/nibbana>}"
|
|
||||||
|
|
||||||
/set irc.server.oftc.command /msg nickserv IDENTIFY ${lib.strings.fileContents <system-secrets/irc/oftc>};/msg nickserv SET CLOAK ON
|
|
||||||
/set irc.server.oftc.autojoin "#osm,#osm-de,#home-manager"
|
|
||||||
|
|
||||||
/set irc.server.hackint.autojoin "#krebs,#nixos,#the_playlist"
|
|
||||||
/set irc.server.hackint.sasl_mechanism plain
|
|
||||||
/set irc.server.hackint.sasl_username ${nick}
|
|
||||||
/set irc.server.hackint.sasl_password ${lib.strings.fileContents <system-secrets/irc/hackint>}
|
|
||||||
|
|
||||||
/set irc.server.libera.autojoin "#flipdot,#haskell,#nixos,#fysi,#binaergewitter"
|
|
||||||
/set irc.server.libera.sasl_mechanism plain
|
|
||||||
/set irc.server.libera.sasl_username ${nick}
|
|
||||||
/set irc.server.libera.sasl_password ${lib.strings.fileContents <system-secrets/irc/libera>}
|
|
||||||
|
|
||||||
/set irc.server.retiolum.autojoin "#xxx,#brockman,#flix,#autowifi"
|
|
||||||
/set irc.server.retiolum.command "/oper aids balls"
|
|
||||||
/set irc.server.news.autojoin "#cook,#drachengame,#oepnv,#kmeinung,#memes"
|
|
||||||
/set irc.server.news.command "/oper aids balls"
|
|
||||||
/set logger.level.irc.news 0
|
|
||||||
|
|
||||||
/filter addreplace zerocovid * * [kc]orona|💉|🤒|😷|[kc]ovid|virus|lockdown|va[kc][sc]in|mutante|mutation|impf|pandemi|κορ[ωο]ν[αο]ϊό|корона|expert|infe[ck]t|infizi|in[cz]iden[cz]|sars-cov|drosten|virolog|lauterbach|delta|omi[ck]ron|epidemi|booster|r-wert
|
|
||||||
/filter addreplace joinquit * irc_join,irc_part,irc_quit,irc_nick *
|
|
||||||
/filter addreplace playlist_topic irc.*.#the_playlist irc_topic *
|
|
||||||
/filter addreplace brockman_notice irc.news.* irc_notice *
|
|
||||||
|
|
||||||
/set irc.look.server_buffer independent
|
|
||||||
|
|
||||||
/connect libera
|
|
||||||
/connect oftc
|
|
||||||
/connect hackint
|
|
||||||
/connect retiolum
|
|
||||||
/connect news
|
|
||||||
/matrix connect nibbana
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
description = "Weechat bouncer";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
restartIfChanged = true;
|
|
||||||
path = [ pkgs.alacritty.terminfo ];
|
|
||||||
environment.WEECHAT_HOME = "/var/lib/weechat";
|
|
||||||
script = "${tmux} -2 new-session -d -s IM ${weechat}/bin/weechat";
|
|
||||||
preStop = "${tmux} kill-session -t IM";
|
|
||||||
serviceConfig = {
|
|
||||||
User = "weechat";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
Type = "oneshot";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
users.groups.weechat = {};
|
|
||||||
users.extraUsers.weechat = {
|
|
||||||
useDefaultShell = true;
|
|
||||||
openssh.authorizedKeys.keys = kieran.sshKeys pkgs ++ [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@heym"
|
|
||||||
];
|
|
||||||
createHome = true;
|
|
||||||
group = "weechat";
|
|
||||||
home = "/var/lib/weechat";
|
|
||||||
isSystemUser = true;
|
|
||||||
packages = [ pkgs.tmux ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
68
deploy.nix
68
deploy.nix
@@ -1,68 +0,0 @@
|
|||||||
let
|
|
||||||
inherit (import ./lib/default.nix) sshPort;
|
|
||||||
|
|
||||||
gitFromJson = path:
|
|
||||||
let object = importJson path;
|
|
||||||
in {
|
|
||||||
inherit (object) url;
|
|
||||||
ref = object.rev;
|
|
||||||
};
|
|
||||||
krops = builtins.fetchGit (gitFromJson .versions/krops.json);
|
|
||||||
lib = import "${krops}/lib";
|
|
||||||
pkgs = import "${krops}/pkgs" { };
|
|
||||||
importJson = (import <nixpkgs> { }).lib.importJSON;
|
|
||||||
|
|
||||||
regularSystem = { path, name, address }: {
|
|
||||||
source = lib.evalSource [{
|
|
||||||
niveum.file = toString ./.;
|
|
||||||
system.file = toString path;
|
|
||||||
nixos-config.symlink = "system/configuration.nix";
|
|
||||||
|
|
||||||
nixpkgs.git = gitFromJson .versions/nixpkgs.json // { shallow = true; };
|
|
||||||
nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json // { shallow = true; };
|
|
||||||
home-manager.git = gitFromJson .versions/home-manager.json;
|
|
||||||
stockholm.git = gitFromJson .versions/stockholm.json;
|
|
||||||
nix-writers.git = gitFromJson .versions/nix-writers.json;
|
|
||||||
retiolum.git = gitFromJson .versions/retiolum.json;
|
|
||||||
nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
|
|
||||||
system-secrets.pass = {
|
|
||||||
dir = toString ~/.password-store;
|
|
||||||
name = "systems/${name}";
|
|
||||||
};
|
|
||||||
secrets.pass = {
|
|
||||||
dir = toString ~/.password-store;
|
|
||||||
name = "shared";
|
|
||||||
};
|
|
||||||
}];
|
|
||||||
target = "root@${address}:${toString sshPort}";
|
|
||||||
};
|
|
||||||
inherit (pkgs.krops) writeDeploy;
|
|
||||||
in {
|
|
||||||
zaatar = writeDeploy "deploy-zaatar" (regularSystem {
|
|
||||||
path = systems/zaatar;
|
|
||||||
name = "zaatar";
|
|
||||||
address = "zaatar.r";
|
|
||||||
});
|
|
||||||
kabsa = writeDeploy "deploy-kabsa" (regularSystem {
|
|
||||||
path = systems/kabsa;
|
|
||||||
name = "kabsa";
|
|
||||||
address = "kabsa.r";
|
|
||||||
});
|
|
||||||
toum = writeDeploy "deploy-toum" (regularSystem {
|
|
||||||
path = systems/toum;
|
|
||||||
name = "toum";
|
|
||||||
address = "toum.r";
|
|
||||||
}) // {
|
|
||||||
buildTarget = "${builtins.getEnv "USER"}@localhost/${builtins.getEnv "HOME"}/.cache/krops";
|
|
||||||
};
|
|
||||||
makanek = writeDeploy "deploy-makanek" (regularSystem {
|
|
||||||
path = systems/makanek;
|
|
||||||
name = "makanek";
|
|
||||||
address = "makanek.r";
|
|
||||||
});
|
|
||||||
manakish = writeDeploy "deploy-manakish" (regularSystem {
|
|
||||||
path = systems/manakish;
|
|
||||||
name = "manakish";
|
|
||||||
address = "manakish.r";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
293
flake.lock
generated
Normal file
293
flake.lock
generated
Normal file
@@ -0,0 +1,293 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1638122382,
|
||||||
|
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"home-manager": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1639871969,
|
||||||
|
"narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "697cc8c68ed6a606296efbbe9614c32537078756",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-21.11",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"krops": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": [
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1632420452,
|
||||||
|
"narHash": "sha256-ncK6vABW/Ku9XI0kqj1otarUfblryoQzSaOCnaZ0oSs=",
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "krops",
|
||||||
|
"rev": "0388970c568905fedcbf429e5745aacd4f7a6633",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "krops",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"menstruation-backend": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1634573652,
|
||||||
|
"narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "menstruation.rs",
|
||||||
|
"rev": "dd405fe2acf32441e8ac56e488e689bb1c4bea82",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "menstruation.rs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"menstruation-telegram": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1634815642,
|
||||||
|
"narHash": "sha256-q1OTMx5ayNu9ppHJBDUie/ow+BcA5DXnHEm11EY+C4E=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "menstruation-telegram",
|
||||||
|
"rev": "a34555cf46f02157718b0565b5456348fff54181",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "menstruation-telegram",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix-writers": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1554228333,
|
||||||
|
"narHash": "sha256-hG/PlcCvCQhNcU55NpHfATkyH9k6cZmO7uvBoJjasXU=",
|
||||||
|
"ref": "master",
|
||||||
|
"rev": "c528cf970e292790b414b4c1c8c8e9d7e73b2a71",
|
||||||
|
"revCount": 32,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://cgit.krebsco.de/nix-writers"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://cgit.krebsco.de/nix-writers"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1640860570,
|
||||||
|
"narHash": "sha256-k43dodTc3IUH2cJfdzHFhZZOILQeAdtB1mBxbVSu7vw=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "8d373df05fb709a00b78648d1a63dbce7678bf79",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "release-21.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1640874390,
|
||||||
|
"narHash": "sha256-wAmjdulrW1tZQHEUgnK3LmycEfEVi/sq/9nD/22PdI4=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "7771661d93bad2f3d1d7c65852a918afd2a2bcf1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"recht": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1619583518,
|
||||||
|
"narHash": "sha256-3eFw6xWue9cvPxXq1ROq32ecvPOmqOedgQhyOr7N9iE=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "recht",
|
||||||
|
"rev": "d551afed23122bb3106e59eb2274394ec5555048",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "recht",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"retiolum": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1641415159,
|
||||||
|
"narHash": "sha256-QlJGc9Hnp8sBgcljLeus/4nZppRxVARMJO4kAD6P/04=",
|
||||||
|
"owner": "krebs",
|
||||||
|
"repo": "retiolum",
|
||||||
|
"rev": "aa65c68493f042d7ad5012249b4aafc4ee59b8f2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "krebs",
|
||||||
|
"repo": "retiolum",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"home-manager": "home-manager",
|
||||||
|
"krops": "krops",
|
||||||
|
"menstruation-backend": "menstruation-backend",
|
||||||
|
"menstruation-telegram": "menstruation-telegram",
|
||||||
|
"nix-writers": "nix-writers",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
|
"recht": "recht",
|
||||||
|
"retiolum": "retiolum",
|
||||||
|
"scripts": "scripts",
|
||||||
|
"stockholm": "stockholm",
|
||||||
|
"telebots": "telebots",
|
||||||
|
"tinc-graph": "tinc-graph",
|
||||||
|
"traadfri": "traadfri",
|
||||||
|
"tuna": "tuna"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1639436812,
|
||||||
|
"narHash": "sha256-6CajvfDo7t4ANgjc7DxqH7lI3WRE4MK8q3mBKAjk80k=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "scripts",
|
||||||
|
"rev": "d34a8161ba11135a45d3141dc9af482db945d63c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "scripts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"stockholm": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1641473549,
|
||||||
|
"narHash": "sha256-wAgqTsftZaHiB2dqZ8bY9/PCQRfo/y097m0u85H4AI8=",
|
||||||
|
"ref": "master",
|
||||||
|
"rev": "dbc238752043078de95aac231d31cc5fd88a329f",
|
||||||
|
"revCount": 10268,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://cgit.lassul.us/stockholm"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://cgit.lassul.us/stockholm"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"telebots": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1623510321,
|
||||||
|
"narHash": "sha256-MxYNNL81RXZkYLd4IgiNTSo1X80kTuDzsdGNSA0f1y8=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "telebots",
|
||||||
|
"rev": "22931c9457e092c4e413555dbe61819d77844246",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "telebots",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tinc-graph": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1639820904,
|
||||||
|
"narHash": "sha256-d4s2PulBGIIQXtX7blZz+Wnmij5dK/IrBcilNGjqZC4=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "tinc-graph",
|
||||||
|
"rev": "1b9c69ffdbdab82d30a23e44f739feea63d94163",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "tinc-graph",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"traadfri": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1640451803,
|
||||||
|
"narHash": "sha256-zS/b93uFpPM9basNP7ngmm+YjYV0IUQAmNghetHA6Ss=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "traadfri",
|
||||||
|
"rev": "cf46bd09cd3263b90a09b0ca979aa705a4c3671c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "traadfri",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tuna": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1627117248,
|
||||||
|
"narHash": "sha256-OfqbWLblJY4BJlrCpn8EkHoP3baNJSDTbw45SPaX+0Q=",
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "tuna",
|
||||||
|
"rev": "1cbed44069a3009738afdafecefe0a05316039a6",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "kmein",
|
||||||
|
"repo": "tuna",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
112
flake.nix
Normal file
112
flake.nix
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
{
|
||||||
|
description = "niveum: packages, modules, systems";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/release-21.11";
|
||||||
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
|
||||||
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
home-manager = {
|
||||||
|
url = "github:nix-community/home-manager/release-21.11";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
krops = {
|
||||||
|
url = "github:Mic92/krops";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.flake-utils.follows = "flake-utils";
|
||||||
|
};
|
||||||
|
|
||||||
|
# legacy
|
||||||
|
menstruation-backend = { url = "github:kmein/menstruation.rs"; flake = false; };
|
||||||
|
menstruation-telegram = { url = "github:kmein/menstruation-telegram"; flake = false; };
|
||||||
|
nix-writers = { url = "git+https://cgit.krebsco.de/nix-writers"; flake = false; };
|
||||||
|
recht = { url = "github:kmein/recht"; flake = false; };
|
||||||
|
retiolum = { url = "github:krebs/retiolum"; flake = false; };
|
||||||
|
scripts = { url = "github:kmein/scripts"; flake = false; };
|
||||||
|
stockholm = { url = "git+https://cgit.lassul.us/stockholm"; flake = false; };
|
||||||
|
telebots = { url = "github:kmein/telebots"; flake = false; };
|
||||||
|
tinc-graph = { url = "github:kmein/tinc-graph"; flake = false; };
|
||||||
|
traadfri = { url = "github:kmein/traadfri"; flake = false; };
|
||||||
|
tuna = { url = "github:kmein/tuna"; flake = false; };
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs =
|
||||||
|
{ self
|
||||||
|
, flake-utils
|
||||||
|
, home-manager
|
||||||
|
, krops
|
||||||
|
, menstruation-backend
|
||||||
|
, menstruation-telegram
|
||||||
|
, nix-writers
|
||||||
|
, nixpkgs
|
||||||
|
, nixpkgs-unstable
|
||||||
|
, recht
|
||||||
|
, retiolum
|
||||||
|
, scripts
|
||||||
|
, stockholm
|
||||||
|
, telebots
|
||||||
|
, tinc-graph
|
||||||
|
, traadfri
|
||||||
|
, tuna
|
||||||
|
}@inputs:
|
||||||
|
let
|
||||||
|
system = "x86_64-linux";
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
source = name: {
|
||||||
|
niveum.file = toString ./.;
|
||||||
|
nixos-config.symlink = "niveum/systems/${name}/configuration.nix";
|
||||||
|
system-secrets.pass = {
|
||||||
|
dir = toString ~/.password-store;
|
||||||
|
name = "systems/${name}";
|
||||||
|
};
|
||||||
|
secrets.pass = {
|
||||||
|
dir = toString ~/.password-store;
|
||||||
|
name = "shared";
|
||||||
|
};
|
||||||
|
} // nixpkgs.lib.mapAttrs' (name: value: {
|
||||||
|
inherit name;
|
||||||
|
value.git = {
|
||||||
|
url = {
|
||||||
|
# having to declare the git upstream urls here is suboptimal, but the inputs don't remember where they're from
|
||||||
|
home-manager = "https://github.com/nix-community/home-manager";
|
||||||
|
menstruation-backend = "https://github.com/kmein/menstruation.rs";
|
||||||
|
menstruation-telegram = "https://github.com/kmein/menstruation-telegram";
|
||||||
|
nix-writers = "https://cgit.krebsco.de/nix-writers";
|
||||||
|
nixpkgs = "https://github.com/NixOS/nixpkgs";
|
||||||
|
nixpkgs-unstable = "https://github.com/NixOS/nixpkgs";
|
||||||
|
recht = "https://github.com/kmein/recht";
|
||||||
|
retiolum = "https://github.com/krebs/retiolum";
|
||||||
|
scripts = "https://github.com/kmein/scripts";
|
||||||
|
stockholm = "https://cgit.lassul.us/stockholm";
|
||||||
|
telebots = "https://github.com/kmein/telebots";
|
||||||
|
tinc-graph = "https://github.com/kmein/tinc-graph";
|
||||||
|
traadfri = "https://github.com/kmein/traadfri";
|
||||||
|
tuna = "https://github.com/kmein/tuna";
|
||||||
|
}.${name};
|
||||||
|
ref = value.rev;
|
||||||
|
shallow = true;
|
||||||
|
};
|
||||||
|
}) (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name [ "flake-utils" "krops" "self" ]) inputs);
|
||||||
|
deployScriptFor = {name, host}: let inherit (import ./lib/default.nix) sshPort; in toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
|
||||||
|
source = krops.lib.evalSource [ (source name) ];
|
||||||
|
target = "root@${host}:${toString sshPort}";
|
||||||
|
});
|
||||||
|
in {
|
||||||
|
apps.${system} = let
|
||||||
|
forSystems = f: builtins.listToAttrs (map f (builtins.attrNames (builtins.readDir ./systems)));
|
||||||
|
deployScripts = forSystems (name: {
|
||||||
|
name = "deploy-${name}";
|
||||||
|
value = {
|
||||||
|
type = "app";
|
||||||
|
program = deployScriptFor { inherit name; host = "${name}.r"; };
|
||||||
|
};
|
||||||
|
});
|
||||||
|
ciScripts = forSystems (name: {
|
||||||
|
name = "build-${name}";
|
||||||
|
value = {
|
||||||
|
type = "app";
|
||||||
|
program = import ./ci.nix { inherit name system inputs; };
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in deployScripts // ciScripts;
|
||||||
|
};
|
||||||
|
}
|
||||||
179
lib/goldendict-config.nix
Normal file
179
lib/goldendict-config.nix
Normal file
@@ -0,0 +1,179 @@
|
|||||||
|
{pkgs, path}: ''
|
||||||
|
<config>
|
||||||
|
<paths>
|
||||||
|
<path recursive="1">${path}</path>
|
||||||
|
</paths>
|
||||||
|
<sounddirs/>
|
||||||
|
<dictionaryOrder name="" id="0">
|
||||||
|
<mutedDictionaries/>
|
||||||
|
</dictionaryOrder>
|
||||||
|
<inactiveDictionaries name="" id="0">
|
||||||
|
<mutedDictionaries/>
|
||||||
|
</inactiveDictionaries>
|
||||||
|
<groups nextId="1"/>
|
||||||
|
<hunspell dictionariesPath=""/>
|
||||||
|
<transliteration>
|
||||||
|
<enableRussianTransliteration>0</enableRussianTransliteration>
|
||||||
|
<enableGermanTransliteration>0</enableGermanTransliteration>
|
||||||
|
<enableGreekTransliteration>0</enableGreekTransliteration>
|
||||||
|
<enableBelarusianTransliteration>0</enableBelarusianTransliteration>
|
||||||
|
<chinese>
|
||||||
|
<enable>0</enable>
|
||||||
|
<enableSCToTWConversion>1</enableSCToTWConversion>
|
||||||
|
<enableSCToHKConversion>1</enableSCToHKConversion>
|
||||||
|
<enableTCToSCConversion>1</enableTCToSCConversion>
|
||||||
|
</chinese>
|
||||||
|
<romaji>
|
||||||
|
<enable>0</enable>
|
||||||
|
<enableHepburn>1</enableHepburn>
|
||||||
|
<enableNihonShiki>0</enableNihonShiki>
|
||||||
|
<enableKunreiShiki>0</enableKunreiShiki>
|
||||||
|
<enableHiragana>1</enableHiragana>
|
||||||
|
<enableKatakana>1</enableKatakana>
|
||||||
|
</romaji>
|
||||||
|
</transliteration>
|
||||||
|
<forvo>
|
||||||
|
<enable>0</enable>
|
||||||
|
<apiKey></apiKey>
|
||||||
|
<languageCodes></languageCodes>
|
||||||
|
</forvo>
|
||||||
|
<mediawikis>
|
||||||
|
<mediawiki enabled="0" name="English Wikipedia" icon="" id="ae6f89aac7151829681b85f035d54e48" url="https://en.wikipedia.org/w"/>
|
||||||
|
<mediawiki enabled="0" name="English Wiktionary" icon="" id="affcf9678e7bfe701c9b071f97eccba3" url="https://en.wiktionary.org/w"/>
|
||||||
|
<mediawiki enabled="0" name="German Wikipedia" icon="" id="a8a66331a1242ca2aeb0b4aed361c41d" url="https://de.wikipedia.org/w"/>
|
||||||
|
<mediawiki enabled="0" name="German Wiktionary" icon="" id="21c64bca5ec10ba17ff19f3066bc962a" url="https://de.wiktionary.org/w"/>
|
||||||
|
</mediawikis>
|
||||||
|
<websites>
|
||||||
|
<website enabled="0" name="Google En-En (Oxford)" icon="" id="b88cb2898e634c6638df618528284c2d" url="https://www.google.com/search?q=define:%GDWORD%&hl=en" inside_iframe="1"/>
|
||||||
|
<website enabled="0" name="Urban Dictionary" icon="" id="f376365a0de651fd7505e7e5e683aa45" url="https://www.urbandictionary.com/define.php?term=%GDWORD%" inside_iframe="1"/>
|
||||||
|
<website enabled="0" name="Multitran (En)" icon="" id="324ca0306187df7511b26d3847f4b07c" url="https://multitran.ru/c/m.exe?CL=1&l1=1&s=%GD1251%" inside_iframe="1"/>
|
||||||
|
<website enabled="0" name="Lingvo (En-Ru)" icon="" id="924db471b105299c82892067c0f10787" url="http://lingvopro.abbyyonline.com/en/Search/en-ru/%GDWORD%" inside_iframe="1"/>
|
||||||
|
<website enabled="0" name="Michaelis (Pt-En)" icon="" id="087a6d65615fb047f4c80eef0a9465db" url="http://michaelis.uol.com.br/moderno/ingles/index.php?lingua=portugues-ingles&palavra=%GDISO1%" inside_iframe="1"/>
|
||||||
|
</websites>
|
||||||
|
<dictservers/>
|
||||||
|
<programs>
|
||||||
|
<program enabled="0" name="Espeak" icon="" id="2cf8b3a60f27e1ac812de0b57c148340" commandLine="${pkgs.espeak}/bin/espeak %GDWORD%" type="0"/>
|
||||||
|
<program enabled="0" name="Manpages" icon="" id="4f898f7582596cea518c6b0bfdceb8b3" commandLine="${pkgs.man_db}/bin/man -a --html=/bin/cat %GDWORD%" type="2"/>
|
||||||
|
</programs>
|
||||||
|
<voiceEngines/>
|
||||||
|
<mutedDictionaries/>
|
||||||
|
<popupMutedDictionaries>
|
||||||
|
<mutedDictionary>ae6f89aac7151829681b85f035d54e48</mutedDictionary>
|
||||||
|
</popupMutedDictionaries>
|
||||||
|
<preferences>
|
||||||
|
<interfaceLanguage></interfaceLanguage>
|
||||||
|
<helpLanguage></helpLanguage>
|
||||||
|
<displayStyle>modern</displayStyle>
|
||||||
|
<newTabsOpenAfterCurrentOne>0</newTabsOpenAfterCurrentOne>
|
||||||
|
<newTabsOpenInBackground>1</newTabsOpenInBackground>
|
||||||
|
<hideSingleTab>0</hideSingleTab>
|
||||||
|
<mruTabOrder>0</mruTabOrder>
|
||||||
|
<hideMenubar>0</hideMenubar>
|
||||||
|
<enableTrayIcon>1</enableTrayIcon>
|
||||||
|
<startToTray>1</startToTray>
|
||||||
|
<closeToTray>1</closeToTray>
|
||||||
|
<autoStart>0</autoStart>
|
||||||
|
<doubleClickTranslates>1</doubleClickTranslates>
|
||||||
|
<selectWordBySingleClick>0</selectWordBySingleClick>
|
||||||
|
<escKeyHidesMainWindow>0</escKeyHidesMainWindow>
|
||||||
|
<zoomFactor>1</zoomFactor>
|
||||||
|
<helpZoomFactor>1</helpZoomFactor>
|
||||||
|
<wordsZoomLevel>0</wordsZoomLevel>
|
||||||
|
<enableMainWindowHotkey>1</enableMainWindowHotkey>
|
||||||
|
<mainWindowHotkey>Ctrl+F11, Ctrl+F11</mainWindowHotkey>
|
||||||
|
<enableClipboardHotkey>1</enableClipboardHotkey>
|
||||||
|
<clipboardHotkey>Ctrl+C, Ctrl+C</clipboardHotkey>
|
||||||
|
<enableScanPopup>1</enableScanPopup>
|
||||||
|
<startWithScanPopupOn>0</startWithScanPopupOn>
|
||||||
|
<enableScanPopupModifiers>0</enableScanPopupModifiers>
|
||||||
|
<scanPopupModifiers>0</scanPopupModifiers>
|
||||||
|
<scanPopupAltMode>0</scanPopupAltMode>
|
||||||
|
<scanPopupAltModeSecs>3</scanPopupAltModeSecs>
|
||||||
|
<ignoreOwnClipboardChanges>0</ignoreOwnClipboardChanges>
|
||||||
|
<scanToMainWindow>0</scanToMainWindow>
|
||||||
|
<ignoreDiacritics>0</ignoreDiacritics>
|
||||||
|
<showScanFlag>0</showScanFlag>
|
||||||
|
<scanPopupUseUIAutomation>1</scanPopupUseUIAutomation>
|
||||||
|
<scanPopupUseIAccessibleEx>1</scanPopupUseIAccessibleEx>
|
||||||
|
<scanPopupUseGDMessage>1</scanPopupUseGDMessage>
|
||||||
|
<scanPopupUnpinnedWindowFlags>0</scanPopupUnpinnedWindowFlags>
|
||||||
|
<scanPopupUnpinnedBypassWMHint>0</scanPopupUnpinnedBypassWMHint>
|
||||||
|
<pronounceOnLoadMain>0</pronounceOnLoadMain>
|
||||||
|
<pronounceOnLoadPopup>0</pronounceOnLoadPopup>
|
||||||
|
<useInternalPlayer>1</useInternalPlayer>
|
||||||
|
<internalPlayerBackend>FFmpeg+libao</internalPlayerBackend>
|
||||||
|
<audioPlaybackProgram>mplayer</audioPlaybackProgram>
|
||||||
|
<alwaysOnTop>1</alwaysOnTop>
|
||||||
|
<searchInDock>1</searchInDock>
|
||||||
|
<historyStoreInterval>0</historyStoreInterval>
|
||||||
|
<favoritesStoreInterval>0</favoritesStoreInterval>
|
||||||
|
<confirmFavoritesDeletion>1</confirmFavoritesDeletion>
|
||||||
|
<proxyserver enabled="0" useSystemProxy="0">
|
||||||
|
<type>0</type>
|
||||||
|
<host></host>
|
||||||
|
<port>3128</port>
|
||||||
|
<user></user>
|
||||||
|
<password></password>
|
||||||
|
<systemProxyUser></systemProxyUser>
|
||||||
|
<systemProxyPassword></systemProxyPassword>
|
||||||
|
</proxyserver>
|
||||||
|
<disallowContentFromOtherSites>0</disallowContentFromOtherSites>
|
||||||
|
<enableWebPlugins>0</enableWebPlugins>
|
||||||
|
<hideGoldenDictHeader>0</hideGoldenDictHeader>
|
||||||
|
<maxNetworkCacheSize>50</maxNetworkCacheSize>
|
||||||
|
<clearNetworkCacheOnExit>1</clearNetworkCacheOnExit>
|
||||||
|
<maxStringsInHistory>500</maxStringsInHistory>
|
||||||
|
<storeHistory>1</storeHistory>
|
||||||
|
<alwaysExpandOptionalParts>0</alwaysExpandOptionalParts>
|
||||||
|
<addonStyle></addonStyle>
|
||||||
|
<collapseBigArticles>0</collapseBigArticles>
|
||||||
|
<articleSizeLimit>2000</articleSizeLimit>
|
||||||
|
<limitInputPhraseLength>0</limitInputPhraseLength>
|
||||||
|
<inputPhraseLengthLimit>1000</inputPhraseLengthLimit>
|
||||||
|
<maxDictionaryRefsInContextMenu>20</maxDictionaryRefsInContextMenu>
|
||||||
|
<trackClipboardChanges>0</trackClipboardChanges>
|
||||||
|
<synonymSearchEnabled>1</synonymSearchEnabled>
|
||||||
|
<fullTextSearch>
|
||||||
|
<searchMode>0</searchMode>
|
||||||
|
<matchCase>0</matchCase>
|
||||||
|
<maxArticlesPerDictionary>100</maxArticlesPerDictionary>
|
||||||
|
<maxDistanceBetweenWords>2</maxDistanceBetweenWords>
|
||||||
|
<useMaxArticlesPerDictionary>0</useMaxArticlesPerDictionary>
|
||||||
|
<useMaxDistanceBetweenWords>1</useMaxDistanceBetweenWords>
|
||||||
|
<dialogGeometry></dialogGeometry>
|
||||||
|
<disabledTypes></disabledTypes>
|
||||||
|
<enabled>1</enabled>
|
||||||
|
<ignoreWordsOrder>0</ignoreWordsOrder>
|
||||||
|
<ignoreDiacritics>0</ignoreDiacritics>
|
||||||
|
<maxDictionarySize>0</maxDictionarySize>
|
||||||
|
</fullTextSearch>
|
||||||
|
</preferences>
|
||||||
|
<lastMainGroupId>0</lastMainGroupId>
|
||||||
|
<lastPopupGroupId>0</lastPopupGroupId>
|
||||||
|
<popupWindowState>AAAA/wAAAAH9AAAAAAAAAg0AAAGTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAQAAAAEAAAAaAGQAaQBjAHQAaQBvAG4AYQByAHkAQgBhAHIDAAAAAP////8AAAAAAAAAAA==</popupWindowState>
|
||||||
|
<popupWindowGeometry>AdnQywADAAAAAAC6AAABEgAAAuYAAAKkAAAAugAAARIAAALmAAACpAAAAAAAAAAABVYAAAC6AAABEgAAAuYAAAKk</popupWindowGeometry>
|
||||||
|
<pinPopupWindow>0</pinPopupWindow>
|
||||||
|
<popupWindowAlwaysOnTop>0</popupWindowAlwaysOnTop>
|
||||||
|
<mainWindowState>AAAA/wAAAAH9AAAAAgAAAAAAAADMAAAC0PwCAAAAAfsAAAAUAHMAZQBhAHIAYwBoAFAAYQBuAGUBAAAAFAAAAtAAAAB9AP///wAAAAEAAADMAAAC0PwCAAAAA/sAAAASAGQAaQBjAHQAcwBQAGEAbgBlAQAAABQAAAFvAAAAYQD////7AAAAGgBmAGEAdgBvAHIAaQB0AGUAcwBQAGEAbgBlAAAAABQAAALQAAAAYQD////7AAAAFgBoAGkAcwB0AG8AcgB5AFAAYQBuAGUBAAABhAAAAWAAAABhAP///wAAA7QAAALQAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAIAAAAUAG4AYQB2AFQAbwBvAGwAYgBhAHIAAAAAAP////8AAAAAAAAAAAAAABoAZABpAGMAdABpAG8AbgBhAHIAeQBCAGEAcgAAAAAA/////wAAAAAAAAAA</mainWindowState>
|
||||||
|
<mainWindowGeometry>AdnQywADAAAAAAAEAAAAGAAABVEAAAL7AAAABAAAABgAAAVRAAAC+wAAAAAAAAAABVYAAAAEAAAAGAAABVEAAAL7</mainWindowGeometry>
|
||||||
|
<helpWindowGeometry>AdnQywADAAAAAAF3AAAAgwAAA9AAAAJGAAABeAAAAIQAAAPPAAACRQAAAAAAAAAABVYAAAF4AAAAhAAAA88AAAJF</helpWindowGeometry>
|
||||||
|
<helpSplitterState>AAAA/wAAAAEAAAACAAABBAAABAAB/////wEAAAABAA==</helpSplitterState>
|
||||||
|
<dictInfoGeometry>AdnQywADAAAAAAF1AAAAmgAAA84AAAIrAAABdgAAAJsAAAPNAAACKgAAAAAAAAAABVYAAAF2AAAAmwAAA80AAAIq</dictInfoGeometry>
|
||||||
|
<inspectorGeometry></inspectorGeometry>
|
||||||
|
<timeForNewReleaseCheck></timeForNewReleaseCheck>
|
||||||
|
<skippedRelease></skippedRelease>
|
||||||
|
<showingDictBarNames>1</showingDictBarNames>
|
||||||
|
<usingSmallIconsInToolbars>1</usingSmallIconsInToolbars>
|
||||||
|
<editDictionaryCommandLine></editDictionaryCommandLine>
|
||||||
|
<maxPictureWidth>0</maxPictureWidth>
|
||||||
|
<maxHeadwordSize>256</maxHeadwordSize>
|
||||||
|
<maxHeadwordsToExpand>0</maxHeadwordsToExpand>
|
||||||
|
<headwordsDialog>
|
||||||
|
<searchMode>0</searchMode>
|
||||||
|
<matchCase>0</matchCase>
|
||||||
|
<autoApply>0</autoApply>
|
||||||
|
<headwordsExportPath></headwordsExportPath>
|
||||||
|
<headwordsDialogGeometry></headwordsDialogGeometry>
|
||||||
|
</headwordsDialog>
|
||||||
|
</config>
|
||||||
|
''
|
||||||
@@ -96,6 +96,7 @@ in {
|
|||||||
block = "custom";
|
block = "custom";
|
||||||
interval = 60 * 5;
|
interval = 60 * 5;
|
||||||
command = let inherit (import <niveum/configs/spacetime.nix>) location; in "${pkgs.scripts.horoscope}/bin/horoscope --latitude=${toString location.latitude} --longitude=${toString location.longitude}";
|
command = let inherit (import <niveum/configs/spacetime.nix>) location; in "${pkgs.scripts.horoscope}/bin/horoscope --latitude=${toString location.latitude} --longitude=${toString location.longitude}";
|
||||||
|
# astrolog -zN Berlin -n -k | tail -n +4 | head -n 7 | sed 's/://g;s/\s\+/ /g;s/ R/R/;s/\[\s*/[/g;s/Sun/☉/;s/Moon/☽/;s/Merc/☿/;s/Venu/♀/;s/Mars/♂/;s/Jupi/♃/;s/Satu/♄/' | cut -f1-2 -d' ' | paste -sd' ' -
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
block = "custom";
|
block = "custom";
|
||||||
@@ -105,7 +106,6 @@ in {
|
|||||||
import astral
|
import astral
|
||||||
import astral.moon
|
import astral.moon
|
||||||
import astral.sun
|
import astral.sun
|
||||||
import math
|
|
||||||
|
|
||||||
moon_phases = {
|
moon_phases = {
|
||||||
0: "🌑",
|
0: "🌑",
|
||||||
@@ -121,12 +121,10 @@ in {
|
|||||||
current_phase = astral.moon.phase()
|
current_phase = astral.moon.phase()
|
||||||
closest_phase = min(moon_phases.keys(), key=lambda x: abs(current_phase - x))
|
closest_phase = min(moon_phases.keys(), key=lambda x: abs(current_phase - x))
|
||||||
|
|
||||||
moon_percentage = round(100 * math.sin(current_phase / 28 * math.pi), 1)
|
|
||||||
|
|
||||||
city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
|
city = astral.LocationInfo("Berlin", "Germany", "${spacetime.time.timeZone}", ${toString spacetime.location.latitude}, ${toString spacetime.location.longitude})
|
||||||
sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)
|
sun = astral.sun.sun(city.observer, date=astral.today(), tzinfo=city.timezone)
|
||||||
|
|
||||||
print("🌅 {} 🌇 {} {} {}%".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), moon_phases[closest_phase], moon_percentage))
|
print("🌅 {} 🌇 {} {} {}".format(sun["sunrise"].strftime("%R"), sun["sunset"].strftime("%R"), moon_phases[closest_phase], round(current_phase, 1)))
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|||||||
121
lib/vim/init.vim
121
lib/vim/init.vim
@@ -17,16 +17,14 @@ let maplocalleader="\\"
|
|||||||
|
|
||||||
" noremap <Leader>h :<C-u>split<CR>
|
" noremap <Leader>h :<C-u>split<CR>
|
||||||
" noremap <Leader>v :<C-u>vsplit<CR>
|
" noremap <Leader>v :<C-u>vsplit<CR>
|
||||||
noremap <Leader>gs :Gstatus<CR>
|
noremap <Leader>gs :Git status<CR>
|
||||||
noremap <Leader>gc :Gcommit<CR>
|
noremap <Leader>gc :Git commit<CR>
|
||||||
noremap <leader>n :bn<CR>
|
noremap <leader>n :bn<CR>
|
||||||
noremap <leader>p :bp<CR>
|
noremap <leader>p :bp<CR>
|
||||||
noremap <leader>c :bd<CR>
|
noremap <leader>c :bd<CR>
|
||||||
noremap <leader>b :Buffers<CR>
|
noremap <leader>b :Buffers<CR>
|
||||||
noremap <leader>t :Tags<CR>
|
noremap <leader>t :Tags<CR>
|
||||||
|
|
||||||
noremap <leader>f :Goyo<CR>
|
|
||||||
|
|
||||||
" reindent whole file
|
" reindent whole file
|
||||||
noremap <leader>i mzgg=G`z
|
noremap <leader>i mzgg=G`z
|
||||||
|
|
||||||
@@ -62,18 +60,17 @@ set list listchars=tab:⇥\ ,extends:❯,precedes:❮,nbsp:␣,trail:· showbrea
|
|||||||
set foldlevelstart=30
|
set foldlevelstart=30
|
||||||
|
|
||||||
iabbrev ddate <C-R>=strftime("%F")<CR>
|
iabbrev ddate <C-R>=strftime("%F")<CR>
|
||||||
|
iabbrev dtime <C-R>=strftime("%F %T")<CR>
|
||||||
|
|
||||||
" if exists("g:loaded_netrwPlugin")
|
|
||||||
let g:netrw_banner=0
|
let g:netrw_banner=0
|
||||||
let g:netrw_browse_split=4
|
let g:netrw_browse_split=4
|
||||||
let g:netrw_altv=1 " open splits to the right
|
let g:netrw_altv=1 " open splits to the right
|
||||||
let g:netrw_liststyle=3 " tree view
|
let g:netrw_liststyle=3 " tree view
|
||||||
let g:netrw_list_hide=netrw_gitignore#Hide()
|
let g:netrw_list_hide=netrw_gitignore#Hide()
|
||||||
let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
|
let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
|
||||||
" endif
|
|
||||||
|
|
||||||
" call matchadd('colorcolumn', '\%101v', 100)
|
call matchadd('colorcolumn', '\%101v', 100)
|
||||||
" highlight colorcolumn ctermbg=red
|
highlight colorcolumn ctermbg=red
|
||||||
|
|
||||||
" undofile - This allows you to use undos after exiting and restarting
|
" undofile - This allows you to use undos after exiting and restarting
|
||||||
" This, like swap and backups, uses .vim-undo first, then ~/.vim/undo
|
" This, like swap and backups, uses .vim-undo first, then ~/.vim/undo
|
||||||
@@ -82,8 +79,7 @@ if exists("+undofile")
|
|||||||
if isdirectory($HOME . '/.vim/undo') == 0
|
if isdirectory($HOME . '/.vim/undo') == 0
|
||||||
:silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
|
:silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
|
||||||
endif
|
endif
|
||||||
set undodir=./.vim-undo//
|
set undodir=~/.vim/undo/
|
||||||
set undodir+=~/.vim/undo//
|
|
||||||
set undofile
|
set undofile
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -113,61 +109,37 @@ command! ToggleBackground call s:toggle_background()
|
|||||||
inoremap <F12> <C-O>:ToggleBackground<CR>
|
inoremap <F12> <C-O>:ToggleBackground<CR>
|
||||||
nnoremap <F12> :ToggleBackground<CR>
|
nnoremap <F12> :ToggleBackground<CR>
|
||||||
|
|
||||||
if has("autocmd")
|
autocmd bufnewfile,bufread *.4th set filetype=forth
|
||||||
autocmd bufnewfile,bufread *.4th set filetype=forth
|
autocmd bufnewfile,bufread *.asm set filetype=nasm
|
||||||
autocmd bufnewfile,bufread *.asm set filetype=nasm
|
autocmd bufnewfile,bufread *.c set keywordprg=man\ 3
|
||||||
autocmd bufnewfile,bufread *.c set keywordprg=man\ 3
|
autocmd bufnewfile,bufread *.h set keywordprg=man\ 3
|
||||||
autocmd bufnewfile,bufread *.conf set filetype=conf
|
autocmd bufnewfile,bufread *.conf set filetype=conf
|
||||||
autocmd bufnewfile,bufread *.fs packadd vim-fsharp | set filetype=fsharp
|
autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix | set path+=/var/src
|
||||||
autocmd bufnewfile,bufread *.h set keywordprg=man\ 3
|
autocmd bufnewfile,bufread *.rust packadd rust-vim
|
||||||
autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix | set path+=/var/src
|
autocmd bufnewfile,bufread *.csv packadd csv.vim | set filetype=csv
|
||||||
autocmd bufnewfile,bufread *.rust packadd rust-vim " | packadd deoplete-rust
|
autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
|
||||||
autocmd bufnewfile,bufread *.csv packadd csv-vim | set filetype=csv
|
autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
|
||||||
autocmd bufnewfile,bufread *.toml packadd vim-toml | set filetype=toml
|
autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
|
||||||
autocmd bufnewfile,bufread *.nim packadd nim-vim | set filetype=nim
|
autocmd bufnewfile,bufread *.jq packadd jq.vim
|
||||||
autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
|
autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
|
||||||
autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
|
autocmd bufnewfile,bufread urls,config set filetype=conf
|
||||||
autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
|
autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
|
||||||
autocmd bufnewfile,bufread *.purs packadd purescript-vim | set filetype=purescript
|
autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
|
||||||
autocmd bufnewfile,bufread *.jq packadd jq.vim
|
autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
|
||||||
autocmd bufnewfile,bufread *.re packadd vim-reason-plus | set filetype=reason
|
autocmd filetype javascript packadd vim-javascript
|
||||||
autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
|
autocmd filetype make setlocal noexpandtab
|
||||||
autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax
|
|
||||||
autocmd bufnewfile,bufread urls,config set filetype=conf
|
|
||||||
autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
|
|
||||||
autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall
|
|
||||||
autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
|
|
||||||
autocmd filetype javascript packadd vim-javascript
|
|
||||||
autocmd filetype make setlocal noexpandtab
|
|
||||||
autocmd filetype html packadd emmet-vim
|
|
||||||
autocmd filetype gitcommit setlocal spell spelllang=en
|
|
||||||
autocmd filetype mail setlocal spell spelllang=de textwidth=0 | command Send %! mail-send
|
|
||||||
autocmd bufreadpost *
|
|
||||||
\ if line("'\"") > 0 && line("'\"") <= line("$") |
|
|
||||||
\ exe "normal! g`\"" |
|
|
||||||
\ endif
|
|
||||||
autocmd bufreadpre * setlocal foldmethod=indent
|
|
||||||
" autocmd bufwritepre * :call <SID>StripTrailingWhitespaces()
|
|
||||||
" autocmd bufwinenter * if &fdm == 'indent' | setlocal foldmethod=manual | endif
|
|
||||||
|
|
||||||
autocmd VimEnter * UpdateRemotePlugins
|
autocmd filetype html packadd emmet-vim
|
||||||
endif
|
autocmd filetype gitcommit setlocal spell spelllang=en
|
||||||
|
autocmd filetype mail setlocal spell spelllang=de textwidth=0
|
||||||
|
autocmd bufreadpost *
|
||||||
|
\ if line("'\"") > 0 && line("'\"") <= line("$") |
|
||||||
|
\ exe "normal! g`\"" |
|
||||||
|
\ endif
|
||||||
|
autocmd bufreadpre * setlocal foldmethod=indent
|
||||||
|
|
||||||
let g:startify_custom_header = ''
|
|
||||||
|
|
||||||
" let g:deoplete#enable_at_startup = 1
|
|
||||||
set completeopt=noinsert,menuone,noselect
|
set completeopt=noinsert,menuone,noselect
|
||||||
set complete+=kspell
|
set complete+=kspell
|
||||||
" let g:deoplete#sources = {}
|
|
||||||
" let g:deoplete#sources._ = ['ale', 'file', 'omni', 'buffer']
|
|
||||||
"
|
|
||||||
" let g:deoplete#sources#rust#racer_binary = $HOME . '/.cargo/bin/racer'
|
|
||||||
" let g:deoplete#sources#rust#rust_source_path = substitute(system('rustc --print sysroot'), '\n$', '', '') . '/lib/rustlib/src/rust/src'
|
|
||||||
|
|
||||||
inoremap ^] ^X^]
|
|
||||||
inoremap ^F ^X^F
|
|
||||||
inoremap ^D ^X^D
|
|
||||||
inoremap ^L ^X^L
|
|
||||||
|
|
||||||
let g:SuperTabDefaultCompletionType = 'context'
|
let g:SuperTabDefaultCompletionType = 'context'
|
||||||
|
|
||||||
@@ -197,7 +169,6 @@ let g:ale_fixers = {
|
|||||||
\ 'typescript': ['prettier'],
|
\ 'typescript': ['prettier'],
|
||||||
\ 'css': ['prettier'],
|
\ 'css': ['prettier'],
|
||||||
\ 'html': ['prettier'],
|
\ 'html': ['prettier'],
|
||||||
\ 'markdown': ['prettier'],
|
|
||||||
\ 'json': ['jq'],
|
\ 'json': ['jq'],
|
||||||
\ 'python': ['black'],
|
\ 'python': ['black'],
|
||||||
\ 'rust': ['rustfmt']
|
\ 'rust': ['rustfmt']
|
||||||
@@ -209,29 +180,5 @@ autocmd bufnewfile,bufread elm.json let g:ale_fix_on_save = 0
|
|||||||
|
|
||||||
let g:ale_completion_enabled = 1
|
let g:ale_completion_enabled = 1
|
||||||
|
|
||||||
"if exists("g:loaded_airline")
|
|
||||||
" set noshowmode laststatus=0 noruler
|
|
||||||
let g:airline#extensions#tabline#close_symbol = 'X'
|
|
||||||
let g:airline#extensions#tabline#enabled = 0
|
|
||||||
"let g:airline#extensions#tabline#left_alt_sep = ''
|
|
||||||
"let g:airline#extensions#tabline#left_sep = ''
|
|
||||||
"let g:airline#extensions#tabline#right_alt_sep = ''
|
|
||||||
"let g:airline#extensions#tabline#right_sep = ''
|
|
||||||
let g:airline#extensions#tabline#show_close_button = 1
|
|
||||||
let g:airline#extensions#tabline#show_tab_type = 0
|
|
||||||
let g:airline#extensions#tabline#tab_min_count = 2
|
|
||||||
let g:airline#extensions#tabline#tab_nr_type = 0
|
|
||||||
let g:airline#extensions#tmuxline#enabled = 0
|
|
||||||
"let g:airline#extensions#wordcount#enabled = 1
|
|
||||||
"let g:airline_left_alt_sep = ''
|
|
||||||
"let g:airline_left_sep = ''
|
|
||||||
"let g:airline_right_alt_sep = ''
|
|
||||||
"let g:airline_right_sep = ''
|
|
||||||
let g:airline_section_z = '%{line(".")}/%{line("$")} %{col(".")}'
|
|
||||||
"endif
|
|
||||||
"if exists("g:loaded_airline_themes")
|
|
||||||
let g:airline_theme='base16'
|
|
||||||
"endif
|
|
||||||
|
|
||||||
let g:vimwiki_list = [{'path': '~/notes/',
|
let g:vimwiki_list = [{'path': '~/notes/',
|
||||||
\ 'syntax': 'markdown', 'ext': '.md'}]
|
\ 'syntax': 'markdown', 'ext': '.md'}]
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ let
|
|||||||
startAt = bot.time;
|
startAt = bot.time;
|
||||||
serviceConfig.Type = "oneshot";
|
serviceConfig.Type = "oneshot";
|
||||||
wants = [ "network-online.target" ];
|
wants = [ "network-online.target" ];
|
||||||
script = strings.concatStringsSep "\n" ([ "QUOTE=$(${bot.command})" ]
|
script = strings.concatStringsSep "\n" ([ "QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then" ]
|
||||||
++ map (chatId: ''
|
++ map (chatId: ''
|
||||||
${pkgs.curl}/bin/curl -s -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
|
${pkgs.curl}/bin/curl -s -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
|
||||||
-d chat_id="${chatId}" \
|
-d chat_id="${chatId}" \
|
||||||
@@ -17,7 +17,8 @@ let
|
|||||||
lib.strings.optionalString (bot.parseMode != null)
|
lib.strings.optionalString (bot.parseMode != null)
|
||||||
"-d parse_mode=${bot.parseMode}"
|
"-d parse_mode=${bot.parseMode}"
|
||||||
}
|
}
|
||||||
'') bot.chatIds);
|
'') bot.chatIds
|
||||||
|
++ [ "fi" ]);
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
options.niveum.telegramBots = mkOption {
|
options.niveum.telegramBots = mkOption {
|
||||||
@@ -27,7 +28,7 @@ in {
|
|||||||
time = mkOption { type = types.str; };
|
time = mkOption { type = types.str; };
|
||||||
token = mkOption { type = types.strMatching "[0-9A-Za-z:-]+"; };
|
token = mkOption { type = types.strMatching "[0-9A-Za-z:-]+"; };
|
||||||
chatIds = mkOption {
|
chatIds = mkOption {
|
||||||
type = types.listOf (types.strMatching "[0-9]+|@[A-Za-z0-9]+");
|
type = types.listOf (types.strMatching "-?[0-9]+|@[A-Za-z0-9]+");
|
||||||
};
|
};
|
||||||
command = mkOption { type = types.str; };
|
command = mkOption { type = types.str; };
|
||||||
parseMode = mkOption {
|
parseMode = mkOption {
|
||||||
|
|||||||
@@ -2,14 +2,7 @@
|
|||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.niveum.traadfri;
|
cfg = config.niveum.traadfri;
|
||||||
traadfri = let
|
traadfri = pkgs.callPackage <traadfri> {
|
||||||
traadfri-package = pkgs.fetchFromGitHub {
|
|
||||||
owner = "kmein";
|
|
||||||
repo = "traadfri";
|
|
||||||
rev = "cf46bd09cd3263b90a09b0ca979aa705a4c3671c";
|
|
||||||
sha256 = "0az9q38pl8fqk00488blhn6rhvwsw2wky3dbdlyz7945ggvxnbyd";
|
|
||||||
};
|
|
||||||
in pkgs.callPackage traadfri-package {
|
|
||||||
libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };
|
libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
tuna-src = pkgs.fetchFromGitHub {
|
tuna = pkgs.callPackage <tuna> {};
|
||||||
owner = "kmein";
|
|
||||||
repo = "tuna";
|
|
||||||
rev = "1cbed44069a3009738afdafecefe0a05316039a6";
|
|
||||||
sha256 = "0i7vjzv4hf8fdz9j09cdnvfhyylh0izsdhjs4q0qw9g5nrc9pyir";
|
|
||||||
};
|
|
||||||
tuna = pkgs.callPackage tuna-src {};
|
|
||||||
cfg = config.services.tuna;
|
cfg = config.services.tuna;
|
||||||
in {
|
in {
|
||||||
imports = [];
|
imports = [];
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
import <nixpkgs-mozilla>
|
|
||||||
@@ -81,9 +81,17 @@ in rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
qrpaste = pkgs.writers.writeDashBin "qrpaste" ''
|
qrpaste = pkgs.writers.writeDashBin "qrpaste" ''
|
||||||
file="$(${pkgs.mktemp}/bin/mktemp qrpasteXXX.png --tmpdir)"
|
file="$(${pkgs.mktemp}/bin/mktemp --tmpdir)"
|
||||||
|
trap clean EXIT
|
||||||
|
clean() {
|
||||||
|
rm "$file"
|
||||||
|
}
|
||||||
${pkgs.qrencode}/bin/qrencode "$(${pkgs.xclip}/bin/xclip -selection clipboard -out)" -o "$file"
|
${pkgs.qrencode}/bin/qrencode "$(${pkgs.xclip}/bin/xclip -selection clipboard -out)" -o "$file"
|
||||||
${pkgs.sxiv}/bin/sxiv "$file" ; rm "$file"
|
${pkgs.sxiv}/bin/sxiv "$file"
|
||||||
|
'';
|
||||||
|
|
||||||
|
ttspaste = pkgs.writers.writeDashBin "ttspaste" ''
|
||||||
|
${pkgs.xclip}/bin/xclip -selection clipboard -out | ${pkgs.curl}/bin/curl -G http://tts.r/api/tts --data-urlencode 'text@-' | ${pkgs.mpv}/bin/mpv -
|
||||||
'';
|
'';
|
||||||
|
|
||||||
interdimensional-cable =
|
interdimensional-cable =
|
||||||
@@ -394,17 +402,12 @@ in rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
nix-index-update = pkgs.writers.writeDashBin "nix-index-update" ''
|
nix-index-update = pkgs.writers.writeDashBin "nix-index-update" ''
|
||||||
mkdir -p $HOME/.cache/nix-index
|
filename="index-x86_64-$(uname | tr A-Z a-z)"
|
||||||
tag=$(git -c 'versionsort.suffix=-' \
|
mkdir -p ~/.cache/nix-index
|
||||||
ls-remote \
|
cd ~/.cache/nix-index
|
||||||
--exit-code \
|
# -N will only download a new version if there is an update.
|
||||||
--refs \
|
${pkgs.wget}/bin/wget -q -N https://github.com/Mic92/nix-index-database/releases/latest/download/$filename
|
||||||
--tags \
|
ln -f $filename files
|
||||||
--sort='v:refname' \
|
|
||||||
https://github.com/Mic92/nix-index-database \
|
|
||||||
| awk 'END {match($2, /([^/]+)$/, m); print m[0]}')
|
|
||||||
curl -L "https://github.com/Mic92/nix-index-database/releases/download/$tag/files" -o $XDG_RUNTIME_DIR/files-$tag
|
|
||||||
mv $XDG_RUNTIME_DIR/files-$tag $HOME/.cache/nix-index/files
|
|
||||||
'';
|
'';
|
||||||
} // {
|
} // {
|
||||||
devour = pkgs.callPackage <niveum/packages/devour.nix> { };
|
devour = pkgs.callPackage <niveum/packages/devour.nix> { };
|
||||||
|
|||||||
@@ -51,6 +51,10 @@ pkgs.writers.writeDashBin "pls" ''
|
|||||||
${pkgs.curl}/bin/curl -sS -XPOST "${playlistAPI}/skip"
|
${pkgs.curl}/bin/curl -sS -XPOST "${playlistAPI}/skip"
|
||||||
echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.bad)} | shuf -n1 | ${sendIRC}
|
echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.bad)} | shuf -n1 | ${sendIRC}
|
||||||
;;
|
;;
|
||||||
|
say|msg)
|
||||||
|
shift
|
||||||
|
echo "$@" | ${sendIRC}
|
||||||
|
;;
|
||||||
recent)
|
recent)
|
||||||
${pkgs.curl}/bin/curl -sS -XGET "${playlistAPI}/recent" | tac | head
|
${pkgs.curl}/bin/curl -sS -XGET "${playlistAPI}/recent" | tac | head
|
||||||
;;
|
;;
|
||||||
|
|||||||
121
shell.nix
121
shell.nix
@@ -1,121 +0,0 @@
|
|||||||
{ pkgs ? import <nixpkgs> { }
|
|
||||||
, release ? "21.11"
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
inherit (pkgs) lib;
|
|
||||||
|
|
||||||
dependencies = {
|
|
||||||
nixpkgs = {
|
|
||||||
ref = "refs/heads/nixos-${release}";
|
|
||||||
url = "https://github.com/NixOS/nixpkgs.git";
|
|
||||||
path = toString .versions/nixpkgs.json;
|
|
||||||
};
|
|
||||||
nixpkgs-unstable = {
|
|
||||||
ref = "refs/heads/master";
|
|
||||||
url = "https://github.com/NixOS/nixpkgs.git";
|
|
||||||
path = toString .versions/nixpkgs-unstable.json;
|
|
||||||
};
|
|
||||||
nix-writers = {
|
|
||||||
ref = "refs/heads/master";
|
|
||||||
url = "https://cgit.krebsco.de/nix-writers";
|
|
||||||
path = toString .versions/nix-writers.json;
|
|
||||||
};
|
|
||||||
home-manager = {
|
|
||||||
ref = "refs/heads/release-${release}";
|
|
||||||
url = "https://github.com/nix-community/home-manager.git";
|
|
||||||
path = toString .versions/home-manager.json;
|
|
||||||
};
|
|
||||||
krops = {
|
|
||||||
ref = "refs/tags/v1.25.0";
|
|
||||||
url = "https://cgit.krebsco.de/krops";
|
|
||||||
path = toString .versions/krops.json;
|
|
||||||
};
|
|
||||||
stockholm = {
|
|
||||||
ref = "refs/heads/master";
|
|
||||||
url = "https://cgit.lassul.us/stockholm";
|
|
||||||
path = toString .versions/stockholm.json;
|
|
||||||
};
|
|
||||||
retiolum = {
|
|
||||||
ref = "refs/heads/master";
|
|
||||||
url = "https://github.com/krebs/retiolum";
|
|
||||||
path = toString .versions/retiolum.json;
|
|
||||||
};
|
|
||||||
nixpkgs-mozilla = {
|
|
||||||
ref = "refs/heads/master";
|
|
||||||
url = "https://github.com/mozilla/nixpkgs-mozilla";
|
|
||||||
path = toString .versions/nixpkgs-mozilla.json;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in pkgs.mkShell {
|
|
||||||
buildInputs = [
|
|
||||||
(let
|
|
||||||
updateCommand = pkgs.writers.writeDash "niveum-update-one" ''
|
|
||||||
[ $# -eq 1 ] || {
|
|
||||||
echo "Please provide a dependency to update." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
case "$1" in
|
|
||||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dependency: ''
|
|
||||||
${name})
|
|
||||||
${pkgs.nix-prefetch-git}/bin/nix-prefetch-git --url "${dependency.url}" --rev "${dependency.ref}" > "${dependency.path}";;
|
|
||||||
'') dependencies)}
|
|
||||||
esac
|
|
||||||
'';
|
|
||||||
in pkgs.writers.writeDashBin "niveum-update" ''
|
|
||||||
if [ $# -gt 0 ]; then
|
|
||||||
dependencies="$@"
|
|
||||||
else
|
|
||||||
dependencies="${lib.concatStringsSep " " (lib.attrNames dependencies)}"
|
|
||||||
fi
|
|
||||||
${pkgs.parallel}/bin/parallel --line-buffer --tagstring '{}' -q ${updateCommand} '{1}' ::: $dependencies
|
|
||||||
'')
|
|
||||||
|
|
||||||
(let
|
|
||||||
deployCommand = pkgs.writers.writeDash "niveum-deploy-one" ''
|
|
||||||
${pkgs.git}/bin/git diff $(${pkgs.openssh}/bin/ssh "$1" cat /etc/niveum/version)
|
|
||||||
eval "$(${pkgs.nix}/bin/nix-build --no-out-link "${toString ./.}/deploy.nix" -A "$1")"
|
|
||||||
'';
|
|
||||||
in pkgs.writers.writeDashBin "niveum-deploy" ''
|
|
||||||
deploy() {
|
|
||||||
${pkgs.parallel}/bin/parallel --line-buffer --tagstring '{}' -q ${deployCommand} '{1}' ::: "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -z "$(${pkgs.git}/bin/git status --porcelain)" ]; then
|
|
||||||
deploy "$@"
|
|
||||||
else
|
|
||||||
if [ "$1" = --force ]; then
|
|
||||||
shift
|
|
||||||
deploy "$@"
|
|
||||||
else
|
|
||||||
echo Working directory is dirty. Not deploying.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
'')
|
|
||||||
|
|
||||||
(let
|
|
||||||
statusCommand = pkgs.writers.writeDash "niveum-status-one" ''
|
|
||||||
[ $# -eq 1 ] || {
|
|
||||||
echo "Please provide a niveum system hostname." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
hostname="$1"
|
|
||||||
version_file=/etc/niveum/version
|
|
||||||
|
|
||||||
if commit_id="$(${pkgs.coreutils}/bin/timeout 2s ${pkgs.openssh}/bin/ssh "$hostname" cat $version_file 2>/dev/null)"; then
|
|
||||||
${pkgs.git}/bin/git log -1 --oneline "$commit_id"
|
|
||||||
else
|
|
||||||
echo offline
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
in pkgs.writers.writeDashBin "niveum-status" ''
|
|
||||||
if [ $# -gt 0 ]; then
|
|
||||||
systems="$@"
|
|
||||||
else
|
|
||||||
systems="$(ls ${toString ./.}/systems)"
|
|
||||||
fi
|
|
||||||
${pkgs.parallel}/bin/parallel --line-buffer --tagstring '{}' -q ${statusCommand} '{1}' ::: $systems
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
|
||||||
Submodule submodules/menstruation-backend deleted from dd405fe2ac
Submodule submodules/menstruation-telegram deleted from a34555cf46
Submodule submodules/nur-packages deleted from 8468cfbc06
@@ -5,11 +5,10 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
<niveum/configs/default.nix>
|
|
||||||
<niveum/configs/battery.nix>
|
|
||||||
<niveum/configs/networkmanager.nix>
|
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
# <stockholm/krebs/2configs/hw/x220.nix>
|
<niveum/configs/battery.nix>
|
||||||
|
<niveum/configs/default.nix>
|
||||||
|
<niveum/configs/networkmanager.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
niveum = {
|
niveum = {
|
||||||
@@ -18,29 +17,18 @@ in
|
|||||||
promptColours.success = "cyan";
|
promptColours.success = "cyan";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix.buildCores = 1;
|
nix = {
|
||||||
nix.maxJobs = 2;
|
buildCores = 1;
|
||||||
|
maxJobs = 2;
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ nixpkgs-unstable.minecraft ];
|
environment.systemPackages = [ nixpkgs-unstable.minecraft ];
|
||||||
|
|
||||||
boot.loader.systemd-boot = {
|
networking = {
|
||||||
enable = true;
|
hostName = "kabsa";
|
||||||
configurationLimit = 5;
|
wireless.interfaces = [ "wlp3s0" ];
|
||||||
consoleMode = "max";
|
retiolum = retiolumAddresses.kabsa;
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/mnt/sd-card" = {
|
|
||||||
device = "/dev/disk/by-id/mmc-SD32G_0xda0aa352-part1";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
networking.hostName = "kabsa";
|
|
||||||
|
|
||||||
networking.wireless.interfaces = [ "wlp3s0" ];
|
|
||||||
|
|
||||||
networking.retiolum = retiolumAddresses.kabsa;
|
|
||||||
|
|
||||||
system.stateVersion = "19.03";
|
system.stateVersion = "19.03";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,37 @@
|
|||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, ... }: {
|
||||||
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
|
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
boot = {
|
||||||
boot.initrd.kernelModules = [ ];
|
initrd = {
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||||
boot.extraModulePackages = [ ];
|
luks.devices."luksmap".device = "/dev/disk/by-uuid/03b6abd0-e9ce-49c8-9659-a1d94f645d0f";
|
||||||
|
kernelModules = [ ];
|
||||||
boot.initrd.luks.devices."luksmap".device = "/dev/disk/by-uuid/03b6abd0-e9ce-49c8-9659-a1d94f645d0f";
|
};
|
||||||
|
kernelModules = [ "kvm-intel" ];
|
||||||
fileSystems."/" = {
|
extraModulePackages = [ ];
|
||||||
device = "/dev/disk/by-uuid/66ced7b9-cfa7-40dd-a488-18ef91a337e0";
|
loader = {
|
||||||
fsType = "ext4";
|
efi.canTouchEfiVariables = true;
|
||||||
|
systemd-boot = {
|
||||||
|
enable = true;
|
||||||
|
configurationLimit = 5;
|
||||||
|
consoleMode = "max";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems = {
|
||||||
device = "/dev/disk/by-uuid/E1B1-1B9C";
|
"/" = {
|
||||||
fsType = "vfat";
|
device = "/dev/disk/by-uuid/66ced7b9-cfa7-40dd-a488-18ef91a337e0";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
"/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/E1B1-1B9C";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
"/mnt/sd-card" = {
|
||||||
|
device = "/dev/disk/by-id/mmc-SD32G_0xda0aa352-part1";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
zramSwap.enable = false;
|
zramSwap.enable = false;
|
||||||
|
|||||||
@@ -4,70 +4,46 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./gitea.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
<niveum/configs/hedgedoc.nix>
|
./hedgedoc.nix
|
||||||
|
./matterbridge.nix
|
||||||
|
./menstruation.nix
|
||||||
|
./monitoring
|
||||||
|
./moodle-dl-borsfaye.nix
|
||||||
|
./names.nix
|
||||||
|
./nextcloud.nix
|
||||||
|
./radio
|
||||||
|
./retiolum-map.nix
|
||||||
|
./tarot.nix
|
||||||
|
./urlwatch.nix
|
||||||
|
./weechat.nix
|
||||||
|
<niveum/configs/monitoring.nix>
|
||||||
|
<niveum/configs/nix.nix>
|
||||||
|
<niveum/configs/save-space.nix>
|
||||||
<niveum/configs/spacetime.nix>
|
<niveum/configs/spacetime.nix>
|
||||||
<niveum/configs/sshd.nix>
|
<niveum/configs/sshd.nix>
|
||||||
<niveum/configs/nextcloud.nix>
|
|
||||||
<niveum/configs/moodle-dl/borsfaye.nix>
|
|
||||||
<niveum/configs/save-space.nix>
|
|
||||||
<niveum/configs/monitoring/pull.nix>
|
|
||||||
<niveum/configs/monitoring/push.nix>
|
|
||||||
<niveum/configs/version.nix>
|
|
||||||
<niveum/configs/radio>
|
|
||||||
<niveum/configs/gitea.nix>
|
|
||||||
<niveum/configs/retiolum-map.nix>
|
|
||||||
<niveum/configs/names.nix>
|
|
||||||
<niveum/configs/menstruation.nix>
|
|
||||||
<niveum/configs/telegram-bots>
|
<niveum/configs/telegram-bots>
|
||||||
<niveum/configs/nix.nix>
|
|
||||||
<niveum/configs/weechat.nix>
|
|
||||||
<niveum/configs/urlwatch.nix>
|
|
||||||
<niveum/configs/matterbridge.nix>
|
|
||||||
<niveum/configs/tarot.nix>
|
|
||||||
<niveum/modules/retiolum.nix>
|
<niveum/modules/retiolum.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader.grub.enable = true;
|
networking = {
|
||||||
boot.loader.grub.version = 2;
|
firewall.allowedTCPPorts = [ 80 443 ];
|
||||||
|
hostName = "makanek";
|
||||||
nixpkgs.config = {
|
interfaces.ens3.useDHCP = true;
|
||||||
allowUnfree = true;
|
retiolum = retiolumAddresses.makanek;
|
||||||
packageOverrides = pkgs: {
|
useDHCP = false;
|
||||||
writeDashBin = pkgs.writers.writeDashBin;
|
|
||||||
writeDash = pkgs.writers.writeDash;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.interfaces.ens3.useDHCP = true;
|
|
||||||
|
|
||||||
networking.hostName = "makanek";
|
|
||||||
|
|
||||||
system.stateVersion = "20.03";
|
system.stateVersion = "20.03";
|
||||||
|
|
||||||
boot.loader.grub.devices = [ "/dev/sda" ];
|
|
||||||
|
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
networking.retiolum = retiolumAddresses.makanek;
|
|
||||||
|
|
||||||
environment.etc."tinc/retiolum/rsa_key.priv" = {
|
|
||||||
text = builtins.readFile <system-secrets/retiolum.key>;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
recommendedOptimisation = true;
|
recommendedOptimisation = true;
|
||||||
recommendedProxySettings = true;
|
recommendedProxySettings = true;
|
||||||
recommendedTlsSettings = true;
|
recommendedTlsSettings = true;
|
||||||
|
sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL";
|
||||||
# Only allow PFS-enabled ciphers with AES256
|
|
||||||
sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
security.acme = {
|
security.acme = {
|
||||||
@@ -75,5 +51,5 @@ in
|
|||||||
email = kieran.email;
|
email = kieran.email;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.vim pkgs.git pkgs.tmux pkgs.python3Packages.python ];
|
environment.systemPackages = [ pkgs.vim pkgs.git pkgs.tmux pkgs.python3 ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,25 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ];
|
||||||
[ <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "xhci_pci" "sd_mod" "sr_mod" ];
|
boot = {
|
||||||
boot.initrd.kernelModules = [ ];
|
initrd = {
|
||||||
boot.kernelModules = [ ];
|
availableKernelModules = [ "ata_piix" "virtio_pci" "xhci_pci" "sd_mod" "sr_mod" ];
|
||||||
boot.extraModulePackages = [ ];
|
kernelModules = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/9eaeaaa7-b453-4634-8a69-d416f702d3aa";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
};
|
||||||
|
kernelModules = [ ];
|
||||||
|
extraModulePackages = [ ];
|
||||||
|
loader.grub = {
|
||||||
|
enable = true;
|
||||||
|
version = 2;
|
||||||
|
devices = [ "/dev/sda" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/9eaeaaa7-b453-4634-8a69-d416f702d3aa";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
backend = pkgs.callPackage <niveum/submodules/menstruation-backend> {};
|
backend = pkgs.callPackage <menstruation-backend> {};
|
||||||
telegram = pkgs.callPackage <niveum/submodules/menstruation-telegram> {};
|
telegram = pkgs.callPackage <menstruation-telegram> {};
|
||||||
backendPort = 8000;
|
backendPort = 8000;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@@ -1,13 +1,8 @@
|
|||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
port = 5703;
|
port = 5703;
|
||||||
geogen = (pkgs.fetchFromGitHub {
|
geogen-src = "${<scripts>}/onomastics";
|
||||||
owner = "kmein";
|
geogen = pkgs.callPackage geogen-src {};
|
||||||
repo = "scripts";
|
|
||||||
rev = "8945430f27a8c6fd632dd35382cb094abe3543ff";
|
|
||||||
sha256 = "1djyxkynypxsrmdf6idgjszqpcgqyq607rrsvl58p2bpymmwibzb";
|
|
||||||
}) + "/onomastics";
|
|
||||||
inherit (pkgs.callPackage geogen {}) dependencyEnv;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
systemd.services.names = {
|
systemd.services.names = {
|
||||||
@@ -19,8 +14,8 @@ in
|
|||||||
};
|
};
|
||||||
script = ''
|
script = ''
|
||||||
cd $(mktemp -d)
|
cd $(mktemp -d)
|
||||||
ln -s "${geogen}/wsgi.py" wsgi.py
|
ln -s "${geogen-src}/wsgi.py" wsgi.py
|
||||||
${dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
|
${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -7,13 +7,7 @@ let
|
|||||||
geo-ip-database = "${lib.head config.services.geoipupdate.settings.EditionIDs}.mmdb";
|
geo-ip-database = "${lib.head config.services.geoipupdate.settings.EditionIDs}.mmdb";
|
||||||
geo-ip-database-path = "${config.services.geoipupdate.settings.DatabaseDirectory}/${geo-ip-database}";
|
geo-ip-database-path = "${config.services.geoipupdate.settings.DatabaseDirectory}/${geo-ip-database}";
|
||||||
|
|
||||||
tinc-graph-source = pkgs.fetchFromGitHub {
|
tinc-graph = pkgs.callPackage <tinc-graph> {};
|
||||||
owner = "kmein";
|
|
||||||
repo = "tinc-graph";
|
|
||||||
rev = "1b9c69ffdbdab82d30a23e44f739feea63d94163";
|
|
||||||
sha256 = "0bk4x9l399f80lmz4asx7s5fcsgrfdb6xyymbq884621x4z3d2vp";
|
|
||||||
};
|
|
||||||
tinc-graph = pkgs.callPackage tinc-graph-source {};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
systemd.services.retiolum-index = {
|
systemd.services.retiolum-index = {
|
||||||
169
systems/makanek/weechat.nix
Normal file
169
systems/makanek/weechat.nix
Normal file
@@ -0,0 +1,169 @@
|
|||||||
|
{ lib, pkgs, ... }:
|
||||||
|
let
|
||||||
|
inherit (import <niveum/lib>) kieran;
|
||||||
|
relayPassword = lib.fileContents <system-secrets/weechat/relay>;
|
||||||
|
in {
|
||||||
|
systemd.services.weechat =
|
||||||
|
let
|
||||||
|
tmux = pkgs.writers.writeDash "tmux" ''
|
||||||
|
exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
|
||||||
|
set-option -g prefix `
|
||||||
|
unbind-key C-b
|
||||||
|
bind ` send-prefix
|
||||||
|
|
||||||
|
set-option -g status off
|
||||||
|
set-option -g default-terminal screen-256color
|
||||||
|
|
||||||
|
#use session instead of windows
|
||||||
|
bind-key c new-session
|
||||||
|
bind-key p switch-client -p
|
||||||
|
bind-key n switch-client -n
|
||||||
|
bind-key C-s switch-client -l
|
||||||
|
''} "$@"
|
||||||
|
'';
|
||||||
|
weechat = pkgs.weechat-declarative.override {
|
||||||
|
config = {
|
||||||
|
scripts = [
|
||||||
|
pkgs.weechatScripts.weechat-autosort
|
||||||
|
pkgs.weechatScripts.colorize_nicks
|
||||||
|
pkgs.weechatScripts.weechat-matrix
|
||||||
|
];
|
||||||
|
settings = let nick = "kmein"; in {
|
||||||
|
weechat = {
|
||||||
|
look.mouse = true;
|
||||||
|
color.chat_nick_colors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254);
|
||||||
|
};
|
||||||
|
irc = {
|
||||||
|
look = {
|
||||||
|
server_buffer = "independent";
|
||||||
|
color_nicks_in_nicklist = true;
|
||||||
|
};
|
||||||
|
server_default = {
|
||||||
|
nicks = nick;
|
||||||
|
msg_part = "tschö mit ö";
|
||||||
|
msg_quit = "ciao kakao";
|
||||||
|
msg_kick = "warum machst du diese?";
|
||||||
|
realname = kieran.name;
|
||||||
|
};
|
||||||
|
server = {
|
||||||
|
hackint = {
|
||||||
|
autoconnect = true;
|
||||||
|
address = "irc.hackint.org/6697";
|
||||||
|
ipv6 = true;
|
||||||
|
ssl = true;
|
||||||
|
autojoin = [ "#krebs" "#nixos" "#the_playlist" ];
|
||||||
|
sasl_mechanism = "plain";
|
||||||
|
sasl_username = nick;
|
||||||
|
sasl_password = lib.strings.fileContents <system-secrets/irc/hackint>;
|
||||||
|
};
|
||||||
|
libera = {
|
||||||
|
autoconnect = true;
|
||||||
|
address = "irc.libera.chat/6697";
|
||||||
|
ssl = true;
|
||||||
|
autojoin = [ "#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" ];
|
||||||
|
sasl_mechanism = "plain";
|
||||||
|
sasl_username = nick;
|
||||||
|
sasl_password = lib.strings.fileContents <system-secrets/irc/libera>;
|
||||||
|
};
|
||||||
|
oftc = {
|
||||||
|
autoconnect = true;
|
||||||
|
address = "irc.oftc.net/6697";
|
||||||
|
ssl = true;
|
||||||
|
ipv6 = true;
|
||||||
|
command = lib.concatStringsSep "\\;" [
|
||||||
|
"/msg nickserv identify ${lib.strings.fileContents <system-secrets/irc/oftc>}"
|
||||||
|
"/msg nickserv set cloak on"
|
||||||
|
];
|
||||||
|
autojoin = [ "#osm" "#osm-de" "#home-manager" ];
|
||||||
|
};
|
||||||
|
retiolum = {
|
||||||
|
autoconnect = true;
|
||||||
|
address = "irc.r";
|
||||||
|
autojoin = [ "#xxx" "#brockman" "#flix" "#autowifi" ];
|
||||||
|
command = lib.concatStringsSep "\\;" [
|
||||||
|
"/oper admin aidsballs"
|
||||||
|
"/msg nickserv always-on true"
|
||||||
|
"/msg nickserv autoreplay-missed on"
|
||||||
|
"/msg nickserv auto-away"
|
||||||
|
];
|
||||||
|
sasl_mechanism = "plain";
|
||||||
|
sasl_username = nick;
|
||||||
|
sasl_password = lib.strings.fileContents <system-secrets/irc/retiolum>;
|
||||||
|
};
|
||||||
|
news = {
|
||||||
|
autoconnect = true;
|
||||||
|
address = "news.r";
|
||||||
|
autojoin = [ "#cook" "#drachengame" "#oepnv" "#kmeinung" "#memes" ];
|
||||||
|
command = "/oper aids balls";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
logger.level.irc.news = 0;
|
||||||
|
matrix.server.nibbana = {
|
||||||
|
address = "nibbana.jp";
|
||||||
|
username = nick;
|
||||||
|
password = lib.strings.fileContents <system-secrets/matrix/nibbana>;
|
||||||
|
autoconnect = true;
|
||||||
|
};
|
||||||
|
alias.cmd.mod = "/quote omode $channel +o $nick";
|
||||||
|
relay = {
|
||||||
|
port.weechat = 9000;
|
||||||
|
network.password = relayPassword;
|
||||||
|
};
|
||||||
|
filters = {
|
||||||
|
zerocovid = {
|
||||||
|
buffer = "*";
|
||||||
|
tags = "*";
|
||||||
|
regex = "[kc]orona|💉|🤒|😷|[kc]ovid|virus|lockdown|va[kc][sc]in|mutante|mutation|impf|pandemi|κορ[ωο]ν[αο]ϊό|корона|expert|infe[ck]t|infizi|in[cz]iden[cz]|sars-cov|drosten|virolog|lauterbach|delta|omi[ck]ron|epidemi|booster|r-wert";
|
||||||
|
};
|
||||||
|
joinquit = {
|
||||||
|
buffer = "*";
|
||||||
|
tags = [ "irc_join" "irc_part" "irc_quit" "irc_nick" ];
|
||||||
|
regex = "*";
|
||||||
|
};
|
||||||
|
playlist_topic = {
|
||||||
|
buffer = "irc.*.#the_playlist";
|
||||||
|
tags = "irc_topic";
|
||||||
|
regex = "*";
|
||||||
|
};
|
||||||
|
brockman_notice = {
|
||||||
|
buffer = "irc.news.*";
|
||||||
|
tags = "irc_notice";
|
||||||
|
regex = "*";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
extraCommands = ''/matrix connect nibbana'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
description = "Weechat bouncer";
|
||||||
|
after = [ "network.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
restartIfChanged = true;
|
||||||
|
path = [ pkgs.alacritty.terminfo ];
|
||||||
|
environment.WEECHAT_HOME = "/var/lib/weechat";
|
||||||
|
preStart = "${pkgs.coreutils}/bin/rm $WEECHAT_HOME/*.conf";
|
||||||
|
script = "${tmux} -2 new-session -d -s IM ${weechat}/bin/weechat";
|
||||||
|
preStop = "${tmux} kill-session -t IM";
|
||||||
|
serviceConfig = {
|
||||||
|
User = "weechat";
|
||||||
|
Group = "weechat";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
Type = "oneshot";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
users.groups.weechat = {};
|
||||||
|
users.extraUsers.weechat = {
|
||||||
|
useDefaultShell = true;
|
||||||
|
openssh.authorizedKeys.keys = kieran.sshKeys pkgs ++ [
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@heym"
|
||||||
|
];
|
||||||
|
createHome = true;
|
||||||
|
group = "weechat";
|
||||||
|
home = "/var/lib/weechat";
|
||||||
|
isSystemUser = true;
|
||||||
|
packages = [ pkgs.tmux ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,7 +1,3 @@
|
|||||||
# Edit this configuration file to define what should be installed on
|
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
let
|
||||||
inherit (import <niveum/lib>) retiolumAddresses;
|
inherit (import <niveum/lib>) retiolumAddresses;
|
||||||
@@ -9,25 +5,10 @@ in
|
|||||||
{
|
{
|
||||||
imports = [ # Include the results of the hardware scan.
|
imports = [ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
./hdmi.nix
|
||||||
<niveum/configs/default.nix>
|
<niveum/configs/default.nix>
|
||||||
<niveum/configs/battery.nix>
|
<niveum/configs/battery.nix>
|
||||||
<niveum/configs/wpa_supplicant.nix>
|
<niveum/configs/wpa_supplicant.nix>
|
||||||
{
|
|
||||||
programs.steam.enable = true;
|
|
||||||
nixpkgs.config.steam.java = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
services.xserver.displayManager.sessionCommands =
|
|
||||||
let
|
|
||||||
intern = "LVDS-1";
|
|
||||||
extern = "HDMI-1";
|
|
||||||
pulseaudioCard = "alsa_card.pci-0000_00_1b.0";
|
|
||||||
pulseaudioProfile = "output:hdmi-stereo+input:analog-stereo";
|
|
||||||
in toString (pkgs.writers.writeDash "hdmi-on" ''
|
|
||||||
${pkgs.xorg.xrandr}/bin/xrandr --output ${intern} --primary --auto --output ${extern} --above ${intern} --auto
|
|
||||||
${pkgs.pulseaudio}/bin/pactl set-card-profile ${pulseaudioCard} ${pulseaudioProfile}
|
|
||||||
'');
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
niveum = {
|
niveum = {
|
||||||
@@ -36,21 +17,17 @@ in
|
|||||||
promptColours.success = "green";
|
promptColours.success = "green";
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.useDHCP = false;
|
networking = {
|
||||||
networking.interfaces = {
|
useDHCP = false;
|
||||||
enp0s25.useDHCP = true;
|
interfaces = {
|
||||||
wlp3s0.useDHCP = true;
|
enp0s25.useDHCP = true;
|
||||||
wwp0s20u4i6.useDHCP = true;
|
wlp3s0.useDHCP = true;
|
||||||
|
wwp0s20u4i6.useDHCP = true;
|
||||||
|
};
|
||||||
|
wireless.interfaces = [ "wlp3s0" ];
|
||||||
|
retiolum = retiolumAddresses.manakish;
|
||||||
|
hostName = "manakish";
|
||||||
};
|
};
|
||||||
networking.wireless.interfaces = [ "wlp3s0" ];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git vim
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.retiolum = retiolumAddresses.manakish;
|
|
||||||
|
|
||||||
networking.hostName = "manakish";
|
|
||||||
|
|
||||||
system.stateVersion = "20.09"; # Did you read the comment?
|
system.stateVersion = "20.09"; # Did you read the comment?
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,40 +1,37 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
boot = {
|
||||||
boot.initrd.kernelModules = [ ];
|
initrd = {
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||||
boot.extraModulePackages = [ ];
|
kernelModules = [];
|
||||||
|
luks.devices."crypted".device = "/dev/disk/by-uuid/493cb228-c292-4f71-9f38-dcb3e96dec47";
|
||||||
|
};
|
||||||
|
kernelModules = [ "kvm-intel" ];
|
||||||
|
extraModulePackages = [ ];
|
||||||
|
loader.grub = {
|
||||||
|
enable = true;
|
||||||
|
version = 2;
|
||||||
|
efiSupport = true;
|
||||||
|
efiInstallAsRemovable = true;
|
||||||
|
device = "/dev/sda";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems = {
|
||||||
{ device = "/dev/disk/by-uuid/ff47c479-e6d4-4cd6-93f1-9685f4018bc6";
|
"/" = {
|
||||||
|
device = "/dev/disk/by-uuid/ff47c479-e6d4-4cd6-93f1-9685f4018bc6";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
"/boot" = {
|
||||||
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/493cb228-c292-4f71-9f38-dcb3e96dec47";
|
device = "/dev/disk/by-uuid/D4AC-91B0";
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/D4AC-91B0";
|
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
boot.loader.grub = {
|
|
||||||
enable = true;
|
|
||||||
version = 2;
|
|
||||||
efiSupport = true;
|
|
||||||
efiInstallAsRemovable = true;
|
|
||||||
device = "/dev/sda";
|
|
||||||
};
|
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
}
|
}
|
||||||
|
|||||||
13
systems/manakish/hdmi.nix
Normal file
13
systems/manakish/hdmi.nix
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.xserver.displayManager.sessionCommands =
|
||||||
|
let
|
||||||
|
intern = "LVDS-1";
|
||||||
|
extern = "HDMI-1";
|
||||||
|
pulseaudioCard = "alsa_card.pci-0000_00_1b.0";
|
||||||
|
pulseaudioProfile = "output:hdmi-stereo+input:analog-stereo";
|
||||||
|
in toString (pkgs.writers.writeDash "hdmi-on" ''
|
||||||
|
${pkgs.xorg.xrandr}/bin/xrandr --output ${intern} --primary --auto --output ${extern} --above ${intern} --auto
|
||||||
|
${pkgs.pulseaudio}/bin/pactl set-card-profile ${pulseaudioCard} ${pulseaudioProfile}
|
||||||
|
'');
|
||||||
|
}
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
inherit (import <niveum/lib>) kieran;
|
|
||||||
in {
|
|
||||||
imports = [
|
|
||||||
./hardware-configuration.nix
|
|
||||||
# <niveum/configs/hass>
|
|
||||||
<niveum/configs/distrobump.nix>
|
|
||||||
<niveum/configs/spacetime.nix>
|
|
||||||
<niveum/configs/sshd.nix>
|
|
||||||
<niveum/configs/save-space.nix>
|
|
||||||
<niveum/configs/tmux.nix>
|
|
||||||
<niveum/configs/version.nix>
|
|
||||||
<niveum/configs/traadfri.nix>
|
|
||||||
<niveum/configs/wpa_supplicant.nix>
|
|
||||||
<niveum/modules/retiolum.nix>
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.nixPath = [ "/var/src" ];
|
|
||||||
|
|
||||||
boot.loader.grub.enable = false;
|
|
||||||
boot.loader.generic-extlinux-compatible.enable = true;
|
|
||||||
|
|
||||||
networking.hostName = "toum";
|
|
||||||
|
|
||||||
environment.variables.TERM = "linux";
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git vim htop wget reptyr
|
|
||||||
libraspberrypi
|
|
||||||
];
|
|
||||||
|
|
||||||
users.mutableUsers = false;
|
|
||||||
|
|
||||||
networking.retiolum = {
|
|
||||||
ipv4 = "10.243.2.3";
|
|
||||||
ipv6 = "42:0:3c46:56af:d12b:affd:8390:df22";
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.etc."tinc/retiolum/rsa_key.priv" = {
|
|
||||||
text = builtins.readFile <system-secrets/retiolum.key>;
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
|
|
||||||
system.stateVersion = "20.03";
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{ config, pkgs, ... }: {
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages; # https://github.com/NixOS/nixpkgs/issues/97064#issuecomment-708986741
|
|
||||||
boot.kernelParams = [ "cma=32M" ];
|
|
||||||
|
|
||||||
fileSystems = {
|
|
||||||
"/" = {
|
|
||||||
device = "/dev/disk/by-label/NIXOS_SD";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [{
|
|
||||||
device = "/swapfile";
|
|
||||||
size = 1024;
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
@@ -4,100 +4,24 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./gaslight.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
./kiosk.nix
|
||||||
|
./moodle-dl-meinhark.nix
|
||||||
|
./pulseaudio.nix
|
||||||
|
./tuna.nix
|
||||||
|
./grocy.nix
|
||||||
<home-manager/nixos>
|
<home-manager/nixos>
|
||||||
<niveum/configs/wpa_supplicant.nix>
|
|
||||||
<niveum/configs/keyboard.nix>
|
<niveum/configs/keyboard.nix>
|
||||||
<niveum/modules/retiolum.nix>
|
<niveum/configs/monitoring.nix>
|
||||||
<niveum/configs/spacetime.nix>
|
|
||||||
<niveum/configs/nix.nix>
|
<niveum/configs/nix.nix>
|
||||||
<niveum/configs/tuna.nix>
|
|
||||||
<niveum/configs/sshd.nix>
|
|
||||||
<niveum/configs/version.nix>
|
|
||||||
<niveum/configs/gaslight.nix>
|
|
||||||
<niveum/configs/printing.nix>
|
<niveum/configs/printing.nix>
|
||||||
|
<niveum/configs/spacetime.nix>
|
||||||
|
<niveum/configs/sshd.nix>
|
||||||
<niveum/configs/traadfri.nix>
|
<niveum/configs/traadfri.nix>
|
||||||
<niveum/configs/bvg.nix>
|
<niveum/configs/tmux.nix>
|
||||||
<niveum/configs/moodle-dl/meinhark.nix>
|
<niveum/configs/wpa_supplicant.nix>
|
||||||
<niveum/configs/monitoring/push.nix>
|
<niveum/modules/retiolum.nix>
|
||||||
{
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
sound.enable = true;
|
|
||||||
|
|
||||||
hardware.pulseaudio = {
|
|
||||||
enable = true;
|
|
||||||
systemWide = true;
|
|
||||||
tcp = {
|
|
||||||
enable = true;
|
|
||||||
anonymousClients.allowedIpRanges = [ "127.0.0.1" "10.243.2.0/24" "192.168.0.0/16" ];
|
|
||||||
};
|
|
||||||
zeroconf.publish.enable = true;
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 4713 ];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
environment.systemPackages =
|
|
||||||
let
|
|
||||||
worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
|
|
||||||
in [
|
|
||||||
(pkgs.writers.writeDashBin "mpv" ''
|
|
||||||
${pkgs.mpv}/bin/mpv --no-video "$@"
|
|
||||||
'')
|
|
||||||
(pkgs.writers.writeDashBin "worldradio" ''
|
|
||||||
shuf ${worldradio} | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv --no-video
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
users.extraUsers.kiosk = {
|
|
||||||
isNormalUser = true;
|
|
||||||
password = "";
|
|
||||||
extraGroups = [ "audio" ];
|
|
||||||
};
|
|
||||||
services.cage = {
|
|
||||||
enable = true;
|
|
||||||
user = config.users.extraUsers.kiosk.name;
|
|
||||||
extraArguments = [ "-s" ]; # allow vt switching
|
|
||||||
program =
|
|
||||||
let startUrls = [ "https://open.spotify.com" "https://youtube.com" "http://bvg.kmein.r" ];
|
|
||||||
in pkgs.writers.writeDash "kiosk-browser" ''
|
|
||||||
while true; do
|
|
||||||
${pkgs.chromium}/bin/chromium \
|
|
||||||
--no-first-run --no-message-box --noerrdialogs \
|
|
||||||
--default-browser --no-default-browser-check \
|
|
||||||
--start-maximized ${lib.escapeShellArgs startUrls}
|
|
||||||
sleep 0.5
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
systemd.services.cage-tty1.environment.XKB_DEFAULT_LAYOUT = "de";
|
|
||||||
programs.chromium = {
|
|
||||||
enable = true;
|
|
||||||
extensions = [
|
|
||||||
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
environment.systemPackages = [ pkgs.tmux ];
|
|
||||||
systemd.services.turntables = {
|
|
||||||
description = "music controller session";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
path = [ pkgs.alacritty.terminfo ];
|
|
||||||
script = ''
|
|
||||||
${pkgs.tmux}/bin/tmux -2 new-session -d -s turntables ${pkgs.alsaUtils}/bin/alsamixer \; new-window
|
|
||||||
'';
|
|
||||||
preStop = "${pkgs.tmux}/bin/tmux kill-session -t turntables";
|
|
||||||
serviceConfig = {
|
|
||||||
User = "root";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
Type = "oneshot";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nix.nixPath = [ "/var/src" ];
|
nix.nixPath = [ "/var/src" ];
|
||||||
@@ -110,19 +34,25 @@ in
|
|||||||
|
|
||||||
services.illum.enable = true;
|
services.illum.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ git vim htop ncmpcpp ];
|
environment.systemPackages =
|
||||||
|
let
|
||||||
|
worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
|
||||||
|
in [
|
||||||
|
(pkgs.writers.writeDashBin "mpv" ''${pkgs.mpv}/bin/mpv --no-video "$@"'')
|
||||||
|
(pkgs.writers.writeDashBin "worldradio" ''
|
||||||
|
shuf ${worldradio} | ${pkgs.findutils}/bin/xargs ${pkgs.mpv}/bin/mpv --no-video
|
||||||
|
'')
|
||||||
|
pkgs.git
|
||||||
|
pkgs.vim
|
||||||
|
pkgs.htop
|
||||||
|
pkgs.ncmpcpp
|
||||||
|
];
|
||||||
|
|
||||||
boot.loader.systemd-boot = {
|
networking = {
|
||||||
enable = true;
|
hostName = "zaatar";
|
||||||
configurationLimit = 5;
|
wireless.interfaces = [ "wlp2s0" ];
|
||||||
|
retiolum = retiolumAddresses.zaatar;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
networking.hostName = "zaatar";
|
|
||||||
networking.wireless.interfaces = [ "wlp2s0" ];
|
|
||||||
|
|
||||||
networking.retiolum = retiolumAddresses.zaatar;
|
|
||||||
|
|
||||||
system.stateVersion = "20.09";
|
system.stateVersion = "20.09";
|
||||||
}
|
}
|
||||||
|
|||||||
10
systems/zaatar/grocy.nix
Normal file
10
systems/zaatar/grocy.nix
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
services.grocy = {
|
||||||
|
enable = true;
|
||||||
|
hostName = "grocy.kmein.r";
|
||||||
|
nginx.enableSSL = false;
|
||||||
|
settings.calendar.firstDayOfWeek = 1;
|
||||||
|
settings.culture = "de";
|
||||||
|
settings.currency = "EUR";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,23 +1,32 @@
|
|||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
|
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules =
|
boot = {
|
||||||
[ "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_acpi" "rtsx_usb_sdmmc" ];
|
initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_acpi" "rtsx_usb_sdmmc" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
extraModulePackages = [ ];
|
||||||
|
loader = {
|
||||||
fileSystems."/" = {
|
systemd-boot = {
|
||||||
device = "/dev/disk/by-label/nixos";
|
enable = true;
|
||||||
fsType = "ext4";
|
configurationLimit = 5;
|
||||||
|
};
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems = {
|
||||||
device = "/dev/disk/by-label/boot";
|
"/" = {
|
||||||
fsType = "vfat";
|
device = "/dev/disk/by-label/nixos";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
"/boot" = {
|
||||||
|
device = "/dev/disk/by-label/boot";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
|
||||||
[{ device = "/dev/disk/by-label/swap"; }];
|
|
||||||
|
|
||||||
nix.maxJobs = lib.mkDefault 4;
|
nix.maxJobs = lib.mkDefault 4;
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
|
|||||||
31
systems/zaatar/kiosk.nix
Normal file
31
systems/zaatar/kiosk.nix
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
users.extraUsers.kiosk = {
|
||||||
|
isNormalUser = true;
|
||||||
|
password = "";
|
||||||
|
extraGroups = [ "audio" ];
|
||||||
|
};
|
||||||
|
services.cage = {
|
||||||
|
enable = true;
|
||||||
|
user = config.users.extraUsers.kiosk.name;
|
||||||
|
extraArguments = [ "-s" ]; # allow vt switching
|
||||||
|
program =
|
||||||
|
let startUrls = [ "https://open.spotify.com" "https://youtube.com" "http://bvg.kmein.r" ];
|
||||||
|
in pkgs.writers.writeDash "kiosk-browser" ''
|
||||||
|
while true; do
|
||||||
|
${pkgs.brave}/bin/brave \
|
||||||
|
--no-first-run --no-message-box --noerrdialogs \
|
||||||
|
--default-browser --no-default-browser-check \
|
||||||
|
--start-maximized ${lib.escapeShellArgs startUrls}
|
||||||
|
sleep 0.5
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
systemd.services.cage-tty1.environment.XKB_DEFAULT_LAYOUT = "de";
|
||||||
|
programs.chromium = {
|
||||||
|
enable = true;
|
||||||
|
extensions = [
|
||||||
|
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
14
systems/zaatar/pulseaudio.nix
Normal file
14
systems/zaatar/pulseaudio.nix
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
sound.enable = true;
|
||||||
|
|
||||||
|
hardware.pulseaudio = {
|
||||||
|
enable = true;
|
||||||
|
systemWide = true;
|
||||||
|
tcp = {
|
||||||
|
enable = true;
|
||||||
|
anonymousClients.allowedIpRanges = [ "127.0.0.1" "10.243.2.0/24" "192.168.0.0/16" ];
|
||||||
|
};
|
||||||
|
zeroconf.publish.enable = true;
|
||||||
|
};
|
||||||
|
networking.firewall.allowedTCPPorts = [ 4713 ];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user