1
0
mirror of https://github.com/kmein/niveum synced 2026-03-20 20:01:08 +01:00

minimize usage of //

This commit is contained in:
2025-12-25 08:21:59 +01:00
parent 583bc83839
commit 3a6428982f
3 changed files with 348 additions and 303 deletions

View File

@@ -130,12 +130,12 @@ in {
titlebar = false; titlebar = false;
border = 1; border = 1;
}; };
bars = [ bars = let position = "bottom"; in [
(config.home-manager.users.me.stylix.targets.i3.exportedBarConfig (lib.recursiveUpdate config.home-manager.users.me.stylix.targets.i3.exportedBarConfig
// rec { {
workspaceButtons = true; workspaceButtons = true;
mode = "hide"; # "dock"; mode = "hide"; # "dock";
position = "bottom"; inherit position;
statusCommand = toString (pkgs.writers.writeDash "i3status-rust" '' statusCommand = toString (pkgs.writers.writeDash "i3status-rust" ''
export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})" export I3RS_GITHUB_TOKEN="$(cat ${config.age.secrets.github-token-i3status-rust.path})"
export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})" export OPENWEATHERMAP_API_KEY="$(cat ${config.age.secrets.openweathermap-api-key.path})"

View File

@@ -94,9 +94,9 @@ in
home-manager.users.me = { home-manager.users.me = {
home.file = home.file =
lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; }) lib.mapAttrs' (name: path: lib.nameValuePair ".xkb/symbols/${name}" { source = path; })
(lib.filterAttrs (_: value: !(value ? "code")) languages) // { (lib.recursiveUpdate (lib.filterAttrs (_: value: !(value ? "code")) languages) {
".xkb/symbols/ir".source = ../lib/keyboards/farsi; ".xkb/symbols/ir".source = ../lib/keyboards/farsi;
}; });
}; };
console.keyMap = "de"; console.keyMap = "de";

249
flake.nix
View File

