Compare commits
2 Commits
27821c270f
...
4b509c271a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b509c271a | ||
|
|
2bdcc0aba0 |
@@ -1,41 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Nomarchy Update Script
|
|
||||||
# 1. Updates the flake inputs in the repository
|
|
||||||
# 2. Applies system-wide NixOS changes
|
|
||||||
# 3. Applies user-level Home Manager changes (Standalone)
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Detect the repository location
|
|
||||||
if [ -f "/etc/nixos/flake.nix" ]; then
|
|
||||||
REPO_DIR="/etc/nixos"
|
|
||||||
elif [ -f "/etc/nomarchy/flake.nix" ]; then
|
|
||||||
REPO_DIR="/etc/nomarchy"
|
|
||||||
else
|
|
||||||
echo "Error: Nomarchy flake repository not found in /etc/nixos or /etc/nomarchy."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "--- Starting Nomarchy Update from $REPO_DIR ---"
|
|
||||||
|
|
||||||
# 1. Update Flake Lock
|
|
||||||
echo "Updating flake inputs..."
|
|
||||||
sudo nix flake update --flake "$REPO_DIR"
|
|
||||||
|
|
||||||
# 2. Rebuild System
|
|
||||||
echo "Applying system-level updates..."
|
|
||||||
sudo nixos-rebuild switch --flake "$REPO_DIR#default" --impure
|
|
||||||
|
|
||||||
# 3. Rebuild Home Environment (Standalone)
|
|
||||||
echo "Applying user-level updates..."
|
|
||||||
home-manager switch --flake "$REPO_DIR#$USER" --impure
|
|
||||||
|
|
||||||
# 4. Commit changes if it's a git repo
|
|
||||||
if [ -d "$REPO_DIR/.git" ]; then
|
|
||||||
echo "Committing update to local history..."
|
|
||||||
sudo git -C "$REPO_DIR" add flake.lock
|
|
||||||
sudo git -C "$REPO_DIR" commit -m "chore: update system (flake.lock)" || echo "No lockfile changes to commit."
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "--- Nomarchy Update Complete ---"
|
|
||||||
@@ -169,7 +169,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
|
|||||||
| `nomarchy-tui-remove` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | |
|
| `nomarchy-tui-remove` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | |
|
||||||
| `nomarchy-tui-remove-all` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | |
|
| `nomarchy-tui-remove-all` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | |
|
||||||
| `nomarchy-tz-select` | `core/system/scripts` | features/desktop/waybar/config/config.jsonc,features/scripts/utils/nomarchy-menu, +2 more | `kept` | |
|
| `nomarchy-tz-select` | `core/system/scripts` | features/desktop/waybar/config/config.jsonc,features/scripts/utils/nomarchy-menu, +2 more | `kept` | |
|
||||||
| `nomarchy-update` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,core/home/config/nomarchy/default/mako/core.ini, +5 more | `kept` | |
|
| `nomarchy-update` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,core/home/config/nomarchy/default/mako/core.ini, +5 more | `kept` | |
|
||||||
| `nomarchy-update-available` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-day/config.jsonc, +1 more | `kept` | |
|
| `nomarchy-update-available` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-day/config.jsonc, +1 more | `kept` | |
|
||||||
| `nomarchy-update-firmware` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` | |
|
| `nomarchy-update-firmware` | `features/scripts/utils` | features/scripts/utils/nomarchy-menu | `kept` | |
|
||||||
| `nomarchy-update-time` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` | |
|
| `nomarchy-update-time` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` | |
|
||||||
|
|||||||
@@ -49,6 +49,14 @@
|
|||||||
];
|
];
|
||||||
services.xserver.videoDrivers = [ "amdgpu" "radeon" "nouveau" "modesetting" "fbdev" "virtio" ];
|
services.xserver.videoDrivers = [ "amdgpu" "radeon" "nouveau" "modesetting" "fbdev" "virtio" ];
|
||||||
|
|
||||||
|
# VM guest agents. Without these the virtio-gpu connector only advertises
|
||||||
|
# its 1024x768 fallback mode, so Hyprland's `monitor = , highres, …` rule
|
||||||
|
# picks that as the highest available resolution and the live session boots
|
||||||
|
# tiny. The agents let the SPICE/QEMU host negotiate a real resolution.
|
||||||
|
# (The installed system gets the same wiring via core/system/vm-guest.nix.)
|
||||||
|
services.spice-vdagentd.enable = true;
|
||||||
|
services.qemuGuest.enable = true;
|
||||||
|
|
||||||
environment.etc."install.sh" = {
|
environment.etc."install.sh" = {
|
||||||
source = ../installer/install.sh;
|
source = ../installer/install.sh;
|
||||||
mode = "0755";
|
mode = "0755";
|
||||||
|
|||||||
Reference in New Issue
Block a user