diff --git a/Droidnix/README.html b/Droidnix/README.html index a2307a3ee..15aaaa391 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,142 +204,143 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

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

-
-

Root Level

-
+
+

Root Level

+
  • = is the entry point and imports:
      @@ -399,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. @@ -429,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

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

generated/assets/aliases.conf

-
+
+

generated/assets/aliases.conf

+

This is a list of additional apps to install

@@ -553,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.

@@ -644,9 +645,9 @@ The Nix flake definition for Droidnix.
-
-

generated/modules/traveldroid/system/colors.nix

-
+
+

generated/modules/traveldroid/system/colors.nix

+

Setting the colors for Droidnix.

@@ -723,9 +724,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, ... }:
@@ -794,9 +795,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. @@ -854,9 +855,9 @@ in
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

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

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

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

-
+
+

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

+

This installs emacs

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

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

@@ -1221,9 +1222,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1275,9 +1276,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

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

@@ -1364,9 +1365,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1401,9 +1402,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1423,9 +1424,9 @@ in
-
-

generated/modules/traveldroid/apps/zeditor.nix

-
+
+

generated/modules/traveldroid/apps/zeditor.nix

+

This sets Zed Editor

@@ -1481,9 +1482,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

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

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

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1649,9 +1650,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1696,9 +1697,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

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

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1886,9 +1887,9 @@ in
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -1934,9 +1935,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

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

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

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

generated/modules/traveldroid/system/avahi.nix

-
+
+

generated/modules/traveldroid/system/avahi.nix

+

Avahi helps discovering services

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

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+

Installing Bluetooth services and supporting aps

@@ -2115,9 +2116,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.

@@ -2158,9 +2159,9 @@ in
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

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

generated/modules/traveldroid/system/firewall.nix

-
+
+

generated/modules/traveldroid/system/firewall.nix

+

This sets the firewall.

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

generated/modules/traveldroid/system/hypridle.nix

-
+
+

generated/modules/traveldroid/system/hypridle.nix

+

This installs hypridle

@@ -2328,9 +2329,9 @@ in
-
-

generated/modules/traveldroid/system/hyprlock.nix

-
+
+

generated/modules/traveldroid/system/hyprlock.nix

+

This installs hyprlock

@@ -2387,9 +2388,9 @@ in
-
-

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

-
+
+

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

+

This sets the dbus implementation

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

@@ -2486,9 +2487,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

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

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

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

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2588,9 +2589,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/quickshell.nix

-
+
+

generated/modules/traveldroid/system/quickshell.nix

+

This sets the dbus implementation

@@ -2642,9 +2643,9 @@ in
-
-

generated/modules/traveldroid/system/swaync.nix

-
+
+

generated/modules/traveldroid/system/swaync.nix

+

This sets the dbus implementation

@@ -2693,13 +2694,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

@@ -2761,9 +2762,9 @@ in

These are all the prepared config files

-
-

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

-
+
+

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

+

This contaions emacs

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

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

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

generated/.config/hypr/animations.conf

-
+
+

generated/.config/hypr/animations.conf

+

These are config files for .config/hypr

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

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

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -3494,14 +3495,15 @@ bind = , workspace, exec, ~/.config/scripts/set-workspace-wallpaper.sh ######################### # System stuff ######################### -bind = $mainMod, U, exec, kitty --class update-term -e bash -lc "~/.config/scripts/update.sh; exec bash" +# bind = $mainMod, U, exec, kitty --class update-term -e bash -lc "~/.config/scripts/update.sh; exec bash" +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

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

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for .config/hypr

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

generated/.config/hypr/hyprlock.conf

-
+
+

generated/.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

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

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

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

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

-
+
+

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

+

These are config files for .config/hypr

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

generated/.config/hypr/layout.conf

-
+
+

generated/.config/hypr/layout.conf

+

These settings control Hyprland config

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

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

-
+
+

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

+

These are config files for .config/hypr

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

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

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

-
+
+

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

+

These are config files for .config/hypr

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

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

-
+
+

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

+

These setttings configure rules for workspaces

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

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

-
+
+

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

+

offers a audio widget

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

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

-
+
+

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

+

Provides a powermenu