@@ -78,8 +78,10 @@
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
lib = nixpkgs.lib; lib = nixpkgs.lib;
in in
nixinate.nixinate.x86_64-linux self lib.mergeAttrsList [
// { nixinate.nixinate.x86_64-linux
self
{
mock-secrets = { mock-secrets = {
type = "app"; type = "app";
program = toString ( program = toString (
@@ -90,7 +92,7 @@
}; };
} }
# the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873 # the following error prevents remote building of ful: https://github.com/NixOS/nixpkgs/issues/177873
// builtins.listToAttrs ( (builtins.listToAttrs (
map ( map (
hostname: hostname:
let let
@@ -120,8 +122,8 @@
); );
} }
) (builtins.attrNames self.nixosConfigurations) ) (builtins.attrNames self.nixosConfigurations)
) ))
// { {
deploy-ful = { deploy-ful = {
type = "app"; type = "app";
program = toString ( program = toString (
@@ -132,7 +134,8 @@
'' ''
); );
}; };
}; }
];
}; };
# TODO overlay for packages # TODO overlay for packages
@@ -152,11 +155,13 @@
panoptikon = import lib/panoptikon.nix; panoptikon = import lib/panoptikon.nix;
}; };
nixosConfigurations = let nixosConfigurations =
let
niveumSpecialArgs = system: { niveumSpecialArgs = system: {
unstablePackages = import nixpkgs-unstable { unstablePackages = import nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfreePredicate = pkg: config.allowUnfreePredicate =
pkg:
builtins.elem (nixpkgs-unstable.lib.getName pkg) [ builtins.elem (nixpkgs-unstable.lib.getName pkg) [
"obsidian" "obsidian"
"zoom" "zoom"
@@ -166,10 +171,23 @@
niveumPackages = self.packages.${system}; niveumPackages = self.packages.${system};
niveumLib = self.lib; niveumLib = self.lib;
inputs = { inputs = {
inherit tinc-graph self telebots menstruation-telegram menstruation-backend scripts agenix recht autorenkalender nixpkgs wallpaper-generator; inherit
tinc-graph
self
telebots
menstruation-telegram
menstruation-backend
scripts
agenix
recht
autorenkalender
nixpkgs
wallpaper-generator
;
}; };
}; };
in { in
{
ful = nixpkgs.lib.nixosSystem rec { ful = nixpkgs.lib.nixosSystem rec {
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = niveumSpecialArgs system; specialArgs = niveumSpecialArgs system;
@@ -285,127 +303,154 @@
}; };
}; };
packages = eachSupportedSystem (system: let packages = eachSupportedSystem (
system:
let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
overlays = [ overlays = [
nur.overlays.default nur.overlays.default
(self: super: { (self: super: {
mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];}; mpv = super.mpv.override {
scripts = [
super.mpvScripts.visualizer
super.mpvScripts.mpris
];
};
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"''; dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
}) })
]; ];
}; };
wrapScript = { wrapScript =
packages ? [], {
packages ? [ ],
name, name,
script, script,
}: }:
pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"''; pkgs.writers.writeDashBin name ''PATH=$PATH:${
in { nixpkgs.lib.makeBinPath (
packages
++ [
pkgs.findutils
pkgs.coreutils
pkgs.gnused
pkgs.gnugrep
]
)
} ${script} "$@"'';
in
{
# linguistics and ancient world # linguistics and ancient world
auc = pkgs.callPackage packages/auc.nix {}; auc = pkgs.callPackage packages/auc.nix { };
betacode = pkgs.callPackage packages/betacode.nix {}; betacode = pkgs.callPackage packages/betacode.nix { };
brassica = pkgs.callPackage packages/brassica.nix {}; # TODO upstream brassica = pkgs.callPackage packages/brassica.nix { }; # TODO upstream
devanagari = pkgs.callPackage packages/devanagari {}; devanagari = pkgs.callPackage packages/devanagari { };
stardict-tools = pkgs.callPackage packages/stardict-tools.nix {}; stardict-tools = pkgs.callPackage packages/stardict-tools.nix { };
heuretes = pkgs.callPackage packages/heuretes.nix {}; heuretes = pkgs.callPackage packages/heuretes.nix { };
ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py); ipa = pkgs.writers.writePython3Bin "ipa" { flakeIgnore = [ "E501" ]; } (
jsesh = pkgs.callPackage packages/jsesh.nix {}; # TODO upstream builtins.readFile packages/ipa.py
kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {}; );
polyglot = pkgs.callPackage packages/polyglot.nix {}; jsesh = pkgs.callPackage packages/jsesh.nix { }; # TODO upstream
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {}; kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix { };
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {}; polyglot = pkgs.callPackage packages/polyglot.nix { };
closest = pkgs.callPackage packages/closest {}; tocharian-font = pkgs.callPackage packages/tocharian-font.nix { };
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix { };
closest = pkgs.callPackage packages/closest { };
# lit # lit
random-zeno = pkgs.callPackage packages/random-zeno.nix {}; random-zeno = pkgs.callPackage packages/random-zeno.nix { };
literature-quote = pkgs.callPackage packages/literature-quote.nix {}; literature-quote = pkgs.callPackage packages/literature-quote.nix { };
# krebs # krebs
brainmelter = pkgs.callPackage packages/brainmelter.nix {}; brainmelter = pkgs.callPackage packages/brainmelter.nix { };
cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {}; cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix { };
hc = pkgs.callPackage packages/hc.nix {}; hc = pkgs.callPackage packages/hc.nix { };
kpaste = pkgs.callPackage packages/kpaste.nix {}; kpaste = pkgs.callPackage packages/kpaste.nix { };
pls = pkgs.callPackage packages/pls.nix {}; pls = pkgs.callPackage packages/pls.nix { };
untilport = pkgs.callPackage packages/untilport.nix {}; untilport = pkgs.callPackage packages/untilport.nix { };
radio-news = pkgs.callPackage packages/radio-news.nix {}; radio-news = pkgs.callPackage packages/radio-news.nix { };
# window manager # window manager
swallow = pkgs.callPackage packages/swallow.nix {}; swallow = pkgs.callPackage packages/swallow.nix { };
devour = pkgs.callPackage packages/devour.nix {}; devour = pkgs.callPackage packages/devour.nix { };
cheat-sh = pkgs.callPackage packages/cheat-sh.nix {}; cheat-sh = pkgs.callPackage packages/cheat-sh.nix { };
vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {}; # TODO upstream vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix { }; # TODO upstream
cro = pkgs.callPackage packages/cro.nix {}; cro = pkgs.callPackage packages/cro.nix { };
default-gateway = pkgs.callPackage packages/default-gateway.nix {}; default-gateway = pkgs.callPackage packages/default-gateway.nix { };
depp = pkgs.callPackage packages/depp.nix {}; depp = pkgs.callPackage packages/depp.nix { };
fkill = pkgs.callPackage packages/fkill.nix {}; fkill = pkgs.callPackage packages/fkill.nix { };
fzfmenu = pkgs.callPackage packages/fzfmenu.nix {}; fzfmenu = pkgs.callPackage packages/fzfmenu.nix { };
gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";}; gpt35 = pkgs.callPackage packages/gpt.nix { model = "gpt-3.5-turbo"; };
gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";}; gpt4 = pkgs.callPackage packages/gpt.nix { model = "gpt-4"; };
image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {}; image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix { };
image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix {}; image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix { };
k-lock = pkgs.callPackage packages/k-lock.nix {}; k-lock = pkgs.callPackage packages/k-lock.nix { };
klem = pkgs.callPackage packages/klem.nix {}; klem = pkgs.callPackage packages/klem.nix { };
man-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream man-pandoc = pkgs.callPackage packages/man/pandoc.nix { }; # TODO upstream
man-pdf = pkgs.callPackage packages/man-pdf.nix {}; man-pdf = pkgs.callPackage packages/man-pdf.nix { };
mansplain = pkgs.callPackage packages/mansplain.nix {}; mansplain = pkgs.callPackage packages/mansplain.nix { };
manual-sort = pkgs.callPackage packages/manual-sort.nix {}; manual-sort = pkgs.callPackage packages/manual-sort.nix { };
menu-calc = pkgs.callPackage packages/menu-calc.nix {}; menu-calc = pkgs.callPackage packages/menu-calc.nix { };
noise-waves = pkgs.callPackage packages/noise-waves.nix {}; noise-waves = pkgs.callPackage packages/noise-waves.nix { };
mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";}; mpv-radio = pkgs.callPackage packages/mpv-radio.nix { di-fm-key-file = "/dev/null"; };
mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";}; mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix { di-fm-key-file = "/dev/null"; };
mpv-tv = pkgs.callPackage packages/mpv-tv.nix {}; mpv-tv = pkgs.callPackage packages/mpv-tv.nix { };
mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {}; mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix { };
new-mac = pkgs.callPackage packages/new-mac.nix {}; new-mac = pkgs.callPackage packages/new-mac.nix { };
nix-git = pkgs.callPackage packages/nix-git.nix {}; nix-git = pkgs.callPackage packages/nix-git.nix { };
notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};}; notemenu = pkgs.callPackage packages/notemenu.nix { niveumPackages = self.packages.${system}; };
opustags = pkgs.callPackage packages/opustags.nix {}; # TODO upstream opustags = pkgs.callPackage packages/opustags.nix { }; # TODO upstream
q = pkgs.callPackage packages/q.nix {}; q = pkgs.callPackage packages/q.nix { };
qrpaste = pkgs.callPackage packages/qrpaste.nix {}; qrpaste = pkgs.callPackage packages/qrpaste.nix { };
go-webring = pkgs.callPackage packages/go-webring.nix {}; # TODO upstream go-webring = pkgs.callPackage packages/go-webring.nix { }; # TODO upstream
rfc = pkgs.callPackage packages/rfc.nix {}; rfc = pkgs.callPackage packages/rfc.nix { };
gimp = pkgs.callPackage packages/gimp.nix {}; gimp = pkgs.callPackage packages/gimp.nix { };
scanned = pkgs.callPackage packages/scanned.nix {}; scanned = pkgs.callPackage packages/scanned.nix { };
text2pdf = pkgs.callPackage packages/text2pdf.nix {}; # TODO upstream text2pdf = pkgs.callPackage packages/text2pdf.nix { }; # TODO upstream
timer = pkgs.callPackage packages/timer.nix {}; timer = pkgs.callPackage packages/timer.nix { };
trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream trans = pkgs.callPackage packages/trans.nix { }; # TODO upstream
ttspaste = pkgs.callPackage packages/ttspaste.nix {}; ttspaste = pkgs.callPackage packages/ttspaste.nix { };
unicodmenu = pkgs.callPackage packages/unicodmenu.nix {}; unicodmenu = pkgs.callPackage packages/unicodmenu.nix { };
emailmenu = pkgs.callPackage packages/emailmenu.nix {}; emailmenu = pkgs.callPackage packages/emailmenu.nix { };
stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream stag = pkgs.callPackage packages/stag.nix { }; # TODO upstream
vg = pkgs.callPackage packages/vg.nix {}; vg = pkgs.callPackage packages/vg.nix { };
vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};}; vim = pkgs.callPackage packages/vim.nix { niveumPackages = self.packages.${system}; };
obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {}; obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix { };
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix { }; # TODO upstream
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix { }; # TODO upstream
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix { }; # TODO upstream
vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix { }; # TODO upstream
vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix { }; # TODO upstream
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix { }; # TODO upstream
vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream vimPlugins-vim-colors-paramount =
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream { }; # TODO upstream
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix { }; # TODO upstream
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix { }; # TODO upstream
vimv = pkgs.callPackage packages/vimv.nix {}; vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix { }; # TODO upstream
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {}; # TODO upstream vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix { }; # TODO upstream
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream vimv = pkgs.callPackage packages/vimv.nix { };
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {}; weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix { }; # TODO upstream
wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix { }; # TODO upstream
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix { };
wttr = pkgs.callPackage packages/wttr.nix { }; # TODO upstream
booksplit = wrapScript { booksplit = wrapScript {
script = voidrice.outPath + "/.local/bin/booksplit"; script = voidrice.outPath + "/.local/bin/booksplit";
name = "booksplit"; name = "booksplit";
packages = [pkgs.ffmpeg pkgs.glibc.bin]; packages = [
pkgs.ffmpeg
pkgs.glibc.bin
];
}; };
tag = wrapScript { tag = wrapScript {
script = voidrice.outPath + "/.local/bin/tag"; script = voidrice.outPath + "/.local/bin/tag";
name = "tag"; name = "tag";
packages = [pkgs.ffmpeg]; packages = [ pkgs.ffmpeg ];
}; };
}); }
);
}; };
} }