diff --git a/Droidnix/README.html b/Droidnix/README.html index cbc53d309..0b1e4f209 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/packages.nix

+

This installs a list of apps

@@ -724,9 +724,9 @@ in {
-
-

generated/assets/packages.conf

-
+
+

generated/assets/packages.conf

+

This is a list of additional apps to install

@@ -787,9 +787,9 @@ vlc
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

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

.config/kitty/Catppuccin-Mocha.conf

-
+
+

.config/kitty/Catppuccin-Mocha.conf

+

These are config files for .config/kitty

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

.config/kitty/kitty.conf

-
+
+

.config/kitty/kitty.conf

+

These are config files for .config/kitty

@@ -968,9 +968,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 +1010,9 @@ in
-
-

.config/starship.toml

-
+
+

.config/starship.toml

+

These are config files for .config

@@ -1301,9 +1301,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 +1343,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

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

.config/wofi/config

-
+
+

.config/wofi/config

+

These are config files for .config/wofi

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

.config/wofi/style.css

-
+
+

.config/wofi/style.css

+

These are config files for .config/wofi

@@ -1518,9 +1518,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 +1540,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

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

=generated/.config/zsh/.zshrc

-
+
+

=generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

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

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

-
+
+

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

+

This installs emacs

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

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

-
+
+

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

+

This contaions emacs

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2249,13 +2249,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 +2273,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

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

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

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

.config/hypr/animations.conf

-
+
+

.config/hypr/animations.conf

+

These are config files for .config/hypr

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

.config/hypr/behaviour.conf

-
+
+

.config/hypr/behaviour.conf

+

These are config files for .config/hypr

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

.config/hypr/bindings.conf

-
+
+

.config/hypr/bindings.conf

+

These are config files for .config/hypr

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

.config/hypr/exec-once.conf

-
+
+

.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2599,9 +2599,9 @@ exec-once = swww-daemon &
-
-

.config/hypr/hypridle.conf

-
+
+

.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2626,9 +2626,9 @@ listener {
-
-

.config/hypr/hyprland.conf

-
+
+

.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2675,9 +2675,9 @@ misc {
-
-

.config/hypr/hyprlock.conf

-
+
+

.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2718,9 +2718,9 @@ label {
-
-

.config/hypr/layer-rules.conf

-
+
+

.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

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

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

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

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

.config/hypr/theming.css

-
+
+

.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -2856,9 +2856,9 @@ decoration {
-
-

.config/hypr/window-rules.conf

-
+
+

.config/hypr/window-rules.conf

+

These are config files for .config/hypr

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

@@ -2932,9 +2932,9 @@ workspace {
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -2946,7 +2946,6 @@ let homeDir = "/home/${username}"; wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers"; wallpaperDst = "${homeDir}/Wallpapers"; - scriptFile = "${homeDir}/Wallpapers/scripts/set-wallpapers.sh"; in { # Make bash available @@ -3001,38 +3000,7 @@ in }; ############################ - # User service to run wallpaper script/usr/bin/env bash - ############################ - systemd.user.services.wallpaperAtLogon = { - description = "Run wallpaper logon script"; - after = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - - serviceConfig = { - Type = "oneshot"; - ExecStart = scriptFile; - Restart = "no"; - }; - - wantedBy = [ "default.target" ]; - }; - - ############################ - # Timer to run the script at login and every 15 minutes - ############################ - systemd.user.timers.wallpaperAtLogonTimer = { - description = "Run wallpaper script at login and every 15 minutes"; - wantedBy = [ "timers.target" ]; - - timerConfig = { - OnBootSec = "1min"; # run 1 minute after login - OnUnitActiveSec = "15min"; # repeat every 15 minutes - Persistent = true; # catch up missed runs - }; - }; - - ############################ - # Random background per workspace at boot + # Random background per workspace at logon ############################ systemd.user.services.workspaceWallpapers = { @@ -3052,9 +3020,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -3146,9 +3114,9 @@ in
 
-
-

.config/stylix/stylix.conf

-
+
+

.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3185,9 +3153,9 @@ icons = {
-
-

.config/stylix/palette.json

-
+
+

.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3217,9 +3185,9 @@ These are config files for .config/stylix
-
-

.config/stylix/palette.html

-
+
+

.config/stylix/palette.html

+

These are config files for .config/stylix

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

@@ -3350,9 +3318,9 @@ in
-
-

.config/waybar/config

-
+
+

.config/waybar/config

+

These are config files for waybar

@@ -3475,9 +3443,9 @@ These are config files for waybar
-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for waybar

@@ -3712,9 +3680,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for waypaper

@@ -3751,9 +3719,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -3838,13 +3806,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, ... }:
 
@@ -3885,9 +3853,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

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

@@ -3970,9 +3938,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -4036,9 +4004,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

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

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

@@ -4169,9 +4137,9 @@ in

These are all the prepared config files

-
-

.config/waybar/style.css

-
+
+

.config/waybar/style.css

+

These are config files for .config/waybar

@@ -4405,9 +4373,9 @@ window#waybar {
-
-

.config/waypaper/config.ini

-
+
+

.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4444,9 +4412,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

.config/zed/settings.json

-
+
+

.config/zed/settings.json

+

These are config files for .config/zed

@@ -4486,7 +4454,7 @@ These are config files for .config/zed

Author: Henro Veijer

-

Created: 2026-03-29 Sun 20:48

+

Created: 2026-03-29 Sun 21:14

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 14a6a0d0a..5f46e8322 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -2366,7 +2366,6 @@ let homeDir = "/home/${username}"; wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers"; wallpaperDst = "${homeDir}/Wallpapers"; - scriptFile = "${homeDir}/Wallpapers/scripts/set-wallpapers.sh"; in { # Make bash available @@ -2421,38 +2420,7 @@ in }; ############################ - # User service to run wallpaper script/usr/bin/env bash - ############################ - systemd.user.services.wallpaperAtLogon = { - description = "Run wallpaper logon script"; - after = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - - serviceConfig = { - Type = "oneshot"; - ExecStart = scriptFile; - Restart = "no"; - }; - - wantedBy = [ "default.target" ]; - }; - - ############################ - # Timer to run the script at login and every 15 minutes - ############################ - systemd.user.timers.wallpaperAtLogonTimer = { - description = "Run wallpaper script at login and every 15 minutes"; - wantedBy = [ "timers.target" ]; - - timerConfig = { - OnBootSec = "1min"; # run 1 minute after login - OnUnitActiveSec = "15min"; # repeat every 15 minutes - Persistent = true; # catch up missed runs - }; - }; - - ############################ - # Random background per workspace at boot + # Random background per workspace at logon ############################ systemd.user.services.workspaceWallpapers = { diff --git a/Droidnix/assets/traveldroid/Wallpapers/scripts/set-wallpapers.sh b/Droidnix/assets/traveldroid/Wallpapers/scripts/set-wallpapers.sh deleted file mode 100755 index 1eeffc50a..000000000 --- a/Droidnix/assets/traveldroid/Wallpapers/scripts/set-wallpapers.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/run/current-system/sw/bin/bash -set -euo pipefail -echo "Running as $(whoami)" - -# ----------------------------- -# Configuration -# ----------------------------- -PICTURES_DIR="$HOME/Wallpapers/pictures" -NAMESPACE="main" # Base namespace for swww-daemon -MONITOR=$(hyprctl monitors -j | jq -r '.[0].name') # First monitor - -# ----------------------------- -# Start swww-daemon if not running -# ----------------------------- -if ! pgrep -x swww-daemon >/dev/null; then - echo "Starting swww-daemon..." - swww-daemon --namespace "$NAMESPACE" & - sleep 0.5 # give socket time to appear -fi - -# ----------------------------- -# Gather wallpapers -# ----------------------------- -mapfile -t IMAGES < <(find "$PICTURES_DIR" -type f \( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \)) -if [ "${#IMAGES[@]}" -eq 0 ]; then - echo "No images found in $PICTURES_DIR" - exit 1 -fi - -# ----------------------------- -# Pre-assign wallpapers to each workspace -# ----------------------------- -declare -A WS_WALLPAPER -for ws in $(hyprctl workspaces -j | jq -r '.[].id'); do - RAND_IMAGE="${IMAGES[RANDOM % ${#IMAGES[@]}]}" - WS_WALLPAPER["$ws"]="$RAND_IMAGE" - echo "Pre-assigning wallpaper for workspace $ws: $RAND_IMAGE" - swww img "$RAND_IMAGE" --resize stretch --transition-type random --namespace "$ws" -done - -# ----------------------------- -# Listen for workspace events -# ----------------------------- -IPC_SOCKET="$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock" -echo "Listening for workspace events on $IPC_SOCKET..." - -socat -u UNIX-CONNECT:"$IPC_SOCKET" STDOUT | while read -r line; do - if [[ "$line" =~ workspace\#([0-9]+) ]]; then - WS="${BASH_REMATCH[1]}" - # Use the pre-assigned wallpaper for this workspace - RAND_IMAGE="${WS_WALLPAPER[$WS]}" - echo "Workspace $WS active → setting wallpaper: $RAND_IMAGE" - swww img "$RAND_IMAGE" --resize stretch --transition-type random --namespace "$WS" - fi -done diff --git a/Droidnix/assets/traveldroid/Wallpapers/scripts/workspace-wallpapers.sh b/Droidnix/assets/traveldroid/Wallpapers/scripts/workspace-wallpapers.sh index 7963f955f..27bd1f033 100755 --- a/Droidnix/assets/traveldroid/Wallpapers/scripts/workspace-wallpapers.sh +++ b/Droidnix/assets/traveldroid/Wallpapers/scripts/workspace-wallpapers.sh @@ -1,19 +1,23 @@ #!/run/current-system/sw/bin/bash set -euo pipefail +echo "Running as $(whoami)" +currentuser=$(whoami) # or set manually +currentprofile=/run/current-system/sw/bin + # ----------------------------- # Configuration # ----------------------------- PICTURES_DIR="$HOME/Wallpapers/pictures" NAMESPACE="main" # Fixed swww namespace -MONITOR=$(hyprctl monitors -j | jq -r '.[0].name') # First monitor +MONITOR=$($currentprofile/hyprctl monitors -j | $currentprofile/jq -r '.[0].name') # ----------------------------- # Start swww-daemon if not running # ----------------------------- if ! pgrep -x swww-daemon >/dev/null; then echo "Starting swww-daemon..." - swww-daemon --namespace "$NAMESPACE" & + $currentprofile/swww-daemon --namespace "$NAMESPACE" & sleep 0.5 # give socket time to appear fi @@ -37,6 +41,6 @@ socat -u UNIX-CONNECT:"$IPC_SOCKET" STDOUT | while read -r line; do WS="${BASH_REMATCH[1]}" RAND_IMAGE="${IMAGES[RANDOM % ${#IMAGES[@]}]}" echo "Workspace $WS active → setting wallpaper: $RAND_IMAGE" - swww img "$RAND_IMAGE" --resize stretch --transition-type random --namespace "$WS" + $currentprofile/swww img "$RAND_IMAGE" --resize stretch --transition-type random --namespace "$WS" fi done diff --git a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix index 9a33ff60b..50efc12c5 100644 --- a/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix +++ b/Droidnix/generated/modules/traveldroid/desktop/wallpaper.nix @@ -5,7 +5,6 @@ let homeDir = "/home/${username}"; wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers"; wallpaperDst = "${homeDir}/Wallpapers"; - scriptFile = "${homeDir}/Wallpapers/scripts/set-wallpapers.sh"; in { # Make bash available @@ -60,38 +59,7 @@ in }; ############################ - # User service to run wallpaper script/usr/bin/env bash - ############################ - systemd.user.services.wallpaperAtLogon = { - description = "Run wallpaper logon script"; - after = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - - serviceConfig = { - Type = "oneshot"; - ExecStart = scriptFile; - Restart = "no"; - }; - - wantedBy = [ "default.target" ]; - }; - - ############################ - # Timer to run the script at login and every 15 minutes - ############################ - systemd.user.timers.wallpaperAtLogonTimer = { - description = "Run wallpaper script at login and every 15 minutes"; - wantedBy = [ "timers.target" ]; - - timerConfig = { - OnBootSec = "1min"; # run 1 minute after login - OnUnitActiveSec = "15min"; # repeat every 15 minutes - Persistent = true; # catch up missed runs - }; - }; - - ############################ - # Random background per workspace at boot + # Random background per workspace at logon ############################ systemd.user.services.workspaceWallpapers = {