From 9a2e98978b13a5495463c36baee571df3b683e58 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 07:41:40 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 38 +++++++++++-------- .../generated/modules/apps/zenbrowser.nix | 38 +++++++++++-------- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 09c53a6b5..cc1b21cbc 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -783,27 +783,33 @@ in This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder #+BEGIN_SRC nix :tangle generated/modules/apps/zenbrowser.nix :noweb tangle :mkdirp yes :eval never-html # ./generated/modules/apps/zenbrowser.nix -{ lib, ... }: +{ lib, pkgs, ... }: let - # Import the Zen Browser flake directly - zenBrowserFlake = import (builtins.fetchTarball { - url = "https://github.com/youwen5/zen-browser-flake/archive/refs/heads/main.tar.gz"; - }) {}; + username = "henrov"; # vervang door je echte gebruikersnaam in { - # Module option to enable Zen Browser - options.mySystem.apps.zenBrowser.enable = - lib.mkEnableOption "Enable Zen Browser"; + flake.nixosModules.zenbrowser = { config, pkgs, lib, ... }: - # Top-level config using dendritic pattern - config = { config, pkgs, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) { - # Add Zen Browser to system packages - environment.systemPackages = [ - zenBrowserFlake.packages.x86_64-linux.zen-browser - ]; - }; -} + { + options.mySystem.apps.zenbrowser.enable = + lib.mkEnableOption "Enable Zen Browser"; + + config = lib.mkIf (config.mySystem.apps.zenbrowser.enable or false) { + + # --- Home Manager gebruiker --- + home-manager.users.${username} = { + home.stateVersion = "25.11"; + home.username = username; + home.homeDirectory = "/home/${username}"; + + # --- Thunar en plugins --- + home.packages = with pkgs; [ + zen-browser + ]; + }; + }; + } #+END_SRC ** =generated/modules/apps/packages.nix= diff --git a/Droidnix/generated/modules/apps/zenbrowser.nix b/Droidnix/generated/modules/apps/zenbrowser.nix index f78548203..a01ac1b0d 100644 --- a/Droidnix/generated/modules/apps/zenbrowser.nix +++ b/Droidnix/generated/modules/apps/zenbrowser.nix @@ -1,22 +1,28 @@ # ./generated/modules/apps/zenbrowser.nix -{ lib, ... }: +{ lib, pkgs, ... }: let - # Import the Zen Browser flake directly - zenBrowserFlake = import (builtins.fetchTarball { - url = "https://github.com/youwen5/zen-browser-flake/archive/refs/heads/main.tar.gz"; - }) {}; + username = "henrov"; # vervang door je echte gebruikersnaam in { - # Module option to enable Zen Browser - options.mySystem.apps.zenBrowser.enable = - lib.mkEnableOption "Enable Zen Browser"; + flake.nixosModules.zenbrowser = { config, pkgs, lib, ... }: - # Top-level config using dendritic pattern - config = { config, pkgs, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) { - # Add Zen Browser to system packages - environment.systemPackages = [ - zenBrowserFlake.packages.x86_64-linux.zen-browser - ]; - }; -} + { + options.mySystem.apps.zenbrowser.enable = + lib.mkEnableOption "Enable Zen Browser"; + + config = lib.mkIf (config.mySystem.apps.zenbrowser.enable or false) { + + # --- Home Manager gebruiker --- + home-manager.users.${username} = { + home.stateVersion = "25.11"; + home.username = username; + home.homeDirectory = "/home/${username}"; + + # --- Thunar en plugins --- + home.packages = with pkgs; [ + zen-browser + ]; + }; + }; + }