From 698bffbe00a8b26b306ff9078437b1901b38fff5 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Mon, 30 Mar 2026 11:56:29 +0000 Subject: [PATCH] Regenerated --- Droidnix/README.html | 685 +++++++++--------- Droidnix/README.org | 117 +-- .../{packages.conf => 2_b_installed.conf} | 20 +- .../traveldroid/apps/2_b_installed.nix | 99 +++ 4 files changed, 538 insertions(+), 383 deletions(-) rename Droidnix/generated/assets/{packages.conf => 2_b_installed.conf} (74%) create mode 100644 Droidnix/generated/modules/traveldroid/apps/2_b_installed.nix diff --git a/Droidnix/README.html b/Droidnix/README.html index 36ae4a183..91874d31f 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Droidnix: A Dendritic NixOS + Home Manager Configuration NixOS Configuration Structure @@ -204,114 +204,114 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -327,26 +327,26 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. It allows users to choose between Hyprland and Mangowc as their window manager, with shared and WM-specific configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.

-
-

Installed components:

-
+
+

Installed components:

+
    -
  • Core
  • -
  • Hyprland
  • -
  • Mangowc
  • +
  • Core
  • +
  • Hyprland
  • +
  • Mangowc
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

This project uses a modular NixOS configuration with Hyprland and MangoWC support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -359,9 +359,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -372,16 +372,16 @@ The Droidnix repository is organized into two main parts:
-
-

Generated Structure

-
+
+

Generated Structure

+

The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.

-
-

First Setup

-
+
+

First Setup

+
  1. Clone this repository.
  2. Run the setup script: ./setup_droid.
  3. @@ -411,9 +411,9 @@ The .assets/ folder contains all static files, such as configs, scr This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

flake.nix

-
+
+

flake.nix

+

The Nix flake definition for Droidnix.

@@ -478,9 +478,9 @@ The Nix flake definition for Droidnix.
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -536,9 +536,9 @@ in
 
-
-

generated/hosts/traveldroid/hardware-configuration.nix

-
+
+

generated/hosts/traveldroid/hardware-configuration.nix

+
  1. Boot into NixOS Live ISO or your installed system.
  2. Open a terminal.
  3. @@ -596,9 +596,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -650,17 +650,17 @@ in
 
-
-

Following are the imported modules

+
+

Following are the imported modules

-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

generated/modules/traveldroid/apps/packages.nix

-
+
+

generated/modules/traveldroid/apps/2_b_installed.nix

+

This installs a list of apps

@@ -669,17 +669,15 @@ This installs a list of apps let ################################# - # Read package list from config file + # FILE ################################# - packagesConfPath = "${flakeRoot}/generated/assets/packages.conf"; - raw = builtins.readFile packagesConfPath; + confPath = "${flakeRoot}/generated/assets/packages.conf"; + raw = builtins.readFile confPath; + lines = lib.splitString "\n" raw; - rawLines = lib.splitString "\n" raw; - - # Guard against splitting into characters accidentally - _guard = assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw); true; - - # Clean each line: remove CRs, comments, trim whitespace + ################################# + # CLEAN LINE + ################################# cleanLine = line: let noCR = lib.replaceStrings [ "\r" ] [ "" ] line; @@ -687,58 +685,100 @@ let in lib.strings.trim noInlineComment; - # Filter out empty lines - entries = builtins.filter (l: l != "") (map cleanLine rawLines); + ################################# + # PARSE SECTION + ################################# + parseSection = section: + let + result = + builtins.foldl' + (acc: line: + let + l = lib.strings.trim line; + in + if l == section then + acc // { active = true; } + else if lib.hasPrefix "#" l then + acc // { active = false; } + else if acc.active then + acc // { entries = acc.entries ++ [ l ]; } + else + acc + ) + { active = false; entries = []; } + lines; + in + builtins.filter (l: l != "") (map cleanLine result.entries); + + ################################# + # NIX PACKAGES + ################################# + packageEntries = parseSection "#packages"; - # Resolve attribute paths in pkgs resolvePkg = name: let parts = lib.splitString "." name; found = lib.attrByPath parts null pkgs; in if found == null then - (throw '' - packages.nix: package not found in pkgs - Token : ${builtins.toJSON name} - packages.conf : ${packagesConfPath} - Hint : check the attribute name on search.nixos.org/packages - '') + throw '' + packages.nix: package not found + Token: ${name} + File : ${confPath} + '' else found; - # Final system-wide package list - packages = builtins.seq _guard (map resolvePkg entries); + packages = map resolvePkg packageEntries; + + ################################# + # FLATPAKS + ################################# + flatpakEntries = parseSection "#flatpaks"; in { ################################# - # Allow unfree packages globally + # Allow unfree ################################# - nixpkgs.config = { allowUnfree = true; }; + nixpkgs.config.allowUnfree = true; ################################# - # System packages + # System packages (Nix) ################################# environment.systemPackages = packages; + + ################################# + # Flatpak setup + ################################# + services.flatpak.enable = true; + + services.flatpak.remotes = [ + { + name = "flathub"; + location = "https://flathub.org/repo/flathub.flatpakrepo"; + } + ]; + + ################################# + # Flatpak apps + ################################# + services.flatpak.packages = flatpakEntries; }
-
-

