From 663117b352f7f9d50876a7e9e127f0de8ff6411a Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Wed, 29 Apr 2026 12:31:04 +0200 Subject: [PATCH] Regenerated --- Droidnix/.zed/settings.json | 3 + Droidnix/README.html | 826 +++++++++--------- Droidnix/README.org | 42 +- Droidnix/flake.nix | 2 + Droidnix/generated/.config/scripts/update.sh | 22 - .../modules/traveldroid/system/quickshell.nix | 38 +- 6 files changed, 451 insertions(+), 482 deletions(-) create mode 100644 Droidnix/.zed/settings.json delete mode 100755 Droidnix/generated/.config/scripts/update.sh diff --git a/Droidnix/.zed/settings.json b/Droidnix/.zed/settings.json new file mode 100644 index 000000000..5437caeb9 --- /dev/null +++ b/Droidnix/.zed/settings.json @@ -0,0 +1,3 @@ +{ + "project_name": "Droidnix" +} diff --git a/Droidnix/README.html b/Droidnix/README.html index fe7a06afd..2cf31dab0 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,143 +204,143 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -356,25 +356,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: @@ -387,9 +387,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • = is the entry point and imports:
      @@ -400,16 +400,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. @@ -430,9 +430,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

@@ -510,9 +510,9 @@ com.logseq.Logseq
-
-

generated/assets/aliases.conf

-
+
+

generated/assets/aliases.conf

+

This is a list of additional apps to install

@@ -554,9 +554,9 @@ keys=hyprctl binds 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.

@@ -618,6 +618,7 @@ The Nix flake definition for Droidnix. stylix hyprland zen-browser + quickshell buildUser mutableConfigPath ; @@ -633,6 +634,7 @@ The Nix flake definition for Droidnix. stylix hyprland zen-browser + quickshell buildUser mutableConfigPath ; @@ -645,9 +647,9 @@ The Nix flake definition for Droidnix.
-
-

generated/modules/traveldroid/system/colors.nix

-
+
+

generated/modules/traveldroid/system/colors.nix

+

Setting the colors for Droidnix.

@@ -724,9 +726,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. ---
 { config, pkgs, lib, flakeRoot, ... }:
@@ -795,9 +797,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. @@ -855,9 +857,9 @@ in
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -917,13 +919,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

@@ -1031,9 +1033,9 @@ in {
-
-

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

-
+
+

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

+

This installs emacs

@@ -1129,9 +1131,9 @@ in
-
-

generated/disabled/modules/traveldroid/apps/flameshot.nix

-
+
+

generated/disabled/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

@@ -1191,9 +1193,9 @@ in
-
-

generated/modules/traveldroid/apps/kdeconnect.nix

-
+
+

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

@@ -1222,9 +1224,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1276,9 +1278,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

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

@@ -1365,9 +1367,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1402,9 +1404,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1424,9 +1426,9 @@ in
-
-

generated/modules/traveldroid/apps/zeditor.nix

-
+
+

generated/modules/traveldroid/apps/zeditor.nix

+

This sets Zed Editor

@@ -1482,9 +1484,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1598,13 +1600,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

@@ -1622,9 +1624,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1650,9 +1652,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1697,9 +1699,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -1786,9 +1788,9 @@ in
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1887,9 +1889,9 @@ in
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -1935,9 +1937,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1967,9 +1969,9 @@ in
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -2040,13 +2042,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, ... }:
 
@@ -2065,9 +2067,9 @@ in
-
-

generated/modules/traveldroid/system/avahi.nix

-
+
+

generated/modules/traveldroid/system/avahi.nix

+

Avahi helps discovering services

@@ -2087,9 +2089,9 @@ Avahi helps discovering services
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+

Installing Bluetooth services and supporting aps

@@ -2116,9 +2118,9 @@ in
-
-

generated/modules/traveldroid/system/copy_scripts.nix

-
+
+

generated/modules/traveldroid/system/copy_scripts.nix

+

This copies any scripts from generated.config/scripts to ~/.config/scripts and makes any .sh files executable.

@@ -2159,9 +2161,9 @@ in
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -2188,9 +2190,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/firewall.nix

-
+
+

generated/modules/traveldroid/system/firewall.nix

+

This sets the firewall.

@@ -2271,9 +2273,9 @@ This sets the firewall.
-
-

generated/modules/traveldroid/system/hypridle.nix

-
+
+

generated/modules/traveldroid/system/hypridle.nix

+

This installs hypridle

@@ -2329,9 +2331,9 @@ in
-
-

generated/modules/traveldroid/system/hyprlock.nix

-
+
+

generated/modules/traveldroid/system/hyprlock.nix

+

This installs hyprlock

