Compare commits
2 Commits
bfd95cb40b
...
95101fda3f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95101fda3f | ||
|
|
6e0d17b859 |
@@ -210,7 +210,7 @@ and it's whichever has higher Nix priority. Fix these explicitly:
|
|||||||
| Graphics | `hardware.graphics.enable = true` (was `hardware.opengl`) | Probably already enabled — fine |
|
| Graphics | `hardware.graphics.enable = true` (was `hardware.opengl`) | Probably already enabled — fine |
|
||||||
| User groups | needs `video render networkmanager` | Add to your `users.users.<user>.extraGroups` |
|
| User groups | needs `video render networkmanager` | Add to your `users.users.<user>.extraGroups` |
|
||||||
| `/etc/os-release` | `ID=nomarchy`, `NAME=Nomarchy` | A few third-party scripts grep `ID=nixos` — adjust them or rely on `ID_LIKE` (TBD) |
|
| `/etc/os-release` | `ID=nomarchy`, `NAME=Nomarchy` | A few third-party scripts grep `ID=nixos` — adjust them or rely on `ID_LIKE` (TBD) |
|
||||||
| autoLogin | `enable = true; user = "nomarchy";` (mkDefault) | Override with `services.displayManager.autoLogin.user = "<your user>"` or disable |
|
| autoLogin | `enable = false; user = "nomarchy";` (mkDefault) | Off by default — opt in with `services.displayManager.autoLogin = { enable = true; user = "<your user>"; };` if you want it |
|
||||||
|
|
||||||
Impermanence is **off** unless you set `nomarchy.system.impermanence.enable = true`,
|
Impermanence is **off** unless you set `nomarchy.system.impermanence.enable = true`,
|
||||||
and it requires a BTRFS layout with a `root-blank` snapshot. Don't enable it
|
and it requires a BTRFS layout with a `root-blank` snapshot. Don't enable it
|
||||||
|
|||||||
@@ -59,39 +59,9 @@ if [[ "$USER" == "nixos" ]]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 4. Starter home.nix
|
# 4. Setup Local Repo (Crucial for nomarchy-env-update to work)
|
||||||
echo ""
|
echo ""
|
||||||
echo "Step 4: Starter home.nix"
|
echo "Step 4: Git Repository Check"
|
||||||
HOME_NIX="$HOME/.config/home-manager/home.nix"
|
|
||||||
if [ ! -f "$HOME_NIX" ]; then
|
|
||||||
echo "It looks like you don't have a ~/.config/home-manager/home.nix file yet."
|
|
||||||
echo "Nomarchy uses this file to manage your user-level packages and settings."
|
|
||||||
if gum confirm "Would you like to generate a starter home.nix?"; then
|
|
||||||
mkdir -p "$(dirname "$HOME_NIX")"
|
|
||||||
cat <<EOF > "$HOME_NIX"
|
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
# Nomarchy starter home.nix
|
|
||||||
# Add your user packages here.
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
btop
|
|
||||||
fastfetch
|
|
||||||
chromium
|
|
||||||
# Add more packages here
|
|
||||||
];
|
|
||||||
|
|
||||||
# home.stateVersion = "25.11"; # Consult docs/MIGRATION.md if you change this
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
echo "Starter home.nix generated at $HOME_NIX"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Detected existing home.nix at $HOME_NIX. Skipping generation."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 5. Setup Local Repo (Crucial for nomarchy-env-update to work)
|
|
||||||
echo ""
|
|
||||||
echo "Step 5: Git Repository Check"
|
|
||||||
echo "Nomarchy relies on a local git repository for declarative updates."
|
echo "Nomarchy relies on a local git repository for declarative updates."
|
||||||
if [ ! -d "/etc/nixos/.git" ]; then
|
if [ ! -d "/etc/nixos/.git" ]; then
|
||||||
echo "Warning: /etc/nixos is not a git repository. Declarative updates might fail."
|
echo "Warning: /etc/nixos is not a git repository. Declarative updates might fail."
|
||||||
@@ -102,7 +72,7 @@ if [ ! -d "/etc/nixos/.git" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 6. Success
|
# 5. Success
|
||||||
echo ""
|
echo ""
|
||||||
echo "Applying all changes..."
|
echo "Applying all changes..."
|
||||||
nomarchy-env-update
|
nomarchy-env-update
|
||||||
|
|||||||
@@ -27,8 +27,12 @@ in
|
|||||||
|
|
||||||
services.displayManager.defaultSession = lib.mkDefault "hyprland-uwsm";
|
services.displayManager.defaultSession = lib.mkDefault "hyprland-uwsm";
|
||||||
|
|
||||||
|
# autoLogin defaults off so hand-migrated configs (no installer-written
|
||||||
|
# username) don't try to log in as a nonexistent "nomarchy" user. The
|
||||||
|
# installer-generated system.nix sets both `enable = true;` and
|
||||||
|
# `user = "$USERNAME";` at normal priority, overriding these defaults.
|
||||||
services.displayManager.autoLogin = {
|
services.displayManager.autoLogin = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault false;
|
||||||
user = lib.mkDefault "nomarchy";
|
user = lib.mkDefault "nomarchy";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user