generated/assets/packages.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

-
#productivity
+
#packages
 todoist
-
-# browsers
 brave
 chromium
-
-# utils
 git
 direnv
 ripgrep
@@ -759,37 +799,30 @@ zed-editor
 eza
 z-lua
 qdirstat
-
-# office
 obsidian
 onlyoffice-desktopeditors
-
-# development
 postman
 tea
-
-#jetbrains.pycharm
 python3
-
-# communication
 nextcloud-client
 nextcloud-talk-desktop
 signal-desktop
 openssl
-
-# multimedia
 audacity
 handbrake
 spotify
 vlc
 
+#flatpaks
+eu.betterbird.Betterbird
+com.todoist.Todoist
 
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -851,9 +884,9 @@ in
-
-

.config/kitty/Catppuccin-Mocha.conf

-
+
+

.config/kitty/Catppuccin-Mocha.conf

+

These are config files for .config/kitty

@@ -944,9 +977,9 @@ color15 #a6adc8
-
-

.config/kitty/kitty.conf

-
+
+

.config/kitty/kitty.conf

+

These are config files for .config/kitty

@@ -968,9 +1001,9 @@ font_size 10.0
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1010,9 +1043,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1301,9 +1334,9 @@ crust = "#181926"
-
-

generated/modules/traveldroid/apps/thunar.nix

-
+
+

generated/modules/traveldroid/apps/thunar.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1343,9 +1376,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1378,9 +1411,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

@@ -1427,9 +1460,9 @@ prompt = >
-
-

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

@@ -1518,9 +1551,9 @@ These are config files for .config/wofi
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1540,9 +1573,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1598,9 +1631,9 @@ in
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1635,9 +1668,9 @@ fi
-
-

generated/modules/traveldroid/apps/emacs/emacs.nix

-
+
+

generated/modules/traveldroid/apps/emacs/emacs.nix

+

This installs emacs

@@ -1733,9 +1766,9 @@ in
-
-

generated/.config/emacs/early-init.el

-
+
+

generated/.config/emacs/early-init.el

+

This contaions emacs

@@ -1836,9 +1869,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2249,13 +2282,13 @@ the top of the file."
-
-

generated/modules/traveldroid/desktop

-
+
+

generated/modules/traveldroid/desktop

+
-
-

generated/modules/traveldroid/desktop/fonts.nix

-
+
+

generated/modules/traveldroid/desktop/fonts.nix

+

This file installs and configures fonts

