In between commit, started on reworking README.org, stopped at line 1245
This commit is contained in:
+19
-22
@@ -91,17 +91,17 @@ They are never tangled into the filesystem.
|
||||
These blocks generate real =.nix= files and insert the same code into the documentation.
|
||||
Example:
|
||||
#+begin_example
|
||||
** install_packages.nix
|
||||
** packages.nix
|
||||
<tekst>
|
||||
#+begin_src nix :tangle configuration/apps/install_packages.nix :noweb tangle :mkdirp yes
|
||||
#+begin_src nix :tangle configuration/apps/packages.nix :noweb tangle :mkdirp yes
|
||||
<nixos code>
|
||||
#+end_src
|
||||
#+end_example
|
||||
|
||||
Explanation:
|
||||
- The headline =install_packages.nix= becomes a documentation chapter.
|
||||
- The headline =packages.nix= becomes a documentation chapter.
|
||||
- The paragraph =<tekst>= explains what the module does.
|
||||
- =<nixos code>= is exactly what will be written into the .nix module =configuration/apps/install_packages.nix=
|
||||
- =<nixos code>= is exactly what will be written into the .nix module =configuration/apps/packages.nix=
|
||||
- The same source block is rendered as a code block in the documentation.
|
||||
|
||||
This means:
|
||||
@@ -324,7 +324,7 @@ flatpak search <application-name>
|
||||
|
||||
or by browsing: https://flathub.org/.
|
||||
|
||||
The behavior and integration of Flatpak installation within the system are defined in =install_flatpaks.nix=, which reads the corresponding configuration files and ensures declarative installation.
|
||||
The behavior and integration of Flatpak installation within the system are defined in =flatpaks.nix=, which reads the corresponding configuration files and ensures declarative installation.
|
||||
|
||||
This separation maintains clarity between system-level packages and user-facing Flatpak applications while preserving reproducibility and modular structure.
|
||||
|
||||
@@ -521,12 +521,12 @@ The tree below shows the full repository layout, with the standardized internal
|
||||
│ │ │ └── ssh
|
||||
│ │ │ └── ssh-client.conf
|
||||
│ │ └── services
|
||||
│ ├── lock.png
|
||||
│ ├── lockscreen.png
|
||||
│ └── scripts
|
||||
├── configuration
|
||||
│ ├── apps
|
||||
│ │ ├── install_flatpaks.nix
|
||||
│ │ └── install_packages.nix
|
||||
│ │ ├── flatpaks.nix
|
||||
│ │ └── packages.nix
|
||||
│ ├── core
|
||||
│ │ ├── boot.nix
|
||||
│ │ ├── files.nix
|
||||
@@ -864,8 +864,8 @@ This section describes the main system configuration for the computers that I ha
|
||||
{ pkgs, user, ... } :
|
||||
{
|
||||
imports = [
|
||||
./apps/install_flatpaks.nix
|
||||
./apps/install_packages.nix
|
||||
./apps/flatpaks.nix
|
||||
./apps/packages.nix
|
||||
./core/files.nix
|
||||
./core/locale.nix
|
||||
./core/networking.nix
|
||||
@@ -899,8 +899,8 @@ This section describes the main system configuration for the computers that I ha
|
||||
** Apps section
|
||||
This section describes a way of installing packages, either through nixpkgs orr flatpak. What apps to instal is decided in the files ./assets/conf/apps/packages.conf and flatpaks.conf
|
||||
|
||||
** install_packages.nix
|
||||
#+begin_src nix :tangle configuration/apps/install_packages.nix :noweb tangle :mkdirp yes
|
||||
** packages.nix
|
||||
#+begin_src nix :tangle configuration/apps/packages.nix :noweb tangle :mkdirp yes
|
||||
{ config, lib, pkgs, flakeRoot, inputs, ... }:
|
||||
let
|
||||
packagesConfPath = flakeRoot.outPath + "/assets/conf/apps/packages.conf";
|
||||
@@ -928,7 +928,7 @@ let
|
||||
in
|
||||
if found == null then
|
||||
throw ''
|
||||
install_packages.nix: package not found in pkgs
|
||||
packages.nix: package not found in pkgs
|
||||
Token : ${builtins.toJSON name}
|
||||
packages.conf : ${toString packagesConfPath}
|
||||
Hint : check the attribute name on search.nixos.org/packages
|
||||
@@ -946,8 +946,8 @@ in
|
||||
}
|
||||
#+end_src
|
||||
|
||||
** install_flatpaks.nix
|
||||
#+begin_src nix :tangle configuration/apps/install_flatpaks.nix :noweb tangle :mkdirp yes
|
||||
** flatpaks.nix
|
||||
#+begin_src nix :tangle configuration/apps/flatpaks.nix :noweb tangle :mkdirp yes
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
let
|
||||
moduleName = "install-flatpaks";
|
||||
@@ -1133,7 +1133,7 @@ This file has most of the settings the control how the computer boots up.
|
||||
}
|
||||
#+end_src
|
||||
|
||||
** Login
|
||||
* Login
|
||||
Here we control what the login screen would look like. In configuration/default.nix you can choose whether to use tuigreet (very minimalistic) or LightDM (nicer, themeable)
|
||||
|
||||
** Tuigreet
|
||||
@@ -1162,7 +1162,7 @@ Doesn't match the rest of the aesthetic of the system (with hyprland), but I lik
|
||||
|
||||
let
|
||||
lightdmConf = builtins.readFile ../../assets/conf/core/lightdm.conf;
|
||||
lockPng = ../../assets/lock.png;
|
||||
lockPng = ../../assets/lockscreen.png;
|
||||
|
||||
greeterConfPath = ../../assets/conf/core/lightdm-gtk-greeter.conf;
|
||||
greeterRaw = builtins.readFile greeterConfPath;
|
||||
@@ -1186,17 +1186,14 @@ let
|
||||
if ms == [] then null else builtins.elemAt ms 0;
|
||||
in
|
||||
if m == null then null else lib.strings.trim (builtins.elemAt m 0);
|
||||
|
||||
# In your greeter.conf these are *package keys*, not theme names.
|
||||
themePkgKey = getIniValue "theme-name";
|
||||
iconPkgKey = getIniValue "icon-theme-name";
|
||||
cursorPkgKey = getIniValue "cursor-theme-name";
|
||||
|
||||
cursorSizeStr = getIniValue "cursor-theme-size";
|
||||
cursorSize =
|
||||
if cursorSizeStr == null then null
|
||||
else lib.toInt (lib.strings.trim cursorSizeStr);
|
||||
|
||||
# Map package-keys (from greeter.conf) -> { package, name }
|
||||
#
|
||||
# IMPORTANT:
|
||||
@@ -1802,13 +1799,13 @@ They are configured below.
|
||||
#+begin_src nix :tangle home/desktop/hyprlock.nix :noweb tangle :mkdirp yes
|
||||
{ config, lib, pkgs, flakeRoot, ... }:
|
||||
let
|
||||
lockPngSrc = flakeRoot.outPath + "/assets/lock.png";
|
||||
lockPngSrc = flakeRoot.outPath + "/assets/lockscreen.png";
|
||||
hyprlockConf = flakeRoot.outPath + "/assets/conf/desktop/hypr/hyprlock.conf";
|
||||
in
|
||||
{
|
||||
home.packages = [ pkgs.hyprlock ];
|
||||
# Gebruik home.file voor echte bestanden (geen symlinks)
|
||||
home.file.".config/hypr/lock.png" = {
|
||||
home.file.".config/hypr/lockscreen.png" = {
|
||||
source = lib.mkForce lockPngSrc;
|
||||
};
|
||||
home.file.".config/hypr/hyprlock.conf" = {
|
||||
|
||||
Reference in New Issue
Block a user