diff --git a/Droidnix/README.html b/Droidnix/README.html index ff525b002..b8637f5ef 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,121 +204,123 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -334,25 +336,25 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. with 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
  • +
  • Core
  • +
  • Hyprland
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

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

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -378,16 +380,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. @@ -408,9 +410,9 @@ The generated/ directory contains all generated configurations, div The .assets/ folder contains all static files, such as configs, scripts, and themes. These files are not generated and can be edited directly.

-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -488,9 +490,9 @@ com.todoist.Todoist This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

generated/flake.nix

-
+
+

generated/flake.nix

+

The Nix flake definition for Droidnix.

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

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -607,9 +609,9 @@ The Nix flake definition for Droidnix.
 
-
-

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. @@ -667,9 +669,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, ... }:
 
@@ -728,13 +730,13 @@ in
 
-
-

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

@@ -842,9 +844,9 @@ in {
-
-

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

-
+
+

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

+

This installs emacs

@@ -940,9 +942,9 @@ in
-
-

generated/modules/traveldroid/apps/flameshot.nix

-
+
+

generated/modules/traveldroid/apps/flameshot.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

@@ -981,9 +983,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1041,9 +1043,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1082,9 +1084,9 @@ in
-
-

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

@@ -1125,9 +1127,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1160,9 +1162,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1182,9 +1184,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1247,13 +1249,13 @@ in
-
-

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

@@ -1271,9 +1273,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1299,9 +1301,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1348,9 +1350,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -1437,9 +1439,9 @@ in
 
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1538,9 +1540,9 @@ in
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -1606,9 +1608,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1638,9 +1640,9 @@ in
 
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -1694,13 +1696,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/audio.nix

-
+
+

generated/modules/traveldroid/system/audio.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1718,9 +1720,9 @@ in
 
-
-

generated/modules/traveldroid/system/base-colors.nix

-
+
+

generated/modules/traveldroid/system/base-colors.nix

+
{ config, pkgs, flakeRoot, ... }:
 let
@@ -1742,9 +1744,9 @@ in
 
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+
{ lib, config, pkgs, home-manager, ... }:
 
@@ -1765,9 +1767,28 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/copy_scripts.nix

+
+
+
{ config, pkgs, flakeRoot ... }:
+let
+  scriptsSrc = "${flakeRoot}/generated/.config/scripts;"
+in
+{
+  home.file.".config/scripts" = {
+    source = scriptsSrc;
+    recursive = true;
+    executable = true;
+  };
+}
+
+
+
+
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -1794,9 +1815,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/gnome-keyring.nix

-
+
+

generated/modules/traveldroid/system/gnome-keyring.nix

+

This sets the dbus implementation

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

@@ -1900,9 +1921,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -1965,9 +1986,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -1983,9 +2004,9 @@ This sets the networking.
 
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2010,13 +2031,13 @@ This sets the dbus implementation
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/users/

-
+
+

generated/users/

+

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

@@ -2078,9 +2099,9 @@ in

These are all the prepared config files

-
-

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

-
+
+

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

+

This contaions emacs

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2593,9 +2614,9 @@ the top of the file."
-
-

generated/.config/hypr/animations.conf

-
+
+

generated/.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2616,9 +2637,9 @@ animations {
-
-

generated/.config/hypr/behaviour.conf

-
+
+

generated/.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2632,9 +2653,9 @@ These are config files for .config/hypr
-
-

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2787,13 +2808,18 @@ bind = $mainMod, W, exec, zen # Auto apps ######################### bind = , workspace, exec, ~/.config/hypr/scripts/set-workspace-wallpaper.sh + +######################### +# System stuff +######################### +bind = $mainMod, U, exec, sudo nixos-rebuild switch --upgrade && flatpak update
-
-

generated/.config/hypr/exec-once.conf

-
+
+

generated/.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2812,9 +2838,9 @@ exec-once = nextcloud --background
-
-

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -2839,9 +2865,9 @@ listener {
-
-

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -2887,9 +2913,9 @@ misc {
-
-

generated/.config/hypr/hyprlock.conf

-
+
+

generated/.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -2930,9 +2956,9 @@ label {
-
-

generated/.config/hypr/layer-rules.conf

-
+
+

generated/.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

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

generated/.config/hypr/layout.conf

-
+
+

generated/.config/hypr/layout.conf

+

These are config files for .config/hypr

@@ -2959,9 +2985,9 @@ These are config files for .config/hypr
-
-

generated/.config/hypr/monitor-rules.conf

-
+
+

generated/.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -2972,9 +2998,9 @@ monitor=DP-1,3840x1080@144,1920x0,1
-
-

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

-
+
+

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

+

These are config files for .config/hypr/scripts

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

generated/.config/hypr/theming.css

-
+
+

generated/.config/hypr/theming.css

+

These are config files for .config/hypr

@@ -3068,9 +3094,9 @@ decoration {
-
-

generated/.config/hypr/window-rules.conf

-
+
+

generated/.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -3108,9 +3134,9 @@ windowrule {
-
-

generated/.config/hypr/workspace-rules.conf

-
+
+

generated/.config/hypr/workspace-rules.conf

+

These are config files for .config/hypr

@@ -3131,16 +3157,37 @@ workspace = 7 workspace = 8 workspace = 9 workspace = 10 -
-
-

generated/.config/shared/colors.css

-
+
+

generated/.config/scripts/update.sh

+

-A file containing colopr variables +A file containing color variables +

+
+
#!/usr/bin/env bash
+set -e
+REPO="$HOME/Repos/nixos/Droidnix"   # adjust this to your flake repo path
+HOSTNAME="$(hostname)"
+cd "$REPO"
+echo "🔄 Updating flake..."
+nix flake update
+echo "🏗 Rebuilding NixOS..."
+sudo nixos-rebuild switch --flake ".#$HOSTNAME"
+echo "📦 Updating Flatpaks..."
+flatpak update -y
+
+
+
+
+
+

generated/.config/shared/colors.css

+
+

+A file containing color variables

/* Catppuccin Mocha Palette */
@@ -3178,9 +3225,9 @@ A file containing colopr variables
 
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -3468,9 +3515,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -3507,9 +3554,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -3539,9 +3586,9 @@ These are config files for .config/stylix
-
-

generated/.config/stylix/palette.html

-
+
+

generated/.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -3619,9 +3666,9 @@ These are config files for .config/stylix
-
-

generated/.config/waybar/config

-
+
+

generated/.config/waybar/config

+

These are config files for waybar

@@ -3839,9 +3886,9 @@ These are config files for waybar
-
-

generated/.config/waybar/style.css

-
+
+

generated/.config/waybar/style.css

+

This file contains all css for waybar

@@ -4034,9 +4081,9 @@ activeworkspaces:not(.active) {
-
-

generated/.config/waybar/scripts/bluetooth-status.sh

-
+
+

generated/.config/waybar/scripts/bluetooth-status.sh

+

These are config files for waybar

@@ -4062,9 +4109,9 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"
-
-

generated/.config/waybar/scripts/hypr-workspaces.sh

-
+
+

generated/.config/waybar/scripts/hypr-workspaces.sh

+

These are config files for waybar

@@ -4094,9 +4141,9 @@ jq -c -n \
-
-

generated/.config/waybar/scripts/hypr-workspacesmenu.sh

-
+
+

generated/.config/waybar/scripts/hypr-workspacesmenu.sh

+

These are config files for waybar

@@ -4113,9 +4160,9 @@ hyprctl dispatch focuswindow address:$addr
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -4152,9 +4199,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -4190,9 +4237,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -4241,9 +4288,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

These are config files for .config/wofi

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

generated/.config/zed/settings.json

-
+
+

generated/.config/zed/settings.json

+

These are config files for Zed editor

@@ -4376,9 +4423,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -4403,7 +4450,7 @@ fi

Author: Henro Veijer

-

Created: 2026-04-10 vr 18:22

+

Created: 2026-04-10 vr 18:38

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index ca6f2f175..a2f782758 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1274,6 +1274,21 @@ in } #+END_SRC +** =generated/modules/traveldroid/system/copy_scripts.nix= +#+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/copy_scripts.nix :noweb yes :mkdirp yes :eval never +{ config, pkgs, flakeRoot ... }: +let + scriptsSrc = "${flakeRoot}/generated/.config/scripts;" +in +{ + home.file.".config/scripts" = { + source = scriptsSrc; + recursive = true; + executable = true; + }; +} +#+END_SRC + ** =generated/modules/traveldroid/system/dbus.nix= This sets the dbus implementation #+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/dbus.nix :noweb yes :mkdirp yes :eval never @@ -2227,6 +2242,11 @@ bind = $mainMod, W, exec, zen # Auto apps ######################### bind = , workspace, exec, ~/.config/hypr/scripts/set-workspace-wallpaper.sh + +######################### +# System stuff +######################### +bind = $mainMod, U, exec, sudo nixos-rebuild switch --upgrade && flatpak update #+END_SRC ** =generated/.config/hypr/exec-once.conf= @@ -2505,11 +2525,26 @@ workspace = 7 workspace = 8 workspace = 9 workspace = 10 +#+END_SRC +** =generated/.config/scripts/update.sh= +A file containing color variables +#+BEGIN_SRC sh :tangle generated/.config/scripts/update.sh :noweb yes :mkdirp yes :eval never +#!/usr/bin/env bash +set -e +REPO="$HOME/Repos/nixos/Droidnix" # adjust this to your flake repo path +HOSTNAME="$(hostname)" +cd "$REPO" +echo "🔄 Updating flake..." +nix flake update +echo "🏗 Rebuilding NixOS..." +sudo nixos-rebuild switch --flake ".#$HOSTNAME" +echo "📦 Updating Flatpaks..." +flatpak update -y #+END_SRC ** =generated/.config/shared/colors.css= -A file containing colopr variables +A file containing color variables #+BEGIN_SRC css :tangle generated/.config/shared/colors.css :noweb yes :mkdirp yes :eval never /* Catppuccin Mocha Palette */ @define-color crust #11111b; diff --git a/Droidnix/assets/traveldroid/scripts/copy_stuff.sh b/Droidnix/assets/traveldroid/scripts/copy_stuff.sh deleted file mode 100755 index 3c483bae6..000000000 --- a/Droidnix/assets/traveldroid/scripts/copy_stuff.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -# Source and destination directories -SOURCE_DIR="/home/henrov/Repos/nixos/henrovnix_ok/assets/copy_stuff/" -DEST_DIR="/home/henrov/" -# Check if source directory exists -if [ ! -d "$SOURCE_DIR" ]; then - echo "Error: Source directory $SOURCE_DIR does not exist." - exit 1 -fi -# Use rsync to copy files, overwriting symlinks and existing files -# --no-group --no-owner preserves your user ownership -rsync -av --no-group --no-owner "$SOURCE_DIR/" "$DEST_DIR/" -echo "Config files copied from $SOURCE_DIR to $DEST_DIR. Symlinks replaced with editable files." - -pkill waybar && waybar & -hyprctl reload diff --git a/Droidnix/generated/.config/hypr/bindings.conf b/Droidnix/generated/.config/hypr/bindings.conf index 1195d6594..cf6559399 100644 --- a/Droidnix/generated/.config/hypr/bindings.conf +++ b/Droidnix/generated/.config/hypr/bindings.conf @@ -146,3 +146,8 @@ bind = $mainMod, W, exec, zen # Auto apps ######################### bind = , workspace, exec, ~/.config/hypr/scripts/set-workspace-wallpaper.sh + +######################### +# System stuff +######################### +bind = $mainMod, U, exec, sudo nixos-rebuild switch --upgrade && flatpak update diff --git a/Droidnix/generated/.config/scripts/update.sh b/Droidnix/generated/.config/scripts/update.sh new file mode 100644 index 000000000..736bb4050 --- /dev/null +++ b/Droidnix/generated/.config/scripts/update.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -e +REPO="$HOME/Repos/nixos/Droidnix" # adjust this to your flake repo path +HOSTNAME="$(hostname)" +cd "$REPO" +echo "🔄 Updating flake..." +nix flake update +echo "🏗 Rebuilding NixOS..." +sudo nixos-rebuild switch --flake ".#$HOSTNAME" +echo "📦 Updating Flatpaks..." +flatpak update -y diff --git a/Droidnix/generated/modules/traveldroid/system/copy_scripts.nix b/Droidnix/generated/modules/traveldroid/system/copy_scripts.nix new file mode 100644 index 000000000..ac441c34c --- /dev/null +++ b/Droidnix/generated/modules/traveldroid/system/copy_scripts.nix @@ -0,0 +1,11 @@ +{ config, pkgs, flakeRoot ... }: +let + scriptsSrc = "${flakeRoot}/generated/.config/scripts;" +in +{ + home.file.".config/scripts" = { + source = scriptsSrc; + recursive = true; + executable = true; + }; +}