@@ -4377,9 +4379,107 @@ ShellRoot {
-
-

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

-
+
+

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

+
+

+Updates the system +

+
+
import Quickshell
+
+ShellWindow {
+    id: root
+    width: 600
+    height: 380
+    visible: true
+
+    property int currentStep: 0
+    property int totalSteps: 4
+    property string status: "idle"
+
+    Column {
+        anchors.fill: parent
+        anchors.margins: 16
+        spacing: 10
+
+        Text {
+            text: "System Updater"
+            font.pixelSize: 20
+        }
+
+        ProgressBar {
+            from: 0
+            to: root.totalSteps
+            value: root.currentStep
+            width: parent.width
+        }
+
+        Text {
+            text: "Step " + root.currentStep + " / " + root.totalSteps
+        }
+
+        Rectangle {
+            width: parent.width
+            height: 180
+
+            ListView {
+                id: logView
+                anchors.fill: parent
+                model: logModel
+            }
+
+            ListModel {
+                id: logModel
+            }
+        }
+
+        Row {
+            spacing: 10
+
+            Button {
+                text: "Run update"
+                onClicked: updater.start()
+            }
+
+            Button {
+                text: "Close"
+                onClicked: root.visible = false
+            }
+        }
+    }
+
+    Process {
+        id: updater
+        command: ["bash", "/home/henrov/.config/scripts/update-engine.sh"]
+
+        onStdout: function(data) {
+            let line = data.trim()
+
+            logModel.append({ text: line })
+
+            if (line.startsWith("STEP:")) {
+                let parts = line.split(":")
+                root.currentStep = parseInt(parts[1])
+            }
+
+            if (line.startsWith("DONE")) {
+                root.status = "done"
+            }
+
+            if (line.startsWith("FAIL")) {
+                root.status = "error"
+            }
+        }
+    }
+}
+
+
+
+
+
+

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

+

Provides a layout menu

@@ -4526,9 +4626,9 @@ ShellRoot {
-
-

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

-
+
+

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

+

Providing an media

@@ -4545,9 +4645,9 @@ fi
-
-

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

-
+
+

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

+

Providing an media

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

@@ -4670,9 +4770,9 @@ fi
-
-

generated/.config/scripts/power.sh

-
+
+

generated/.config/scripts/power.sh

+

Enables a terminal power menu

@@ -4727,40 +4827,60 @@ main
-
-

generated/.config/scripts/update.sh

-
+
+

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

+

A file containing color variables

set -uo pipefail
 
-REPO="/home/$USER/Repos/nixos/Droidnix"
-HOSTNAME="$(hostname)"
-cd "$REPO"
+emit() { echo "$1"; }
 
-run() {
-  echo
-  echo "▶ $1"
-  shift
-  "$@" || { echo "❌ Failed: $1"; exit 1; }
+step() {
+  echo "STEP:$1:$2"
 }
 
-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
+ok() {
+  echo "OK:$1"
+}
 
-echo
-echo "✅ Done"
+fail() {
+  echo "FAIL:$1"
+}
+
+REPO="/home/$USER/Repos/nixos/Droidnix"
+HOSTNAME="$(hostname)"
+cd "$REPO" || exit 1
+
+step 1 "Fixing ownership"
+sudo chown -R "$USER":"wheel" "$REPO" || fail "ownership"
+ok 1
+
+step 2 "Updating flake"
+nix flake update || fail "flake"
+ok 2
+
+step 3 "Rebuilding system"
+sudo nixos-rebuild switch --flake ".#$HOSTNAME" || fail "rebuild"
+hyprctl reload
+ok 3
+
+step 4 "Flatpak cleanup"
+flatpak uninstall --unused -y
+flatpak update --appstream -y
+flatpak update -y || fail "flatpak"
+ok 4
+
+emit "DONE"
 
-
-

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

-
+
+

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

+

Providing an media

@@ -4775,9 +4895,9 @@ Providing an media
-
-

generated/.config/shared/colors.css

-
+
+

generated/.config/shared/colors.css

+

A file containing color variables

@@ -4818,9 +4938,9 @@ A file containing color variables
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -5108,9 +5228,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -5147,9 +5267,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

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

@@ -5258,9 +5378,9 @@ These are config files for .config/stylix
-
-

generated/.config/swaync/config.json

-
+
+

generated/.config/swaync/config.json

+

These are config files for waybar

@@ -5321,9 +5441,9 @@ These are config files for waybar
-
-

generated/.config/swaync/style.css

-
+
+

generated/.config/swaync/style.css

+

These are config files for waybar

@@ -5516,9 +5636,9 @@ These are config files for waybar
-
-

generated/.config/waybar/config.jsonc

-
+
+

generated/.config/waybar/config.jsonc

+

These are config files for waybar

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

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

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

@@ -6188,9 +6308,9 @@ jq -c -n \
-
-

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

-
+
+

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

+

These are config files for waybar

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

@@ -6238,9 +6358,9 @@ fi
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -6277,9 +6397,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -6315,9 +6435,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -6344,9 +6464,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

This is the default layout for wofi

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

@@ -6487,9 +6607,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -6526,7 +6646,7 @@ cd() {

Author: Henro Veijer

-

Created: 2026-04-29 wo 11:42

+

Created: 2026-04-29 wo 11:54

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 55c45e886..106aca7bc 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -2857,7 +2857,8 @@ bind = , workspace, exec, ~/.config/scripts/set-workspace-wallpaper.sh ######################### # System stuff ######################### -bind = $mainMod, U, exec, kitty --class update-term -e bash -lc "~/.config/scripts/update.sh; exec bash" +# bind = $mainMod, U, exec, kitty --class update-term -e bash -lc "~/.config/scripts/update.sh; exec bash" +bind = $mainMod, U, exec, qs -c updater #+END_SRC ** =generated/.config/hypr/exec-once.conf= @@ -3666,6 +3667,98 @@ ShellRoot { } #+END_SRC +** =generated/.config/quickshell/updater/shell.qml= +Updates the system +#+BEGIN_SRC qml :tangle generated/.config/quickshell/updater/shell.qml :noweb yes :mkdirp yes :eval never +import Quickshell + +ShellWindow { + id: root + width: 600 + height: 380 + visible: true + + property int currentStep: 0 + property int totalSteps: 4 + property string status: "idle" + + Column { + anchors.fill: parent + anchors.margins: 16 + spacing: 10 + + Text { + text: "System Updater" + font.pixelSize: 20 + } + + ProgressBar { + from: 0 + to: root.totalSteps + value: root.currentStep + width: parent.width + } + + Text { + text: "Step " + root.currentStep + " / " + root.totalSteps + } + + Rectangle { + width: parent.width + height: 180 + + ListView { + id: logView + anchors.fill: parent + model: logModel + } + + ListModel { + id: logModel + } + } + + Row { + spacing: 10 + + Button { + text: "Run update" + onClicked: updater.start() + } + + Button { + text: "Close" + onClicked: root.visible = false + } + } + } + + Process { + id: updater + command: ["bash", "/home/henrov/.config/scripts/update-engine.sh"] + + onStdout: function(data) { + let line = data.trim() + + logModel.append({ text: line }) + + if (line.startsWith("STEP:")) { + let parts = line.split(":") + root.currentStep = parseInt(parts[1]) + } + + if (line.startsWith("DONE")) { + root.status = "done" + } + + if (line.startsWith("FAIL")) { + root.status = "error" + } + } + } +} +#+END_SRC + ** =generated/.config/quickshell/layoutswitcher/shell.qml= Provides a layout menu #+BEGIN_SRC qml :tangle generated/.config/quickshell/layoutswitcher/shell.qml :noweb yes :mkdirp yes :eval never @@ -3986,29 +4079,49 @@ main() { main #+END_SRC -** =generated/.config/scripts/update.sh= +** =generated/.config/scripts/update-engine.sh= A file containing color variables -#+BEGIN_SRC sh :tangle generated/.config/scripts/update.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never +#+BEGIN_SRC sh :tangle generated/.config/scripts/update-engine.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never set -uo pipefail +emit() { echo "$1"; } + +step() { + echo "STEP:$1:$2" +} + +ok() { + echo "OK:$1" +} + +fail() { + echo "FAIL:$1" +} + REPO="/home/$USER/Repos/nixos/Droidnix" HOSTNAME="$(hostname)" -cd "$REPO" +cd "$REPO" || exit 1 -run() { - echo - echo "▶ $1" - shift - "$@" || { echo "❌ Failed: $1"; exit 1; } -} +step 1 "Fixing ownership" +sudo chown -R "$USER":"wheel" "$REPO" || fail "ownership" +ok 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 +step 2 "Updating flake" +nix flake update || fail "flake" +ok 2 -echo -echo "✅ Done" +step 3 "Rebuilding system" +sudo nixos-rebuild switch --flake ".#$HOSTNAME" || fail "rebuild" +hyprctl reload +ok 3 + +step 4 "Flatpak cleanup" +flatpak uninstall --unused -y +flatpak update --appstream -y +flatpak update -y || fail "flatpak" +ok 4 + +emit "DONE" #+END_SRC ** =generated/.config/wofi/scripts/wofi-launcher.sh= diff --git a/Droidnix/generated/.config/hypr/bindings.conf b/Droidnix/generated/.config/hypr/bindings.conf index 07a699bf1..7fe7f4473 100644 --- a/Droidnix/generated/.config/hypr/bindings.conf +++ b/Droidnix/generated/.config/hypr/bindings.conf @@ -165,4 +165,5 @@ bind = , workspace, exec, ~/.config/scripts/set-workspace-wallpaper.sh ######################### # System stuff ######################### -bind = $mainMod, U, exec, kitty --class update-term -e bash -lc "~/.config/scripts/update.sh; exec bash" +# bind = $mainMod, U, exec, kitty --class update-term -e bash -lc "~/.config/scripts/update.sh; exec bash" +bind = $mainMod, U, exec, qs -c updater diff --git a/Droidnix/generated/.config/quickshell/updater/shell.qml b/Droidnix/generated/.config/quickshell/updater/shell.qml new file mode 100644 index 000000000..26c3560e4 --- /dev/null +++ b/Droidnix/generated/.config/quickshell/updater/shell.qml @@ -0,0 +1,88 @@ +// --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- +import Quickshell + +ShellWindow { + id: root + width: 600 + height: 380 + visible: true + + property int currentStep: 0 + property int totalSteps: 4 + property string status: "idle" + + Column { + anchors.fill: parent + anchors.margins: 16 + spacing: 10 + + Text { + text: "System Updater" + font.pixelSize: 20 + } + + ProgressBar { + from: 0 + to: root.totalSteps + value: root.currentStep + width: parent.width + } + + Text { + text: "Step " + root.currentStep + " / " + root.totalSteps + } + + Rectangle { + width: parent.width + height: 180 + + ListView { + id: logView + anchors.fill: parent + model: logModel + } + + ListModel { + id: logModel + } + } + + Row { + spacing: 10 + + Button { + text: "Run update" + onClicked: updater.start() + } + + Button { + text: "Close" + onClicked: root.visible = false + } + } + } + + Process { + id: updater + command: ["bash", "/home/henrov/.config/scripts/update-engine.sh"] + + onStdout: function(data) { + let line = data.trim() + + logModel.append({ text: line }) + + if (line.startsWith("STEP:")) { + let parts = line.split(":") + root.currentStep = parseInt(parts[1]) + } + + if (line.startsWith("DONE")) { + root.status = "done" + } + + if (line.startsWith("FAIL")) { + root.status = "error" + } + } + } +} diff --git a/Droidnix/generated/.config/scripts/update-engine.sh b/Droidnix/generated/.config/scripts/update-engine.sh new file mode 100755 index 000000000..6df7d32ec --- /dev/null +++ b/Droidnix/generated/.config/scripts/update-engine.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- +set -uo pipefail + +emit() { echo "$1"; } + +step() { + echo "STEP:$1:$2" +} + +ok() { + echo "OK:$1" +} + +fail() { + echo "FAIL:$1" +} + +REPO="/home/$USER/Repos/nixos/Droidnix" +HOSTNAME="$(hostname)" +cd "$REPO" || exit 1 + +step 1 "Fixing ownership" +sudo chown -R "$USER":"wheel" "$REPO" || fail "ownership" +ok 1 + +step 2 "Updating flake" +nix flake update || fail "flake" +ok 2 + +step 3 "Rebuilding system" +sudo nixos-rebuild switch --flake ".#$HOSTNAME" || fail "rebuild" +hyprctl reload +ok 3 + +step 4 "Flatpak cleanup" +flatpak uninstall --unused -y +flatpak update --appstream -y +flatpak update -y || fail "flatpak" +ok 4 + +emit "DONE"