@@ -2388,9 +2390,9 @@ in
-
-

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

-
+
+

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

+

This sets the dbus implementation

@@ -2438,9 +2440,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 imho fits the aesthetic I am aiming for

@@ -2487,9 +2489,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -2538,9 +2540,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 {
@@ -2563,9 +2565,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2589,37 +2591,23 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/quickshell.nix

-
+
+

generated/modules/traveldroid/system/quickshell.nix

+

-This sets the dbus implementation +This sets the quickshell implementation

-
{ pkgs, lib, config, flakeRoot, ... }:
+
{ pkgs, lib, config, flakeRoot, quickshell, ... }:
 let
   username = config.defaultUser or "henrov";
-  quickshellPath = flakeRoot + "/generated/.config/quickshell";
-  allFiles = lib.filesystem.listFilesRecursive quickshellPath;
-
-  toRelative = file:
-    let
-      base = toString flakeRoot + "/generated/";
-      relative = lib.removePrefix base (toString file);
-    in
-      builtins.unsafeDiscardStringContext relative;
-
-  toFileEntry = file: {
-    name = toRelative file;
-    value = {
-      source = file;
-      force = true;
-    };
-  };
+  sysName = "quickshell";
+  assetPath = "${flakeRoot}/generated/.config/${sysName}";
+  quickshellPkg = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
 in
 {
   environment.systemPackages = with pkgs; [
-    quickshell
+    quickshellPkg
     qt6.qtdeclarative
     qt6.qttools
     qt6.qtsvg
@@ -2633,9 +2621,17 @@ in
     platformTheme = "qt5ct";
   };
 
-  home-manager.users = {
-    ${username} = {
-      home.file = builtins.listToAttrs (map toFileEntry allFiles);
+  home-manager.users.${username} = {
+    home.activation.quickshellMutableFiles = {
+      after = [ "writeBoundary" ];
+      before = [];
+      data = ''
+        rm -rf $HOME/.config/${sysName}
+        mkdir -p $HOME/.config/${sysName}
+        cp -r ${assetPath}/* $HOME/.config/${sysName}/
+        chmod -R u+w $HOME/.config/${sysName}/
+        find $HOME/.config/${sysName}/ -name "*.sh" -exec chmod +x {} \;
+      '';
     };
   };
 }
@@ -2643,9 +2639,9 @@ in
-
-

generated/modules/traveldroid/system/swaync.nix

-
+
+

generated/modules/traveldroid/system/swaync.nix

+

This sets the dbus implementation

@@ -2694,13 +2690,13 @@ in
-
-

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

@@ -2762,9 +2758,9 @@ in

These are all the prepared config files

-
-

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

-
+
+

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

+

This contaions emacs

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -3277,9 +3273,9 @@ the top of the file."
-
-

generated/.config/hypr/animations.conf

-
+
+

generated/.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -3298,9 +3294,9 @@ These are config files for .config/hypr
-
-

generated/.config/hypr/behaviour.conf

-
+
+

generated/.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -3322,9 +3318,9 @@ input {
-
-

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -3501,9 +3497,9 @@ bind = $mainMod, U, exec, qs -c updater
-
-

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3524,9 +3520,9 @@ exec-once = waybar
-
-

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -3557,9 +3553,9 @@ listener {
-
-

generated/.config/hypr/hyprlock.conf

-
+
+

generated/.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -3589,9 +3585,9 @@ input-field {
-
-

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -3610,9 +3606,9 @@ source = ./workspace-rules.conf
-
-

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3625,9 +3621,9 @@ layerrule = xray 1, match:namespace swaync-control-center
-
-

generated/.config/hypr/layout.conf

-
+
+

generated/.config/hypr/layout.conf

+

These settings control Hyprland config

@@ -3642,9 +3638,9 @@ scrolling {
-
-

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3655,9 +3651,9 @@ monitor = eDP-1, preferred, auto-left, 1.5
-
-

generated/.config/hypr/theming.conf

-
+
+

generated/.config/hypr/theming.conf

+

These are config files for .config/hypr

@@ -3723,9 +3719,9 @@ misc {
-
-

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

-
+
+

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

+

These are config files for .config/hypr

@@ -3816,9 +3812,9 @@ windowrule {
-
-

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

-
+
+

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

+

These setttings configure rules for workspaces

@@ -3833,9 +3829,9 @@ workspace = 6, monitor:DP-1 #, layout:dwindle
-
-

generated/.config/quickshell/media/shell.qml

-
+
+

generated/.config/quickshell/media/shell.qml

+

offers a audio widget

@@ -4229,9 +4225,9 @@ ShellRoot {
-
-

generated/.config/quickshell/powermenu/shell.qml

-
+
+

generated/.config/quickshell/powermenu/shell.qml

+

Provides a powermenu

@@ -4379,9 +4375,9 @@ ShellRoot {
-
-

generated/.config/quickshell/updater/shell.qml

-
+
+

generated/.config/quickshell/updater/shell.qml

+

Updates the system

@@ -4440,9 +4436,9 @@ Window {
-
-

generated/.config/quickshell/layoutswitcher/shell.qml

-
+
+

generated/.config/quickshell/layoutswitcher/shell.qml

+

Provides a layout menu

@@ -4589,9 +4585,9 @@ ShellRoot {
-
-

generated/.config/waybar/scripts/batterywarn.sh

-
+
+

generated/.config/waybar/scripts/batterywarn.sh

+

Providing an media

@@ -4608,9 +4604,9 @@ fi
-
-

generated/.config/waybar/scripts/media.sh

-
+
+

generated/.config/waybar/scripts/media.sh

+

Providing an media

@@ -4709,9 +4705,9 @@ jq -c -n \
-
-

generated/.config/scripts/numlock-check.sh

-
+
+

generated/.config/scripts/numlock-check.sh

+

Count keyboards and enable numlock if more then 1, else disable

@@ -4733,9 +4729,9 @@ fi
-
-

generated/.config/scripts/power.sh

-
+
+

generated/.config/scripts/power.sh

+

Enables a terminal power menu

@@ -4790,9 +4786,9 @@ main
-
-

generated/.config/scripts/update-engine.sh

-
+
+

generated/.config/scripts/update-engine.sh

+

A file containing color variables

@@ -4823,9 +4819,9 @@ update_step 100 "Done"
-
-

generated/.config/wofi/scripts/wofi-launcher.sh

-
+
+

generated/.config/wofi/scripts/wofi-launcher.sh

+

Providing an media

@@ -4840,9 +4836,9 @@ Providing an media
-
-

generated/.config/shared/colors.css

-
+
+

generated/.config/shared/colors.css

+

A file containing color variables

@@ -4883,9 +4879,9 @@ A file containing color variables
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -5173,9 +5169,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -5212,9 +5208,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

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

@@ -5323,9 +5319,9 @@ These are config files for .config/stylix
-
-

generated/.config/swaync/config.json

-
+
+

generated/.config/swaync/config.json

+

These are config files for waybar

@@ -5386,9 +5382,9 @@ These are config files for waybar
-
-

generated/.config/swaync/style.css

-
+
+

generated/.config/swaync/style.css

+

These are config files for waybar

@@ -5581,9 +5577,9 @@ These are config files for waybar
-
-

generated/.config/waybar/config.jsonc

-
+
+

generated/.config/waybar/config.jsonc

+

These are config files for waybar

@@ -5920,9 +5916,9 @@ These are config files for waybar
-
-

generated/.config/waybar/style-dark.css

-
+
+

generated/.config/waybar/style-dark.css

+

This file contains all css for waybar

@@ -6182,9 +6178,9 @@ label#custom-windows:not(.active) {
-
-

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

-
+
+

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

+

These are config files for waybar

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

@@ -6253,9 +6249,9 @@ jq -c -n \
-
-

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

-
+
+

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

+

These are config files for waybar

@@ -6277,9 +6273,9 @@ hyprctl dispatch focuswindow address:"$addr"
-
-

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

-
+
+

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

+

These are config files for waybar

@@ -6303,9 +6299,9 @@ fi
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -6342,9 +6338,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -6380,9 +6376,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -6409,9 +6405,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

This is the default layout for wofi

@@ -6507,9 +6503,9 @@ This is the default layout for wofi
-
-

generated/.config/zed/settings.json

-
+
+

generated/.config/zed/settings.json

+

These are config files for Zed editor

@@ -6547,9 +6543,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -6586,7 +6582,7 @@ cd() {

Author: Henro Veijer

-

Created: 2026-04-29 wo 12:14

+

Created: 2026-04-29 wo 12:31

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index d8c42582e..0e5350323 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -236,6 +236,7 @@ The Nix flake definition for Droidnix. stylix hyprland zen-browser + quickshell buildUser mutableConfigPath ; @@ -251,6 +252,7 @@ The Nix flake definition for Droidnix. stylix hyprland zen-browser + quickshell buildUser mutableConfigPath ; @@ -2000,32 +2002,18 @@ This sets the dbus implementation #+END_SRC ** =generated/modules/traveldroid/system/quickshell.nix= -This sets the dbus implementation +This sets the quickshell implementation #+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/quickshell.nix :noweb yes :mkdirp yes :eval never -{ pkgs, lib, config, flakeRoot, ... }: +{ pkgs, lib, config, flakeRoot, quickshell, ... }: let username = config.defaultUser or "henrov"; - quickshellPath = flakeRoot + "/generated/.config/quickshell"; - allFiles = lib.filesystem.listFilesRecursive quickshellPath; - - toRelative = file: - let - base = toString flakeRoot + "/generated/"; - relative = lib.removePrefix base (toString file); - in - builtins.unsafeDiscardStringContext relative; - - toFileEntry = file: { - name = toRelative file; - value = { - source = file; - force = true; - }; - }; + sysName = "quickshell"; + assetPath = "${flakeRoot}/generated/.config/${sysName}"; + quickshellPkg = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default; in { environment.systemPackages = with pkgs; [ - quickshell + quickshellPkg qt6.qtdeclarative qt6.qttools qt6.qtsvg @@ -2039,9 +2027,17 @@ in platformTheme = "qt5ct"; }; - home-manager.users = { - ${username} = { - home.file = builtins.listToAttrs (map toFileEntry allFiles); + home-manager.users.${username} = { + home.activation.quickshellMutableFiles = { + after = [ "writeBoundary" ]; + before = []; + data = '' + rm -rf $HOME/.config/${sysName} + mkdir -p $HOME/.config/${sysName} + cp -r ${assetPath}/* $HOME/.config/${sysName}/ + chmod -R u+w $HOME/.config/${sysName}/ + find $HOME/.config/${sysName}/ -name "*.sh" -exec chmod +x {} \; + ''; }; }; } diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index 3fcb39386..8fc4e7a0f 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -56,6 +56,7 @@ stylix hyprland zen-browser + quickshell buildUser mutableConfigPath ; @@ -71,6 +72,7 @@ stylix hyprland zen-browser + quickshell buildUser mutableConfigPath ; diff --git a/Droidnix/generated/.config/scripts/update.sh b/Droidnix/generated/.config/scripts/update.sh deleted file mode 100755 index 426690537..000000000 --- a/Droidnix/generated/.config/scripts/update.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- -set -uo pipefail - -REPO="/home/$USER/Repos/nixos/Droidnix" -HOSTNAME="$(hostname)" -cd "$REPO" - -run() { - echo - echo "▶ $1" - shift - "$@" || { echo "❌ Failed: $1"; exit 1; } -} - -run "Fixing ownership" sudo chown -R "$USER":"wheel" "$REPO" -run "Updating flake" nix flake update -run "Rebuilding NixOS" sudo nixos-rebuild switch --flake ".#$HOSTNAME" && hyprctl reload -run "Updating Flatpaks" flatpak uninstall --unused && flatpak update --appstream && flatpak update -y - -echo -echo "✅ Done" diff --git a/Droidnix/generated/modules/traveldroid/system/quickshell.nix b/Droidnix/generated/modules/traveldroid/system/quickshell.nix index 8edac971a..193d4244c 100644 --- a/Droidnix/generated/modules/traveldroid/system/quickshell.nix +++ b/Droidnix/generated/modules/traveldroid/system/quickshell.nix @@ -1,28 +1,14 @@ # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- -{ pkgs, lib, config, flakeRoot, ... }: +{ pkgs, lib, config, flakeRoot, quickshell, ... }: let username = config.defaultUser or "henrov"; - quickshellPath = flakeRoot + "/generated/.config/quickshell"; - allFiles = lib.filesystem.listFilesRecursive quickshellPath; - - toRelative = file: - let - base = toString flakeRoot + "/generated/"; - relative = lib.removePrefix base (toString file); - in - builtins.unsafeDiscardStringContext relative; - - toFileEntry = file: { - name = toRelative file; - value = { - source = file; - force = true; - }; - }; + sysName = "quickshell"; + assetPath = "${flakeRoot}/generated/.config/${sysName}"; + quickshellPkg = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default; in { environment.systemPackages = with pkgs; [ - quickshell + quickshellPkg qt6.qtdeclarative qt6.qttools qt6.qtsvg @@ -36,9 +22,17 @@ in platformTheme = "qt5ct"; }; - home-manager.users = { - ${username} = { - home.file = builtins.listToAttrs (map toFileEntry allFiles); + home-manager.users.${username} = { + home.activation.quickshellMutableFiles = { + after = [ "writeBoundary" ]; + before = []; + data = '' + rm -rf $HOME/.config/${sysName} + mkdir -p $HOME/.config/${sysName} + cp -r ${assetPath}/* $HOME/.config/${sysName}/ + chmod -R u+w $HOME/.config/${sysName}/ + find $HOME/.config/${sysName}/ -name "*.sh" -exec chmod +x {} \; + ''; }; }; }