mirror of
https://github.com/kmein/niveum
synced 2026-03-25 05:51:07 +01:00
Compare commits
43 Commits
a23f0c80a2
...
mympd
| Author | SHA1 | Date | |
|---|---|---|---|
| d06d0a9de4 | |||
| d4e82500ae | |||
| 6aa9be6f70 | |||
| 4e362678ca | |||
| a2081dece4 | |||
| 98cf188a17 | |||
| 4932c7c08a | |||
| c8a6991f09 | |||
| 5d3c9a67ab | |||
|
|
659a888c3d | ||
| 26908b03a3 | |||
| feccea5234 | |||
| 8ffb0bd245 | |||
| c1b777b689 | |||
| e85a8f7634 | |||
| 25bc6f573c | |||
| 4b5915354b | |||
| 43ab6b3210 | |||
| 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 |
36
ci.nix
36
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 {
|
||||
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,13 +1,16 @@
|
||||
{ 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"];
|
||||
colourPairs = lib.getAttrs colourNames colours;
|
||||
|
||||
@@ -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,5 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||
tp_smapi
|
||||
acpi_call
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
environment.systemPackages = [pkgs.beets];
|
||||
home-manager.users.me.xdg.configFile = {
|
||||
"beets/config.yaml".source = (pkgs.formats.yaml {}).generate "config.yaml" {
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings.General.Enable =
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
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
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) tmpfilesConfig;
|
||||
in {
|
||||
imports = [
|
||||
<niveum/modules/dropbox.nix>
|
||||
];
|
||||
@@ -7,13 +14,35 @@
|
||||
dropbox.enable = false;
|
||||
};
|
||||
|
||||
system.activationScripts.home-symlinks = ''
|
||||
ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
|
||||
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
|
||||
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
|
||||
'';
|
||||
systemd.tmpfiles.rules = map tmpfilesConfig [
|
||||
{
|
||||
type = "L+";
|
||||
user = config.users.users.me.name;
|
||||
group = "users";
|
||||
mode = "0755";
|
||||
argument = "${config.users.users.me.home}/cloud/Seafile/Wiki";
|
||||
path = "${config.users.users.me.home}/notes";
|
||||
}
|
||||
{
|
||||
type = "L+";
|
||||
user = config.users.users.me.name;
|
||||
group = "users";
|
||||
mode = "0755";
|
||||
argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
|
||||
path = "${config.users.users.me.home}/uni";
|
||||
}
|
||||
{
|
||||
type = "L+";
|
||||
user = config.users.users.me.name;
|
||||
group = "users";
|
||||
mode = "0755";
|
||||
argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
|
||||
path = "${config.users.users.me.home}/mahlzeit";
|
||||
}
|
||||
];
|
||||
|
||||
home-manager.users.me = {
|
||||
services.gnome-keyring.enable = true;
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
@@ -50,8 +79,8 @@
|
||||
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"];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
@@ -29,7 +34,10 @@ in {
|
||||
};
|
||||
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;
|
||||
};
|
||||
@@ -76,13 +83,15 @@ in {
|
||||
# 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"
|
||||
]}
|
||||
]
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -91,8 +100,7 @@ in {
|
||||
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,10 +144,8 @@ 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";}
|
||||
@@ -176,7 +187,7 @@ in {
|
||||
|
||||
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;
|
||||
})
|
||||
localAddresses;
|
||||
}
|
||||
./alacritty.nix
|
||||
./backup.nix
|
||||
@@ -249,5 +262,6 @@ in {
|
||||
./vscode.nix
|
||||
./watson.nix
|
||||
./zsh.nix
|
||||
./tor.nix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
nixify = pkgs.writers.writeDashBin "nixify" ''
|
||||
set -efuC
|
||||
|
||||
@@ -22,14 +21,14 @@ in {
|
||||
|
||||
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,4 +1,9 @@
|
||||
{ lib, config, pkgs, ... }: {
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(import <stockholm/makefu/3modules/bump-distrowatch.nix> {
|
||||
inherit lib config;
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ lib, pkgs, ... }: {
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
# for ICE wifi, ref https://gist.github.com/sunsided/7840e89ff4e11b64a2d7503fafa0290c
|
||||
|
||||
@@ -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";
|
||||
@@ -74,5 +77,4 @@ in {
|
||||
| ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.utillinux}/bin/setsid ${pkgs.xdg_utils}/bin/xdg-open '{}'
|
||||
'')
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
@@ -1,42 +1,53 @@
|
||||
{pkgs, ...}: {
|
||||
nixpkgs.config.joypixels.acceptLicense = true;
|
||||
|
||||
fonts = {
|
||||
enableDefaultFonts = true;
|
||||
fontDir.enable = true;
|
||||
fonts = with pkgs; [
|
||||
alegreya
|
||||
alegreya-sans
|
||||
amiri
|
||||
cantarell-fonts
|
||||
charis-sil
|
||||
corefonts
|
||||
crimson
|
||||
eb-garamond
|
||||
etBook
|
||||
fira
|
||||
font-awesome-ttf
|
||||
gentium
|
||||
gfs-fonts
|
||||
gyre-fonts
|
||||
ia-writer-duospace
|
||||
ibm-plex
|
||||
inconsolata
|
||||
iosevka
|
||||
libertine
|
||||
jetbrains-mono
|
||||
joypixels
|
||||
libertinus
|
||||
libre-bodoni
|
||||
lmodern
|
||||
merriweather
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
noto-fonts-emoji
|
||||
ocr-a
|
||||
roboto
|
||||
roboto-mono
|
||||
roboto-slab
|
||||
scheherazade-new
|
||||
source-code-pro
|
||||
source-serif-pro
|
||||
source-sans-pro
|
||||
ubuntu_font_family
|
||||
gfs-fonts
|
||||
jetbrains-mono
|
||||
twemoji-color-font
|
||||
joypixels
|
||||
source-serif-pro
|
||||
theano
|
||||
tocharian-font
|
||||
];
|
||||
fontconfig.defaultFonts = {
|
||||
monospace = [ "JetBrains Mono" "JoyPixels" ];
|
||||
serif = [ "Roboto Slab" ];
|
||||
sansSerif = [ "Roboto" "Noto Sans" ];
|
||||
emoji = [ "JoyPixels" ];
|
||||
vistafonts
|
||||
vollkorn
|
||||
zilla-slab
|
||||
]; # google-fonts league-of-moveable-type
|
||||
fontconfig.defaultFonts = let
|
||||
emojiFont = "JoyPixels";
|
||||
in {
|
||||
monospace = ["JetBrains Mono" emojiFont];
|
||||
serif = ["Merriweather"];
|
||||
sansSerif = ["Cantarell" emojiFont];
|
||||
emoji = [emojiFont];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
environment = {
|
||||
systemPackages = [pkgs.fzf];
|
||||
variables = {
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
{ 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
|
||||
@@ -10,6 +13,7 @@ in
|
||||
pkgs.gitAndTools.gh
|
||||
pkgs.gitAndTools.git-extras
|
||||
pkgs.gitAndTools.git-trim
|
||||
pkgs.gitAndTools.git-absorb
|
||||
pkgs.gitstats
|
||||
pkgs.patch
|
||||
pkgs.patchutils
|
||||
@@ -38,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,4 +1,8 @@
|
||||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [<niveum/modules/hledger.nix>];
|
||||
|
||||
niveum.hledger = {
|
||||
|
||||
@@ -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,7 +49,8 @@ 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"];
|
||||
@@ -63,13 +67,15 @@ in {
|
||||
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}
|
||||
''}
|
||||
''
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
@@ -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"'';
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
{
|
||||
networking.firewall = {
|
||||
allowedTCPPortRanges = [{
|
||||
allowedTCPPortRanges = [
|
||||
{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
}];
|
||||
allowedUDPPortRanges = [{
|
||||
}
|
||||
];
|
||||
allowedUDPPortRanges = [
|
||||
{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
}];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
home-manager.users.me = {
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let commaSep = builtins.concatStringsSep ",";
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
commaSep = builtins.concatStringsSep ",";
|
||||
in {
|
||||
services.xserver = {
|
||||
layout = commaSep ["de" "gr"];
|
||||
@@ -12,6 +16,5 @@ in {
|
||||
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,8 +15,7 @@ let
|
||||
username = "kmein";
|
||||
password = lib.fileContents <secrets/nextcloud-fysi/password>;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
environment.systemPackages = [pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman];
|
||||
|
||||
systemd.user.services.vdirsyncer = {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
systemd.services.lb-subscription = {
|
||||
enable = true;
|
||||
wants = ["network-online.target"];
|
||||
|
||||
@@ -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;";
|
||||
};
|
||||
@@ -43,14 +46,21 @@
|
||||
|
||||
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 = [
|
||||
{
|
||||
@@ -68,7 +78,8 @@
|
||||
];
|
||||
}
|
||||
];
|
||||
}}
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,12 +1,24 @@
|
||||
{ pkgs, lib, ... }: let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
|
||||
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-format = "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
|
||||
ytdl-raw-options = lib.concatStringsSep "," [''sub-lang="de,en"'' "write-sub=" "write-auto-sub="];
|
||||
screenshot-template = "%F-%wH%wM%wS-%#04n";
|
||||
};
|
||||
@@ -22,6 +34,7 @@ in {
|
||||
};
|
||||
scripts = [
|
||||
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
|
||||
{
|
||||
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<>\"]"
|
||||
''}
|
||||
''
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
environment.shellAliases.view = "nvim -R";
|
||||
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vimPlugins = pkgs.vimPlugins // {
|
||||
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> {};
|
||||
|
||||
@@ -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,8 +41,7 @@ let
|
||||
phase2-auth = "pap";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [<niveum/modules/networkmanager-declarative.nix>];
|
||||
|
||||
programs.nm-applet.enable = true;
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ 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> {};
|
||||
@@ -7,7 +10,10 @@ let
|
||||
|
||||
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
|
||||
@@ -153,7 +161,7 @@ in {
|
||||
scripts.vimv
|
||||
scripts.swallow # window swallowing
|
||||
scripts.literature-quote
|
||||
scripts.nav # json navigation
|
||||
jless # less(1) for json
|
||||
scripts.notetags
|
||||
scripts.booksplit
|
||||
scripts.dmenurandr
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{ config, ... }:
|
||||
let
|
||||
{config, ...}: let
|
||||
user = config.users.users.me.name;
|
||||
in
|
||||
{
|
||||
in {
|
||||
security.polkit.extraConfig = ''
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (subject.user == "${user}" && action.id == "org.freedesktop.systemd1.manage-units") {
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
suspend = pkgs.writers.writeDash "suspend" "${pkgs.systemd}/bin/systemctl suspend";
|
||||
in {
|
||||
imports = [<stockholm/krebs/3modules/power-action.nix>];
|
||||
|
||||
krebs.power-action = {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
inherit (import <niveum/lib>) localAddresses;
|
||||
hp-driver = pkgs.hplipWithPlugin;
|
||||
in {
|
||||
@@ -13,7 +12,8 @@ in {
|
||||
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,4 +1,8 @@
|
||||
{ config, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
<niveum/modules/retiolum.nix>
|
||||
];
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) colours;
|
||||
in {
|
||||
home-manager.users.me.programs.rofi = {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services.xserver.displayManager.sessionCommands = "${pkgs.seafile-client}/bin/seafile-applet &";
|
||||
|
||||
home-manager.users.me.xdg.configFile = {
|
||||
|
||||
@@ -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,8 +1,11 @@
|
||||
{ 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 = {
|
||||
|
||||
@@ -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";
|
||||
@@ -156,7 +162,8 @@ let
|
||||
|
||||
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,7 +304,6 @@ 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
|
||||
@@ -355,3 +365,4 @@ MacDonell = pkgs.fetchzip {
|
||||
stripRoot = false;
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
important-directories = pkgs.writeText "directories" ''
|
||||
h ~/
|
||||
d ~/cloud/Dropbox/
|
||||
@@ -15,8 +18,7 @@ in {
|
||||
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 '
|
||||
@@ -39,7 +42,7 @@ let
|
||||
'';
|
||||
in {
|
||||
niveum.telegramBots.transits = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
time = "*:0/1";
|
||||
token = lib.strings.fileContents <system-secrets/telegram/kmein.token>;
|
||||
chatIds = ["-1001796440545"];
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
autorenkalender-package = pkgs.fetchFromGitHub {
|
||||
owner = "kmein";
|
||||
repo = "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,7 +18,8 @@ in {
|
||||
<niveum/modules/telegram-bot.nix>
|
||||
];
|
||||
|
||||
systemd.tmpfiles.rules = map (path: tmpfilesConfig {
|
||||
systemd.tmpfiles.rules = map (path:
|
||||
tmpfilesConfig {
|
||||
type = "d";
|
||||
mode = "0750";
|
||||
age = "1h";
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
scripts = import <niveum/packages/scripts> {inherit pkgs lib;};
|
||||
inherit (scripts) literature-quote;
|
||||
in {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
nachtischsatan-bot = {token}:
|
||||
pkgs.writers.writePython3 "nachtischsatan-bot" {
|
||||
libraries = [pkgs.python3Packages.python-telegram-bot];
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
niveum.telegramBots.tlg-wotd = {
|
||||
enable = true;
|
||||
time = "9:30";
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
{ 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;};
|
||||
|
||||
@@ -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,4 +1,4 @@
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
services.tor.enable = true;
|
||||
services.tor.torsocks.enable = true;
|
||||
environment.systemPackages = [pkgs.tor];
|
||||
}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (import <niveum/lib>) localAddresses;
|
||||
living-room-id = 131090;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [<niveum/modules/traadfri.nix>];
|
||||
|
||||
environment.systemPackages = [
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [<stockholm/krebs/3modules/fetchWallpaper.nix>];
|
||||
|
||||
krebs.fetchWallpaper = {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
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
|
||||
'';
|
||||
|
||||
50
flake.lock
generated
50
flake.lock
generated
@@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1644229661,
|
||||
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||
"lastModified": 1648297722,
|
||||
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -22,11 +22,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1643933536,
|
||||
"narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
|
||||
"lastModified": 1648834319,
|
||||
"narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2860d7e3bb350f18f7477858f3513f9798896831",
|
||||
"rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -62,11 +62,11 @@
|
||||
"menstruation-backend": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1634573652,
|
||||
"narHash": "sha256-FIj8oCOJO+Wqxr2o5MMqIShvzMJud4iUq3o8y4NIRvw=",
|
||||
"lastModified": 1649545504,
|
||||
"narHash": "sha256-TVm3246ML7gWPeGm+bdb+Qo8o/7nve7sQ2hBdCZm3z8=",
|
||||
"owner": "kmein",
|
||||
"repo": "menstruation.rs",
|
||||
"rev": "dd405fe2acf32441e8ac56e488e689bb1c4bea82",
|
||||
"rev": "d9f3c6d53542fd7c7ed191e37cf4e342d4a47bcb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -109,11 +109,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1645652565,
|
||||
"narHash": "sha256-yVQN2Wi8xSSpuj6JTck/6IOJ40hNvmoReMvFY86xd9w=",
|
||||
"lastModified": 1649490789,
|
||||
"narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4275a321beab5a71872fb7a5fe5da511bb2bec73",
|
||||
"rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -125,11 +125,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1645917420,
|
||||
"narHash": "sha256-y/F63lVqvxlBt5brDCV/QUdcnP7acvtR6Mf0Phrr13Q=",
|
||||
"lastModified": 1649541735,
|
||||
"narHash": "sha256-JdOywA2jcdGCxNgu0dJA7ZNtaV7sS0HwuZg9YaXd94c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6f21ff94fc44af21973c6fdae6e03323382b7909",
|
||||
"rev": "c2b6e029cd1efa0efd37daab89264ef040ae5669",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -158,11 +158,11 @@
|
||||
"retiolum": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1645558430,
|
||||
"narHash": "sha256-Q8URzBIbh6vHf5QHKWHEMUDbRHeyVSFpqB8i4PmnX6M=",
|
||||
"lastModified": 1647444524,
|
||||
"narHash": "sha256-N4T1UXLkYJMQqk65LkTDpW70ujXXeZ9xe5k+LOpznAI=",
|
||||
"owner": "krebs",
|
||||
"repo": "retiolum",
|
||||
"rev": "5e69ac7782c7d384a4b6cad4619dd83aa952426f",
|
||||
"rev": "de6d7dc9bd671e65f2ee3004b6807625e7553e84",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -194,11 +194,11 @@
|
||||
"scripts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1639436812,
|
||||
"narHash": "sha256-6CajvfDo7t4ANgjc7DxqH7lI3WRE4MK8q3mBKAjk80k=",
|
||||
"lastModified": 1648400983,
|
||||
"narHash": "sha256-I9ADWgUN1orbnXPBW4kulHpv8wkx6C8zsQcg9wphpPg=",
|
||||
"owner": "kmein",
|
||||
"repo": "scripts",
|
||||
"rev": "d34a8161ba11135a45d3141dc9af482db945d63c",
|
||||
"rev": "f5df67a2416d8f05a7dbfea269c44668854c7887",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -210,11 +210,11 @@
|
||||
"stockholm": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1645880762,
|
||||
"narHash": "sha256-SPSnMKtPzBNzxHxMi3jnoeoaQ14Ddua9rM/P/1mwMYs=",
|
||||
"lastModified": 1649089964,
|
||||
"narHash": "sha256-ybuVI8rnpMyBUoyoIXJ1e3QBMBIOoEgKTiFzIPfzy8A=",
|
||||
"ref": "master",
|
||||
"rev": "a67ded588b45c09ca58a3b4007a8d32e42323613",
|
||||
"revCount": 10414,
|
||||
"rev": "b3833baee96d7bce2c54295110b40c646468a1ff",
|
||||
"revCount": 10500,
|
||||
"type": "git",
|
||||
"url": "https://cgit.lassul.us/stockholm"
|
||||
},
|
||||
|
||||
116
flake.nix
116
flake.nix
@@ -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,11 +95,18 @@
|
||||
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}" {
|
||||
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}";
|
||||
});
|
||||
@@ -77,7 +117,10 @@
|
||||
name = "deploy-${name}";
|
||||
value = {
|
||||
type = "app";
|
||||
program = deployScriptFor { inherit name; host = "${name}.r"; };
|
||||
program = deployScriptFor {
|
||||
inherit name;
|
||||
host = "${name}.r";
|
||||
};
|
||||
};
|
||||
});
|
||||
ciScripts = forSystems (name: {
|
||||
@@ -87,6 +130,7 @@
|
||||
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
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
499
lib/streams.nix
499
lib/streams.nix
File diff suppressed because it is too large
Load Diff
@@ -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,6 +114,8 @@ command! ToggleBackground call s:toggle_background()
|
||||
inoremap <F12> <C-O>:ToggleBackground<CR>
|
||||
nnoremap <F12> :ToggleBackground<CR>
|
||||
|
||||
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
|
||||
@@ -128,10 +135,12 @@ autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax |
|
||||
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 bufreadpost *
|
||||
\ if line("'\"") > 0 && line("'\"") <= line("$") |
|
||||
\ exe "normal! g`\"" |
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
{ 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";};
|
||||
|
||||
|
||||
@@ -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)"
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
{ 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";};
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,38 +1,53 @@
|
||||
# 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;
|
||||
@@ -40,11 +55,15 @@ in {
|
||||
};
|
||||
|
||||
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>;
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
options.niveum = {
|
||||
wirelessInterface = mkOption {type = types.str;};
|
||||
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.niveum.telegramBots;
|
||||
|
||||
botService = name: bot:
|
||||
@@ -17,7 +21,8 @@ let
|
||||
lib.strings.optionalString (bot.parseMode != null)
|
||||
"-d parse_mode=${bot.parseMode}"
|
||||
}
|
||||
'') bot.chatIds
|
||||
'')
|
||||
bot.chatIds
|
||||
++ ["fi"]);
|
||||
};
|
||||
in {
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ 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;};
|
||||
@@ -22,18 +26,24 @@ in {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
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}" ''
|
||||
]
|
||||
++ 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}" ''
|
||||
'')
|
||||
cfg.rooms
|
||||
++ lib.mapAttrsToList (name: value:
|
||||
pkgs.writers.writeDashBin "traadfri-${name}" ''
|
||||
exec traadfri --target Bulb ${toString value} "$@"
|
||||
'') cfg.bulbs;
|
||||
'')
|
||||
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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
{ lib, writeShellScriptBin }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
writeShellScriptBin,
|
||||
}: let
|
||||
aliasFlag = name: value: "-c alias.${name}=${lib.escapeShellArg value}";
|
||||
aliases = {
|
||||
eroeffne = "init";
|
||||
@@ -20,7 +22,8 @@ let
|
||||
tagebuch = "log";
|
||||
zustand = "status";
|
||||
};
|
||||
in writeShellScriptBin "depp" ''
|
||||
in
|
||||
writeShellScriptBin "depp" ''
|
||||
if [ $# -gt 0 ]; then
|
||||
git ${lib.concatStringsSep " " (lib.attrsets.mapAttrsToList aliasFlag aliases)} "$@"
|
||||
else
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
{pkgs ? import <nixpkgs> {}}:
|
||||
with pkgs;
|
||||
with pkgs.python2Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gourmet";
|
||||
version = "0.17.4";
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, cmake, python3, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017.09.06";
|
||||
name = "iolanguage-${version}";
|
||||
@@ -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,4 +1,7 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "ix";
|
||||
src = fetchurl {
|
||||
|
||||
@@ -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,7 +23,8 @@ stdenv.mkDerivation {
|
||||
sha256 = "1igjv0hbwmakdccp5in4gw9w2p5swxdwsdx0glyna2s29sh1d37x";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
buildInputs = [ which pkg-config automake autoconf libtool ]
|
||||
buildInputs =
|
||||
[which pkg-config automake autoconf libtool]
|
||||
++ lib.optionals docs [doxygen asciidoc]
|
||||
++ lib.optional tls gnutls;
|
||||
# preConfigure = "./autogen.sh";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ fetchPypi, buildPythonPackage, pygtrie, ... }:
|
||||
{
|
||||
fetchPypi,
|
||||
buildPythonPackage,
|
||||
pygtrie,
|
||||
...
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "betacode";
|
||||
version = "0.2";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ buildPythonApplication, fetchPypi, requests }:
|
||||
let
|
||||
in buildPythonApplication rec {
|
||||
{
|
||||
buildPythonApplication,
|
||||
fetchPypi,
|
||||
requests,
|
||||
}: let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "instaloader";
|
||||
version = "4.2.4";
|
||||
src = fetchPypi {
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ fetchPypi, buildPythonPackage, ... }:
|
||||
{
|
||||
fetchPypi,
|
||||
buildPythonPackage,
|
||||
...
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pygtrie";
|
||||
version = "2.3";
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
{ buildPythonPackage, buildPythonApplication, fetchPypi, pytestrunner, six, beautifulsoup4, requests, dbus-python }:
|
||||
let
|
||||
{
|
||||
buildPythonPackage,
|
||||
buildPythonApplication,
|
||||
fetchPypi,
|
||||
pytestrunner,
|
||||
six,
|
||||
beautifulsoup4,
|
||||
requests,
|
||||
dbus-python,
|
||||
}: let
|
||||
lyricwikia = buildPythonPackage rec {
|
||||
pname = "lyricwikia";
|
||||
version = "0.1.9";
|
||||
@@ -11,7 +19,8 @@ let
|
||||
propagatedBuildInputs = [six beautifulsoup4 requests];
|
||||
doCheck = false;
|
||||
};
|
||||
in buildPythonApplication rec {
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "spotify-cli-linux";
|
||||
version = "1.4.2";
|
||||
src = fetchPypi {
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ stdenv, fetchFromGitHub, lib, pandoc }:
|
||||
let
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pandoc,
|
||||
}: let
|
||||
owner = "kamalist";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{ ruby, stdenv, bundlerEnv, fetchFromGitHub }:
|
||||
let
|
||||
{
|
||||
ruby,
|
||||
stdenv,
|
||||
bundlerEnv,
|
||||
fetchFromGitHub,
|
||||
}: let
|
||||
src = fetchFromGitHub {
|
||||
owner = "kmein";
|
||||
repo = "bvg";
|
||||
@@ -13,7 +17,8 @@ let
|
||||
lockfile = "${src.out}/Gemfile.lock";
|
||||
gemset = "${src.out}/gemset.nix";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "bvg";
|
||||
buildInputs = [env.wrappedRuby];
|
||||
script = "${src.out}/bvg.rb";
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, makeWrapper, pandoc, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
pandoc,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "daybook";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user