henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working on zsh

Browse Source
This commit is contained in:
Henro Veijer
2026-03-09 19:40:50 +01:00
parent b1339e9aa6
commit 6d393aec40
3 changed files with 439 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.html
+369 -372
View File
File diff suppressed because it is too large Load Diff
Droidnix/README.org
+36 -39
View File
@@ -648,58 +648,55 @@ This is top file of this level which contains just an import statement for all r
** =generated/system/applications/packages.nix= ** =generated/system/applications/packages.nix=
This will import all packages listed in ./assets/common/apps/packlages.conf This will import all packages listed in ./assets/common/apps/packlages.conf
#+BEGIN_SRC nix :tangle generated/system/applications/packages.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/system/applications/packages.nix :noweb tangle :mkdirp yes :eval never-html
{ config, pkgs, lib, user, inputs, flakeRoot,... }: { config, lib, pkgs, flakeRoot, inputs, ... }:
{
config,
lib,
pkgs,
flakeRoot,
inputs,
...
}:
let let
packagesConfPath = "${builtins.toString flakeRoot.outPath}/assets/common/apps/packages.conf"; packagesConfPath = flakeRoot.outPath + "/assets/conf/apps/packages.conf";
raw = builtins.readFile packagesConfPath; raw = builtins.readFile packagesConfPath;
# IMPORTANT: explicit "\n" so we never accidentally split into characters # IMPORTANT: explicit "\n" so we never accidentally split into characters
rawLines = lib.splitString "\n" raw; rawLines = lib.splitString "\n" raw;
# Guard: if we accidentally split into characters, rawLines length ~= stringLength raw # Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
_guard = _guard = assert !(
assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw); builtins.stringLength raw > 1 &&
true; builtins.length rawLines == builtins.stringLength raw
cleanLine = ); true;
l: cleanLine = l:
let let
noCR = lib.replaceStrings [ "\r" ] [ "" ] l; noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
noInlineComment = lib.head (lib.splitString "#" noCR); noInlineComment = lib.head (lib.splitString "#" noCR);
in in
lib.strings.trim noInlineComment; lib.strings.trim noInlineComment;
entries = builtins.filter (l: l != "") (map cleanLine rawLines); entries =
resolvePkg = builtins.filter (l: l != "")
name: (map cleanLine rawLines);
let resolvePkg = name:
parts = lib.splitString "." name; let
found = lib.attrByPath parts null pkgs; parts = lib.splitString "." name;
in found = lib.attrByPath parts null pkgs;
if found == null then in
throw '' if found == null then
packages.nix: package not found in pkgs throw ''
Token : ${builtins.toJSON name} packages.nix: package not found in pkgs
packages.conf : ${toString packagesConfPath} Token : ${builtins.toJSON name}
Hint : check the attribute name on search.nixos.org/packages packages.conf : ${toString packagesConfPath}
'' Hint : check the attribute name on search.nixos.org/packages
else ''
found; else
found;
packages = builtins.seq _guard (map resolvePkg entries); packages = builtins.seq _guard (map resolvePkg entries);
zenBrowser = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default; zenBrowser =
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
in in
{ {
environment.systemPackages = packages ++ [ zenBrowser ]; environment.systemPackages =
packages
++ [ zenBrowser ];
} }
#+END_SRC #+END_SRC
** =generated/system/applications/flatpaks.nix= ** =generated/system/applications/flatpaks.nix=
This will import all packages listed in ./assets/common/apps/flatpaks.conf This will import all packages listed in ./assets/common/apps/flatpaks.conf
#+BEGIN_SRC nix :tangle generated/system/applications/packages.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/system/applications/flatpaks.nix :noweb tangle :mkdirp yes :eval never-html
{ {
config, config,
pkgs, pkgs,
Droidnix/generated/system/applications/packages.nix
+34 -150
View File
@@ -1,159 +1,43 @@
{ config, pkgs, lib, user, inputs, flakeRoot,... }: { config, lib, pkgs, flakeRoot, inputs, ... }:
{
config,
lib,
pkgs,
flakeRoot,
inputs,
...
}:
let let
packagesConfPath = "${builtins.toString flakeRoot.outPath}/assets/common/apps/packages.conf"; packagesConfPath = flakeRoot.outPath + "/assets/conf/apps/packages.conf";
raw = builtins.readFile packagesConfPath; raw = builtins.readFile packagesConfPath;
# IMPORTANT: explicit "\n" so we never accidentally split into characters # IMPORTANT: explicit "\n" so we never accidentally split into characters
rawLines = lib.splitString "\n" raw; rawLines = lib.splitString "\n" raw;
# Guard: if we accidentally split into characters, rawLines length ~= stringLength raw # Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
_guard = _guard = assert !(
assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw); builtins.stringLength raw > 1 &&
true; builtins.length rawLines == builtins.stringLength raw
cleanLine = ); true;
l: cleanLine = l:
let let
noCR = lib.replaceStrings [ "\r" ] [ "" ] l; noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
noInlineComment = lib.head (lib.splitString "#" noCR); noInlineComment = lib.head (lib.splitString "#" noCR);
in in
lib.strings.trim noInlineComment; lib.strings.trim noInlineComment;
entries = builtins.filter (l: l != "") (map cleanLine rawLines); entries =
resolvePkg = builtins.filter (l: l != "")
name: (map cleanLine rawLines);
let resolvePkg = name:
parts = lib.splitString "." name; let
found = lib.attrByPath parts null pkgs; parts = lib.splitString "." name;
in found = lib.attrByPath parts null pkgs;
if found == null then in
throw '' if found == null then
packages.nix: package not found in pkgs throw ''
Token : ${builtins.toJSON name} packages.nix: package not found in pkgs
packages.conf : ${toString packagesConfPath} Token : ${builtins.toJSON name}
Hint : check the attribute name on search.nixos.org/packages packages.conf : ${toString packagesConfPath}
'' Hint : check the attribute name on search.nixos.org/packages
else ''
found; else
found;
packages = builtins.seq _guard (map resolvePkg entries); packages = builtins.seq _guard (map resolvePkg entries);
zenBrowser = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default; zenBrowser =
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
in in
{ {
environment.systemPackages = packages ++ [ zenBrowser ]; environment.systemPackages =
} packages
++ [ zenBrowser ];
{
config,
pkgs,
lib,
flakeRoot,
...
}:
let
moduleName = "install-flatpaks";
flatpakConfPath = flakeRoot.outPath + "/assets/common/apps/flatpaks.conf";
raw = builtins.readFile flatpakConfPath;
# Explicit "\n" so we never accidentally split into characters
rawLines = lib.splitString "\n" raw;
# Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
_guard =
assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw);
true;
cleanLine =
l:
let
noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
noInlineComment = lib.head (lib.splitString "#" noCR);
in
lib.strings.trim noInlineComment;
entries = builtins.filter (l: l != "") (map cleanLine rawLines);
# Flatpak app IDs are reverse-DNS style like org.example.App (at least 2 dots).
# We'll validate and fail early with a clear message.
dotCount = s: builtins.length (lib.splitString "." s) - 1;
isValidId = s: (dotCount s) >= 2; # matches the error you're seeing: "at least 2 periods"
_validate = builtins.seq _guard (
builtins.map (
id:
if isValidId id then
true
else
throw ''
${moduleName}: invalid Flatpak ID in flatpaks.conf (needs reverse-DNS with at least 2 dots)
Token : ${builtins.toJSON id}
flatpaks.conf : ${toString flatpakConfPath}
Fix: remove stray tokens/headers, or comment them out with '#'.
''
) entries
);
# Use validated entries
flatpakApps = builtins.seq _validate entries;
syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
set -euo pipefail
# Use the deployed config path (matches environment.etc below)
CONF="/etc/flatpak/flatpaks.conf"
if [[ -f "$CONF" ]]; then
echo "flatpak-sync: using $CONF"
else
echo "flatpak-sync: WARNING: $CONF not found, using embedded list"
fi
if ! flatpak remotes --system --columns=name | grep -qx flathub; then
flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
fi
desired_apps=(
${lib.concatStringsSep "\n" (map (a: ''"${a}"'') flatpakApps)}
)
for app in "''${desired_apps[@]}"; do
if ! flatpak info --system "$app" >/dev/null 2>&1; then
flatpak install --system -y --noninteractive flathub "$app"
fi
done
'';
in
{
services.flatpak.enable = true;
xdg.portal = {
enable = true;
};
# Deploy the config file for runtime visibility/debugging
environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
systemd.services.flatpak-sync = {
description = "Install Flatpak apps listed in flatpaks.conf";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
serviceConfig = {
Type = "oneshot";
ExecStart = syncFlatpaks;
};
restartTriggers = [ flatpakConfPath ];
path = [
pkgs.flatpak
pkgs.coreutils
pkgs.gnugrep
pkgs.gnused
];
};
} }