Regenerated

Droidnix/.zed/settings.json

@@ -0,0 +1,3 @@
+{
+  "project_name": "Droidnix"
+}

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";
+  sysName = "quickshell";
-  allFiles = lib.filesystem.listFilesRecursive quickshellPath;
+  assetPath = "${flakeRoot}/generated/.config/${sysName}";
-
+  quickshellPkg = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  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;
-    };
-  };
 in
 {
   environment.systemPackages = with pkgs; [
-    quickshell
+    quickshellPkg
     qt6.qtdeclarative
     qt6.qttools
     qt6.qtsvg
@@ -2039,9 +2027,17 @@ in
     platformTheme = "qt5ct";
   };
 
-  home-manager.users = {
+  home-manager.users.${username} = {
-    ${username} = {
+    home.activation.quickshellMutableFiles = {
-      home.file = builtins.listToAttrs (map toFileEntry allFiles);
+      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 {} \;
+      '';
     };
   };
 }

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
               ;

Droidnix/generated/.config/scripts/update.sh

@@ -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"

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";
+  sysName = "quickshell";
-  allFiles = lib.filesystem.listFilesRecursive quickshellPath;
+  assetPath = "${flakeRoot}/generated/.config/${sysName}";
-
+  quickshellPkg = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  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;
-    };
-  };
 in
 {
   environment.systemPackages = with pkgs; [
-    quickshell
+    quickshellPkg
     qt6.qtdeclarative
     qt6.qttools
     qt6.qtsvg
@@ -36,9 +22,17 @@ in
     platformTheme = "qt5ct";
   };
 
-  home-manager.users = {
+  home-manager.users.${username} = {
-    ${username} = {
+    home.activation.quickshellMutableFiles = {
-      home.file = builtins.listToAttrs (map toFileEntry allFiles);
+      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 {} \;
+      '';
     };
   };
 }