kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
Code Releases Activity

chore: only one unstable nixpkgs

Browse Source
This commit is contained in:
Kierán Meinhardt
2022-05-20 23:03:37 +02:00
parent 0c872352e3
commit abb7924fca
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configs/default.nix
View File

@@ -30,6 +30,7 @@ in {
tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {}; tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {}; iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
ix = pkgs.callPackage <niveum/packages/ix.nix> {}; ix = pkgs.callPackage <niveum/packages/ix.nix> {};
unstable = import <nixpkgs-unstable> {inherit (config.nixpkgs) config;};
}; };
}; };
overlays = [ overlays = [

10
configs/fonts.nix
View File

@@ -1,6 +1,4 @@
{pkgs, ...}: let {pkgs, ...}: {
nixpkgs-unstable = import <nixpkgs-unstable> {};
in {
nixpkgs.config.joypixels.acceptLicense = true; nixpkgs.config.joypixels.acceptLicense = true;
fonts = { fonts = {
enableDefaultFonts = true; enableDefaultFonts = true;
@@ -9,17 +7,17 @@ in {
alegreya alegreya
alegreya-sans alegreya-sans
amiri amiri
nixpkgs-unstable.annapurna-sil unstable.annapurna-sil
cantarell-fonts cantarell-fonts
charis-sil charis-sil
corefonts corefonts
crimson crimson
eb-garamond eb-garamond
etBook etBook
nixpkgs-unstable.ezra-sil unstable.ezra-sil
fira fira
font-awesome-ttf font-awesome-ttf
nixpkgs-unstable.galatia-sil unstable.galatia-sil
gentium gentium
gfs-fonts gfs-fonts
gyre-fonts gyre-fonts

10
configs/packages.nix
View File

@@ -8,8 +8,6 @@
menstruation = pkgs.callPackage <menstruation-backend> {}; menstruation = pkgs.callPackage <menstruation-backend> {};
pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {}; pandoc-doc = pkgs.callPackage <niveum/packages/man/pandoc.nix> {};
nixpkgs-unstable = import <nixpkgs-unstable> {config.allowUnfree = true;};
zoteroStyle = { zoteroStyle = {
name, name,
sha256, sha256,
@@ -35,7 +33,7 @@
}) })
]; ];
astrolog = nixpkgs-unstable.astrolog.overrideAttrs (old: astrolog = pkgs.unstable.astrolog.overrideAttrs (old:
old old
// { // {
installPhase = '' installPhase = ''
@@ -124,10 +122,10 @@ in {
electrum electrum
inkscape inkscape
astrolog astrolog
nixpkgs-unstable.anki # flashcards unstable.anki # flashcards
jbofihe # lojbanic software jbofihe # lojbanic software
nixpkgs-unstable.zoom-us # video conferencing unstable.zoom-us # video conferencing
nixpkgs-unstable.alejandra # nix formatter unstable.alejandra # nix formatter
pdfgrep # search in pdf pdfgrep # search in pdf
pdftk # pdf toolkit pdftk # pdf toolkit
mupdf mupdf

5
configs/telegram-bots/astrology.nix
View File

@@ -3,7 +3,6 @@
lib, lib,
... ...
}: let }: let
nixpkgs-unstable = import <nixpkgs-unstable> {};
toSymbols = pkgs.writers.writeDash "to-symbols" '' toSymbols = pkgs.writers.writeDash "to-symbols" ''
${pkgs.gnused}/bin/sed ' ${pkgs.gnused}/bin/sed '
s/\bTri\b/△/; s/\bTri\b/△/;
@@ -50,8 +49,8 @@ in {
now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//') now=$(${pkgs.coreutils}/bin/date +%_H:%M | ${pkgs.gnused}/bin/sed 's/^\s*//')
date=$(${pkgs.coreutils}/bin/date +'%m %d %Y') date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
{ {
${nixpkgs-unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node" ${pkgs.unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto "North Node"
${nixpkgs-unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node" ${pkgs.unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto "North Node"
} | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || : } | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n | ${pkgs.gnugrep}/bin/grep "^$now" || :
''); '');
}; };

4
systems/makanek/configuration.nix
View File

@@ -62,6 +62,10 @@ in {
useDHCP = false; useDHCP = false;
}; };
nixpkgs.config.packageOverrides = pkgs: {
unstable = import <nixpkgs-unstable> {inherit (config.nixpkgs) config;};
};
system.stateVersion = "20.03"; system.stateVersion = "20.03";
services.nginx = { services.nginx = {

3
systems/makanek/hedgedoc.nix
View File

@@ -5,7 +5,6 @@
}: let }: let
backupLocation = "/var/lib/codimd-backup"; backupLocation = "/var/lib/codimd-backup";
stateLocation = "/var/lib/codimd/state.sqlite"; stateLocation = "/var/lib/codimd/state.sqlite";
nixpkgs-unstable = import <nixpkgs-unstable> {};
domain = "pad.kmein.de"; domain = "pad.kmein.de";
inherit (import <niveum/lib>) tmpfilesConfig; inherit (import <niveum/lib>) tmpfilesConfig;
in { in {
@@ -61,7 +60,7 @@ in {
systemd.services.hedgedoc-backup = { systemd.services.hedgedoc-backup = {
description = "Hedgedoc backup service"; description = "Hedgedoc backup service";
script = '' script = ''
${nixpkgs-unstable.sqlite}/bin/sqlite3 -json ${stateLocation} "select shortid, alias, ownerId, content from Notes" \ ${pkgs.unstable.sqlite}/bin/sqlite3 -json ${stateLocation} "select shortid, alias, ownerId, content from Notes" \
| ${ | ${
pkgs.writers.writePython3 "hedgedoc-json-to-fs.py" {} '' pkgs.writers.writePython3 "hedgedoc-json-to-fs.py" {} ''
import json import json