mirror of
https://github.com/kmein/niveum
synced 2026-03-30 09:11:10 +02:00
Compare commits
66 Commits
2efb8d7d8a
...
tahina
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e96539faa | |||
| e08eb0e970 | |||
| 012d78cc0e | |||
|
|
62f52922b8 | ||
| 28d359c73b | |||
| 8830147359 | |||
| e9adccacd9 | |||
|
|
588ec3d180 | ||
| 6ea8500818 | |||
| bf6c82a11d | |||
| 9c68ff20bc | |||
| 2565bfbc27 | |||
| a4d002e293 | |||
| 730070bc9d | |||
| 6f1f1887b9 | |||
|
|
68f8bb06f4 | ||
| 7afe712c27 | |||
| 1946a30b2f | |||
| c1f013fc2f | |||
| 3be0766a7a | |||
| 5216f693a1 | |||
| ab3de7a042 | |||
| de6d91297b | |||
| 6342fb9047 | |||
| d37e90cb97 | |||
|
|
13727abfd6 | ||
| a23f0c80a2 | |||
| b0b19c3989 | |||
| ef223a9717 | |||
| ecfc2ca06c | |||
| cd7e688a46 | |||
|
|
f7b9008ed0 | ||
| 81706489b5 | |||
| 817f57ad09 | |||
| eafb1ce0c3 | |||
| 0c72a89760 | |||
| a7db357e54 | |||
| 1ad6c63a2f | |||
| 502ab93585 | |||
|
|
fe6bda3cf2 | ||
| c64e681ada | |||
| af813cc876 | |||
| 704f745f5e | |||
| 93dd8bd702 | |||
| 6e995764d4 | |||
| 87b9fc49ea | |||
| b4e42e6b22 | |||
| 87f73a8fc1 | |||
| db8c06364f | |||
| 24b7044a3f | |||
| 908667267b | |||
| b3090737fd | |||
| f195351474 | |||
| 1cce7dc8df | |||
| 894cc6efef | |||
| f1ed00fe40 | |||
| 7d1e1e712f | |||
| fd1c36874a | |||
| bc52a4a358 | |||
| 5aade69fbe | |||
| 0ead88d04a | |||
| d21ff3e731 | |||
| 7a918319b7 | |||
| 5524f3b92b | |||
| fe8af09148 | |||
| d9ca1e673d |
38
ci.nix
38
ci.nix
@@ -1,27 +1,36 @@
|
||||
{ inputs, system, name }:
|
||||
let
|
||||
{
|
||||
inputs,
|
||||
system,
|
||||
name,
|
||||
}: let
|
||||
inherit (inputs) nixpkgs;
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
ensureFiles = paths: pkgs.runCommand "directory" {} ''
|
||||
ensureFiles = paths:
|
||||
pkgs.runCommand "directory" {} ''
|
||||
set -efu
|
||||
mkdir $out
|
||||
cd $out
|
||||
${nixpkgs.lib.concatMapStringsSep "\n" (path: ''
|
||||
${
|
||||
nixpkgs.lib.concatMapStringsSep "\n" (path: ''
|
||||
mkdir -p "$(dirname ${nixpkgs.lib.escapeShellArg path})"
|
||||
echo foo > ${nixpkgs.lib.escapeShellArg path}
|
||||
'') paths}
|
||||
'')
|
||||
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);
|
||||
]
|
||||
++ 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"
|
||||
"hass/token"
|
||||
"mail/cock"
|
||||
"mail/fastmail"
|
||||
"mail/gmail/amroplay"
|
||||
@@ -37,10 +46,14 @@ let
|
||||
"spotify/username"
|
||||
"spotify/password"
|
||||
];
|
||||
systemSecrets = let basic = [ "retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"]; in {
|
||||
zaatar = ensureFiles ([ "moodle.token" "telegram/moodle-dl.token" ] ++ basic);
|
||||
systemSecrets = let
|
||||
basic = ["retiolum.ed25519" "retiolum.key" "syncthing/cert.pem" "syncthing/key.pem"];
|
||||
in
|
||||
{
|
||||
zaatar = ensureFiles (["moodle.token" "telegram/moodle-dl.token" "mpd-web.key"] ++ basic);
|
||||
kabsa = ensureFiles basic;
|
||||
manakish = ensureFiles basic;
|
||||
tahina = ensureFiles basic;
|
||||
makanek = ensureFiles ([
|
||||
"irc/retiolum"
|
||||
"irc/hackint"
|
||||
@@ -62,6 +75,9 @@ let
|
||||
"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")
|
||||
]
|
||||
++ basic);
|
||||
}
|
||||
.${name};
|
||||
in
|
||||
toString (pkgs.writers.writeDash "build" "NIX_PATH=${nixPath} nix-build '<nixpkgs/nixos>' -A system --dry-run")
|
||||
|
||||
@@ -1,21 +1,24 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
environment.variables.TERMINAL = "alacritty";
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.alacritty
|
||||
];
|
||||
|
||||
home-manager.users.me.xdg.configFile =
|
||||
let
|
||||
home-manager.users.me.xdg.configFile = let
|
||||
inherit (import <niveum/lib>) colours;
|
||||
colourNames = [ "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" ];
|
||||
colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
|
||||
colourPairs = lib.getAttrs colourNames colours;
|
||||
in {
|
||||
"alacritty/alacritty.yml".source = (pkgs.formats.yaml {}).generate "alacritty.yml" {
|
||||
background_opacity = 0.9;
|
||||
colors = {
|
||||
primary = { inherit (colours) background foreground; };
|
||||
primary = {inherit (colours) background foreground;};
|
||||
normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
|
||||
bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
|
||||
};
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
inherit (import <niveum/lib>) restic;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) restic;
|
||||
in {
|
||||
services.restic.backups.niveum = {
|
||||
initialize = true;
|
||||
inherit (restic) repository;
|
||||
timerConfig = { OnCalendar = "8:00"; RandomizedDelaySec = "1h"; };
|
||||
timerConfig = {
|
||||
OnCalendar = "8:00";
|
||||
RandomizedDelaySec = "1h";
|
||||
};
|
||||
passwordFile = toString <secrets/restic/password>;
|
||||
extraBackupArgs = [
|
||||
"--exclude=/home/kfm/projects/nixpkgs/.git"
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||
tp_smapi
|
||||
acpi_call
|
||||
];
|
||||
boot.kernelModules = [ "tp_smapi" "acpi_call" ];
|
||||
environment.systemPackages = [ pkgs.tpacpi-bat ];
|
||||
boot.kernelModules = ["tp_smapi" "acpi_call"];
|
||||
environment.systemPackages = [pkgs.tpacpi-bat];
|
||||
|
||||
services.tlp = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.beets ];
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = [pkgs.beets];
|
||||
home-manager.users.me.xdg.configFile = {
|
||||
"beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {
|
||||
directory = "~/cloud/syncthing/music";
|
||||
library = "~/cloud/syncthing/common/music.db";
|
||||
plugins = toString [ "fetchart" "lastgenre" ];
|
||||
plugins = toString ["fetchart" "lastgenre"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings.General.Enable =
|
||||
lib.concatStringsSep "," [ "Source" "Sink" "Media" "Socket" ];
|
||||
lib.concatStringsSep "," ["Source" "Sink" "Media" "Socket"];
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.blueman ];
|
||||
environment.systemPackages = [pkgs.blueman];
|
||||
|
||||
home-manager.users.me = { services.blueman-applet.enable = false; };
|
||||
home-manager.users.me = {services.blueman-applet.enable = false;};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{pkgs, ...}:
|
||||
# https://paste.sr.ht/~erictapen/11716989e489b600f237041b6d657fdf0ee17b34
|
||||
let
|
||||
certificate = pkgs.stdenv.mkDerivation rec {
|
||||
@@ -7,7 +7,7 @@ let
|
||||
1,/DST Root CA X3/d
|
||||
1,/-----END CERTIFICATE-----/p
|
||||
'';
|
||||
nativeBuildInputs = with pkgs; [ cacert gnused ];
|
||||
nativeBuildInputs = with pkgs; [cacert gnused];
|
||||
phases = "installPhase";
|
||||
installPhase = ''
|
||||
${pkgs.gnused}/bin/sed -n -f $src ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt > $out
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
programs.chromium = {
|
||||
enable = true;
|
||||
extensions = [
|
||||
"nngceckbapebfimnlniiiahkandclblb" # BitWarden
|
||||
# "ihlenndgcmojhcghmfjfneahoeklbjjh" # cVim
|
||||
# "fpnmgdkabkmnadcjpehmlllkndpkmiak" # Wayback Machine
|
||||
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
|
||||
"khncfooichmfjbepaaaebmommgaepoid" # Remove YouTube Recommended Videos
|
||||
"pjjgklgkfeoeiebjogplpnibpfnffkng" # undistracted
|
||||
"nhdogjmejiglipccpnnnanhbledajbpd" # vuejs devtools
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.brave ];
|
||||
environment.systemPackages = [pkgs.brave];
|
||||
|
||||
environment.variables.BROWSER = "brave";
|
||||
}
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
<niveum/modules/dropbox.nix>
|
||||
];
|
||||
@@ -50,14 +55,14 @@
|
||||
cert = toString <system-secrets/syncthing/cert.pem>;
|
||||
key = toString <system-secrets/syncthing/key.pem>;
|
||||
inherit ((import <niveum/lib>).syncthing) devices;
|
||||
folders =
|
||||
let cloud-dir = "${config.users.users.me.home}/cloud";
|
||||
folders = let
|
||||
cloud-dir = "${config.users.users.me.home}/cloud";
|
||||
in {
|
||||
"${cloud-dir}/syncthing/common".devices = [ "kabsa" "manakish" ];
|
||||
"${cloud-dir}/syncthing/library".devices = [ "kabsa" "manakish" "heym" ];
|
||||
"${cloud-dir}/syncthing/mundoiu".devices = [ "kabsa" "manakish" "heym" ];
|
||||
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
||||
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
||||
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
||||
"${cloud-dir}/syncthing/music" = {
|
||||
devices = [ "kabsa" "manakish" "heym" "zaatar" ];
|
||||
devices = ["kabsa" "manakish" "heym" "zaatar"];
|
||||
id = "music";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
copyqConfig = pkgs.writers.writeDash "copyq-config" ''
|
||||
${pkgs.copyq}/bin/copyq config check_clipboard true
|
||||
${pkgs.copyq}/bin/copyq config check_selection false
|
||||
@@ -18,10 +21,10 @@ let
|
||||
${pkgs.copyq}/bin/copyq config text_wrap true
|
||||
'';
|
||||
in {
|
||||
environment.systemPackages = [ pkgs.copyq ];
|
||||
environment.systemPackages = [pkgs.copyq];
|
||||
|
||||
systemd.user.services.copyq = {
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
wantedBy = ["graphical-session.target"];
|
||||
environment = {
|
||||
DISPLAY = ":${toString config.services.xserver.display}";
|
||||
};
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{ pkgs, lib, config, options, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
inherit (lib.strings) makeBinPath;
|
||||
inherit (import <niveum/lib>) localAddresses kieran;
|
||||
in {
|
||||
@@ -7,7 +12,7 @@ in {
|
||||
<home-manager/nixos>
|
||||
<niveum/modules/system-dependent.nix>
|
||||
{
|
||||
boot.supportedFilesystems = [ "ntfs" ];
|
||||
boot.supportedFilesystems = ["ntfs"];
|
||||
}
|
||||
{
|
||||
nix.nixPath = [
|
||||
@@ -23,13 +28,16 @@ in {
|
||||
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||
gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
|
||||
tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
|
||||
iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };
|
||||
ix = pkgs.callPackage <niveum/packages/ix.nix> { };
|
||||
iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
|
||||
ix = pkgs.callPackage <niveum/packages/ix.nix> {};
|
||||
};
|
||||
};
|
||||
overlays = [
|
||||
(self: super: {
|
||||
scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
|
||||
scripts = import <niveum/packages/scripts> {
|
||||
pkgs = super;
|
||||
lib = super.lib;
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
@@ -57,8 +65,7 @@ in {
|
||||
users.users.me = {
|
||||
name = "kfm";
|
||||
description = kieran.name;
|
||||
hashedPassword =
|
||||
"$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
|
||||
hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
|
||||
isNormalUser = true;
|
||||
uid = 1000;
|
||||
};
|
||||
@@ -72,27 +79,28 @@ in {
|
||||
hardware.pulseaudio = {
|
||||
enable = true;
|
||||
package = pkgs.pulseaudioFull;
|
||||
extraModules = [ pkgs.pulseaudio-modules-bt ];
|
||||
extraModules = [pkgs.pulseaudio-modules-bt];
|
||||
# copy server:/run/pulse/.config/pulse/cookie to client:~/.config/pulse/cookie to authenticate a client machine
|
||||
zeroconf.discovery.enable = true;
|
||||
extraConfig = ''
|
||||
load-module ${toString [
|
||||
load-module ${
|
||||
toString [
|
||||
"module-tunnel-sink-new"
|
||||
"server=zaatar.r"
|
||||
"sink_name=zaatar"
|
||||
"channels=2"
|
||||
"rate=44100"
|
||||
]}
|
||||
]
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
users.users.me.extraGroups = [ "audio" ];
|
||||
users.users.me.extraGroups = ["audio"];
|
||||
|
||||
environment.systemPackages = [ pkgs.pavucontrol pkgs.ncpamixer pkgs.pamixer pkgs.pulsemixer ];
|
||||
environment.systemPackages = [pkgs.pavucontrol pkgs.ncpamixer pkgs.pamixer pkgs.pulsemixer];
|
||||
}
|
||||
{
|
||||
environment.interactiveShellInit =
|
||||
"export PATH=$PATH:$HOME/projects/niveum";
|
||||
environment.interactiveShellInit = "export PATH=$PATH:$HOME/projects/niveum";
|
||||
environment.shellAliases = let
|
||||
wcd = pkgs.writers.writeDash "wcd" ''
|
||||
cd "$(readlink "$(${pkgs.which}/bin/which --skip-alias "$1")" | xargs dirname)/.."
|
||||
@@ -103,12 +111,15 @@ in {
|
||||
take = pkgs.writers.writeDash "take" ''
|
||||
mkdir "$1" && cd "$1"
|
||||
'';
|
||||
cdt = pkgs.writers.writeDash "cdt" ''
|
||||
cd "$(mktemp -d)"
|
||||
pwd
|
||||
'';
|
||||
swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
|
||||
in {
|
||||
"ß" = "${pkgs.utillinux}/bin/setsid";
|
||||
cat = "${pkgs.bat}/bin/bat --style=plain";
|
||||
chromium-incognito =
|
||||
"chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
|
||||
chromium-incognito = "chromium --user-data-dir=$(mktemp -d /tmp/chr.XXXXXX) --no-first-run --incognito";
|
||||
cp = "cp --interactive";
|
||||
ip = "${pkgs.iproute}/bin/ip -c";
|
||||
l = "ls --color=auto --time-style=long-iso --almost-all";
|
||||
@@ -124,6 +135,8 @@ in {
|
||||
rm = "rm --interactive";
|
||||
s = "${pkgs.systemd}/bin/systemctl";
|
||||
take = "source ${take}";
|
||||
cdt = "source ${cdt}";
|
||||
vit = "$EDITOR $(mktemp)";
|
||||
tmux = "${pkgs.tmux}/bin/tmux -2";
|
||||
sxiv = swallow "${pkgs.sxiv}/bin/sxiv";
|
||||
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
||||
@@ -131,13 +144,11 @@ in {
|
||||
wcd = "source ${wcd}";
|
||||
im = "${pkgs.openssh}/bin/ssh weechat@makanek -t tmux attach-session -t IM";
|
||||
where = "source ${where}";
|
||||
yt =
|
||||
"${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
|
||||
yta =
|
||||
"${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
|
||||
yt = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -ic"; # Download video link
|
||||
yta = "${pkgs.youtube-dl}/bin/youtube-dl --add-metadata -xic"; # Download with audio
|
||||
};
|
||||
}
|
||||
{ i18n.defaultLocale = "en_DK.UTF-8"; }
|
||||
{i18n.defaultLocale = "en_DK.UTF-8";}
|
||||
{
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
@@ -150,7 +161,7 @@ in {
|
||||
enable = true;
|
||||
greeters.gtk = {
|
||||
enable = true;
|
||||
indicators = [ "~spacer" "~host" "~spacer" "~session" "~power" ];
|
||||
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -170,13 +181,13 @@ in {
|
||||
};
|
||||
};
|
||||
}
|
||||
{ programs.command-not-found.enable = true; }
|
||||
{programs.command-not-found.enable = true;}
|
||||
{
|
||||
programs.gnupg.agent.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.gnupg
|
||||
(pkgs.pass.withExtensions (e: [e.pass-otp]))
|
||||
(pkgs.pass.withExtensions (e: [e.pass-otp e.pass-import e.pass-genphrase]))
|
||||
];
|
||||
}
|
||||
{
|
||||
@@ -189,10 +200,12 @@ in {
|
||||
};
|
||||
}
|
||||
{
|
||||
networking.hosts = lib.mapAttrs' (name: address: {
|
||||
networking.hosts =
|
||||
lib.mapAttrs' (name: address: {
|
||||
name = address;
|
||||
value = [ "${name}.local" ];
|
||||
}) localAddresses;
|
||||
value = ["${name}.local"];
|
||||
})
|
||||
localAddresses;
|
||||
}
|
||||
./alacritty.nix
|
||||
./backup.nix
|
||||
@@ -228,6 +241,7 @@ in {
|
||||
./flameshot-once.nix
|
||||
./packages.nix
|
||||
./stardict.nix
|
||||
./polkit.nix
|
||||
./power-action.nix
|
||||
./printing.nix
|
||||
./openweathermap.nix
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
nixify = pkgs.writers.writeDashBin "nixify" ''
|
||||
set -efuC
|
||||
|
||||
@@ -18,18 +17,18 @@ let
|
||||
fi
|
||||
'';
|
||||
in {
|
||||
environment.systemPackages = [ pkgs.direnv nixify ];
|
||||
environment.systemPackages = [pkgs.direnv nixify];
|
||||
|
||||
home-manager.users.me.programs.direnv = {
|
||||
enable = true;
|
||||
stdlib = builtins.readFile ("${
|
||||
stdlib = builtins.readFile "${
|
||||
pkgs.fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "dotfiles";
|
||||
rev = "a0a9b7e358fa70a85cd468f8ca1fbb02ae0a91df";
|
||||
sha256 = "1y9h5s1lf59sczsm0ksq2x1yhl98ba9lwk5yil3q53rg7n4574pg";
|
||||
}
|
||||
}/home/.direnvrc");
|
||||
}/home/.direnvrc";
|
||||
};
|
||||
|
||||
programs.zsh.interactiveShellInit = ''
|
||||
|
||||
@@ -1,8 +1,13 @@
|
||||
{ lib, config, pkgs, ... }: {
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(import <stockholm/makefu/3modules/bump-distrowatch.nix> {
|
||||
inherit lib config;
|
||||
pkgs = pkgs // { writeDash = pkgs.writers.writeDash; };
|
||||
pkgs = pkgs // {writeDash = pkgs.writers.writeDash;};
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ lib, pkgs, ... }: {
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
# for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c
|
||||
@@ -7,6 +11,6 @@
|
||||
"--fixed-cidr=172.39.1.0/25"
|
||||
];
|
||||
};
|
||||
users.users.me.extraGroups = [ "docker" ];
|
||||
environment.systemPackages = [ pkgs.docker pkgs.docker_compose ];
|
||||
users.users.me.extraGroups = ["docker"];
|
||||
environment.systemPackages = [pkgs.docker pkgs.docker_compose];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) defaultApplications colours theme;
|
||||
in {
|
||||
home-manager.users.me.services.dunst = {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) defaultApplications;
|
||||
flameshot-once =
|
||||
pkgs.callPackage <stockholm/krebs/5pkgs/simple/flameshot-once> {};
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
flixLocation = "/media/flix";
|
||||
cacheLocation = "/var/cache/flix";
|
||||
indexFilename = "index";
|
||||
@@ -18,7 +21,6 @@ in {
|
||||
"x-systemd.device-timeout=1"
|
||||
"x-systemd.idle-timeout=1min"
|
||||
"x-systemd.requires=tinc.retiolum.service"
|
||||
"x-systemd.requires=wpa_supplicant.service"
|
||||
"user"
|
||||
"_netdev"
|
||||
];
|
||||
@@ -36,7 +38,7 @@ in {
|
||||
|
||||
systemd.services.flix-index = {
|
||||
description = "Flix indexing service";
|
||||
wants = [ "network-online.target" ];
|
||||
wants = ["network-online.target"];
|
||||
script = "cp ${flixLocation}/download/index ./${indexFilename}";
|
||||
startAt = "hourly";
|
||||
serviceConfig = {
|
||||
@@ -75,5 +77,4 @@ in {
|
||||
| ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
|
||||
'')
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
nixpkgs.config.joypixels.acceptLicense = true;
|
||||
|
||||
fonts = {
|
||||
@@ -33,10 +33,10 @@
|
||||
tocharian-font
|
||||
];
|
||||
fontconfig.defaultFonts = {
|
||||
monospace = [ "JetBrains Mono" "JoyPixels" ];
|
||||
serif = [ "Roboto Slab" ];
|
||||
sansSerif = [ "Roboto" "Noto Sans" ];
|
||||
emoji = [ "JoyPixels" ];
|
||||
monospace = ["JetBrains Mono" "JoyPixels"];
|
||||
serif = ["Roboto Slab"];
|
||||
sansSerif = ["Roboto" "Noto Sans"];
|
||||
emoji = ["JoyPixels"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
environment = {
|
||||
systemPackages = [ pkgs.fzf ];
|
||||
systemPackages = [pkgs.fzf];
|
||||
variables = {
|
||||
FZF_DEFAULT_OPTS =
|
||||
lib.escapeShellArgs [ "--height=40%" "--layout=reverse" ];
|
||||
lib.escapeShellArgs ["--height=40%" "--layout=reverse"];
|
||||
FZF_ALT_C_COMMAND = "${pkgs.fd}/bin/fd --type d";
|
||||
FZF_ALT_C_OPTS = lib.escapeShellArgs [
|
||||
"--preview='${pkgs.tree}/bin/tree -L 1 \"{}\"'"
|
||||
@@ -12,7 +16,7 @@
|
||||
];
|
||||
FZF_CTRL_T_COMMAND = "${pkgs.fd}/bin/fd --type f";
|
||||
FZF_CTRL_T_OPTS =
|
||||
lib.escapeShellArgs [ "--preview='${pkgs.bat}/bin/bat \"{}\"'" ];
|
||||
lib.escapeShellArgs ["--preview='${pkgs.bat}/bin/bat \"{}\"'"];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
inherit (import <niveum/lib>) kieran ignorePaths;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) kieran ignorePaths;
|
||||
in {
|
||||
environment.systemPackages = [
|
||||
pkgs.mr
|
||||
pkgs.git
|
||||
pkgs.gitAndTools.gitflow
|
||||
pkgs.gitAndTools.hub
|
||||
pkgs.gitAndTools.gh
|
||||
pkgs.gitAndTools.git-extras
|
||||
pkgs.gitAndTools.git-trim
|
||||
pkgs.gitAndTools.git-absorb
|
||||
pkgs.gitstats
|
||||
pkgs.patch
|
||||
pkgs.patchutils
|
||||
@@ -23,37 +26,6 @@ in
|
||||
};
|
||||
|
||||
home-manager.users.me = {
|
||||
home.file.".mrconfig".text = let
|
||||
prependPath = prefix:
|
||||
lib.attrsets.mapAttrs'
|
||||
(path: lib.attrsets.nameValuePair "${prefix}/${path}");
|
||||
git = url: { checkout = "git clone ${url}"; };
|
||||
github = owner: repo: git "git@github.com:${owner}/${repo}";
|
||||
keybase = owner: repo: git "keybase://private/${owner}/${repo}";
|
||||
in lib.generators.toINI { } ({
|
||||
DEFAULT = { git_gc = ''git gc "$@"''; };
|
||||
} // prependPath "projects" {
|
||||
"menstruation.rs" = github "kmein" "menstruation.rs";
|
||||
brockman = github "kmein" "brockman";
|
||||
challenges = github "kmein" "challenges";
|
||||
conlangs = github "kmein" "conlangs";
|
||||
ledger = keybase "kmein" "ledger";
|
||||
mahlzeit = github "kmein" "mahlzeit";
|
||||
menstruation-telegram = github "kmein" "menstruation-telegram";
|
||||
meteora = github "kmein" "meteora";
|
||||
modernizr = github "kmein" "modernizr";
|
||||
niveum = github "kmein" "niveum";
|
||||
nixpkgs = github "NixOS" "nixpkgs";
|
||||
poetry = github "kmein" "poetry";
|
||||
quotes = github "kmein" "quotes";
|
||||
sphinx = github "kmein" "sphinx";
|
||||
stockholm = git "https://cgit.krebsco.de/stockholm";
|
||||
telebots = github "kmein" "telebots";
|
||||
traadfri = github "kmein" "traadfri";
|
||||
wissen = github "kmein" "wissen";
|
||||
zen = github "kmein" "zen";
|
||||
});
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
package = pkgs.gitAndTools.gitFull;
|
||||
@@ -70,8 +42,7 @@ in
|
||||
diffs = "diff --staged";
|
||||
last = "log -1 HEAD";
|
||||
logs = "log --pretty=oneline";
|
||||
graph =
|
||||
"log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
|
||||
graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all";
|
||||
};
|
||||
ignores = ignorePaths;
|
||||
extraConfig = {
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ config, pkgs, ... }: {
|
||||
imports = [ <niveum/modules/hledger.nix> ];
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [<niveum/modules/hledger.nix>];
|
||||
|
||||
niveum.hledger = {
|
||||
enable = true;
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
sort_key = "PERCENT_CPU";
|
||||
tree_view = true;
|
||||
update_process_names = false;
|
||||
right_meters = [ "Uptime" "Tasks" "LoadAverage" "Battery" ];
|
||||
left_meters = [ "LeftCPUs2" "RightCPUs2" "Memory" "Swap" ];
|
||||
right_meters = ["Uptime" "Tasks" "LoadAverage" "Battery"];
|
||||
left_meters = ["LeftCPUs2" "RightCPUs2" "Memory" "Swap"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib.strings) fileContents;
|
||||
inherit (import <niveum/lib>) sshPort;
|
||||
eduroam = {
|
||||
@@ -32,7 +36,6 @@ in {
|
||||
options = hu-berlin-cifs-options;
|
||||
};
|
||||
|
||||
|
||||
home-manager.users.me.programs.ssh = {
|
||||
matchBlocks = {
|
||||
"alew.hu-berlin.de" = {
|
||||
@@ -46,10 +49,11 @@ in {
|
||||
(pkgs.writers.writeDashBin "hu-ip" ''
|
||||
${pkgs.w3m}/bin/w3m -dump meineip.hu-berlin.de | head --lines=-4 | tail --lines=+3
|
||||
'')
|
||||
(pkgs.writers.writePython3Bin "hu-eduroam-install"
|
||||
(
|
||||
pkgs.writers.writePython3Bin "hu-eduroam-install"
|
||||
{
|
||||
libraries = with pkgs.python3Packages; [ distro pyopenssl dbus-python ];
|
||||
flakeIgnore = [ "E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291" ];
|
||||
libraries = with pkgs.python3Packages; [distro pyopenssl dbus-python];
|
||||
flakeIgnore = ["E501" "E123" "W504" "E722" "F821" "E226" "E126" "E265" "W291"];
|
||||
}
|
||||
(builtins.readFile (builtins.fetchurl {
|
||||
url = "https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/linux-installer/eduroam-linux-hub.py";
|
||||
@@ -60,20 +64,22 @@ in {
|
||||
|
||||
systemd.services.hu-vpn = {
|
||||
enable = true;
|
||||
wants = [ "network-online.target" ];
|
||||
conflicts = [ "openvpn-hu-berlin.service" ];
|
||||
wants = ["network-online.target"];
|
||||
conflicts = ["openvpn-hu-berlin.service"];
|
||||
script = ''
|
||||
${pkgs.openfortivpn}/bin/openfortivpn -c ${pkgs.writeText "hu-berlin.config" ''
|
||||
${pkgs.openfortivpn}/bin/openfortivpn -c ${
|
||||
pkgs.writeText "hu-berlin.config" ''
|
||||
host = forti-ssl.vpn.hu-berlin.de
|
||||
port = 443
|
||||
trusted-cert = 42193a913d276d9eb86217612956e1e6464d6f07bed5393a4787c87adc4bd359
|
||||
username = ${eduroam.identity}@split_tunnel
|
||||
password = ${eduroam.password}
|
||||
''}
|
||||
''
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.openvpn-hu-berlin.conflicts = [ "hu-vpn.service" ];
|
||||
systemd.services.openvpn-hu-berlin.conflicts = ["hu-vpn.service"];
|
||||
|
||||
services.openvpn.servers.hu-berlin = {
|
||||
autoStart = false;
|
||||
@@ -82,8 +88,7 @@ in {
|
||||
password = eduroam.password;
|
||||
};
|
||||
config = fileContents (pkgs.fetchurl {
|
||||
url =
|
||||
"https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
|
||||
url = "https://www.cms.hu-berlin.de/de/dl/netze/vpn/openvpn/hu-berlin.ovpn";
|
||||
sha256 = "15b55aibik5460svjq2gwxrcyh6ay4k8savd6cd5lncgndmd8p8h";
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) defaultApplications colours;
|
||||
klem = import <niveum/packages/scripts/klem.nix> {
|
||||
inherit pkgs lib;
|
||||
@@ -45,7 +49,6 @@ let
|
||||
move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
|
||||
i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
|
||||
'';
|
||||
|
||||
in {
|
||||
services.xserver = {
|
||||
displayManager.defaultSession = "none+i3";
|
||||
@@ -73,7 +76,10 @@ in {
|
||||
home-manager.users.me.xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
config = rec {
|
||||
fonts = {names = ["Sans"]; size = 10.0;};
|
||||
fonts = {
|
||||
names = ["Sans"];
|
||||
size = 10.0;
|
||||
};
|
||||
modifier = "Mod4";
|
||||
window = {
|
||||
titlebar = false;
|
||||
@@ -81,15 +87,15 @@ in {
|
||||
hideEdgeBorders = "smart";
|
||||
commands = [
|
||||
{
|
||||
criteria = { class = "floating"; };
|
||||
criteria = {class = "floating";};
|
||||
command = "floating enable";
|
||||
}
|
||||
{
|
||||
criteria = { class = "fzfmenu"; };
|
||||
criteria = {class = "fzfmenu";};
|
||||
command = "floating enable";
|
||||
}
|
||||
{
|
||||
criteria = { class = "mpv"; };
|
||||
criteria = {class = "mpv";};
|
||||
command = lib.strings.concatStringsSep ", " [
|
||||
"floating enable"
|
||||
"sticky enable"
|
||||
@@ -111,31 +117,43 @@ in {
|
||||
text = colours.foreground;
|
||||
};
|
||||
in rec {
|
||||
focused = scheme // {
|
||||
focused =
|
||||
scheme
|
||||
// {
|
||||
border = colours.cyan.bright;
|
||||
indicator = colours.cyan.bright;
|
||||
childBorder = colours.cyan.bright;
|
||||
};
|
||||
unfocused = scheme // {
|
||||
unfocused =
|
||||
scheme
|
||||
// {
|
||||
border = colours.background;
|
||||
indicator = colours.background;
|
||||
childBorder = colours.background;
|
||||
};
|
||||
focusedInactive = unfocused;
|
||||
urgent = scheme // {
|
||||
urgent =
|
||||
scheme
|
||||
// {
|
||||
border = colours.red.bright;
|
||||
indicator = colours.red.bright;
|
||||
childBorder = colours.red.bright;
|
||||
};
|
||||
placeholder = scheme // {
|
||||
placeholder =
|
||||
scheme
|
||||
// {
|
||||
border = colours.green.bright;
|
||||
indicator = colours.green.bright;
|
||||
childBorder = colours.green.bright;
|
||||
};
|
||||
};
|
||||
bars = [{
|
||||
bars = [
|
||||
{
|
||||
workspaceButtons = false;
|
||||
fonts = {names = ["Sans"]; size = 8.0;};
|
||||
fonts = {
|
||||
names = ["Sans"];
|
||||
size = 8.0;
|
||||
};
|
||||
mode = "hide"; # "dock"
|
||||
position = "bottom";
|
||||
colors = rec {
|
||||
@@ -155,7 +173,8 @@ in {
|
||||
inherit pkgs;
|
||||
})
|
||||
}";
|
||||
}];
|
||||
}
|
||||
];
|
||||
modes.resize = {
|
||||
"Escape" = ''mode "default"'';
|
||||
"Return" = ''mode "default"'';
|
||||
@@ -210,7 +229,7 @@ in {
|
||||
pkgs.writers.writeDash "notemenu" ''
|
||||
set -efu
|
||||
PATH=$PATH:${
|
||||
lib.makeBinPath [ pkgs.rofi pkgs.findutils pkgs.coreutils ]
|
||||
lib.makeBinPath [pkgs.rofi pkgs.findutils pkgs.coreutils]
|
||||
}
|
||||
|
||||
cd ~/notes
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
{
|
||||
networking.firewall = {
|
||||
allowedTCPPortRanges = [{
|
||||
allowedTCPPortRanges = [
|
||||
{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
}];
|
||||
allowedUDPPortRanges = [{
|
||||
}
|
||||
];
|
||||
allowedUDPPortRanges = [
|
||||
{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
}];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
home-manager.users.me = {
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let commaSep = builtins.concatStringsSep ",";
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
commaSep = builtins.concatStringsSep ",";
|
||||
in {
|
||||
services.xserver = {
|
||||
layout = commaSep [ "de" "gr" ];
|
||||
xkbVariant = commaSep [ "T3" "polytonic" ];
|
||||
layout = commaSep ["de" "gr"];
|
||||
xkbVariant = commaSep ["T3" "polytonic"];
|
||||
xkbOptions =
|
||||
commaSep [ "compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle" ];
|
||||
commaSep ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
||||
libinput.enable = true;
|
||||
};
|
||||
|
||||
console.keyMap = "de";
|
||||
|
||||
# improve held key rate
|
||||
services.xserver.displayManager.sessionCommands =
|
||||
"${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
davHome = "~/.local/share/dav";
|
||||
kmeinCloud = {
|
||||
davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
|
||||
@@ -11,14 +15,13 @@ let
|
||||
username = "kmein";
|
||||
password = lib.fileContents <secrets/nextcloud-fysi/password>;
|
||||
};
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [ pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman ];
|
||||
in {
|
||||
environment.systemPackages = [pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman];
|
||||
|
||||
systemd.user.services.vdirsyncer = {
|
||||
enable = true;
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "default.target" ];
|
||||
wants = ["network-online.target"];
|
||||
wantedBy = ["default.target"];
|
||||
startAt = "*:00/10";
|
||||
script = ''
|
||||
${pkgs.vdirsyncer}/bin/vdirsyncer sync
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
systemd.services.lb-subscription = {
|
||||
enable = true;
|
||||
wants = [ "network-online.target" ];
|
||||
wants = ["network-online.target"];
|
||||
startAt = "weekly";
|
||||
serviceConfig = {
|
||||
user = "kfm";
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
"x-scheme-handler/webcal" = "brave-browser.desktop";
|
||||
"inode/directory" = "pcmanfm.desktop";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.nginx.virtualHosts.default = {
|
||||
locations."= /stub_status".extraConfig = "stub_status;";
|
||||
};
|
||||
@@ -35,22 +38,29 @@
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ config.services.prometheus.exporters.node.port ];
|
||||
networking.firewall.allowedTCPPorts = [config.services.prometheus.exporters.node.port];
|
||||
|
||||
systemd.services.promtail = {
|
||||
description = "Promtail service for Loki";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.grafana-loki}/bin/promtail --config.file ${(pkgs.formats.yaml {}).generate "promtail.yaml" {
|
||||
${pkgs.grafana-loki}/bin/promtail --config.file ${
|
||||
(pkgs.formats.yaml {}).generate "promtail.yaml" {
|
||||
server = {
|
||||
http_listen_port = 28183;
|
||||
grpc_listen_port = 0;
|
||||
};
|
||||
positions.filename = "/tmp/positions.yaml";
|
||||
clients = [
|
||||
{ url = "http://${if config.networking.hostName == "makanek" then "127.0.0.1" else "makanek.r"}:3100/loki/api/v1/push"; }
|
||||
{
|
||||
url = "http://${
|
||||
if config.networking.hostName == "makanek"
|
||||
then "127.0.0.1"
|
||||
else "makanek.r"
|
||||
}:3100/loki/api/v1/push";
|
||||
}
|
||||
];
|
||||
scrape_configs = [
|
||||
{
|
||||
@@ -62,13 +72,14 @@
|
||||
};
|
||||
relabel_configs = [
|
||||
{
|
||||
source_labels = [ "__journal__systemd_unit" ];
|
||||
source_labels = ["__journal__systemd_unit"];
|
||||
target_label = "unit";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}}
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,14 +1,24 @@
|
||||
{ pkgs, lib, ... }: let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
|
||||
nixpkgs-unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
|
||||
in {
|
||||
environment.shellAliases.smpv = swallow "mpv";
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
mpv = config.home-manager.users.me.programs.mpv.finalPackage;
|
||||
})
|
||||
];
|
||||
|
||||
home-manager.users.me = {
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
config = {
|
||||
ytdl-raw-options = lib.concatStringsSep "," [ ''sub-lang="de,en"'' "write-sub=" "write-auto-sub=" ];
|
||||
ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
|
||||
screenshot-template = "%F-%wH%wM%wS-%#04n";
|
||||
};
|
||||
bindings = {
|
||||
@@ -22,7 +32,8 @@ in {
|
||||
"Alt+j" = "add video-pan-y -0.05";
|
||||
};
|
||||
scripts = [
|
||||
nixpkgs-unstable.mpvScripts.youtube-quality
|
||||
pkgs.mpvScripts.youtube-quality
|
||||
(pkgs.callPackage <niveum/packages/mpv-visualizer.nix> {})
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
mainMailbox = "posteo";
|
||||
|
||||
accounts.uni = {
|
||||
@@ -113,13 +116,13 @@ let
|
||||
trash = "[Gmail]/Papierkorb";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [ pkgs.neomutt ];
|
||||
in {
|
||||
environment.systemPackages = [pkgs.neomutt];
|
||||
environment.shellAliases.mua = "${pkgs.neomutt}/bin/neomutt -f ${mainMailbox}←";
|
||||
|
||||
home-manager.users.me.xdg.configFile."neomutt/neomuttrc".text = ''
|
||||
set mailcap_path = ${pkgs.writeText "mailcap" ''
|
||||
set mailcap_path = ${
|
||||
pkgs.writeText "mailcap" ''
|
||||
text/plain; $EDITOR %s ;
|
||||
text/html; ${pkgs.lynx}/bin/lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput;
|
||||
image/*; ${pkgs.sxiv}/bin/sxiv %s ;
|
||||
@@ -128,7 +131,8 @@ in
|
||||
application/pdf; ${pkgs.zathura}/bin/zathura %s ;
|
||||
application/pgp-encrypted; ${pkgs.gnupg}/bin/gpg -d '%s'; copiousoutput;
|
||||
application/pgp-keys; ${pkgs.gnupg}/bin/gpg --import '%s'; copiousoutput;
|
||||
''}:$mailcap_path
|
||||
''
|
||||
}:$mailcap_path
|
||||
|
||||
set sidebar_visible
|
||||
set sidebar_format = "%D%?F? [%F]?%* %?N?%N/?%S"
|
||||
@@ -180,21 +184,29 @@ in
|
||||
|
||||
set header_cache="~/.cache/mutt" message_cachedir="~/.cache/mutt"
|
||||
|
||||
source ${pkgs.writeText "accounts.neomuttrc" ''
|
||||
source ${
|
||||
pkgs.writeText "accounts.neomuttrc" ''
|
||||
set realname = "Kierán Meinhardt"
|
||||
account-hook . 'unset imap_user imap_pass smtp_user smtp_pass'
|
||||
# set accordingly: postponed trash record
|
||||
${lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: let imapRoot = "imaps://${account.user}@${account.imap}"; in ''
|
||||
${
|
||||
lib.concatStringsSep "\n\n" (lib.mapAttrsToList (name: account: let
|
||||
imapRoot = "imaps://${account.user}@${account.imap}";
|
||||
in ''
|
||||
account-hook ${account.user}@${account.imap} 'set imap_user="${account.user}" imap_pass="${account.password}"'
|
||||
account-hook ${account.user}@${account.smtp} 'set smtp_user="${account.user}" smtp_pass="${account.password}"'
|
||||
folder-hook ${account.user}@${account.imap} 'set smtp_url="${account.smtpSettings "${account.user}@${account.smtp}"}" from="${account.address}" record="${imapRoot}/${account.folders.sent}" postponed="${imapRoot}/${account.folders.drafts}" trash="${imapRoot}/${account.folders.trash}"'
|
||||
named-mailboxes "${name}←" "${imapRoot}" "${name}→" "${imapRoot}/${account.folders.sent}"
|
||||
'') accounts)}
|
||||
''}
|
||||
'')
|
||||
accounts)
|
||||
}
|
||||
''
|
||||
}
|
||||
|
||||
set spoolfile="${mainMailbox}"
|
||||
|
||||
source ${pkgs.writeText "colors.neomuttrc" ''
|
||||
source ${
|
||||
pkgs.writeText "colors.neomuttrc" ''
|
||||
# Default index colors:
|
||||
color index_number blue default
|
||||
color index red default '.*'
|
||||
@@ -243,6 +255,7 @@ in
|
||||
mono body bold "^gpg: Good signature"
|
||||
mono body bold "^gpg: BAD signature from.*"
|
||||
color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
|
||||
''}
|
||||
''
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
|
||||
environment.shellAliases.vi = "nvim";
|
||||
environment.shellAliases.vim = "nvim";
|
||||
environment.shellAliases.view = "nvim -R";
|
||||
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vimPlugins = pkgs.vimPlugins // {
|
||||
cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> { };
|
||||
vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> { };
|
||||
vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> { };
|
||||
vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> { };
|
||||
icalendar-vim = pkgs.callPackage <niveum/packages/vimPlugins/icalendar-vim.nix> { };
|
||||
jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> { };
|
||||
vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> { };
|
||||
vim-reason-plus = pkgs.callPackage <niveum/packages/vimPlugins/vim-reason-plus.nix> { };
|
||||
vim-mail = pkgs.callPackage <niveum/packages/vimPlugins/vim-mail.nix> { };
|
||||
vimPlugins =
|
||||
pkgs.vimPlugins
|
||||
// {
|
||||
cheat-sh-vim = pkgs.callPackage <niveum/packages/vimPlugins/cheat-sh.nix> {};
|
||||
vim-fetch = pkgs.callPackage <niveum/packages/vimPlugins/vim-fetch.nix> {};
|
||||
vim-colors-paramount = pkgs.callPackage <niveum/packages/vimPlugins/vim-colors-paramount.nix> {};
|
||||
vim-256noir = pkgs.callPackage <niveum/packages/vimPlugins/vim-256noir.nix> {};
|
||||
icalendar-vim = pkgs.callPackage <niveum/packages/vimPlugins/icalendar-vim.nix> {};
|
||||
jq-vim = pkgs.callPackage <niveum/packages/vimPlugins/jq-vim.nix> {};
|
||||
vim-fsharp = pkgs.callPackage <niveum/packages/vimPlugins/vim-fsharp.nix> {};
|
||||
vim-reason-plus = pkgs.callPackage <niveum/packages/vimPlugins/vim-reason-plus.nix> {};
|
||||
vim-mail = pkgs.callPackage <niveum/packages/vimPlugins/vim-mail.nix> {};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
profile = name: custom: lib.recursiveUpdate {
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
profile = name: custom:
|
||||
lib.recursiveUpdate {
|
||||
connection.id = name;
|
||||
connection.type = "wifi";
|
||||
connection.interface-name = "wlp3s0";
|
||||
@@ -14,7 +18,8 @@ let
|
||||
ipv6.dns-search = "";
|
||||
ipv6.method = "auto";
|
||||
proxy = {};
|
||||
} custom;
|
||||
}
|
||||
custom;
|
||||
eduroamProfile = {
|
||||
connection.uuid = "eae9fee6-a7d2-4120-a609-440b457d6fcf";
|
||||
wifi-security = {
|
||||
@@ -36,15 +41,20 @@ let
|
||||
phase2-auth = "pap";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [ <niveum/modules/networkmanager-declarative.nix> ];
|
||||
in {
|
||||
imports = [<niveum/modules/networkmanager-declarative.nix>];
|
||||
|
||||
programs.nm-applet.enable = true;
|
||||
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
packages = [
|
||||
pkgs.networkmanager-openvpn
|
||||
pkgs.networkmanager-fortisslvpn
|
||||
];
|
||||
wifi.macAddress = "random";
|
||||
ethernet.macAddress = "random";
|
||||
unmanaged = [ "docker*" ];
|
||||
unmanaged = ["docker*"];
|
||||
profiles = lib.mapAttrs profile {
|
||||
Aether = {
|
||||
connection.uuid = "7138bb0f-1aeb-4905-890e-a6628427aa21";
|
||||
@@ -80,7 +90,12 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
users.users.me.extraGroups = [ "networkmanager" ];
|
||||
users.users.me.extraGroups = ["networkmanager"];
|
||||
|
||||
environment.systemPackages = [ pkgs.speedtest-cli ];
|
||||
environment.systemPackages = [
|
||||
pkgs.speedtest-cli
|
||||
pkgs.networkmanager-openvpn
|
||||
pkgs.networkmanagerapplet
|
||||
pkgs.networkmanager-fortisslvpn
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
ytdl-format = "'bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best'";
|
||||
|
||||
youtube-download = "${pkgs.ts}/bin/ts ${pkgs.youtube-dl}/bin/youtube-dl -f ${ytdl-format} --add-metadata";
|
||||
|
||||
newsboat-home =
|
||||
"${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
|
||||
newsboat-home = "${config.users.users.me.home}/cloud/Seafile/Documents/newsboat";
|
||||
linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
|
||||
|
||||
newsboat-config = pkgs.writeText "config" ''
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
nixpkgs = {
|
||||
config.allowUnfree = true;
|
||||
overlays = [
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
openweathermap-repo = pkgs.fetchFromGitHub {
|
||||
owner = "ip1981";
|
||||
repo = "openweathermap";
|
||||
@@ -15,5 +18,5 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.weather ];
|
||||
environment.systemPackages = [pkgs.weather];
|
||||
}
|
||||
|
||||
@@ -1,13 +1,19 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
|
||||
worldradio = pkgs.callPackage <niveum/packages/worldradio.nix> {};
|
||||
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 }: {
|
||||
zoteroStyle = {
|
||||
name,
|
||||
sha256,
|
||||
}: {
|
||||
name = "${name}.csl";
|
||||
path = pkgs.fetchurl {
|
||||
url = "https://www.zotero.org/styles/${name}";
|
||||
@@ -17,20 +23,21 @@ let
|
||||
cslDirectory = pkgs.linkFarm "citation-styles" [
|
||||
(zoteroStyle {
|
||||
name = "chicago-author-date-de";
|
||||
sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
|
||||
sha256 = "sha256-ddMYk4A9DJQhx9ldkmF7PhwKuc7wUSr26uHHGAze9Ps=";
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "din-1505-2";
|
||||
sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
|
||||
sha256 = "sha256-bXZbB850fek8J6wMVFL32ndI7F4wiKKr1qUC71ezreE=";
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "apa";
|
||||
sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
|
||||
sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old: old // {
|
||||
astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old:
|
||||
old
|
||||
// {
|
||||
installPhase = ''
|
||||
${old.installPhase}
|
||||
# set sensible defaults
|
||||
@@ -50,7 +57,6 @@ let
|
||||
});
|
||||
|
||||
recht = pkgs.callPackage <recht> {};
|
||||
|
||||
in {
|
||||
home-manager.users.me.home.file = {
|
||||
".csl".source = cslDirectory;
|
||||
@@ -115,11 +121,13 @@ in {
|
||||
xorg.xkill # kill by clicking
|
||||
audacity
|
||||
calibre
|
||||
electrum
|
||||
inkscape
|
||||
astrolog
|
||||
anki # flashcards
|
||||
jbofihe # lojbanic software
|
||||
nixpkgs-unstable.zoom-us # video conferencing
|
||||
nixpkgs-unstable.alejandra # nix formatter
|
||||
pdfgrep # search in pdf
|
||||
pdftk # pdf toolkit
|
||||
mupdf
|
||||
@@ -197,7 +205,7 @@ in {
|
||||
(pkgs.writers.writeDashBin "ncmpcpp-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.ncmpcpp}/bin/ncmpcpp "$@"'')
|
||||
(pkgs.writers.writeDashBin "mpc-zaatar" ''MPD_HOST=${(import <niveum/lib/local-network.nix>).zaatar} exec ${pkgs.mpc_cli}/bin/mpc "$@"'')
|
||||
|
||||
nixpkgs-unstable.spotify
|
||||
spotify
|
||||
ncspot
|
||||
playerctl
|
||||
|
||||
@@ -235,7 +243,7 @@ in {
|
||||
nodePackages.javascript-typescript-langserver
|
||||
texlive.combined.scheme-full
|
||||
latexrun
|
||||
(aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ]))
|
||||
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
||||
# haskellPackages.pandoc-citeproc
|
||||
scripts.text2pdf
|
||||
lowdown
|
||||
@@ -253,12 +261,15 @@ in {
|
||||
binutils # for strip, ld, ...
|
||||
# nightly.rust
|
||||
shellcheck
|
||||
];
|
||||
|
||||
(pkgs.writers.writeDashBin "hass-cli" ''
|
||||
HASS_SERVER=http://zaatar.r:8123 HASS_TOKEN=${lib.strings.fileContents <secrets/hass/token>} exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
|
||||
'')
|
||||
scripts.rofi-hass
|
||||
];
|
||||
|
||||
home-manager.users.me.xdg.configFile."pycodestyle".text = ''
|
||||
[pycodestyle]
|
||||
max-line-length = 110
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
11
configs/polkit.nix
Normal file
11
configs/polkit.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{config, ...}: let
|
||||
user = config.users.users.me.name;
|
||||
in {
|
||||
security.polkit.extraConfig = ''
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (subject.user == "${user}" && action.id == "org.freedesktop.systemd1.manage-units") {
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
});
|
||||
'';
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
|
||||
in
|
||||
{
|
||||
imports = [ <stockholm/krebs/3modules/power-action.nix> ];
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
|
||||
in {
|
||||
imports = [<stockholm/krebs/3modules/power-action.nix>];
|
||||
|
||||
krebs.power-action = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
inherit (import <niveum/lib>) localAddresses;
|
||||
hp-driver = pkgs.hplipWithPlugin;
|
||||
in {
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = [ hp-driver ];
|
||||
drivers = [hp-driver];
|
||||
};
|
||||
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = [ hp-driver ];
|
||||
extraBackends = [hp-driver];
|
||||
};
|
||||
|
||||
hardware.printers.ensurePrinters = [{
|
||||
hardware.printers.ensurePrinters = [
|
||||
{
|
||||
name = "OfficeJet";
|
||||
location = "Zimmer";
|
||||
deviceUri = "https://${localAddresses.officejet}";
|
||||
@@ -25,9 +25,11 @@ in {
|
||||
OutputMode = "Normal";
|
||||
ColorModel = "KGray"; # RGB CMYGray KGray
|
||||
};
|
||||
}];
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
/* HP/hp-officejet_4650_series.ppd.gz
|
||||
/*
|
||||
HP/hp-officejet_4650_series.ppd.gz
|
||||
drv:///hp/hpcups.drv/hp-officejet_4650_series.ppd
|
||||
*/
|
||||
*/
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
{ services.redshift.enable = false; }
|
||||
{services.redshift.enable = false;}
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
<niveum/modules/retiolum.nix>
|
||||
];
|
||||
|
||||
networking.hosts = { "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ]; };
|
||||
networking.hosts = {"42:0:ca48:f98f:63d7:31ce:922b:245d" = ["go"];};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) colours;
|
||||
in{
|
||||
in {
|
||||
home-manager.users.me.programs.rofi = {
|
||||
enable = true;
|
||||
font = "Monospace 10";
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
|
||||
|
||||
home-manager.users.me.xdg.configFile = {
|
||||
@@ -16,5 +19,5 @@
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.seafile-client ];
|
||||
environment.systemPackages = [pkgs.seafile-client];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) sshPort kieran;
|
||||
in {
|
||||
services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";
|
||||
@@ -25,6 +29,11 @@ in {
|
||||
user = "root";
|
||||
port = sshPort;
|
||||
};
|
||||
tahina = {
|
||||
hostname = "tahina.r";
|
||||
user = "root";
|
||||
port = sshPort;
|
||||
};
|
||||
manakish = {
|
||||
hostname = "manakish.r";
|
||||
user = "kfm";
|
||||
@@ -48,6 +57,10 @@ in {
|
||||
hostname = "135.181.85.233";
|
||||
user = "root";
|
||||
};
|
||||
oracle = {
|
||||
hostname = "130.61.171.199";
|
||||
user = "ubuntu";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
inherit (import <niveum/lib>) sshPort kieran;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) sshPort kieran;
|
||||
in {
|
||||
users.motd = "Welcome to ${config.networking.hostName}!";
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
ports = [ sshPort ];
|
||||
ports = [sshPort];
|
||||
passwordAuthentication = false;
|
||||
forwardX11 = true;
|
||||
};
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
dictionaries = {
|
||||
lojban = {
|
||||
jbo-deu = pkgs.fetchzip {
|
||||
@@ -100,7 +104,9 @@ let
|
||||
sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
|
||||
};
|
||||
};
|
||||
sanskrit = let repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f"; in {
|
||||
sanskrit = let
|
||||
repo = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f";
|
||||
in {
|
||||
BoehtlingkRoth = pkgs.fetchzip {
|
||||
url = "${repo}/sa-head/german-entries/tars/Bohtlingk-and-Roth-Grosses-Petersburger-Worterbuch__2021-10-05_14-23-18Z__19MB.tar.gz";
|
||||
sha256 = "13414a8rgd7hd5ffar6nl68nk3ys60wjkgb7m11hp0ahaasmf6ly";
|
||||
@@ -154,9 +160,10 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: { inherit name path; }) dicts);
|
||||
makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (lib.mapAttrsToList (name: path: {inherit name path;}) dicts);
|
||||
|
||||
makeStardict = name: dicts: pkgs.writers.writeDashBin name ''
|
||||
makeStardict = name: dicts:
|
||||
pkgs.writers.writeDashBin name ''
|
||||
set -efu
|
||||
export SDCV_PAGER=${toString sdcvPager}
|
||||
exec ${pkgs.sdcv}/bin/sdcv --color --only-data-dir --data-dir ${makeStardictDataDir dicts} "$@"
|
||||
@@ -266,8 +273,7 @@ let
|
||||
s!</\?p[^>]*>!!gI
|
||||
" | less -FR
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
environment.etc.stardict.source = toString (makeStardictDataDir ({
|
||||
Crum = pkgs.fetchzip {
|
||||
url = "http://download.huzheng.org/misc/stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
|
||||
@@ -281,7 +287,12 @@ in
|
||||
url = "https://github.com/latin-dict/Smith1890/releases/download/v1.0/Smith1890-stardict.zip";
|
||||
sha256 = "0vpsv62p2lrzmgys4d1swpnc6lqhdi7rxwkj2ngy3lz5dk3fysyb";
|
||||
};
|
||||
} // dictionaries.classics // dictionaries.sanskrit // dictionaries.oed // dictionaries.russian // dictionaries.englishGerman));
|
||||
}
|
||||
// dictionaries.classics
|
||||
// dictionaries.sanskrit
|
||||
// dictionaries.oed
|
||||
// dictionaries.russian
|
||||
// dictionaries.englishGerman));
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.goldendict
|
||||
@@ -293,65 +304,65 @@ in
|
||||
(makeStardict "jbo" dictionaries.lojban)
|
||||
];
|
||||
}
|
||||
|
||||
/*
|
||||
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
|
||||
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
|
||||
|
||||
Duden_Rechtschreibung = pkgs.fetchzip {
|
||||
Duden_Rechtschreibung = pkgs.fetchzip {
|
||||
url = "http://download.huzheng.org/babylon/german/stardict-Duden_Rechtschreibung-2.4.2.tar.bz2";
|
||||
sha256 = "0xiprb45s88w62rn8rlbjrsagbiliay9hszsiy20glwabf6zsfji";
|
||||
};
|
||||
Duden = pkgs.fetchzip {
|
||||
};
|
||||
Duden = pkgs.fetchzip {
|
||||
url = "http://download.huzheng.org/de/stardict-duden-2.4.2.tar.bz2";
|
||||
sha256 = "049i4ynfqqxykv1nlkyks94mvn14s22qdax5gg7hx1ks5y4xw64j";
|
||||
};
|
||||
FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
|
||||
};
|
||||
FreeOnlineDictionaryOfComputing = pkgs.fetchzip {
|
||||
url = "http://download.huzheng.org/dict.org/stardict-dictd_www.dict.org_foldoc-2.4.2.tar.bz2";
|
||||
sha256 = "1lw2i8dzxpx929cpgvv0x366dnh4drr10wzqmrhcd0kvwglqawgm";
|
||||
};
|
||||
Cappeller = pkgs.fetchzip {
|
||||
};
|
||||
Cappeller = pkgs.fetchzip {
|
||||
url = "${repo}/sa-head/german-entries/tars/capeller-sanskrit-german__2021-10-05_14-23-18Z__1MB.tar.gz";
|
||||
sha256 = "0jwrj2aih2lrcjg0lqm8jrvq9vsas9s8j4c9ggbg2n0jyz03kci3";
|
||||
stripRoot = false;
|
||||
};
|
||||
Yates = pkgs.fetchzip {
|
||||
};
|
||||
Yates = pkgs.fetchzip {
|
||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/yates__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||
sha256 = "1k7gbalysf48pwa06zfykrqhdk466g35xy64b30k4z8bybgdn8z2";
|
||||
stripRoot = false;
|
||||
};
|
||||
Wilson = pkgs.fetchzip {
|
||||
};
|
||||
Wilson = pkgs.fetchzip {
|
||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/wilson__2021-10-05_14-23-18Z__3MB.tar.gz";
|
||||
sha256 = "0r5z1xif56zlw9r2jp3fvwmcjv4f2fhd9r17j30nah9awx2m1isg";
|
||||
stripRoot = false;
|
||||
};
|
||||
SpokenSanskrit = pkgs.fetchzip {
|
||||
};
|
||||
SpokenSanskrit = pkgs.fetchzip {
|
||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/spokensanskrit__2019-01-12_05-13-52Z__12MB.tar.gz";
|
||||
sha256 = "0x8j657mawvdcyd1knzvf33yp15z77d661n3h6g9hcj7wn9s5xyk";
|
||||
stripRoot = false;
|
||||
};
|
||||
Grassmann = pkgs.fetchzip {
|
||||
};
|
||||
Grassmann = pkgs.fetchzip {
|
||||
url = "${repo}/sa-head/german-entries/tars/grassman-sanskrit-german__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||
sha256 = "0jalsykaxkl6wzrky72lz8g3jdz26lmjpyibbfaf7a5vvnr55k02";
|
||||
stripRoot = false;
|
||||
};
|
||||
Benfey = pkgs.fetchzip {
|
||||
};
|
||||
Benfey = pkgs.fetchzip {
|
||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/benfey__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||
sha256 = "0lj3hgphqgnihn482g9kgjwbvdrcd38vc29v1fi36srn08qdhvcb";
|
||||
stripRoot = false;
|
||||
};
|
||||
ApteSa = pkgs.fetchzip {
|
||||
};
|
||||
ApteSa = pkgs.fetchzip {
|
||||
url = "${repo}/sa-head/en-entries/tars/apte-sa__2021-12-18_13-20-56Z__6MB.tar.gz";
|
||||
sha256 = "0cq1dd02d1pvmjnibbs2cscifjnk2z0nqccf5yzzilxkzsrarh32";
|
||||
stripRoot = false;
|
||||
};
|
||||
MacDonell = pkgs.fetchzip {
|
||||
};
|
||||
MacDonell = pkgs.fetchzip {
|
||||
url = "https://github.com/indic-dict/stardict-sanskrit/raw/4ebd2d3db5820f7cbe3a649c3d5aa8f83d19b29f/sa-head/en-entries/tars/macdonell__2021-10-05_14-23-18Z__2MB.tar.gz";
|
||||
sha256 = "1yzmj0393mxvjv4n2lnvd2c722v2bmxxiyq7pscdwni3bxip3h8s";
|
||||
stripRoot = false;
|
||||
};
|
||||
*/
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
'';
|
||||
};
|
||||
|
||||
users.users.me.extraGroups = [ "wheel" ];
|
||||
users.users.me.extraGroups = ["wheel"];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
important-directories = pkgs.writeText "directories" ''
|
||||
h ~/
|
||||
d ~/cloud/Dropbox/
|
||||
@@ -12,11 +15,10 @@ let
|
||||
cf ''${XDG_CONFIG_HOME:-$HOME/.config}
|
||||
'';
|
||||
in {
|
||||
environment.systemPackages = [ pkgs.sxiv ];
|
||||
environment.systemPackages = [pkgs.sxiv];
|
||||
|
||||
# TODO fix
|
||||
home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source =
|
||||
pkgs.writers.writeDash "key-handler" ''
|
||||
home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" ''
|
||||
PATH=$PATH:${
|
||||
lib.makeBinPath [
|
||||
pkgs.gnused
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
nixpkgs-unstable = import <nixpkgs-unstable> {};
|
||||
toSymbols = pkgs.writers.writeDash "to-symbols" ''
|
||||
${pkgs.gnused}/bin/sed '
|
||||
@@ -42,7 +45,7 @@ in {
|
||||
enable = true;
|
||||
time = "*:0/1";
|
||||
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
||||
chatIds = [ "-1001796440545" ];
|
||||
chatIds = ["-1001796440545"];
|
||||
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')
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
autorenkalender-package = pkgs.fetchFromGitHub {
|
||||
owner = "kmein";
|
||||
repo = "autorenkalender";
|
||||
@@ -7,13 +10,13 @@ let
|
||||
sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
|
||||
};
|
||||
autorenkalender =
|
||||
pkgs.python3Packages.callPackage autorenkalender-package { };
|
||||
pkgs.python3Packages.callPackage autorenkalender-package {};
|
||||
in {
|
||||
niveum.telegramBots.autorenkalender = {
|
||||
enable = true;
|
||||
time = "07:00";
|
||||
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
||||
chatIds = [ "@autorenkalender" ];
|
||||
chatIds = ["@autorenkalender"];
|
||||
parseMode = "Markdown";
|
||||
command = "${autorenkalender}/bin/autorenkalender";
|
||||
};
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
telebots = pkgs.callPackage <telebots> {};
|
||||
reverseDirectory = "/run/telegram-reverse";
|
||||
proverbDirectory = "/run/telegram-proverb";
|
||||
@@ -14,17 +18,18 @@ in {
|
||||
<niveum/modules/telegram-bot.nix>
|
||||
];
|
||||
|
||||
systemd.tmpfiles.rules = map (path: tmpfilesConfig {
|
||||
systemd.tmpfiles.rules = map (path:
|
||||
tmpfilesConfig {
|
||||
type = "d";
|
||||
mode = "0750";
|
||||
age = "1h";
|
||||
inherit path;
|
||||
}) [ reverseDirectory proverbDirectory ];
|
||||
}) [reverseDirectory proverbDirectory];
|
||||
|
||||
systemd.services.telegram-reverse = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
description = "Telegram reverse bot";
|
||||
path = [ pkgs.ffmpeg ];
|
||||
path = [pkgs.ffmpeg];
|
||||
environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/reverse.token>;
|
||||
enable = true;
|
||||
script = "${telebots}/bin/telegram-reverse";
|
||||
@@ -33,7 +38,7 @@ in {
|
||||
};
|
||||
|
||||
systemd.services.telegram-betacode = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
description = "Telegram beta code bot";
|
||||
environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/betacode.token>;
|
||||
enable = true;
|
||||
@@ -42,7 +47,7 @@ in {
|
||||
};
|
||||
|
||||
systemd.services.telegram-proverb = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
description = "Telegram proverb bot";
|
||||
environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/proverb.token>;
|
||||
enable = true;
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
|
||||
inherit (scripts) literature-quote;
|
||||
in {
|
||||
niveum.telegramBots.quotebot = {
|
||||
enable = true;
|
||||
time = "08/6:00";
|
||||
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
||||
chatIds = [ "18980945" "757821027" "455964311" ];
|
||||
chatIds = ["18980945" "757821027" "455964311"];
|
||||
command = "${literature-quote}/bin/literature-quote";
|
||||
parseMode = "Markdown";
|
||||
};
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
nachtischsatan-bot = { token }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
nachtischsatan-bot = {token}:
|
||||
pkgs.writers.writePython3 "nachtischsatan-bot" {
|
||||
libraries = [ pkgs.python3Packages.python-telegram-bot ];
|
||||
libraries = [pkgs.python3Packages.python-telegram-bot];
|
||||
} ''
|
||||
from telegram.ext import Updater, MessageHandler
|
||||
from telegram.ext.filters import Filters
|
||||
@@ -23,7 +26,7 @@ let
|
||||
'';
|
||||
in {
|
||||
systemd.services.telegram-nachtischsatan = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
description = "*flubberflubber*";
|
||||
enable = true;
|
||||
script = toString (nachtischsatan-bot {
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
niveum.telegramBots.tlg-wotd = {
|
||||
enable = true;
|
||||
time = "9:30";
|
||||
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
||||
chatIds = [ "@tlgwotd" ];
|
||||
chatIds = ["@tlgwotd"];
|
||||
command = toString (pkgs.writers.writeDash "tlg-wotd" ''
|
||||
${pkgs.curl}/bin/curl -sSL http://stephanus.tlg.uci.edu/Iris/Wotd \
|
||||
| ${pkgs.recode}/bin/recode html..utf8 \
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
theme = (import <niveum/lib>).theme pkgs;
|
||||
in {
|
||||
environment.systemPackages =
|
||||
[ theme.gtk.package theme.icon.package theme.cursor.package ];
|
||||
environment.systemPackages = [theme.gtk.package theme.icon.package theme.cursor.package];
|
||||
|
||||
services.xserver.displayManager.lightdm.greeters.gtk = {
|
||||
theme = { inherit (theme.gtk) name package; };
|
||||
iconTheme = { inherit (theme.icon) name package; };
|
||||
theme = {inherit (theme.gtk) name package;};
|
||||
iconTheme = {inherit (theme.icon) name package;};
|
||||
};
|
||||
|
||||
home-manager.users.me = {
|
||||
@@ -20,6 +23,6 @@ in {
|
||||
enable = true;
|
||||
platformTheme = "gtk";
|
||||
};
|
||||
xsession.pointerCursor = theme.cursor // { size = 16; };
|
||||
xsession.pointerCursor = theme.cursor // {size = 16;};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
environment.systemPackages = [
|
||||
pkgs.tmuxp
|
||||
pkgs.reptyr # move programs over to a tmux session
|
||||
@@ -9,26 +9,44 @@
|
||||
keyMode = "vi";
|
||||
clock24 = true;
|
||||
terminal = "screen-256color";
|
||||
baseIndex = 1;
|
||||
aggressiveResize = true;
|
||||
escapeTime = 50;
|
||||
historyLimit = 7000;
|
||||
shortcut = "a";
|
||||
extraConfig = ''
|
||||
set -g mouse on
|
||||
|
||||
unbind *
|
||||
bind * list-clients
|
||||
|
||||
# naVIgate
|
||||
bind h select-pane -L
|
||||
bind j select-pane -D
|
||||
bind k select-pane -U
|
||||
bind l select-pane -R
|
||||
|
||||
# Use C-h and C-l to cycle through panes
|
||||
bind -r C-h select-window -t :-
|
||||
bind -r C-l select-window -t :+
|
||||
|
||||
setw -g monitor-activity on
|
||||
set -g visual-activity on
|
||||
|
||||
set -g status-interval 2
|
||||
set -g status-left-length 32
|
||||
set -g status-right-length 150
|
||||
|
||||
set -g status-bg default
|
||||
set -g status-bg colour242
|
||||
|
||||
setw -g window-status-format "#[fg=colour12,bg=colour233] #I #[fg=white,bg=colour237] #W "
|
||||
setw -g window-status-current-format "#[fg=colour12,bg=colour233] * #[fg=white,bg=colour237,bold] #W "
|
||||
|
||||
set -g status-left ""
|
||||
set -g status-right "#[fg=colour255,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour12,bg=colour233] %H:%M "
|
||||
set -g status-right "#[fg=colour255,bg=colour237,bold] #(hostname -I) #[default]#[fg=colour12,bg=colour233] %FT%R "
|
||||
set -g status-justify left
|
||||
|
||||
set -g status-position bottom
|
||||
|
||||
set -g mouse on
|
||||
|
||||
unbind *
|
||||
bind * list-clients
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) localAddresses;
|
||||
living-room-id = 131090;
|
||||
in
|
||||
{
|
||||
imports = [ <niveum/modules/traadfri.nix> ];
|
||||
in {
|
||||
imports = [<niveum/modules/traadfri.nix>];
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.writers.writeDashBin "traadfri-party" ''
|
||||
@@ -29,7 +31,7 @@ in
|
||||
bedroom = 131082;
|
||||
living-room = living-room-id;
|
||||
bedside = 131087;
|
||||
chain = 131089;
|
||||
};
|
||||
bulbs.kette = 65570;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{ pkgs, ... }: { environment.systemPackages = [ pkgs.vscode ]; }
|
||||
{pkgs, ...}: {environment.systemPackages = [pkgs.vscode];}
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
imports = [ <stockholm/krebs/3modules/fetchWallpaper.nix> ];
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [<stockholm/krebs/3modules/fetchWallpaper.nix>];
|
||||
|
||||
krebs.fetchWallpaper = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.watson ];
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = [pkgs.watson];
|
||||
|
||||
environment.variables.WATSON_DIR = "${config.users.users.me.home}/cloud/Seafile/Documents/watson";
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home-manager.users.me.home.file.".zshrc".text = ''
|
||||
# nothing to see here
|
||||
'';
|
||||
@@ -21,7 +25,7 @@
|
||||
enableCompletion = true;
|
||||
autosuggestions.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
syntaxHighlighting.highlighters = [ "main" "brackets" "pattern" "line" ];
|
||||
syntaxHighlighting.highlighters = ["main" "brackets" "pattern" "line"];
|
||||
interactiveShellInit = ''
|
||||
setopt INTERACTIVE_COMMENTS CORRECT
|
||||
setopt MULTIOS
|
||||
|
||||
52
flake.lock
generated
52
flake.lock
generated
@@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1638122382,
|
||||
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||
"lastModified": 1648297722,
|
||||
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
|
||||
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -22,11 +22,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639871969,
|
||||
"narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
|
||||
"lastModified": 1647175256,
|
||||
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "697cc8c68ed6a606296efbbe9614c32537078756",
|
||||
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -46,11 +46,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1632420452,
|
||||
"narHash": "sha256-ncK6vABW/Ku9XI0kqj1otarUfblryoQzSaOCnaZ0oSs=",
|
||||
"lastModified": 1644957911,
|
||||
"narHash": "sha256-ggie/j7pdBqzDs4W7OiPmhqH9IGbXAbJxGqBdVxA8jA=",
|
||||
"owner": "Mic92",
|
||||
"repo": "krops",
|
||||
"rev": "0388970c568905fedcbf429e5745aacd4f7a6633",
|
||||
"rev": "86fb3d2ee94fd8306231853b323ed8804edf26ec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -109,27 +109,27 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1641829252,
|
||||
"narHash": "sha256-CI0qi7k1Y4nFna+kdQtVCbN4ZEVwZcD/oIGgfTcUNrA=",
|
||||
"lastModified": 1647992509,
|
||||
"narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5d3420c1285073d5061a5d88a533b347d1222750",
|
||||
"rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-21.11",
|
||||
"ref": "nixos-21.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1641935776,
|
||||
"narHash": "sha256-8q/V9EgzyW0KvGnBjbTfQ19qoTCFqsEd1mF9DheCukw=",
|
||||
"lastModified": 1648337267,
|
||||
"narHash": "sha256-8DRg8UDvs63iaIaHEbWG7/lnD9ImQlMNsTZMY3PvFLc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bd20b7f07fd337b2e85420edd642382a2cc0196d",
|
||||
"rev": "6de161729c81dc98e844793cc9c8fda29d5ef62a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -158,11 +158,11 @@
|
||||
"retiolum": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1643137996,
|
||||
"narHash": "sha256-Fvmq2i8l9drzU91uvHmx0eeqr06/o+y28RgVmwcTYZ4=",
|
||||
"lastModified": 1647444524,
|
||||
"narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
|
||||
"owner": "krebs",
|
||||
"repo": "retiolum",
|
||||
"rev": "bbed4ffd74987bb9a577ae6290ed446c3f27f594",
|
||||
"rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -194,11 +194,11 @@
|
||||
"scripts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1639436812,
|
||||
"narHash": "sha256-6CajvfDo7t4ANgjc7DxqH7lI3WRE4MK8q3mBKAjk80k=",
|
||||
"lastModified": 1648314795,
|
||||
"narHash": "sha256-hGIXkAcGiJnVXnl8kigZpI3VFrLmAr2+yr85hi5JwP0=",
|
||||
"owner": "kmein",
|
||||
"repo": "scripts",
|
||||
"rev": "d34a8161ba11135a45d3141dc9af482db945d63c",
|
||||
"rev": "d1d525b92a34e55b1ad886807c284106e58716b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -210,11 +210,11 @@
|
||||
"stockholm": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1641747862,
|
||||
"narHash": "sha256-gAGM3sxCP//k83CUow3ZpeHQCeuW62YJ6kWvWd8D1vk=",
|
||||
"lastModified": 1648214990,
|
||||
"narHash": "sha256-rptATGq+jcpL+P+Cr6d3OajV6zYkbHPWlt3aQNZI2TY=",
|
||||
"ref": "master",
|
||||
"rev": "f67bd5783d6ed2be836c7714ea38cbb3f7ac7257",
|
||||
"revCount": 10285,
|
||||
"rev": "ae9c0b12710b5361d0d45510eb401eebfc1b3fb0",
|
||||
"revCount": 10497,
|
||||
"type": "git",
|
||||
"url": "https://cgit.lassul.us/stockholm"
|
||||
},
|
||||
|
||||
124
flake.nix
124
flake.nix
@@ -2,7 +2,7 @@
|
||||
description = "niveum: packages, modules, systems";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/release-21.11";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
home-manager = {
|
||||
@@ -16,42 +16,75 @@
|
||||
};
|
||||
|
||||
# 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; };
|
||||
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
|
||||
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: {
|
||||
source = name:
|
||||
{
|
||||
niveum.file = toString ./.;
|
||||
nixos-config.symlink = "niveum/systems/${name}/configuration.nix";
|
||||
system-secrets.pass = {
|
||||
@@ -62,12 +95,19 @@
|
||||
dir = toString ~/.password-store;
|
||||
name = "shared";
|
||||
};
|
||||
} // nixpkgs.lib.mapAttrs' (name: value: {
|
||||
}
|
||||
// nixpkgs.lib.mapAttrs' (name: value: {
|
||||
inherit name;
|
||||
value.file = toString value;
|
||||
}) (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) ];
|
||||
}) (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 {
|
||||
@@ -77,16 +117,20 @@
|
||||
name = "deploy-${name}";
|
||||
value = {
|
||||
type = "app";
|
||||
program = deployScriptFor { inherit name; host = "${name}.r"; };
|
||||
program = deployScriptFor {
|
||||
inherit name;
|
||||
host = "${name}.r";
|
||||
};
|
||||
};
|
||||
});
|
||||
ciScripts = forSystems (name: {
|
||||
name = "build-${name}";
|
||||
value = {
|
||||
type = "app";
|
||||
program = import ./ci.nix { inherit name system inputs; };
|
||||
program = import ./ci.nix {inherit name system inputs;};
|
||||
};
|
||||
});
|
||||
in deployScripts // ciScripts;
|
||||
in
|
||||
deployScripts // ciScripts;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
rec {
|
||||
tmpfilesConfig = {type, path, mode ? "-", user ? "-", group ? "-", age ? "-", argument ? "-"}: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
|
||||
tmpfilesConfig = {
|
||||
type,
|
||||
path,
|
||||
mode ? "-",
|
||||
user ? "-",
|
||||
group ? "-",
|
||||
age ? "-",
|
||||
argument ? "-",
|
||||
}: "${type} '${path}' ${mode} ${user} ${group} ${age} ${argument}";
|
||||
|
||||
restic = rec {
|
||||
port = 3571;
|
||||
@@ -8,14 +16,25 @@ rec {
|
||||
};
|
||||
|
||||
firewall = lib: {
|
||||
accept = { source, protocol, dport }: "nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept";
|
||||
accept = {
|
||||
source,
|
||||
protocol,
|
||||
dport,
|
||||
}: "nixos-fw -s ${lib.escapeShellArg source} -p ${lib.escapeShellArg protocol} --dport ${lib.escapeShellArg (toString dport)} -j nixos-fw-accept";
|
||||
addRules = lib.concatMapStringsSep "\n" (rule: "iptables -A ${rule}");
|
||||
removeRules = lib.concatMapStringsSep "\n" (rule: "iptables -D ${rule} || true");
|
||||
};
|
||||
|
||||
serveHtml = file: pkgs: ''
|
||||
default_type "text/html";
|
||||
root ${pkgs.linkFarm "fahrplan" [{ name = "index.html"; path = file; }]};
|
||||
root ${
|
||||
pkgs.linkFarm "fahrplan" [
|
||||
{
|
||||
name = "index.html";
|
||||
path = file;
|
||||
}
|
||||
]
|
||||
};
|
||||
index index.html;
|
||||
'';
|
||||
|
||||
@@ -50,7 +69,8 @@ rec {
|
||||
github = "kmein";
|
||||
email = "kmein@posteo.de";
|
||||
name = "Kierán Meinhardt";
|
||||
sshKeys = pkgs: pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
|
||||
sshKeys = pkgs:
|
||||
pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
|
||||
url = "https://github.com/kmein.keys";
|
||||
sha256 = "09c6ny0rmpid1m0pc1wsmb3wyy9g721lf4kv55i4lrp42b3i2d5b";
|
||||
}));
|
||||
@@ -62,6 +82,7 @@ rec {
|
||||
manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
|
||||
toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
|
||||
zaatar.id = "CGHO6LK-ZJBAXBD-UWI7AH3-BXYARE6-EUIM7PE-O2FUCOM-VCCRNCM-IG34WQ7";
|
||||
tahina.id = "UKJ2CBO-EQPKQL4-3QLRUSG-SSYR6AB-CCCUTKU-CLPYR7N-RUI5A6Y-JTL5NA4";
|
||||
};
|
||||
|
||||
ignorePaths = [
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{pkgs, path}: ''
|
||||
{
|
||||
pkgs,
|
||||
path,
|
||||
}: ''
|
||||
<config>
|
||||
<paths>
|
||||
<path recursive="1">${path}</path>
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ pkgs, wirelessInterface, colours, batteryName }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
wirelessInterface,
|
||||
colours,
|
||||
batteryName,
|
||||
}: let
|
||||
inherit (pkgs) lib;
|
||||
|
||||
setsid = script:
|
||||
@@ -95,7 +99,13 @@ in {
|
||||
{
|
||||
block = "custom";
|
||||
interval = 60 * 5;
|
||||
command = let spacetime = import <niveum/configs/spacetime.nix>; in pkgs.writers.writePython3 "sun.py" { libraries = [ pkgs.python3Packages.astral ]; flakeIgnore = [ "E121" "E501" ]; }
|
||||
command = let
|
||||
spacetime = import <niveum/configs/spacetime.nix>;
|
||||
in
|
||||
pkgs.writers.writePython3 "sun.py" {
|
||||
libraries = [pkgs.python3Packages.astral];
|
||||
flakeIgnore = ["E121" "E501"];
|
||||
}
|
||||
''
|
||||
import astral
|
||||
import astral.moon
|
||||
@@ -125,7 +135,7 @@ in {
|
||||
block = "custom";
|
||||
interval = 5;
|
||||
command = pkgs.writers.writeDash "hu-berlin-vpn" ''
|
||||
PATH=${lib.makeBinPath [ pkgs.systemd ]}
|
||||
PATH=${lib.makeBinPath [pkgs.systemd]}
|
||||
(systemctl is-active --quiet openvpn-hu-berlin.service && echo "🎓👍 (OpenVPN)") \
|
||||
|| (systemctl is-active --quiet hu-vpn.service && echo "🎓👍 (PPP+SSL)") \
|
||||
|| echo "🎓👎"
|
||||
@@ -154,7 +164,7 @@ in {
|
||||
format_mem = "{mem_used;G}";
|
||||
clickable = false;
|
||||
}
|
||||
{ block = "load"; }
|
||||
{block = "load";}
|
||||
{
|
||||
block = "time";
|
||||
interval = 1;
|
||||
|
||||
143
lib/radio-news.html
Normal file
143
lib/radio-news.html
Normal file
@@ -0,0 +1,143 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<title>lassulus radio news</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
}
|
||||
|
||||
main {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
display: grid;
|
||||
grid-template-columns: 2fr 1fr;
|
||||
grid-gap: 2em;
|
||||
}
|
||||
|
||||
#news-list ul {
|
||||
list-style: none;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
#news-list li {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
#news-list time {
|
||||
display: block;
|
||||
color: grey;
|
||||
}
|
||||
|
||||
form label {
|
||||
display: block;
|
||||
}
|
||||
|
||||
form input,
|
||||
form textarea {
|
||||
width: 100%;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 768px) {
|
||||
main {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
const newsEndpoint = "http://prism.r:7999";
|
||||
|
||||
function isoString(date) {
|
||||
return date.toISOString().slice(0, -5) + "Z";
|
||||
}
|
||||
|
||||
function setNextNews() {
|
||||
document.getElementById("next-news").innerHTML = (
|
||||
60 - new Date().getUTCMinutes()
|
||||
).toString();
|
||||
}
|
||||
|
||||
setInterval(setNextNews, 6000);
|
||||
|
||||
function fetchNews() {
|
||||
fetch(newsEndpoint).then((response) => {
|
||||
response.json().then((news) => {
|
||||
const newsList = document.getElementById("news-list");
|
||||
newsList.innerHTML = "";
|
||||
const ul = document.createElement("ul");
|
||||
for (const newsItem of news) {
|
||||
const start = new Date(newsItem.from);
|
||||
const end = new Date(newsItem.to);
|
||||
|
||||
const li = document.createElement("li");
|
||||
|
||||
const startDate = document.createElement("time");
|
||||
startDate.className = "start";
|
||||
startDate.title = start.toString();
|
||||
startDate.setAttribute("datetime", isoString(start));
|
||||
startDate.appendChild(document.createTextNode(isoString(start)));
|
||||
|
||||
const endDate = document.createElement("time");
|
||||
endDate.className = "end";
|
||||
endDate.title = end.toString();
|
||||
endDate.setAttribute("datetime", isoString(end));
|
||||
endDate.appendChild(document.createTextNode(isoString(end)));
|
||||
|
||||
li.appendChild(document.createTextNode(newsItem.text));
|
||||
li.appendChild(startDate);
|
||||
li.appendChild(endDate);
|
||||
ul.appendChild(li);
|
||||
}
|
||||
newsList.appendChild(ul);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function sendNews(event) {
|
||||
event.preventDefault();
|
||||
const formData = new FormData(event.target);
|
||||
|
||||
const request = new XMLHttpRequest();
|
||||
request.open("POST", newsEndpoint, false); // synchronous
|
||||
request.send(
|
||||
JSON.stringify({
|
||||
from: isoString(new Date(formData.get("from"))),
|
||||
to: isoString(new Date(formData.get("to"))),
|
||||
text: formData.get("text"),
|
||||
})
|
||||
);
|
||||
location.reload();
|
||||
}
|
||||
|
||||
window.onload = () => {
|
||||
setNextNews();
|
||||
fetchNews();
|
||||
};
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<main>
|
||||
<section>
|
||||
<h1>Submit news</h1>
|
||||
<form onsubmit="sendNews(event)">
|
||||
<label>Start date</label>
|
||||
<input type="datetime-local" name="from" required />
|
||||
<label>End date</label>
|
||||
<input type="datetime-local" name="to" required />
|
||||
<label>News text</label>
|
||||
<textarea name="text" rows="10" required></textarea>
|
||||
<input type="submit" />
|
||||
</form>
|
||||
Next news report should start in <span id="next-news"></span> minutes.
|
||||
</section>
|
||||
<aside>
|
||||
<h1>Planned news</h1>
|
||||
<div id="news-list">
|
||||
<em>No news planned yet.</em>
|
||||
</div>
|
||||
</aside>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
@@ -18,4 +18,9 @@
|
||||
ipv4 = "10.243.2.85";
|
||||
ipv6 = "42:0:3c46:ac99:ae36:cb8:c551:ba27";
|
||||
};
|
||||
|
||||
tahina = {
|
||||
ipv4 = "10.243.2.74";
|
||||
ipv6 = "42:0:3c46:2923:1c90:872:edd6:306";
|
||||
};
|
||||
}
|
||||
|
||||
321
lib/streams.nix
321
lib/streams.nix
@@ -1,4 +1,4 @@
|
||||
{ di-fm-key }:
|
||||
{di-fm-key}:
|
||||
# DI generated via: cat /tmp/di-fm.html| pup '.channel-tile-component json{}' | jq 'map({logo: .children[0].children[1].children[1].src | sub("^"; "http:"), station: .children[3].children[0].children[0].text, desc: .children[3].children[1].text | gsub("\\s+"; " ")})' > /tmp/di-fm.json
|
||||
# soma.fm generated via: curl https://somafm.com/ | pup '.cbshort json{}' | jq 'map({logo:.children[0].children[0].src|sub("^"; "http://soma.fm"), desc: .children[2].text, station: .children[1].text})'
|
||||
let
|
||||
@@ -6,7 +6,7 @@ let
|
||||
importJSON = path: builtins.fromJSON (builtins.readFile path);
|
||||
|
||||
di-fm-name = name: "${name} | DI.FM";
|
||||
di-fm = name: "http://prem2.di.fm/${name}_hi?${di-fm-key}";
|
||||
di-fm = name: "http://prem3.di.fm/${name}_hi?${di-fm-key}";
|
||||
|
||||
soma-fm-name = name: "${name} | soma.fm";
|
||||
soma-fm = name: "http://ice1.somafm.com/${name}-128-aac";
|
||||
@@ -42,9 +42,10 @@ let
|
||||
radiorecord-logo = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 144 46'%3E%3Cpath d='M68.3 24H79c8-11.4 29.8-18.8 41.7-24l-5.4 1.6-.3.2-15.3 4.6-3.1.9-17 5.3-3.4-3.1h-5.4l-3.5 3.2L43 5 32 1.6 26.6 0c12.3 5.4 35.1 14.5 41.7 24zm5.2-11.4c.9 0 1.6.3 2.2.8.6.5.9 1.1.9 1.9 0 .8-.4 2-1.1 3-.5.7-1.2 1.2-1.9 1.3-.7 0-1.3-.5-1.8-1.2-.7-.9-1.1-2-1.1-2.9v-.2c-.2-1.5 1.1-2.7 2.8-2.7zm70.3 17.5c-.5-1.3-2.4-1.5-4.1-1.5h-15.9l-.1.4-.1.2-4.8 16-.1.2-.2.7h16.8c2.8 0 4.6-1 5.5-3.6L143 35c1-2.6 1.2-3.9.8-4.9zm-10.2 11.7h-6.3l2.7-8.9h6.3l-2.7 8.9zM94.5 29.1c-.8-.4-2-.5-3.1-.5H79.9c-2.8 0-4.6 1-5.5 3.6l-2.2 7.5c-.6 2-1.8 4.8.3 5.9.8.4 2 .5 3.1.5h11.5c2.8 0 4.6-1 5.5-3.6l2.2-7.5c.6-2 1.8-4.9-.3-5.9zm-9.2 12.7h-6.4l2.7-8.9H88l-2.7 8.9zm-39.8 0H32.8l.7-2.3h10.9l.1-.4.1-.2.9-2.9.1-.2.2-.7h-11l.7-2.3h13.8l.1-.4.1-.2.8-2.8.1-.2.2-.7H29.3l-.1.4-.2.2-4.8 16-.1.2-.1.7h21.2l.1-.4.1-.2.8-2.8.1-.2.2-.7h-1zm70.2-13.3H99.2c-1.6 5.5-3.3 11-4.9 16.6l-.1.2-.3.7h7.5l.1-.4.1-.2 1.7-5.6h2.5l2.7 5.7.1.1.1.3h8.2l-3.3-6.6c3.4-.4 4.2-1.8 4.8-4.2.2-.6.3-1.2.5-1.7 1.2-3.5-.1-4.8-3.2-4.9zm-4.3 5.1L111 35c-.1.4-.3.5-.7.6l-6.4 1.7 1.4-4.5h5.5c.6 0 .8.2.6.8zm-86.9 1.6c.2-.6.3-1.2.5-1.7 1.2-3.6-.1-4.9-3.2-4.9H5.3C3.7 34.1 2 39.6.4 45.2l-.1.2-.3.6h7.4l.1-.4.1-.2 1.7-5.6h2.5l2.7 5.7.1.1.1.3h8.2l-3.3-6.6c3.5-.3 4.3-1.7 4.9-4.1zm-7-1.6l-.4 1.4c-.1.4-.3.5-.7.6L10 37.3l1.4-4.5h5.5c.6 0 .8.2.6.8zM71.1 35l1.2-3.8c.5-1.3-.4-2.8-1.9-2.7H57c-2.8 0-4.6 1-5.5 3.6l-2.2 7.5c-.6 2-1.8 4.8.3 5.9.8.4 2 .5 3.1.5h12.5c1.5 0 3.2-1.4 3.6-2.7l1-3.7h-5.7l-.6 2.1h-7.3l2.7-8.9h7l-.8 2.2h6z' fill-rule='evenodd' clip-rule='evenodd' fill='%23fff'/%3E%3C/svg%3E";
|
||||
|
||||
caster-fm = subdomain: port: "http://${subdomain}.caster.fm:${toString port}/listen.mp3?authn0b0236758bd0e178156d0787327a055d";
|
||||
in [
|
||||
in
|
||||
[
|
||||
{
|
||||
stream = "https://radio.lassul.us/radio.ogg";
|
||||
stream = "http://lassul.us:8000/radio.ogg";
|
||||
station = "Radio lassulus";
|
||||
logo = "http://lassul.us/art/portraits/selbstportrait.jpg";
|
||||
desc = "Diminutive from lassus (“weary, faint, tired”). A programming human. Doing superior professional art.";
|
||||
@@ -54,16 +55,22 @@ in [
|
||||
stream = "https://c3lounge.de/radio/8000/radio.mp3";
|
||||
}
|
||||
{
|
||||
stream = "https://radio.kmein.de/lyrik/listen.ogg";
|
||||
stream = "https://radio.kmein.de/lyrik.ogg";
|
||||
station = "Lyrik";
|
||||
desc = "Lyrik-Lesung rund um die Uhr.";
|
||||
}
|
||||
{
|
||||
stream = "https://radio.kmein.de/lyrikline/listen.ogg";
|
||||
stream = "https://radio.kmein.de/lyrikline.ogg";
|
||||
station = "Lyrikline";
|
||||
logo = "https://www.lyrikline.org/themes/lyrik/svg/Logo_lyrikline_pure.svg";
|
||||
desc = "24/7 zufällige Wiedergaben von lyrikline.org.";
|
||||
}
|
||||
{
|
||||
stream = "https://radio.kmein.de/wikipedia.ogg";
|
||||
station = "Wikipedia";
|
||||
desc = "Zufällige Wikipedia-Artikel";
|
||||
logo = "https://de.wikipedia.org/wiki/Wikipedia:Enzyklop%C3%A4die/Logo_von_Wikipedia#/media/Datei:Wikipedia-logo-v2.svg";
|
||||
}
|
||||
{
|
||||
stream = "http://162.244.80.20:6948";
|
||||
station = "Cool Jazz Florida";
|
||||
@@ -100,583 +107,488 @@ in [
|
||||
stream = "https://drachenhits.stream.laut.fm/drachenhits";
|
||||
station = "Drachenhits";
|
||||
}
|
||||
] ++
|
||||
# generated via: curl https://radiorecord.ru/api/stations | jq '.result.stations | sort_by(.sort) | map({station:.title,desc:.tooltip,logo:.icon_fill_colored,stream:.stream_320})' > radiorecord.json
|
||||
importJSON ./radiorecord.json
|
||||
++ [
|
||||
]
|
||||
++
|
||||
# generated via: curl https://radiorecord.ru/api/stations | jq '.result.stations | sort_by(.sort) | map({station:.title,desc:.tooltip,logo:.icon_fill_colored,stream:.stream_320})' > radiorecord.json
|
||||
importJSON ./radiorecord.json
|
||||
++ [
|
||||
{
|
||||
desc = "Your favorite dance tunes from the start of the decade. Familiar hits and overlooked classics in abundance.";
|
||||
logo = "http://cdn-images.audioaddict.com/1/4/0/3/5/b/14035b0944a3c2e77852b6d0944f381e.jpg?size=180x180";
|
||||
station = di-fm-name "00s Club Hits";
|
||||
stream = di-fm "00sclubhits";
|
||||
}
|
||||
{
|
||||
desc = "Electronic sounds and atmospheric textures create a genre to enhance your state of mind and take you deeper.";
|
||||
logo = "http://cdn-images.audioaddict.com/a/9/4/6/2/f/a9462ff46233f40fe0aa306379ae7cd8.jpg?size=180x180";
|
||||
station = di-fm-name "Ambient";
|
||||
stream = di-fm "ambient";
|
||||
}
|
||||
{
|
||||
desc = "Spaced out, melodic and full of warmth – these broken beat dance tunes will keep you dazed and amused.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/9/7/3/4/3/397343ffcf5543b60bba72f393e1c3c0.jpg?size=180x180";
|
||||
station = di-fm-name "Atmospheric Breaks";
|
||||
stream = di-fm "atmosphericbreaks";
|
||||
}
|
||||
{
|
||||
desc = "From the funkiest grooves to the dirtiest beats. Hard-hitting, high energy 4/4 club cuts to move the masses.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/f/e/d/8/9/4fed8974f4cfbbd0712baa8ae2cc2ed2.jpg?size=180x180";
|
||||
station = di-fm-name "Bass & Jackin' House";
|
||||
stream = di-fm "bassnjackinhouse";
|
||||
}
|
||||
{
|
||||
desc = "Blending together elements of house music, speed garage, and techno – it's all about the low end frequencies.";
|
||||
logo = "http://cdn-images.audioaddict.com/9/1/9/9/6/d/91996d1fed5b9607c625069bcb8d3b52.jpg?size=180x180";
|
||||
station = di-fm-name "Bassline";
|
||||
stream = di-fm "bassline";
|
||||
}
|
||||
{
|
||||
desc = "Heavily focused on breakbeats and dusty samples. A defining 90s musical movement still going strong today.";
|
||||
logo = "http://cdn-images.audioaddict.com/6/f/4/3/2/4/6f4324c4a776101fd91008d739ac3020.jpg?size=180x180";
|
||||
station = di-fm-name "Big Beat";
|
||||
stream = di-fm "bigbeat";
|
||||
}
|
||||
{
|
||||
desc = "Fusing together house elements from the past and the present – prime time music full of uplifting high energy.";
|
||||
logo = "http://cdn-images.audioaddict.com/0/4/1/2/5/7/0412578b5e31cf1b68f23c3cb5377139.jpg?size=180x180";
|
||||
station = di-fm-name "Big Room House";
|
||||
stream = di-fm "bigroomhouse";
|
||||
}
|
||||
{
|
||||
desc = "Inspired by hip hop and UK rave music, breaks features broken up drum loops and creative samples, synths and fx.";
|
||||
logo = "http://cdn-images.audioaddict.com/2/1/b/1/2/9/21b12909a0618017285f62a5af4b2ce5.jpg?size=180x180";
|
||||
station = di-fm-name "Breaks";
|
||||
stream = di-fm "breaks";
|
||||
}
|
||||
{
|
||||
desc = "The sounds of Chill & Tropical House are expertly made for lounging and dancing alike with its deeper house vibes.";
|
||||
logo = "http://cdn-images.audioaddict.com/2/9/0/1/e/f/2901ef5c923bb0f9ff856ac4007975f0.jpg?size=180x180";
|
||||
station = di-fm-name "Chill & Tropical House";
|
||||
stream = di-fm "chillntropicalhouse";
|
||||
}
|
||||
{
|
||||
desc = "Good EDM doesn't have to blow out your speakers and our curated selection of Chill EDM is a testament to the strength of mellow, chilled out electronic music.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/0/7/5/2/e/f0752e6df86dc7a0f3ffd7a63497df4e.jpg?size=180x180";
|
||||
station = di-fm-name "Chill EDM";
|
||||
stream = di-fm "chilledm";
|
||||
}
|
||||
{
|
||||
desc = "Mellow chill beats, lofi hip-hop, trip hop, downtempo beats and jazz, blended together in a laid back style for perfect listening.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/2/3/8/8/b/f2388be364717a3aa33f62411d9e3585.jpg?size=180x180";
|
||||
station = di-fm-name "ChillHop";
|
||||
stream = di-fm "chillhop";
|
||||
}
|
||||
{
|
||||
desc = "Electronic sounds, mellow mid-tempo rhythms, and a groove meant to calm the senses and ease the mind.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/d/9/6/c/a/fd96ca5c52508a2755a266ebf506f162.jpg?size=180x180";
|
||||
station = di-fm-name "Chillout";
|
||||
stream = di-fm "chillout";
|
||||
}
|
||||
{
|
||||
desc = "The perfect musical soundtrack for when you want to close your eyes, get truly comfortable, and drift away.";
|
||||
logo = "http://cdn-images.audioaddict.com/1/d/4/f/3/3/1d4f3310f94769b4e2f55ee0887eead3.jpg?size=180x180";
|
||||
station = di-fm-name "Chillout Dreams";
|
||||
stream = di-fm "chilloutdreams";
|
||||
}
|
||||
{
|
||||
desc = "The brilliant combination of dubstep rhythms with the mellow grooves of chillout. A unique sound all its own.";
|
||||
logo = "http://cdn-images.audioaddict.com/c/e/9/b/d/1/ce9bd1666b49921b440ec796653b24f0.jpg?size=180x180";
|
||||
station = di-fm-name "Chillstep";
|
||||
stream = di-fm "chillstep";
|
||||
}
|
||||
{
|
||||
desc = "European pop music born in the 90s full of high energy sounds and big hooks – now heard in gyms and malls worldwide.";
|
||||
logo = "http://cdn-images.audioaddict.com/a/9/8/1/5/3/a98153e6c9fcee321fd6dff0c8a6d0ba.jpg?size=180x180";
|
||||
station = di-fm-name "Classic EuroDance";
|
||||
stream = di-fm "classiceurodance";
|
||||
}
|
||||
{
|
||||
desc = "Conceived in the European discos in the 70s, evolving through the decades into modern electronic masterpieces.";
|
||||
logo = "http://cdn-images.audioaddict.com/0/1/0/a/6/6/010a6648f8afc52654b07c07c68e9cad.jpg?size=180x180";
|
||||
station = di-fm-name "Classic EuroDisco";
|
||||
stream = di-fm "classiceurodisco";
|
||||
}
|
||||
{
|
||||
desc = "The classic melodies, the epic breakdowns and gigantic builds. Re-experience Trance music in her prime.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/6/8/0/a/3/4680a3fd0e35f0b2f9bf60c9889d4343.jpg?size=180x180";
|
||||
station = di-fm-name "Classic Trance";
|
||||
stream = di-fm "classictrance";
|
||||
}
|
||||
{
|
||||
desc = "Classic sounds of Vocal Trance";
|
||||
logo = "http://cdn-images.audioaddict.com/1/e/1/8/1/a/1e181a502369be86e3f2e696723c26fe.jpg?size=180x180";
|
||||
station = di-fm-name "Classic Vocal Trance";
|
||||
stream = di-fm "classicvocaltrance";
|
||||
}
|
||||
{
|
||||
desc = "The bassbin rattling, speaker-freaking hits of Dubstep – all tried, tested and approved to work in the clubs.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/6/b/5/e/7/36b5e73f328251b20120a6bc5365777f.jpg?size=180x180";
|
||||
station = di-fm-name "Club Dubstep";
|
||||
stream = di-fm "clubdubstep";
|
||||
}
|
||||
{
|
||||
desc = "The music heard in the biggest venues worldwide. From prime time pushers to deeper house shakers – the sounds of now.";
|
||||
logo = "http://cdn-images.audioaddict.com/2/e/e/f/9/8/2eef98b26e5490acc78ff6ab22e04827.jpg?size=180x180";
|
||||
station = di-fm-name "Club Sounds";
|
||||
stream = di-fm "club";
|
||||
}
|
||||
{
|
||||
desc = "From techno, deep house, progressive and trance – check out the sounds of the DJ deep in the mix.";
|
||||
logo = "http://cdn-images.audioaddict.com/1/3/a/a/0/8/13aa08b5dce2525029c6ddfb8e286dc2.jpg?size=180x180";
|
||||
station = di-fm-name "DJ Mixes";
|
||||
stream = di-fm "djmixes";
|
||||
}
|
||||
{
|
||||
desc = "Evil, gritty and twisted DnB / Drum & Bass. at 160+ BPM, hear the darkest basslines and the hardest hitting percussion.";
|
||||
logo = "http://cdn-images.audioaddict.com/6/e/4/7/c/1/6e47c1d85f09957d568c9535dda75e58.jpg?size=180x180";
|
||||
station = di-fm-name "Dark DnB";
|
||||
stream = di-fm "darkdnb";
|
||||
}
|
||||
{
|
||||
desc = "The darker form of PsyTrance, which is a sound all its own – direct from Goa to your headphones.";
|
||||
logo = "http://cdn-images.audioaddict.com/0/e/1/0/b/9/0e10b950ca2f3e828becbe3dd3c2d0b3.jpg?size=180x180";
|
||||
station = di-fm-name "Dark PsyTrance";
|
||||
stream = di-fm "darkpsytrance";
|
||||
}
|
||||
{
|
||||
desc = "House music crafted for the smaller and mid-sized rooms – deeper tracks full of silky, smooth grooves.";
|
||||
logo = "http://cdn-images.audioaddict.com/9/a/1/b/4/6/9a1b469ae251c084465096038312d506.jpg?size=180x180";
|
||||
station = di-fm-name "Deep House";
|
||||
stream = di-fm "deephouse";
|
||||
}
|
||||
{
|
||||
desc = "Elements of house, funk, and disco. Mid-tempo beats, soulful grooves and head nodding selections.";
|
||||
logo = "http://cdn-images.audioaddict.com/b/2/a/7/1/5/b2a715bb711ab06822bcaf07fde74d51.jpg?size=180x180";
|
||||
station = di-fm-name "Deep Nu-Disco";
|
||||
stream = di-fm "deepnudisco";
|
||||
}
|
||||
{
|
||||
desc = "This smooth, groove-heavy selection of deep progressive house tracks is the perfect soundtrack for smaller and mid-sized rooms.";
|
||||
logo = "http://cdn-images.audioaddict.com/b/0/e/1/9/0/b0e19018c34150a07d76224e5fcdbeda.jpg?size=180x180";
|
||||
station = di-fm-name "Deep Progressive House";
|
||||
stream = di-fm "deepprogressivehouse";
|
||||
}
|
||||
{
|
||||
desc = "A fusion of deep house & techno. Punchy grooves, spaced out sounds and forward thinking productions.";
|
||||
logo = "http://cdn-images.audioaddict.com/d/3/2/1/7/5/d32175a432f823ce84261c01d4b53f57.jpg?size=180x180";
|
||||
station = di-fm-name "Deep Tech";
|
||||
stream = di-fm "deeptech";
|
||||
}
|
||||
{
|
||||
desc = "Where would dance music be without Detroit? The city that started it all continues to inspire and educate.";
|
||||
logo = "http://cdn-images.audioaddict.com/d/7/b/3/1/d/d7b31d5973593af0043fed3f180df702.jpg?size=180x180";
|
||||
station = di-fm-name "Detroit House & Techno";
|
||||
stream = di-fm "detroithousentechno";
|
||||
}
|
||||
{
|
||||
desc = "The feel good sound inspired from 70s disco combined with the warm kick drum of modern house music.";
|
||||
logo = "http://cdn-images.audioaddict.com/2/7/9/7/0/5/279705ae85a4e0f529f6f7fbaa47a646.jpg?size=180x180";
|
||||
station = di-fm-name "Disco House";
|
||||
stream = di-fm "discohouse";
|
||||
}
|
||||
{
|
||||
desc = "Head nodding beats, chilled vocals, and lush soundscapes to bring down the sun and start the night.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/8/3/3/6/f/f8336fff9bcb4b01a36f2684ecd150c6.jpg?size=180x180";
|
||||
station = di-fm-name "Downtempo Lounge";
|
||||
stream = di-fm "downtempolounge";
|
||||
}
|
||||
{
|
||||
desc = "Born in the mid 90s, Drum and Bass / DnB is all about fast breakbeats, urban vibes, and rib rattling basslines.";
|
||||
logo = "http://cdn-images.audioaddict.com/1/9/8/1/3/f/19813f3ba29ad66caa06bbee4aba558a.jpg?size=180x180";
|
||||
station = di-fm-name "Drum and Bass";
|
||||
stream = di-fm "drumandbass";
|
||||
}
|
||||
{
|
||||
desc = "A hybrid of half-time Dubstep and intense Drum and Bass / DnB.";
|
||||
logo = "http://cdn-images.audioaddict.com/1/c/6/0/b/9/1c60b9976b4d861ddc90d668f749fe6f.jpg?size=180x180";
|
||||
station = di-fm-name "Drumstep";
|
||||
stream = di-fm "drumstep";
|
||||
}
|
||||
{
|
||||
desc = "An emphasis on the bass and drums / DnB, delayed effects, sampled vocals and smokey Reggae inspired vibes.";
|
||||
logo = "http://cdn-images.audioaddict.com/e/2/c/8/6/5/e2c865e92c65cfb91ad0e2d3933234e0.jpg?size=180x180";
|
||||
station = di-fm-name "Dub";
|
||||
stream = di-fm "dub";
|
||||
}
|
||||
{
|
||||
desc = "The beloved sounds of deep techno saturated with tape delays, heavy reverb and ice cold atmospherics.";
|
||||
logo = "http://cdn-images.audioaddict.com/1/9/d/6/1/0/19d61084830ef94886b32d847fc5d29e.jpg?size=180x180";
|
||||
station = di-fm-name "Dub Techno";
|
||||
stream = di-fm "dubtechno";
|
||||
}
|
||||
{
|
||||
desc = "The wobbles of the bass, the party rocking beats, and the biggest crowd destroying drops.";
|
||||
logo = "http://cdn-images.audioaddict.com/7/7/c/1/a/e/77c1aec493eeb9e2a5d22951447fbd48.jpg?size=180x180";
|
||||
station = di-fm-name "Dubstep";
|
||||
stream = di-fm "dubstep";
|
||||
}
|
||||
{
|
||||
desc = "The sound of the largest events. From the gargantuan festivals, the huge main rooms and the biggest DJs.";
|
||||
logo = "http://cdn-images.audioaddict.com/d/d/1/1/8/f/dd118f5fe9befc191907a32d0877a13d.jpg?size=180x180";
|
||||
station = di-fm-name "EDM Festival";
|
||||
stream = di-fm "edmfestival";
|
||||
}
|
||||
{
|
||||
desc = "Where dance meets pop. Crossover favorites, stadium-sized anthems and the biggest electronic tunes in existence.";
|
||||
logo = "http://cdn-images.audioaddict.com/6/9/b/2/c/c/69b2cc01d4cbcb5a813ee6428bc4e455.jpg?size=180x180";
|
||||
station = di-fm-name "EDM Hits";
|
||||
stream = di-fm "edm";
|
||||
}
|
||||
{
|
||||
desc = "Buzzing basslines, huge kicks, party rocking drops. House music packed full of gigantic bass and massive synths.";
|
||||
logo = "http://cdn-images.audioaddict.com/7/4/2/3/8/0/742380673147770eef642532828dbc6c.jpg?size=180x180";
|
||||
station = di-fm-name "Electro House";
|
||||
stream = di-fm "electrohouse";
|
||||
}
|
||||
{
|
||||
desc = "The combination of 1920s-1940s jazz and swing music, big band horns and modern day electro house.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/3/e/6/0/9/33e609d64ca20b0719d28d2193eece31.jpg?size=180x180";
|
||||
station = di-fm-name "Electro Swing";
|
||||
stream = di-fm "electroswing";
|
||||
}
|
||||
{
|
||||
desc = "The trailblazers, the renegades and the experimental musicians who gave early inspiration with electronic instruments.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/7/4/a/3/3/574a3373b242bed1018c5c99e5021c3f.jpg?size=180x180";
|
||||
station = di-fm-name "Electronic Pioneers";
|
||||
stream = di-fm "electronicpioneers";
|
||||
}
|
||||
{
|
||||
desc = "Catchy pop music blended together with vintage synthesizers and electronic instrumentation.";
|
||||
logo = "http://cdn-images.audioaddict.com/2/8/c/1/e/8/28c1e8587ae6e0b2589b4d66ccd99324.jpg?size=180x180";
|
||||
station = di-fm-name "Electropop";
|
||||
stream = di-fm "electropop";
|
||||
}
|
||||
{
|
||||
desc = "Trance in its most boisterous form. Uplifting melodies on top of high energy beats create these euphoric anthems.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/1/f/d/f/e/f1fdfea9ba9622ecdee020cc53126e60.jpg?size=180x180";
|
||||
station = di-fm-name "Epic Trance";
|
||||
stream = di-fm "epictrance";
|
||||
}
|
||||
{
|
||||
desc = "Pop music infused with a high energy 4/4 pulse. Heavy on the synthesizers, the melodies and the vocals.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/b/b/2/7/5/4bb2756bcacce0a2bf44ebaaf743f2ab.jpg?size=180x180";
|
||||
station = di-fm-name "EuroDance";
|
||||
stream = di-fm "eurodance";
|
||||
}
|
||||
{
|
||||
desc = "Focused on the funkiest grooves, with plenty of the guitar licks and clever samples placed around a 4/4 swing.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/3/7/0/b/a/3370baa3700e4578558dff57c6443a0f.jpg?size=180x180";
|
||||
station = di-fm-name "Funky House";
|
||||
stream = di-fm "funkyhouse";
|
||||
}
|
||||
{
|
||||
desc = "Hard basslines, booming beats and insatiable grooves. Inspired by Trap, Juke and Garage – molded together into a unique booming style.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/9/e/5/8/b/39e58b7b675d6ec353582cd5e9f38dbe.jpg?size=180x180";
|
||||
station = di-fm-name "Future Bass";
|
||||
stream = di-fm "futurebass";
|
||||
}
|
||||
{
|
||||
desc = "2step Garage rhythms, chunky bass line driven grooves and plenty of forward thinking innovation.";
|
||||
logo = "http://cdn-images.audioaddict.com/0/e/9/0/4/2/0e904268ec98b8c0521c30da4ac321bb.jpg?size=180x180";
|
||||
station = di-fm-name "Future Garage";
|
||||
stream = di-fm "futuregarage";
|
||||
}
|
||||
{
|
||||
desc = "Finest selection of futurepop and synthpop.";
|
||||
logo = "http://cdn-images.audioaddict.com/e/e/8/5/2/3/ee8523a0d6165465961cb2d0445c4f27.jpg?size=180x180";
|
||||
station = di-fm-name "Future Synthpop";
|
||||
stream = di-fm "futuresynthpop";
|
||||
}
|
||||
{
|
||||
desc = "The hardest form of techno with punishing tracks designed to drive the crowds into a sweaty frenzy.";
|
||||
logo = "http://cdn-images.audioaddict.com/d/a/f/c/e/d/dafced37829e69724be99dc375bc5713.jpg?size=180x180";
|
||||
station = di-fm-name "Gabber";
|
||||
stream = di-fm "gabber";
|
||||
}
|
||||
{
|
||||
desc = "The sound of digital malfunctions, electric hum and bit rate distortions perfectly placed alongside laid-back hip hop beats.";
|
||||
logo = "http://cdn-images.audioaddict.com/7/3/5/a/b/b/735abb160f950c98e2bd7caf6843e255.jpg?size=180x180";
|
||||
station = di-fm-name "Glitch Hop";
|
||||
stream = di-fm "glitchhop";
|
||||
}
|
||||
{
|
||||
desc = "A very psychedelic form of trance, Goa-Psy Trance is a sound full of arpeggiated synths and trippy effects.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/e/e/e/4/4/4eee448424df2768055ee7503f0251e9.jpg?size=180x180";
|
||||
station = di-fm-name "Goa-Psy Trance";
|
||||
stream = di-fm "goapsy";
|
||||
}
|
||||
{
|
||||
desc = "A channel showcasing everything from hard dance, trance and happy hardcore to lift the spirits (and the arms).";
|
||||
logo = "http://cdn-images.audioaddict.com/d/f/7/7/8/e/df778eed294536f4e858093124aa2be5.jpg?size=180x180";
|
||||
station = di-fm-name "Hands Up";
|
||||
stream = di-fm "handsup";
|
||||
}
|
||||
{
|
||||
desc = "Concrete kicks and punching rhythms, hard dance is a tougher side of music with sharp edges and aggressive power.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/9/d/a/e/5/59dae529a51feb3f90b542f3d33808ec.jpg?size=180x180";
|
||||
station = di-fm-name "Hard Dance";
|
||||
stream = di-fm "harddance";
|
||||
}
|
||||
{
|
||||
desc = "Tough as nails warehouse jams full of cold aggression, sinister structures and pounding rhythms that hit hard.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/e/5/1/1/d/5e511d67198b404149e7eaed9858e5d4.jpg?size=180x180";
|
||||
station = di-fm-name "Hard Techno";
|
||||
stream = di-fm "hardtechno";
|
||||
}
|
||||
{
|
||||
desc = "Strictly for the hardcore. These are the biggest and boldest bangers, and the hardest hitting tracks.";
|
||||
logo = "http://cdn-images.audioaddict.com/e/0/5/3/8/5/e05385cf844ef4884a26c19ed254efbf.jpg?size=180x180";
|
||||
station = di-fm-name "Hardcore";
|
||||
stream = di-fm "hardcore";
|
||||
}
|
||||
{
|
||||
desc = "Hard techno & hardcore. A global phenomenon with powerful kicks, distorted effects and infectious melodies.";
|
||||
logo = "http://cdn-images.audioaddict.com/8/b/1/0/3/c/8b103c03fbf78becf042085552e9ef41.jpg?size=180x180";
|
||||
station = di-fm-name "Hardstyle";
|
||||
stream = di-fm "hardstyle";
|
||||
}
|
||||
{
|
||||
desc = "Born in Chicago and now global, house music is always evolving but remains true to its pure 4/4 structure.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/3/0/b/6/9/530b699645ddff8d66a2333ae09bb06a.jpg?size=180x180";
|
||||
station = di-fm-name "House";
|
||||
stream = di-fm "house";
|
||||
}
|
||||
{
|
||||
desc = "Smooth, groovy and full of cutting-edge, fresh ideas – beats to kick back and enjoy far from the club setting.";
|
||||
logo = "http://cdn-images.audioaddict.com/9/1/8/4/2/b/91842b0ec15b8b69e50315dbd3afe03e.jpg?size=180x180";
|
||||
station = di-fm-name "Indie Beats";
|
||||
stream = di-fm "indiebeats";
|
||||
}
|
||||
{
|
||||
desc = "The spirit of Rock & Roll with an electronic soul. Club culture and live music combined.";
|
||||
logo = "http://cdn-images.audioaddict.com/9/f/7/0/a/d/9f70ad76ec13a6123405c6d7a03325f3.jpg?size=180x180";
|
||||
station = di-fm-name "Indie Dance";
|
||||
stream = di-fm "indiedance";
|
||||
}
|
||||
{
|
||||
desc = "One of the biggest cultural soundtracks with the infectious thump of house music. Expect sultry saxophones, trumpets, and finger snapping grooves.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/4/b/3/3/e/f4b33e8cbd9f0b1776e64f17b9c35abd.jpg?size=180x180";
|
||||
station = di-fm-name "Jazz House";
|
||||
stream = di-fm "jazzhouse";
|
||||
}
|
||||
{
|
||||
desc = "Jungle keeps the breakbeat tempos high and celebrates the diverse ideas found within urban and rave music.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/1/e/d/e/7/41ede7b8b43cffcc42876e6e319b7ef3.jpg?size=180x180";
|
||||
station = di-fm-name "Jungle";
|
||||
stream = di-fm "jungle";
|
||||
}
|
||||
{
|
||||
desc = "The sounds of Salsa, Brazilian beats and Latin Jazz with the steady grooves of modern East Coast dance music.";
|
||||
logo = "http://cdn-images.audioaddict.com/6/0/1/7/6/e/60176ec05138ad9b621cb92de7f0c8c8.jpg?size=180x180";
|
||||
station = di-fm-name "Latin House";
|
||||
stream = di-fm "latinhouse";
|
||||
}
|
||||
{
|
||||
desc = "Smooth as water, with the fast paced rhythms, Liquid DNB / Drum and Bass flows with rolling ease without losing momentum.";
|
||||
logo = "http://cdn-images.audioaddict.com/6/7/5/9/9/a/67599a0b4f3575ea5f6a74fe633899d7.jpg?size=180x180";
|
||||
station = di-fm-name "Liquid DnB";
|
||||
stream = di-fm "liquiddnb";
|
||||
}
|
||||
{
|
||||
desc = "Smooth, rolling and steady – this fresh formation of Dubstep keeps the sounds you love with a flowing Drum and Bass groove.";
|
||||
logo = "http://cdn-images.audioaddict.com/6/e/f/6/c/e/6ef6ced4249faec61c8fbc58b10b6343.jpg?size=180x180";
|
||||
station = di-fm-name "Liquid Dubstep";
|
||||
stream = di-fm "liquiddubstep";
|
||||
}
|
||||
{
|
||||
desc = "The smoother side of Trap but still packed with mechanical grooves and hip hop moods.";
|
||||
logo = "http://cdn-images.audioaddict.com/6/b/5/b/d/6/6b5bd66a99e46fa1258cb565d988ea7c.jpg?size=180x180";
|
||||
station = di-fm-name "Liquid Trap";
|
||||
stream = di-fm "liquidtrap";
|
||||
}
|
||||
{
|
||||
desc = "Tastefully selected LoFi Hip-Hop tunes with textured atmospheres & laid back beats – with a dash of chillhop and perfectly designed to chill your ears.";
|
||||
logo = "http://cdn-images.audioaddict.com/c/f/7/0/d/a/cf70daf883c01687f321d72376227493.jpg?size=180x180";
|
||||
station = di-fm-name "LoFi Hip-Hop";
|
||||
stream = di-fm "lofihiphop";
|
||||
}
|
||||
{
|
||||
desc = "Punch your one-way ticket to peace of mind and mental clarity with this curated selection of LoFi Lounge & Chill tracks today.";
|
||||
logo = "http://cdn-images.audioaddict.com/0/2/7/2/1/f/02721f4098dbeae07a8956d832f59cd8.jpg?size=180x180";
|
||||
station = di-fm-name "LoFi Lounge & Chill";
|
||||
stream = di-fm "lofiloungenchill";
|
||||
}
|
||||
{
|
||||
desc = "Music to chill to. Music made for when it's all about kicking off your shoes, laying back, and totally relaxing.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/7/a/5/f/b/f7a5fbb67a1a0f0992f131506917c2e6.jpg?size=180x180";
|
||||
station = di-fm-name "Lounge";
|
||||
stream = di-fm "lounge";
|
||||
}
|
||||
{
|
||||
desc = "The melodic side of progressive house, packed with driving rhythms and forward thinking sounds.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/4/8/c/f/6/448cf62c2d3c68ede713008015da9bfc.jpg?size=180x180";
|
||||
station = di-fm-name "Melodic Progressive";
|
||||
stream = di-fm "melodicprogressive";
|
||||
}
|
||||
{
|
||||
desc = "Minimal fuses elements of house, techno and electronica and strips it back to focus on the spaces between the sound.";
|
||||
logo = "http://cdn-images.audioaddict.com/a/9/1/b/1/4/a91b1414a8712794672e3ea1324ffe92.jpg?size=180x180";
|
||||
station = di-fm-name "Minimal";
|
||||
stream = di-fm "minimal";
|
||||
}
|
||||
{
|
||||
desc = "Pitched up vocals, happy hardcore beats, and high energy music non-stop.";
|
||||
logo = "http://cdn-images.audioaddict.com/e/f/8/f/b/e/ef8fbe63f86e496f0ce514ee2e85c30a.jpg?size=180x180";
|
||||
station = di-fm-name "Nightcore";
|
||||
stream = di-fm "nightcore";
|
||||
}
|
||||
{
|
||||
desc = "Modern disco music blending the familiar funk of the 70s and 80s with futuristic beats and up to date grooves.";
|
||||
logo = "http://cdn-images.audioaddict.com/f/2/3/7/8/a/f2378a19d61a3063a2a6271a29fb1595.jpg?size=180x180";
|
||||
station = di-fm-name "Nu Disco";
|
||||
stream = di-fm "nudisco";
|
||||
}
|
||||
{
|
||||
desc = "Acid, one of the characteristics of the TB-303, is celebrated here with the best tracks from house, techno and trance.";
|
||||
logo = "http://cdn-images.audioaddict.com/7/0/a/7/8/3/70a7830bce8d22eb1a7c868773f443e8.jpg?size=180x180";
|
||||
station = di-fm-name "Oldschool Acid";
|
||||
stream = di-fm "oldschoolacid";
|
||||
}
|
||||
{
|
||||
desc = "The biggest classics and secret weapons – this is a true treasure chest of house tracks from back in the day.";
|
||||
logo = "http://cdn-images.audioaddict.com/7/d/0/c/e/f/7d0cefbcb479ce257b24471f3d600eba.jpg?size=180x180";
|
||||
station = di-fm-name "Oldschool House";
|
||||
stream = di-fm "oldschoolhouse";
|
||||
}
|
||||
{
|
||||
desc = "Grab your whistles, white gloves and reach for the laser beams. This is the sound of raving when raving was new.";
|
||||
logo = "http://cdn-images.audioaddict.com/b/1/0/c/2/6/b10c2672a6a54a8ae5356f3ddb49b4c1.jpg?size=180x180";
|
||||
station = di-fm-name "Oldschool Rave";
|
||||
stream = di-fm "oldschoolrave";
|
||||
}
|
||||
{
|
||||
desc = "Go back in time and hear the biggest and best tracks within techno and trance that defined a decade of dance culture.";
|
||||
logo = "http://cdn-images.audioaddict.com/2/4/9/d/1/8/249d182058ac9e5631557eb309efe80f.jpg?size=180x180";
|
||||
station = di-fm-name "Oldschool Techno & Trance";
|
||||
stream = di-fm "oldschool";
|
||||
}
|
||||
{
|
||||
desc = "Always moving forward, progressive continues to reinvent itself into new sounds and styles made for the floor.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/3/5/5/3/1/3355314492d633a5330c659cfe98fc1b.jpg?size=180x180";
|
||||
station = di-fm-name "Progressive";
|
||||
stream = di-fm "progressive";
|
||||
}
|
||||
{
|
||||
desc = "Progress your mind to undiscovered psychedelic dimensions.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/f/a/5/6/5/5fa5659badbaf1a4ff817323ee5e998a.jpg?size=180x180";
|
||||
station = di-fm-name "Progressive Psy";
|
||||
stream = di-fm "progressivepsy";
|
||||
}
|
||||
{
|
||||
desc = "Downtempo psychedelic dub grooves, goa ambient, and world beats.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/5/2/d/1/4/452d14ab72381941b1bd5f94af15678b.jpg?size=180x180";
|
||||
station = di-fm-name "PsyChill";
|
||||
stream = di-fm "psychill";
|
||||
}
|
||||
{
|
||||
desc = "Dub, ambient, and psychedelic trance, fused together in atmospheric harmony.";
|
||||
logo = "http://cdn-images.audioaddict.com/4/0/0/d/5/3/400d53d541322f0883a807c9b79d5540.jpg?size=180x180";
|
||||
station = di-fm-name "PsyDub";
|
||||
stream = di-fm "psydub";
|
||||
}
|
||||
{
|
||||
desc = "The psychedelic side of ambient.";
|
||||
logo = "http://cdn-images.audioaddict.com/a/7/b/0/d/c/a7b0dcee2110e6d01fec96758a639ea3.jpg?size=180x180";
|
||||
station = di-fm-name "Psybient";
|
||||
stream = di-fm "psybient";
|
||||
}
|
||||
{
|
||||
desc = "Russia's hottest club hits.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/8/2/6/2/e/58262e338e405ab82ab92aa55f719f86.jpg?size=180x180";
|
||||
station = di-fm-name "Russian Club Hits";
|
||||
stream = di-fm "russianclubhits";
|
||||
}
|
||||
{
|
||||
desc = "House music saturated with feeling – full of melodies, vocals and true soul. Steady warm 4/4 vibes.";
|
||||
logo = "http://cdn-images.audioaddict.com/e/6/5/5/c/d/e655cd614bd4a1c981273a555081c309.jpg?size=180x180";
|
||||
station = di-fm-name "Soulful House";
|
||||
stream = di-fm "soulfulhouse";
|
||||
}
|
||||
{
|
||||
desc = "Ambient space music for expanding minds.";
|
||||
logo = "http://cdn-images.audioaddict.com/b/e/c/b/e/0/becbe0cb9c3002fc21f97f9e65cf9da1.jpg?size=180x180";
|
||||
station = di-fm-name "Space Dreams";
|
||||
stream = di-fm "spacemusic";
|
||||
}
|
||||
{
|
||||
desc = "This selection of summer chill house classics has been handpicked to elicit that special summer feeling year-round.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/d/8/b/6/1/3d8b619652faa1969274e0d51c8bd59d.jpg?size=180x180";
|
||||
station = di-fm-name "Summer Chill House";
|
||||
stream = di-fm "summerchillhouse";
|
||||
}
|
||||
{
|
||||
desc = "Influenced by video games and movie soundtracks of the 80s, Synthwave's mission continues today with great new music keeping things future retro.";
|
||||
logo = "http://cdn-images.audioaddict.com/d/8/e/a/6/4/d8ea647113c8cdec87b4751f20b3360b.jpg?size=180x180";
|
||||
station = di-fm-name "Synthwave";
|
||||
stream = di-fm "synthwave";
|
||||
}
|
||||
{
|
||||
desc = "Blending the warmth of house music with the cold structural precision of techno, tech house bridges the divide.";
|
||||
logo = "http://cdn-images.audioaddict.com/2/7/b/a/7/0/27ba70234566a810d9dd33745195f088.jpg?size=180x180";
|
||||
station = di-fm-name "Tech House";
|
||||
stream = di-fm "techhouse";
|
||||
}
|
||||
{
|
||||
desc = "Techno is a true musical force full of structure and style. Robotic, mechanical and full of soul, always facing the future.";
|
||||
logo = "http://cdn-images.audioaddict.com/7/a/3/1/4/a/7a314a3ff87e31013172e9099d9aa843.jpg?size=180x180";
|
||||
station = di-fm-name "Techno";
|
||||
stream = di-fm "techno";
|
||||
}
|
||||
{
|
||||
desc = "Emotive dance music which embraces incredible melodies, future-facing production and energetic anthems heard worldwide.";
|
||||
logo = "http://cdn-images.audioaddict.com/b/1/0/5/6/7/b10567777ad265dcc63816fa32396654.jpg?size=180x180";
|
||||
station = di-fm-name "Trance";
|
||||
stream = di-fm "trance";
|
||||
}
|
||||
{
|
||||
desc = "Born out of Southern Hip-Hop and influenced by techno, trap is analog drum machines / DnB & with hip-hop aesthetics.";
|
||||
logo = "http://cdn-images.audioaddict.com/8/8/6/e/b/2/886eb22e09893237ff5a851991543e4b.jpg?size=180x180";
|
||||
station = di-fm-name "Trap";
|
||||
stream = di-fm "trap";
|
||||
}
|
||||
{
|
||||
desc = "The percussive side of the house and tech house scene, tribal house takes drums and puts them in the forefront.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/9/d/5/b/0/59d5b064c1bc9e165850a8d9371d32a5.jpg?size=180x180";
|
||||
station = di-fm-name "Tribal House";
|
||||
stream = di-fm "tribalhouse";
|
||||
}
|
||||
{
|
||||
desc = "UMF Radio 24/7";
|
||||
logo = "http://cdn-images.audioaddict.com/b/4/5/7/b/9/b457b9fe45596e28a7c4b7b004c82ce4.jpg?size=180x180";
|
||||
station = di-fm-name "UMF Radio";
|
||||
stream = di-fm "umfradio";
|
||||
}
|
||||
{
|
||||
desc = "From gritty Berlin streets to dark corners of Brooklyn, this is techno made by artists pushing the genre further.";
|
||||
logo = "http://cdn-images.audioaddict.com/9/f/7/1/0/f/9f710f7f4c2a663bab3ff5551f8669eb.jpg?size=180x180";
|
||||
station = di-fm-name "Underground Techno";
|
||||
stream = di-fm "undergroundtechno";
|
||||
}
|
||||
{
|
||||
desc = "Relaxing vibes and a collection of vocal songs providing the laid back soundtrack to your day.";
|
||||
logo = "http://cdn-images.audioaddict.com/5/7/4/8/8/c/57488ced7c732709c72764636b0065dc.jpg?size=180x180";
|
||||
station = di-fm-name "Vocal Chillout";
|
||||
stream = di-fm "vocalchillout";
|
||||
}
|
||||
{
|
||||
desc = "The glorious 4/4 thump of House music paired perfectly with the human voice. Sultry, soulful, sexy sounds.";
|
||||
logo = "http://cdn-images.audioaddict.com/8/5/a/1/3/b/85a13bb220281bf22bf04d4f1f778b59.jpg?size=180x180";
|
||||
station = di-fm-name "Vocal House";
|
||||
stream = di-fm "vocalhouse";
|
||||
}
|
||||
{
|
||||
desc = "Laid back grooves and a collection of smooth vocals soothe the ears and relax the mind.";
|
||||
logo = "http://cdn-images.audioaddict.com/8/4/3/6/f/9/8436f9d3338ba7c8de0e88dbe45ea4d5.jpg?size=180x180";
|
||||
station = di-fm-name "Vocal Lounge";
|
||||
stream = di-fm "vocallounge";
|
||||
}
|
||||
{
|
||||
desc = "Lush vocals paired together with emotive dance music. Beautiful melodies and endless energy.";
|
||||
logo = "http://cdn-images.audioaddict.com/3/0/9/f/2/4/309f243a8a181ad83e8c5e15cd4b24c3.jpg?size=180x180";
|
||||
station = di-fm-name "Vocal Trance";
|
||||
stream = di-fm "vocaltrance";
|
||||
}
|
||||
@@ -686,6 +598,12 @@ importJSON ./radiorecord.json
|
||||
station = soma-fm-name "Vaporwaves";
|
||||
stream = soma-fm "vaporwaves";
|
||||
}
|
||||
{
|
||||
desc = "Featuring the music from an independent record label focused on modern electronic ambient and space music.";
|
||||
logo = "https://somafm.com/img3/synphaera120.jpg";
|
||||
station = soma-fm-name "Synphaera";
|
||||
stream = soma-fm "synphaera";
|
||||
}
|
||||
{
|
||||
desc = "Emotional Experiments in Music: Ambient, modern composition, post-rock, & experimental electronic music";
|
||||
logo = "http://soma.fm/img/n5md120.png";
|
||||
@@ -1263,15 +1181,42 @@ importJSON ./radiorecord.json
|
||||
station = "Dhol Radio";
|
||||
desc = "ਪੰਜਾਬੀ ਸੰਗੀਤ";
|
||||
}
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "2bhanuman"; station = bhaktiworld-name "Hanuman"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "djbeat"; station = bhaktiworld-name "Mantra Shakti"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "gurbani"; station = bhaktiworld-name "Sangam"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "hot"; station = bhaktiworld-name "Shiv"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "ibadat"; station = bhaktiworld-name "Devi Maa"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "iskon2b"; station = bhaktiworld-name "Om Sai"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "millenniumhits"; station = bhaktiworld-name "Krishna"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "dard"; station = bhaktiworld-name "Shri Ram"; }
|
||||
{ logo = bhaktiworld-logo; stream = bhaktiworld "bhaktiworldindia"; station = bhaktiworld-name "Ganesh"; }
|
||||
{
|
||||
stream = bhaktiworld "2bhanuman";
|
||||
station = bhaktiworld-name "Hanuman";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "djbeat";
|
||||
station = bhaktiworld-name "Mantra Shakti";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "gurbani";
|
||||
station = bhaktiworld-name "Sangam";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "hot";
|
||||
station = bhaktiworld-name "Shiv";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "ibadat";
|
||||
station = bhaktiworld-name "Devi Maa";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "iskon2b";
|
||||
station = bhaktiworld-name "Om Sai";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "millenniumhits";
|
||||
station = bhaktiworld-name "Krishna";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "dard";
|
||||
station = bhaktiworld-name "Shri Ram";
|
||||
}
|
||||
{
|
||||
stream = bhaktiworld "bhaktiworldindia";
|
||||
station = bhaktiworld-name "Ganesh";
|
||||
}
|
||||
{
|
||||
station = "Rockabilly Radio";
|
||||
stream = "http://lin3.ash.fast-serv.com:6026/stream_96";
|
||||
@@ -1427,16 +1372,6 @@ importJSON ./radiorecord.json
|
||||
station = "The UK 1950s Radio Station";
|
||||
logo = "http://www.1950sukradio.co.uk/images/page_componants/1950s_Station_Logo.png";
|
||||
}
|
||||
{
|
||||
stream = "https://rhb-de-hz-fal-stream02-cluster01.radiohost.de/paradiso-jazz_mp3-128";
|
||||
station = "Paradiso Jazz";
|
||||
logo = "https://www.paradiso.de/wp-content/uploads/2019/11/191111_Paradiso-Jazz.jpg";
|
||||
}
|
||||
{
|
||||
stream = "https://rhb-stream20.radiohost.de/paradiso-nashville_mp3-128";
|
||||
station = "Paradiso Nashville";
|
||||
logo = "https://www.paradiso.de/wp-content/uploads/2019/11/191111_Paradiso-Nashville.jpg";
|
||||
}
|
||||
{
|
||||
stream = stereoscenic "mod-h";
|
||||
station = stereoscenic-name "Ambient Modern";
|
||||
@@ -1476,12 +1411,36 @@ importJSON ./radiorecord.json
|
||||
logo = "https://www.radiopartywelle.com/wp-content/uploads/2020/11/RPW-HAUPTLOGO-einfach-gute-Laune-1.png";
|
||||
desc = "... einfach gute Laune!";
|
||||
}
|
||||
{ stream = paloma "RP-Fresh"; station = paloma-name "Fresh"; logo = paloma-logo; }
|
||||
{ stream = paloma "RP-Kultschlager"; station = paloma-name "Kultschlager"; logo = paloma-logo; }
|
||||
{ stream = paloma "RP-Kuschelschlager"; station = paloma-name "Kuschelschlager"; logo = paloma-logo; }
|
||||
{ stream = paloma "RP-Partyschlager"; station = paloma-name "Partyschlager"; logo = paloma-logo; }
|
||||
{ stream = paloma "RP-Volksmusik"; station = paloma-name "Volksmusik"; logo = paloma-logo; }
|
||||
{ stream = paloma "RADIOPALOMA"; station = paloma-name "Live"; logo = paloma-logo; }
|
||||
{
|
||||
stream = paloma "RP-Fresh";
|
||||
station = paloma-name "Fresh";
|
||||
logo = paloma-logo;
|
||||
}
|
||||
{
|
||||
stream = paloma "RP-Kultschlager";
|
||||
station = paloma-name "Kultschlager";
|
||||
logo = paloma-logo;
|
||||
}
|
||||
{
|
||||
stream = paloma "RP-Kuschelschlager";
|
||||
station = paloma-name "Kuschelschlager";
|
||||
logo = paloma-logo;
|
||||
}
|
||||
{
|
||||
stream = paloma "RP-Partyschlager";
|
||||
station = paloma-name "Partyschlager";
|
||||
logo = paloma-logo;
|
||||
}
|
||||
{
|
||||
stream = paloma "RP-Volksmusik";
|
||||
station = paloma-name "Volksmusik";
|
||||
logo = paloma-logo;
|
||||
}
|
||||
{
|
||||
stream = paloma "RADIOPALOMA";
|
||||
station = paloma-name "Live";
|
||||
logo = paloma-logo;
|
||||
}
|
||||
{
|
||||
stream = "http://91.121.59.45:8013/autodj";
|
||||
station = "Feeling Floyd | AutoDJ";
|
||||
@@ -1490,33 +1449,97 @@ importJSON ./radiorecord.json
|
||||
stream = "http://91.121.59.45:8013/live";
|
||||
station = "Feeling Floyd | Live";
|
||||
}
|
||||
]
|
||||
{
|
||||
station = "Chinese Music World";
|
||||
stream = "https://radio.chinesemusicworld.com/chinesemusic.ogg";
|
||||
}
|
||||
{
|
||||
stream = "https://live.hunter.fm/lofi_high";
|
||||
station = "LoFi | Hunter FM";
|
||||
}
|
||||
{
|
||||
stream = "https://live.hunter.fm/pisadinha_high";
|
||||
station = "Pisadinha | Hunter FM";
|
||||
}
|
||||
{
|
||||
stream = "https://classicfm.ice.infomaniak.ch/classic-fm.mp3";
|
||||
station = "Classic FM";
|
||||
}
|
||||
{
|
||||
station = "Digital Jazz";
|
||||
stream = "http://stm01.virtualcast.com.br:8190/live";
|
||||
}
|
||||
{
|
||||
station = "Jazz | Radio Monte Carlo";
|
||||
stream = "http://edge.radiomontecarlo.net/rmcweb019";
|
||||
}
|
||||
{
|
||||
station = "NRK Jazz";
|
||||
stream = "http://lyd.nrk.no/nrk_radio_jazz_aac_h";
|
||||
}
|
||||
{
|
||||
station = "Digital Impulse – Classical Channel";
|
||||
stream = "http://orion.shoutca.st:8978/stream";
|
||||
}
|
||||
{
|
||||
station = "Старое радио (детское)";
|
||||
stream = "http://195.91.237.50:8000/detskoe128";
|
||||
}
|
||||
{
|
||||
station = "Старое радио";
|
||||
stream = "http://195.91.237.50:8000/ices128";
|
||||
}
|
||||
{
|
||||
station = "Старое радио (музыка)";
|
||||
stream = "http://195.91.237.50:8000/music128";
|
||||
}
|
||||
{
|
||||
station = "Fango Radio";
|
||||
stream = "https://azuracast.streams.ovh/radio/8090/radio.mp3";
|
||||
}
|
||||
{
|
||||
station = "Mikis Radio";
|
||||
stream = "http://radio.hostchefs.net:8046/stream";
|
||||
}
|
||||
]
|
||||
/*
|
||||
(caster-fm "TODO" "noasrv" 10182) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
|
||||
(caster-fm "TODO" "shaincast" 20866) # https://github.com/cccruzr/albumsyoumusthear/blob/7e00baf575e4d357cd275d54d1aeb717321141a8/HLS/IBERO_90_1.m3u
|
||||
|
||||
CNN news in morse code
|
||||
http://cw.dimebank.com:8080/CNNslow
|
||||
http://cw.dimebank.com:8080/CNNfast
|
||||
CNN news in morse code
|
||||
http://cw.dimebank.com:8080/CNNslow
|
||||
http://cw.dimebank.com:8080/CNNfast
|
||||
|
||||
Brazilian Jazz
|
||||
http://stm01.virtualcast.com.br:8190/live
|
||||
Orchestral
|
||||
http://orion.shoutca.st:8978/stream
|
||||
|
||||
LoFi / Chill
|
||||
http://ice55.securenetsystems.net/DASH76
|
||||
LoFi / Chill
|
||||
http://ice55.securenetsystems.net/DASH76
|
||||
|
||||
News background music
|
||||
https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
|
||||
News background music
|
||||
https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
|
||||
|
||||
?
|
||||
http://94.23.221.158:9163/stream
|
||||
?
|
||||
http://94.23.221.158:9163/stream
|
||||
|
||||
Greek radio
|
||||
http://radio.hostchefs.net:8046/stream?1520818130148
|
||||
Greek radio
|
||||
http://radio.hostchefs.net:8046/stream?1520818130148
|
||||
|
||||
: http://audiokrishna.com/stations/japa2.mp3
|
||||
http://185.105.4.53:2339//;stream.mp3
|
||||
http://cast5.servcast.net:1390/;stream.mp3
|
||||
: http://audiokrishna.com/stations/japa2.mp3
|
||||
http://185.105.4.53:2339//;stream.mp3
|
||||
http://cast5.servcast.net:1390/;stream.mp3
|
||||
|
||||
Hard rock
|
||||
http://andromeda.shoutca.st:9254/stream
|
||||
|
||||
Rock alternative
|
||||
http://icy.unitedradio.it/VirginRockAlternative.mp3
|
||||
|
||||
American nautical weather news
|
||||
http://ca.radioboss.fm:8149/stream
|
||||
|
||||
Christian radio in all languages
|
||||
https://jesuscomingfm.com/#
|
||||
tamazight http://live.jesuscomingfm.com:8462/;
|
||||
*/
|
||||
|
||||
*/
|
||||
|
||||
@@ -8,7 +8,6 @@ nnoremap <C-l> :Rg<CR>
|
||||
let g:fzf_layout = { 'down': '~15%' }
|
||||
|
||||
colorscheme paramount
|
||||
set background=dark
|
||||
" transparent background
|
||||
hi Normal guibg=NONE ctermbg=NONE
|
||||
|
||||
@@ -35,11 +34,17 @@ nnoremap <Leader>a <Plug>(ale_hover)
|
||||
nnoremap <Leader>d <Plug>(ale_go_to_definition_in_tab)
|
||||
nnoremap <Leader>rf <Plug>(ale_find_references)
|
||||
|
||||
" Hit `%` on `if` to jump to `else`.
|
||||
runtime macros/matchit.vim
|
||||
|
||||
filetype plugin indent on
|
||||
set autoindent
|
||||
set notitle
|
||||
set nospell
|
||||
set nocompatible
|
||||
set smartcase ignorecase " you need these two
|
||||
set backspace=indent,eol,start
|
||||
set hidden
|
||||
set ruler
|
||||
set shiftwidth=2 tabstop=2 expandtab
|
||||
set laststatus=1
|
||||
set number
|
||||
@@ -109,29 +114,33 @@ command! ToggleBackground call s:toggle_background()
|
||||
inoremap <F12> <C-O>:ToggleBackground<CR>
|
||||
nnoremap <F12> :ToggleBackground<CR>
|
||||
|
||||
autocmd bufnewfile,bufread *.4th set filetype=forth
|
||||
autocmd bufnewfile,bufread *.asm set filetype=nasm
|
||||
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 *.nix packadd vim-nix | set filetype=nix | set path+=/var/src
|
||||
autocmd bufnewfile,bufread *.rust packadd rust-vim
|
||||
autocmd bufnewfile,bufread *.csv packadd csv.vim | set filetype=csv
|
||||
autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
|
||||
autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
|
||||
autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
|
||||
autocmd bufnewfile,bufread *.jq packadd jq.vim
|
||||
autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
|
||||
autocmd bufnewfile,bufread urls,config set filetype=conf
|
||||
autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
|
||||
autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
|
||||
autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
|
||||
autocmd filetype javascript packadd vim-javascript
|
||||
autocmd filetype make setlocal noexpandtab
|
||||
augroup filetypes
|
||||
autocmd!
|
||||
autocmd bufnewfile,bufread *.4th set filetype=forth
|
||||
autocmd bufnewfile,bufread *.asm set filetype=nasm
|
||||
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 *.nix packadd vim-nix | set filetype=nix | set path+=/var/src
|
||||
autocmd bufnewfile,bufread *.rust packadd rust-vim
|
||||
autocmd bufnewfile,bufread *.csv packadd csv.vim | set filetype=csv
|
||||
autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
|
||||
autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
|
||||
autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
|
||||
autocmd bufnewfile,bufread *.jq packadd jq.vim
|
||||
autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
|
||||
autocmd bufnewfile,bufread urls,config set filetype=conf
|
||||
autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
|
||||
autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
|
||||
autocmd 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
|
||||
augroup end
|
||||
|
||||
|
||||
autocmd filetype html packadd emmet-vim
|
||||
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`\"" |
|
||||
|
||||
@@ -1,20 +1,25 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
with lib;
|
||||
let cfg = config.niveum.dropbox;
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.niveum.dropbox;
|
||||
in {
|
||||
options.niveum.dropbox = { enable = mkEnableOption "Dropbox"; };
|
||||
options.niveum.dropbox = {enable = mkEnableOption "Dropbox";};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.dropbox-cli ];
|
||||
environment.systemPackages = [pkgs.dropbox-cli];
|
||||
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [ 17500 ];
|
||||
allowedUDPPorts = [ 17500 ];
|
||||
allowedTCPPorts = [17500];
|
||||
allowedUDPPorts = [17500];
|
||||
};
|
||||
|
||||
systemd.user.services.dropbox = {
|
||||
description = "Dropbox synchronisation service";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
wantedBy = ["graphical-session.target"];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.dropbox.out}/bin/dropbox";
|
||||
ExecReload = "${pkgs.coreutils.out}/bin/kill -HUP $MAINPID";
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.niveum.hledger;
|
||||
hledger-git = pkgs.writers.writeDashBin "hledger-git" ''
|
||||
LEDGER_DIR="$(dirname $LEDGER_FILE)"
|
||||
@@ -39,14 +43,14 @@ in {
|
||||
default = "127.0.0.1";
|
||||
};
|
||||
capabilities = mkOption {
|
||||
type = types.listOf (types.enum [ "view" "add" "manage" ]);
|
||||
default = [ "view" "add" ];
|
||||
type = types.listOf (types.enum ["view" "add" "manage"]);
|
||||
default = ["view" "add"];
|
||||
};
|
||||
flags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
user = mkOption { type = types.attrs; };
|
||||
user = mkOption {type = types.attrs;};
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.hledger-web;
|
||||
@@ -55,14 +59,14 @@ in {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package hledger-git hledger-edit ];
|
||||
environment.systemPackages = [cfg.package hledger-git hledger-edit];
|
||||
|
||||
environment.variables.LEDGER_FILE =
|
||||
mkIf (cfg.ledgerFile != null) cfg.ledgerFile;
|
||||
|
||||
systemd.services.hledger-web = mkIf cfg.server.enable {
|
||||
description = "hledger server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
ExecStart = ''
|
||||
|
||||
@@ -1,8 +1,13 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
with lib;
|
||||
let cfg = config.niveum.minecraft;
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.niveum.minecraft;
|
||||
in {
|
||||
options.niveum.minecraft = { enable = mkEnableOption "Minecraft"; };
|
||||
options.niveum.minecraft = {enable = mkEnableOption "Minecraft";};
|
||||
|
||||
config = mkIf cfg.enable { environment.systemPackages = [ pkgs.minecraft ]; };
|
||||
config = mkIf cfg.enable {environment.systemPackages = [pkgs.minecraft];};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.services.moodle-dl;
|
||||
json = pkgs.formats.json {};
|
||||
moodle-dl-json = json.generate "moodle-dl.json" cfg.settings;
|
||||
@@ -52,7 +56,6 @@ in {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
users.users.moodle-dl = {
|
||||
isSystemUser = true;
|
||||
home = cfg.directory;
|
||||
@@ -63,7 +66,7 @@ in {
|
||||
|
||||
systemd.services.moodle-dl = {
|
||||
description = "A Moodle downloader that downloads course content";
|
||||
wants = [ "network-online.target" ];
|
||||
wants = ["network-online.target"];
|
||||
serviceConfig = mkMerge [
|
||||
{
|
||||
Type = "oneshot";
|
||||
@@ -73,11 +76,11 @@ in {
|
||||
ExecStart = "${cfg.package}/bin/moodle-dl ${lib.optionalString cfg.notifyOnly "--without-downloading-files"}";
|
||||
ExecStartPre = "${pkgs.coreutils}/bin/ln -sfn ${toString moodle-dl-json} ${cfg.directory}/config.json";
|
||||
}
|
||||
(mkIf (cfg.directory == stateDirectoryDefault) { StateDirectory = "moodle-dl"; })
|
||||
(mkIf (cfg.directory == stateDirectoryDefault) {StateDirectory = "moodle-dl";})
|
||||
];
|
||||
inherit (cfg) startAt;
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ maintainers.kmein ];
|
||||
meta.maintainers = [maintainers.kmein];
|
||||
}
|
||||
|
||||
@@ -1,50 +1,69 @@
|
||||
# https://github.com/jmackie/nixos-networkmanager-profiles/
|
||||
{ lib, config, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
nm = config.networking.networkmanager;
|
||||
|
||||
mkProfile = profileAttrs:
|
||||
if !(isAttrs profileAttrs) then
|
||||
throw "error 1"
|
||||
if !(isAttrs profileAttrs)
|
||||
then throw "error 1"
|
||||
else {
|
||||
enable = true;
|
||||
mode = "0400"; # readonly (user)
|
||||
text = (foldlAttrs (accum:
|
||||
{ name, value }: ''
|
||||
text =
|
||||
(foldlAttrs (accum: {
|
||||
name,
|
||||
value,
|
||||
}: ''
|
||||
${accum}
|
||||
|
||||
[${name}] ${mkProfileEntry value}'')
|
||||
"# Generated by nixos-networkmanager-profiles" profileAttrs) + "\n";
|
||||
"# Generated by nixos-networkmanager-profiles"
|
||||
profileAttrs)
|
||||
+ "\n";
|
||||
};
|
||||
|
||||
mkProfileEntry = entryAttrs:
|
||||
if !(isAttrs entryAttrs) then
|
||||
throw "error 2"
|
||||
if !(isAttrs entryAttrs)
|
||||
then throw "error 2"
|
||||
else
|
||||
foldlAttrs (accum:
|
||||
{ name, value }: ''
|
||||
foldlAttrs (accum: {
|
||||
name,
|
||||
value,
|
||||
}: ''
|
||||
${accum}
|
||||
${name}=${toString value}'') "" entryAttrs;
|
||||
${name}=${toString value}'') ""
|
||||
entryAttrs;
|
||||
|
||||
foldlAttrs = op: nul: attrs:
|
||||
foldl (accum: { fst, snd }: op accum (nameValuePair fst snd)) nul
|
||||
foldl (accum: {
|
||||
fst,
|
||||
snd,
|
||||
}:
|
||||
op accum (nameValuePair fst snd))
|
||||
nul
|
||||
(lists.zipLists (attrNames attrs) (attrValues attrs));
|
||||
|
||||
attrLength = attrs: length (attrValues attrs);
|
||||
|
||||
in {
|
||||
options.networking.networkmanager.profiles = mkOption {
|
||||
type = types.attrs;
|
||||
default = { };
|
||||
default = {};
|
||||
};
|
||||
|
||||
config = mkIf (attrLength nm.profiles > 0) {
|
||||
environment.etc = (foldlAttrs (accum:
|
||||
{ name, value }:
|
||||
accum // {
|
||||
environment.etc = foldlAttrs (accum: {
|
||||
name,
|
||||
value,
|
||||
}:
|
||||
accum
|
||||
// {
|
||||
"NetworkManager/system-connections/${name}.nmconnection" =
|
||||
mkProfile value;
|
||||
}) { } nm.profiles);
|
||||
}) {}
|
||||
nm.profiles;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
netname = "retiolum";
|
||||
cfg = config.networking.retiolum;
|
||||
in {
|
||||
@@ -27,10 +31,10 @@ in {
|
||||
};
|
||||
|
||||
config = {
|
||||
|
||||
services.tinc.networks.${netname} = {
|
||||
name = cfg.nodename;
|
||||
hosts = builtins.mapAttrs
|
||||
hosts =
|
||||
builtins.mapAttrs
|
||||
(name: _: builtins.readFile "${<retiolum/hosts>}/${name}")
|
||||
(builtins.readDir <retiolum/hosts>);
|
||||
rsaPrivateKeyFile = toString <system-secrets/retiolum.key>;
|
||||
@@ -43,11 +47,11 @@ in {
|
||||
|
||||
networking.extraHosts = builtins.readFile (toString <retiolum/etc.hosts>);
|
||||
|
||||
environment.systemPackages = [ config.services.tinc.networks.${netname}.package ];
|
||||
environment.systemPackages = [config.services.tinc.networks.${netname}.package];
|
||||
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [ 655 ];
|
||||
allowedUDPPorts = [ 655 ];
|
||||
allowedTCPPorts = [655];
|
||||
allowedUDPPorts = [655];
|
||||
};
|
||||
#services.netdata.portcheck.checks.tinc.port = 655;
|
||||
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.services.spotifyd;
|
||||
toml = pkgs.formats.toml {};
|
||||
spotifydConf = if cfg.settings != {} then toml.generate "spotify.conf" cfg.settings else pkgs.writeText "spotifyd.conf" cfg.config;
|
||||
in
|
||||
{
|
||||
spotifydConf =
|
||||
if cfg.settings != {}
|
||||
then toml.generate "spotify.conf" cfg.settings
|
||||
else pkgs.writeText "spotifyd.conf" cfg.config;
|
||||
in {
|
||||
options = {
|
||||
services.spotifyd = {
|
||||
enable = mkEnableOption "spotifyd, a Spotify playing daemon";
|
||||
@@ -41,8 +45,8 @@ in
|
||||
];
|
||||
|
||||
systemd.services.spotifyd = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" "sound.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = ["network-online.target" "sound.target"];
|
||||
description = "spotifyd, a Spotify playing daemon";
|
||||
environment.SHELL = "/bin/sh";
|
||||
serviceConfig = {
|
||||
@@ -56,5 +60,5 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ maintainers.anderslundstedt ];
|
||||
meta.maintainers = [maintainers.anderslundstedt];
|
||||
}
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
options.niveum = {
|
||||
wirelessInterface = mkOption { type = types.str; };
|
||||
wirelessInterface = mkOption {type = types.str;};
|
||||
|
||||
batteryName = mkOption { type = types.str; };
|
||||
batteryName = mkOption {type = types.str;};
|
||||
|
||||
promptColours = let
|
||||
colours16 = types.enum [
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.niveum.telegramBots;
|
||||
|
||||
botService = name: bot:
|
||||
@@ -8,8 +12,8 @@ let
|
||||
enable = bot.enable;
|
||||
startAt = bot.time;
|
||||
serviceConfig.Type = "oneshot";
|
||||
wants = [ "network-online.target" ];
|
||||
script = strings.concatStringsSep "\n" ([ "QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then" ]
|
||||
wants = ["network-online.target"];
|
||||
script = strings.concatStringsSep "\n" (["QUOTE=$(${bot.command})" "if [ -n \"$QUOTE\" ]; then"]
|
||||
++ map (chatId: ''
|
||||
${pkgs.curl}/bin/curl -s -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
|
||||
-d chat_id="${chatId}" \
|
||||
@@ -17,28 +21,29 @@ let
|
||||
lib.strings.optionalString (bot.parseMode != null)
|
||||
"-d parse_mode=${bot.parseMode}"
|
||||
}
|
||||
'') bot.chatIds
|
||||
++ [ "fi" ]);
|
||||
'')
|
||||
bot.chatIds
|
||||
++ ["fi"]);
|
||||
};
|
||||
in {
|
||||
options.niveum.telegramBots = mkOption {
|
||||
type = types.attrsOf (types.submodule {
|
||||
options = {
|
||||
enable = mkEnableOption "Telegram bot";
|
||||
time = mkOption { type = types.str; };
|
||||
token = mkOption { type = types.strMatching "[0-9A-Za-z:-]+"; };
|
||||
time = mkOption {type = types.str;};
|
||||
token = mkOption {type = types.strMatching "[0-9A-Za-z:-]+";};
|
||||
chatIds = mkOption {
|
||||
type = types.listOf (types.strMatching "-?[0-9]+|@[A-Za-z0-9]+");
|
||||
};
|
||||
command = mkOption { type = types.str; };
|
||||
command = mkOption {type = types.str;};
|
||||
parseMode = mkOption {
|
||||
type = types.nullOr (types.enum [ "HTML" "Markdown" ]);
|
||||
type = types.nullOr (types.enum ["HTML" "Markdown"]);
|
||||
default = null;
|
||||
};
|
||||
};
|
||||
});
|
||||
default = { };
|
||||
default = {};
|
||||
};
|
||||
|
||||
config = { systemd.services = attrsets.mapAttrs' botService cfg; };
|
||||
config = {systemd.services = attrsets.mapAttrs' botService cfg;};
|
||||
}
|
||||
|
||||
@@ -1,40 +1,49 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.niveum.traadfri;
|
||||
traadfri = pkgs.callPackage <traadfri> {
|
||||
libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };
|
||||
libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {tls = true;};
|
||||
};
|
||||
in {
|
||||
options.niveum.traadfri = {
|
||||
enable = mkEnableOption "Trådfri CLI";
|
||||
user = mkOption { type = types.str; };
|
||||
host = mkOption { type = types.str; };
|
||||
key = mkOption { type = types.str; };
|
||||
user = mkOption {type = types.str;};
|
||||
host = mkOption {type = types.str;};
|
||||
key = mkOption {type = types.str;};
|
||||
rooms = mkOption {
|
||||
type = types.attrsOf types.int;
|
||||
default = { };
|
||||
default = {};
|
||||
};
|
||||
bulbs = mkOption {
|
||||
type = types.attrsOf types.int;
|
||||
default = { };
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.shellAliases = lib.attrsets.mapAttrs' (name: value:
|
||||
lib.nameValuePair "traadfri-${name}" "traadfri --target Bulb ${toString value}")
|
||||
cfg.bulbs // lib.attrsets.mapAttrs' (name: value:
|
||||
lib.nameValuePair "traadfri-${name}" "traadfri --target Room ${toString value}")
|
||||
cfg.rooms;
|
||||
|
||||
environment.systemPackages = [
|
||||
environment.systemPackages =
|
||||
[
|
||||
(pkgs.writers.writeDashBin "traadfri" ''
|
||||
TRAADFRI_USER="${cfg.user}" \
|
||||
TRAADFRI_KEY="${cfg.key}" \
|
||||
TRAADFRI_HUB="${cfg.host}" \
|
||||
${traadfri}/bin/traadfri $@
|
||||
'')
|
||||
];
|
||||
]
|
||||
++ lib.mapAttrsToList (name: value:
|
||||
pkgs.writers.writeDashBin "traadfri-${name}" ''
|
||||
exec traadfri --target Room ${toString value} "$@"
|
||||
'')
|
||||
cfg.rooms
|
||||
++ lib.mapAttrsToList (name: value:
|
||||
pkgs.writers.writeDashBin "traadfri-${name}" ''
|
||||
exec traadfri --target Bulb ${toString value} "$@"
|
||||
'')
|
||||
cfg.bulbs;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
tuna = pkgs.callPackage <tuna> {};
|
||||
cfg = config.services.tuna;
|
||||
in {
|
||||
@@ -77,8 +81,8 @@ in {
|
||||
users.groups.tuna = {};
|
||||
# ref https://github.com/florianheinemann/MPD.FM/blob/9d037cf87597b26ae2f10ba9feea48946ad6cc68/service/MPD.FM.service
|
||||
systemd.services.tuna = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "mpd.service" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = ["mpd.service"];
|
||||
script = "${cfg.package}/bin/tuna";
|
||||
environment = {
|
||||
NODE_ENV = "production";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
self: super:
|
||||
with super.lib;
|
||||
let
|
||||
with super.lib; let
|
||||
eval = import <nixpkgs/nixos/lib/eval-config.nix>;
|
||||
paths = (eval {modules = [(import <nixos-config>)];}).config.nixpkgs.overlays;
|
||||
in foldl' (flip extends) (_: super) paths self
|
||||
in
|
||||
foldl' (flip extends) (_: super) paths self
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, makeWrapper, pandoc, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
pandoc,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "daybook";
|
||||
src = fetchFromGitHub {
|
||||
@@ -7,8 +13,8 @@ stdenv.mkDerivation {
|
||||
rev = "db2c34830e09183c80f3381bf5e4c44d52f05d53";
|
||||
sha256 = "0nbsv8f12qh5spq7zhimhdf3p7msk33xrb0ilqvlc6jmlkpislmv";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ pandoc ];
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
buildInputs = [pandoc];
|
||||
buildPhase = ''
|
||||
mkdir -p $out/man/man1
|
||||
pandoc --standalone --to man daybook.1.md -o $out/man/man1/daybook.1
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
{ lib, writeShellScriptBin }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
writeShellScriptBin,
|
||||
}: let
|
||||
aliasFlag = name: value: "-c alias.${name}=${lib.escapeShellArg value}";
|
||||
aliases = {
|
||||
eroeffne = "init";
|
||||
@@ -20,10 +22,11 @@ let
|
||||
tagebuch = "log";
|
||||
zustand = "status";
|
||||
};
|
||||
in writeShellScriptBin "depp" ''
|
||||
in
|
||||
writeShellScriptBin "depp" ''
|
||||
if [ $# -gt 0 ]; then
|
||||
git ${lib.concatStringsSep " " (lib.attrsets.mapAttrsToList aliasFlag aliases)} "$@"
|
||||
else
|
||||
printf "${lib.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v: n + " " + v) aliases)}\n"
|
||||
fi
|
||||
''
|
||||
''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ yarn2nix-moretea }:
|
||||
{yarn2nix-moretea}:
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
name = "devanagari";
|
||||
src = ./.;
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
|
||||
{
|
||||
fetchurl,
|
||||
fetchgit,
|
||||
linkFarm,
|
||||
runCommandNoCC,
|
||||
gnutar,
|
||||
}: rec {
|
||||
offline_cache = linkFarm "offline" packages;
|
||||
packages = [
|
||||
{
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, xdo, makeWrapper, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
xdo,
|
||||
makeWrapper,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "devour";
|
||||
version = "master";
|
||||
@@ -10,10 +16,10 @@ stdenv.mkDerivation {
|
||||
sha256 = "0f2jb8knx7lqy6wmf3rchgq2n2dj496lm8vgcs58rppzrmsk59d5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ xdo ];
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
buildInputs = [xdo];
|
||||
|
||||
DESTDIR="$(out)";
|
||||
DESTDIR = "$(out)";
|
||||
|
||||
fixupPhase = ''
|
||||
wrapProgram $out/bin/devour --prefix PATH ":" ${xdo}/bin ;
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ fetchzip, symlinkJoin, lib }:
|
||||
let
|
||||
{
|
||||
fetchzip,
|
||||
symlinkJoin,
|
||||
lib,
|
||||
}: let
|
||||
gfs-font = name: sha256:
|
||||
fetchzip {
|
||||
inherit name sha256;
|
||||
@@ -10,7 +13,8 @@ let
|
||||
unzip -j -o $downloadedFile "**/*.otf" -d $out/share/fonts/opentype
|
||||
'';
|
||||
};
|
||||
in symlinkJoin {
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "gfs-fonts";
|
||||
paths = lib.mapAttrsToList gfs-font {
|
||||
GFS_Artemisia = "1q39086pr2jhv118fjfv6l1li6japv4pdjnhh1scqw06mqrmydf4";
|
||||
@@ -36,4 +40,4 @@ in symlinkJoin {
|
||||
GFS_Solomos = "1mpx9mw566awvfjdfx5sbz3wz5gbnjjw56gz30mk1lw06vxf0dxz";
|
||||
GFS_Theokritos = "0haasx819x8c8yvna6pqywgi4060av2570jm34cddnz1fgnhv1b8";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
# { stdenv, python }:
|
||||
{ pkgs ? import <nixpkgs> { } }:
|
||||
{pkgs ? import <nixpkgs> {}}:
|
||||
with pkgs;
|
||||
with pkgs.python2Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
buildPythonApplication rec {
|
||||
pname = "gourmet";
|
||||
version = "0.17.4";
|
||||
src = builtins.fetchTarball {
|
||||
url = "https://github.com/thinkle/gourmet/archive/${version}.tar.gz";
|
||||
};
|
||||
buildInputs = [ distutils_extra intltool ];
|
||||
propagatedBuildInputs = [ sqlalchemy reportlab lxml ];
|
||||
meta = with stenv.lib; { maintainers = with maintainers; [ kmein ]; };
|
||||
}
|
||||
buildInputs = [distutils_extra intltool];
|
||||
propagatedBuildInputs = [sqlalchemy reportlab lxml];
|
||||
meta = with stenv.lib; {maintainers = with maintainers; [kmein];};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, cmake, python3, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017.09.06";
|
||||
name = "iolanguage-${version}";
|
||||
@@ -9,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
buildInputs = [ cmake python3 ];
|
||||
buildInputs = [cmake python3];
|
||||
preBuild = "mkdir -p build && cd build";
|
||||
buildPhase = ''
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$out/ ..
|
||||
@@ -17,8 +23,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
meta = with lib; {
|
||||
homepage = "https://iolanguage.org/";
|
||||
description =
|
||||
"Io programming language. Inspired by Self, Smalltalk and LISP.";
|
||||
description = "Io programming language. Inspired by Self, Smalltalk and LISP.";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "ix";
|
||||
src = fetchurl {
|
||||
url = "https://ix.io/client";
|
||||
sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";
|
||||
};
|
||||
phases = [ "installPhase" ];
|
||||
phases = ["installPhase"];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install $src $out/bin/ix
|
||||
|
||||
@@ -1,6 +1,18 @@
|
||||
{ lib, pkg-config, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls
|
||||
, doxygen, asciidoc
|
||||
, tls ? false, docs ? true }:
|
||||
{
|
||||
lib,
|
||||
pkg-config,
|
||||
fetchFromGitHub,
|
||||
automake,
|
||||
autoconf,
|
||||
which,
|
||||
libtool,
|
||||
stdenv,
|
||||
gnutls,
|
||||
doxygen,
|
||||
asciidoc,
|
||||
tls ? false,
|
||||
docs ? true,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "libcoap";
|
||||
version = "unstable-2021-05-28";
|
||||
@@ -11,8 +23,9 @@ stdenv.mkDerivation {
|
||||
sha256 = "1igjv0hbwmakdccp5in4gw9w2p5swxdwsdx0glyna2s29sh1d37x";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
buildInputs = [ which pkg-config automake autoconf libtool ]
|
||||
++ lib.optionals docs [ doxygen asciidoc ]
|
||||
buildInputs =
|
||||
[which pkg-config automake autoconf libtool]
|
||||
++ lib.optionals docs [doxygen asciidoc]
|
||||
++ lib.optional tls gnutls;
|
||||
# preConfigure = "./autogen.sh";
|
||||
# configureFlags = lib.optional (!docs) "--disable-documentation" ++ lib.optional tls "--enable-dtls";
|
||||
@@ -27,6 +40,6 @@ stdenv.mkDerivation {
|
||||
description = "A CoAP (RFC 7252) implementation in C";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.kmein ];
|
||||
maintainers = [maintainers.kmein];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,22 @@
|
||||
{ lib, fetchFromGitHub, mkDerivation, ansi-terminal, base, directory, doctest, filepath
|
||||
, megaparsec, optparse-applicative, prettyprinter, process
|
||||
, raw-strings-qq, stdenv, tasty, tasty-hunit, text, yaml
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkDerivation,
|
||||
ansi-terminal,
|
||||
base,
|
||||
directory,
|
||||
doctest,
|
||||
filepath,
|
||||
megaparsec,
|
||||
optparse-applicative,
|
||||
prettyprinter,
|
||||
process,
|
||||
raw-strings-qq,
|
||||
stdenv,
|
||||
tasty,
|
||||
tasty-hunit,
|
||||
text,
|
||||
yaml,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "mahlzeit";
|
||||
@@ -14,15 +30,32 @@ mkDerivation {
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
ansi-terminal base directory filepath megaparsec prettyprinter text
|
||||
ansi-terminal
|
||||
base
|
||||
directory
|
||||
filepath
|
||||
megaparsec
|
||||
prettyprinter
|
||||
text
|
||||
yaml
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
ansi-terminal base directory filepath optparse-applicative process
|
||||
text yaml
|
||||
ansi-terminal
|
||||
base
|
||||
directory
|
||||
filepath
|
||||
optparse-applicative
|
||||
process
|
||||
text
|
||||
yaml
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base doctest megaparsec raw-strings-qq tasty tasty-hunit
|
||||
base
|
||||
doctest
|
||||
megaparsec
|
||||
raw-strings-qq
|
||||
tasty
|
||||
tasty-hunit
|
||||
];
|
||||
homepage = "https://github.com/kmein/mahlzeit";
|
||||
description = "Recipe toolkit";
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ stdenv, pandoc, lib, fetchgit }:
|
||||
{
|
||||
stdenv,
|
||||
pandoc,
|
||||
lib,
|
||||
fetchgit,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "pandoc-doc";
|
||||
version = pandoc.version;
|
||||
|
||||
37
packages/mpv-visualizer.nix
Normal file
37
packages/mpv-visualizer.nix
Normal file
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
xclip,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "visualizer";
|
||||
version = "unstable-2021-07-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfcc64";
|
||||
repo = "mpv-scripts";
|
||||
rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1";
|
||||
sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp visualizer.lua $out/share/mpv/scripts
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "visualizer.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "various audio visualization";
|
||||
homepage = "https://github.com/mfcc64/mpv-scripts";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [kmein];
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,11 @@
|
||||
{ lib, stdenv, cmake, pkgconfig, libogg, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
pkgconfig,
|
||||
libogg,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opustags";
|
||||
version = "1.3.0";
|
||||
@@ -14,9 +21,9 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_INSTALL_PREFIX=$out"
|
||||
];
|
||||
|
||||
buildInputs = [ libogg ];
|
||||
buildInputs = [libogg];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [cmake pkgconfig];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/fmang/opustags";
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ fetchPypi, buildPythonPackage, pygtrie, ... }:
|
||||
{
|
||||
fetchPypi,
|
||||
buildPythonPackage,
|
||||
pygtrie,
|
||||
...
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "betacode";
|
||||
version = "0.2";
|
||||
@@ -7,6 +12,6 @@ buildPythonPackage rec {
|
||||
sha256 = "08fnjzjvnm9m6p4ddyr8qgfb9bs2nipv4ls50784v0xazgxx7siv";
|
||||
};
|
||||
preBuild = ''echo > README.rst'';
|
||||
propagatedBuildInputs = [ pygtrie ];
|
||||
propagatedBuildInputs = [pygtrie];
|
||||
doCheck = false;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
{ fetchFromGitHub, buildPythonPackage, backports_functools_lru_cache, selenium, regex, ... }:
|
||||
{
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
backports_functools_lru_cache,
|
||||
selenium,
|
||||
regex,
|
||||
...
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "indic_transliteration";
|
||||
version = "unstable-2020-12-15";
|
||||
@@ -8,7 +15,7 @@ buildPythonPackage rec {
|
||||
rev = "2ea25a03af15937916b6768835e056166986c567";
|
||||
sha256 = "1pcf800hl0zkcffc47mkjq9mizsxdi0hwxlnij5bvbqdshd3w9ll";
|
||||
};
|
||||
patches = [ ./regex-version.patch ];
|
||||
propagatedBuildInputs = [ backports_functools_lru_cache selenium regex ];
|
||||
patches = [./regex-version.patch];
|
||||
propagatedBuildInputs = [backports_functools_lru_cache selenium regex];
|
||||
doCheck = false;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user