diff --git a/Droidnix/README.html b/Droidnix/README.html index 2cbcc92a7..1741f06b9 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.

@@ -485,9 +485,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, ... }:
 
@@ -543,9 +543,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. @@ -603,9 +603,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

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

Following are the imported modules

+
+

Following are the imported modules

-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

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

-
+
+

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

+

This installs a list of apps

@@ -775,9 +775,9 @@ in {
-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -827,9 +827,9 @@ com.todoist.Todoist
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -891,9 +891,9 @@ in
-
-

.config/kitty/Catppuccin-Mocha.conf

-
+
+

.config/kitty/Catppuccin-Mocha.conf

+

These are config files for .config/kitty

@@ -984,9 +984,9 @@ color15 #a6adc8
-
-

.config/kitty/kitty.conf

-
+
+

.config/kitty/kitty.conf

+

These are config files for .config/kitty

@@ -1008,9 +1008,9 @@ font_size 10.0
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1050,9 +1050,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1341,9 +1341,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

@@ -1383,9 +1383,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1418,9 +1418,9 @@ in
-
-

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

@@ -1467,9 +1467,9 @@ prompt = >
-
-

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

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

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1580,67 +1580,144 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal +#+BEGINSRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb yes :mkdirp yes :eval never +{ config, pkgs, lib, flakeRoot, … }:

-
-
{ config, pkgs, lib, flakeRoot, ... }:
 
+

let username = config.users.users.defaultUser or "henrov"; generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc"; in { ################################# - # Home Manager Zsh configuration - ################################# +

- _module.args.hmUsers = { - ${username} = { - programs.zsh = { - enable = true; - enableCompletion = true; - # autocd = true; +

+################################# +

- ohMyZsh = { - enable = true; - theme = ""; - plugins = [ - "git" - "sudo" - "extract" - "colored-man-pages" - "command-not-found" - "history" - "docker" - "kubectl" - ]; - }; +

+_module.args.hmUsers = { + ${username} = { + programs.zsh = { + enable = true; + enableCompletion = true; +

- autosuggestions.enable = true; - syntaxHighlighting.enable = true; - }; +

+ohMyZsh = { + enable = true; + theme = ""; + plugins = [ + "git" + "sudo" + "extract" + "colored-man-pages" + "command-not-found" + "history" + "docker" + "kubectl" + ]; +}; +

- # Use ~/.config/zsh as ZDOTDIR - home.sessionVariables = { - ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; - }; +

+ autosuggestions.enable = true; + syntaxHighlighting.enable = true; +}; +

- # Deploy the generated .zshrc +

+home.sessionVariables = { + ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; +}; +

+ +

home.file.".config/zsh/.zshrc".source = generatedZsh; }; }; -} -

+}{ lib, config, pkgs, flakeRoot, … }: +

+ +

+let +

+ +

+ username = config.defaultUser or "henrov"; + generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc"; +in +{ + ################################# +

+ +

+################################# +environment.systemPackages = [ + pkgs.zsh +]; +

+ +

+################################# +

+ +

+################################# +home-manager.users = { + ${username} = { + programs.zsh = { + enable = true; + enableCompletion = true; +

+ +

+ohMyZsh = { + enable = true; + theme = ""; + plugins = [ + "git" + "sudo" + "extract" + "colored-man-pages" + "command-not-found" + "history" + "docker" + "kubectl" + ]; +}; +

+ +

+ autosuggestions.enable = true; + syntaxHighlighting.enable = true; +}; +

+ +

+home.sessionVariables = { + ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; +}; +

+ +

+ home.file.".config/zsh/.zshrc".source = generatedZsh; + }; + }; +}#+ENDSRC +

-
-
-

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -1675,9 +1752,9 @@ fi
-
-

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

-
+
+

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

+

This installs emacs

@@ -1773,9 +1850,9 @@ in
-
-

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

-
+
+

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

+

This contaions emacs

@@ -1876,9 +1953,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2289,13 +2366,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