@@ -2273,9 +2306,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2301,9 +2334,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2350,9 +2383,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2373,9 +2406,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2417,9 +2450,9 @@ misc {
-
-

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2582,9 +2615,9 @@ bind = $mainMod, W, exec, zen
-
-

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2600,9 +2633,9 @@ exec-once = sh ~/Wallpapers/scripts/wallpaper.sh &
-
-

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2627,9 +2660,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2676,9 +2709,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2719,9 +2752,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -2736,9 +2769,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window
-
-

.config/hypr/layout.conf

-
+
+

.config/hypr/layout.conf

+

These are config files for .config/hypr

@@ -2748,9 +2781,9 @@ These are config files for .config/hypr
-
-

.config/hypr/monitor-rules.conf

-
+
+

.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -2761,9 +2794,9 @@ monitor=DP-1,3840x1080@144,1920x0,1
-
-

.config/hypr/scripts/layout-selector.sh

-
+
+

.config/hypr/scripts/layout-selector.sh

+

These are config files for .config/hypr/scripts

@@ -2806,9 +2839,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2857,9 +2890,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -2888,9 +2921,9 @@ windowrulev2 = floatclass:Wofi,opacity:0.9,blur:15
-
-

.config/hypr/# exec-once

-
+
+

.config/hypr/# exec-once

+

These are config files for .config/hypr

@@ -2931,9 +2964,9 @@ workspacecreated = exec $HOME/.local/bin/wallpaper-sync-and-set.sh $workspace
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -3027,9 +3060,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3120,9 +3153,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3159,9 +3192,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3191,9 +3224,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3271,9 +3304,9 @@ These are config files for .config/stylix
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -3324,9 +3357,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3449,9 +3482,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3686,9 +3719,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3725,9 +3758,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -3757,9 +3790,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
 
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3812,13 +3845,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+
{ lib, config, pkgs, flakeRoot, home-manager, ... }:
 
@@ -3859,9 +3892,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3888,9 +3921,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/login-tuigreet.nix

-
+
+

generated/modules/traveldroid/system/login-tuigreet.nix

+

This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for

@@ -3944,9 +3977,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -4010,9 +4043,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -4029,13 +4062,13 @@ This sets the networking.
 
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/parked/users/copy_config_2_config.nix

-
+
+

generated/parked/users/copy_config_2_config.nix

+

This copies stuff to the user home-folder

@@ -4086,9 +4119,9 @@ in
-
-

generated/users/henrov.nix

-
+
+

generated/users/henrov.nix

+

This is the default user, just search and replace henrov another name if you want to change

@@ -4143,9 +4176,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4379,9 +4412,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4418,9 +4451,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4460,7 +4493,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-30 Mon 11:31

+

Created: 2026-03-30 Mon 11:56

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index f3d8acd08..ec252a20b 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -288,24 +288,22 @@ in * generated/traveldroid/modules/apps -** =generated/modules/traveldroid/apps/packages.nix= +** =generated/modules/traveldroid/apps/2_b_installed.nix= This installs a list of apps -#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/packages.nix :noweb yes :mkdirp yes :eval never +#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/2_b_installed.nix :noweb yes :mkdirp yes :eval never { lib, config, pkgs, flakeRoot, ... }: let ################################# - # Read package list from config file + # FILE ################################# - packagesConfPath = "${flakeRoot}/generated/assets/packages.conf"; - raw = builtins.readFile packagesConfPath; + confPath = "${flakeRoot}/generated/assets/packages.conf"; + raw = builtins.readFile confPath; + lines = lib.splitString "\n" raw; - rawLines = lib.splitString "\n" raw; - - # Guard against splitting into characters accidentally - _guard = assert !(builtins.stringLength raw > 1 && builtins.length rawLines == builtins.stringLength raw); true; - - # Clean each line: remove CRs, comments, trim whitespace + ################################# + # CLEAN LINE + ################################# cleanLine = line: let noCR = lib.replaceStrings [ "\r" ] [ "" ] line; @@ -313,52 +311,94 @@ let in lib.strings.trim noInlineComment; - # Filter out empty lines - entries = builtins.filter (l: l != "") (map cleanLine rawLines); + ################################# + # PARSE SECTION + ################################# + parseSection = section: + let + result = + builtins.foldl' + (acc: line: + let + l = lib.strings.trim line; + in + if l == section then + acc // { active = true; } + else if lib.hasPrefix "#" l then + acc // { active = false; } + else if acc.active then + acc // { entries = acc.entries ++ [ l ]; } + else + acc + ) + { active = false; entries = []; } + lines; + in + builtins.filter (l: l != "") (map cleanLine result.entries); + + ################################# + # NIX PACKAGES + ################################# + packageEntries = parseSection "#packages"; - # Resolve attribute paths in pkgs resolvePkg = name: let parts = lib.splitString "." name; found = lib.attrByPath parts null pkgs; in if found == null then - (throw '' - packages.nix: package not found in pkgs - Token : ${builtins.toJSON name} - packages.conf : ${packagesConfPath} - Hint : check the attribute name on search.nixos.org/packages - '') + throw '' + packages.nix: package not found + Token: ${name} + File : ${confPath} + '' else found; - # Final system-wide package list - packages = builtins.seq _guard (map resolvePkg entries); + packages = map resolvePkg packageEntries; + + ################################# + # FLATPAKS + ################################# + flatpakEntries = parseSection "#flatpaks"; in { ################################# - # Allow unfree packages globally + # Allow unfree ################################# - nixpkgs.config = { allowUnfree = true; }; + nixpkgs.config.allowUnfree = true; ################################# - # System packages + # System packages (Nix) ################################# environment.systemPackages = packages; + + ################################# + # Flatpak setup + ################################# + services.flatpak.enable = true; + + services.flatpak.remotes = [ + { + name = "flathub"; + location = "https://flathub.org/repo/flathub.flatpakrepo"; + } + ]; + + ################################# + # Flatpak apps + ################################# + services.flatpak.packages = flatpakEntries; } #+END_SRC -** =generated/assets/packages.conf= +** =generated/assets/2_b_installed.conf= This is a list of additional apps to install -#+BEGIN_SRC conf :tangle generated/assets/packages.conf :noweb yes :mkdirp yes :eval never -#productivity +#+BEGIN_SRC conf :tangle generated/assets/2_b_installed.conf :noweb yes :mkdirp yes :eval never +#packages todoist - -# browsers brave chromium - -# utils git direnv ripgrep @@ -379,30 +419,23 @@ zed-editor eza z-lua qdirstat - -# office obsidian onlyoffice-desktopeditors - -# development postman tea - -#jetbrains.pycharm python3 - -# communication nextcloud-client nextcloud-talk-desktop signal-desktop openssl - -# multimedia audacity handbrake spotify vlc +#flatpaks +eu.betterbird.Betterbird +com.todoist.Todoist #+END_SRC ** =generated/modules/traveldroid/apps/kitty.nix= diff --git a/Droidnix/generated/assets/packages.conf b/Droidnix/generated/assets/2_b_installed.conf similarity index 74% rename from Droidnix/generated/assets/packages.conf rename to Droidnix/generated/assets/2_b_installed.conf index 906217e86..19d76efb7 100644 --- a/Droidnix/generated/assets/packages.conf +++ b/Droidnix/generated/assets/2_b_installed.conf @@ -1,11 +1,7 @@ -#productivity +#packages todoist - -# browsers brave chromium - -# utils git direnv ripgrep @@ -26,26 +22,20 @@ zed-editor eza z-lua qdirstat - -# office obsidian onlyoffice-desktopeditors - -# development postman tea - -#jetbrains.pycharm python3 - -# communication nextcloud-client nextcloud-talk-desktop signal-desktop openssl - -# multimedia audacity handbrake spotify vlc + +#flatpaks +eu.betterbird.Betterbird +com.todoist.Todoist diff --git a/Droidnix/generated/modules/traveldroid/apps/2_b_installed.nix b/Droidnix/generated/modules/traveldroid/apps/2_b_installed.nix new file mode 100644 index 000000000..f2f0b9eac --- /dev/null +++ b/Droidnix/generated/modules/traveldroid/apps/2_b_installed.nix @@ -0,0 +1,99 @@ +{ lib, config, pkgs, flakeRoot, ... }: + +let + ################################# + # FILE + ################################# + confPath = "${flakeRoot}/generated/assets/packages.conf"; + raw = builtins.readFile confPath; + lines = lib.splitString "\n" raw; + + ################################# + # CLEAN LINE + ################################# + cleanLine = line: + let + noCR = lib.replaceStrings [ "\r" ] [ "" ] line; + noInlineComment = lib.head (lib.splitString "#" noCR); + in + lib.strings.trim noInlineComment; + + ################################# + # PARSE SECTION + ################################# + parseSection = section: + let + result = + builtins.foldl' + (acc: line: + let + l = lib.strings.trim line; + in + if l == section then + acc // { active = true; } + else if lib.hasPrefix "#" l then + acc // { active = false; } + else if acc.active then + acc // { entries = acc.entries ++ [ l ]; } + else + acc + ) + { active = false; entries = []; } + lines; + in + builtins.filter (l: l != "") (map cleanLine result.entries); + + ################################# + # NIX PACKAGES + ################################# + packageEntries = parseSection "#packages"; + + resolvePkg = name: + let + parts = lib.splitString "." name; + found = lib.attrByPath parts null pkgs; + in + if found == null then + throw '' + packages.nix: package not found + Token: ${name} + File : ${confPath} + '' + else + found; + + packages = map resolvePkg packageEntries; + + ################################# + # FLATPAKS + ################################# + flatpakEntries = parseSection "#flatpaks"; + +in { + ################################# + # Allow unfree + ################################# + nixpkgs.config.allowUnfree = true; + + ################################# + # System packages (Nix) + ################################# + environment.systemPackages = packages; + + ################################# + # Flatpak setup + ################################# + services.flatpak.enable = true; + + services.flatpak.remotes = [ + { + name = "flathub"; + location = "https://flathub.org/repo/flathub.flatpakrepo"; + } + ]; + + ################################# + # Flatpak apps + ################################# + services.flatpak.packages = flatpakEntries; +}