@@ -2313,9 +2390,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -2341,9 +2418,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -2390,9 +2467,9 @@ in
-
-

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2413,9 +2490,9 @@ animations {
-
-

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2457,9 +2534,9 @@ misc {
-
-

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2622,9 +2699,9 @@ bind = $mainMod, W, exec, zen
-
-

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

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

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2667,9 +2744,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2716,9 +2793,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2759,9 +2836,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -2776,9 +2853,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

@@ -2788,9 +2865,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

@@ -2801,9 +2878,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

@@ -2846,9 +2923,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2897,9 +2974,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -2928,9 +3005,9 @@ windowrulev2 = floatclass:Wofi,opacity:0.9,blur:15
-
-

.config/hypr/workspace-rules.conf

-
+
+

.config/hypr/workspace-rules.conf

+

These are config files for .config/hypr

@@ -2952,33 +3029,27 @@ workspace = 8 workspace = 9 workspace = 10 - -# Auto-launch apps on specific workspaces (use `exec` with `workspace` rule) -exec-once = kitty, workspace 1 -exec-once = flatpak run app.betterbird.zen, workspace 2 -exec-once = zen, workspace 3 - # Force a specific layout for a workspace -# workspace 1, layout:dwindle -# workspace 2, layout:master -# workspace 3, layout:msg +workspace 1, layout:master +workspace 2, layout:dwindle +workspace 3, layout:msg # Set workspace persistence -# workspace 1, persistent:true -# workspace 2, persistent:true +workspace 1, persistent:true +workspace 2, persistent:true # Workspace behavior -# workspace { -# cycle_move_empty = no -#} +workspace { + cycle_move_empty = yes +}
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -3072,9 +3143,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3165,9 +3236,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3204,9 +3275,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3236,9 +3307,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3316,9 +3387,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

@@ -3369,9 +3440,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3494,9 +3565,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3731,9 +3802,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3770,9 +3841,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3858,13 +3929,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, ... }:
 
@@ -3905,9 +3976,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -3934,9 +4005,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

@@ -3990,9 +4061,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -4056,9 +4127,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -4075,13 +4146,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

@@ -4132,9 +4203,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

@@ -4189,9 +4260,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4425,9 +4496,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4464,9 +4535,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4506,7 +4577,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-30 Mon 12:49

+

Created: 2026-03-30 Mon 12:55

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index dd1137cd8..38270ae8b 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1188,8 +1188,60 @@ in home.file.".config/zsh/.zshrc".source = generatedZsh; }; }; -} -#+END_SRC +}{ lib, config, pkgs, flakeRoot, ... }: + +let + # Use defaultUser or fallback to "henrov" + username = config.defaultUser or "henrov"; + generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc"; +in +{ + ################################# + # Install Zsh system-wide + ################################# + environment.systemPackages = [ + pkgs.zsh + ]; + + ################################# + # Home Manager user configuration + ################################# + home-manager.users = { + ${username} = { + programs.zsh = { + enable = true; + enableCompletion = true; + # autocd = true; + + ohMyZsh = { + enable = true; + theme = ""; + plugins = [ + "git" + "sudo" + "extract" + "colored-man-pages" + "command-not-found" + "history" + "docker" + "kubectl" + ]; + }; + + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + }; + + # Use ~/.config/zsh as ZDOTDIR + home.sessionVariables = { + ZDOTDIR = "${config.home.homeDirectory}/.config/zsh"; + }; + + # Deploy the generated .zshrc + home.file.".config/zsh/.zshrc".source = generatedZsh; + }; + }; +}#+END_SRC ** =generated/.config/zsh/.zshrc This sets up the zsh in the terminal @@ -2378,26 +2430,20 @@ workspace = 8 workspace = 9 workspace = 10 - -# Auto-launch apps on specific workspaces (use `exec` with `workspace` rule) -exec-once = kitty, workspace 1 -exec-once = flatpak run app.betterbird.zen, workspace 2 -exec-once = zen, workspace 3 - # Force a specific layout for a workspace -# workspace 1, layout:dwindle -# workspace 2, layout:master -# workspace 3, layout:msg +workspace 1, layout:master +workspace 2, layout:dwindle +workspace 3, layout:msg # Set workspace persistence -# workspace 1, persistent:true -# workspace 2, persistent:true +workspace 1, persistent:true +workspace 2, persistent:true # Workspace behavior -# workspace { -# cycle_move_empty = no -#} +workspace { + cycle_move_empty = yes +} #+END_SRC ** =generated/modules/traveldroid/desktop/wallpaper.nix= diff --git a/Droidnix/generated/.config/hypr/workspace-rules.conf b/Droidnix/generated/.config/hypr/workspace-rules.conf index b0992b32a..2c253255d 100644 --- a/Droidnix/generated/.config/hypr/workspace-rules.conf +++ b/Droidnix/generated/.config/hypr/workspace-rules.conf @@ -14,23 +14,17 @@ workspace = 8 workspace = 9 workspace = 10 - -# Auto-launch apps on specific workspaces (use `exec` with `workspace` rule) -exec-once = kitty, workspace 1 -exec-once = flatpak run app.betterbird.zen, workspace 2 -exec-once = zen, workspace 3 - # Force a specific layout for a workspace -# workspace 1, layout:dwindle -# workspace 2, layout:master -# workspace 3, layout:msg +workspace 1, layout:master +workspace 2, layout:dwindle +workspace 3, layout:msg # Set workspace persistence -# workspace 1, persistent:true -# workspace 2, persistent:true +workspace 1, persistent:true +workspace 2, persistent:true # Workspace behavior -# workspace { -# cycle_move_empty = no -#} +workspace { + cycle_move_empty = yes +}