From 56c1e1153b7ad10c1734adb3147b690a97ff0556 Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Mon, 2 Jun 2025 18:00:50 -0400 Subject: [PATCH] Update host logo fallback and user groups - Update logo path logic to check for host-specific file; fallback to default if missing - Remove unused host art files - Simplify user group assignment by always setting the designated group --- home/global/core/fastfetch/default.nix | 6 +++++- home/global/core/fastfetch/host/gojo.txt | 13 ------------- home/global/core/fastfetch/host/haze.txt | 13 ------------- home/global/core/fastfetch/host/vm.txt | 13 ------------- hosts/global/core/user.nix | 4 ++-- 5 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 home/global/core/fastfetch/host/gojo.txt delete mode 100644 home/global/core/fastfetch/host/haze.txt delete mode 100644 home/global/core/fastfetch/host/vm.txt diff --git a/home/global/core/fastfetch/default.nix b/home/global/core/fastfetch/default.nix index 15482fd..33ae9f9 100644 --- a/home/global/core/fastfetch/default.nix +++ b/home/global/core/fastfetch/default.nix @@ -10,7 +10,11 @@ programs.fastfetch = let hostname = hostSpec.hostName; - logoFile = ./. + "/host/${hostname}.txt"; + logoFile = + let + hostLogoPath = ./. + "/host/${hostname}.txt"; + in + if builtins.pathExists hostLogoPath then hostLogoPath else ./host/nix.txt; weather = import ./scripts/weather.nix { inherit pkgs; }; title = import ./scripts/title.nix { inherit pkgs; }; in diff --git a/home/global/core/fastfetch/host/gojo.txt b/home/global/core/fastfetch/host/gojo.txt deleted file mode 100644 index d5c8e8f..0000000 --- a/home/global/core/fastfetch/host/gojo.txt +++ /dev/null @@ -1,13 +0,0 @@ - - [?25l ▄▄▄ ▄▄▄ ▄▄▄  - ▄▄▄▄ ▄▄▄▄▄▄▄  - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄▄  - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄░▄  - ▄▄▄▄▄ ▄▄▄▄▄▄  - ▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄░ - ▄▄▄▄▄▄ ▄▄▄  - ░▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄  - ▄ ▄▄▄▄▄▄▄▄▄░░▄▄▄▄  - ▄▄▄▄▄▄▄ ▄░▄  - ▄▄▄ ▄▄▄▄ ▄▄▄  - [?25h \ No newline at end of file diff --git a/home/global/core/fastfetch/host/haze.txt b/home/global/core/fastfetch/host/haze.txt deleted file mode 100644 index d5c8e8f..0000000 --- a/home/global/core/fastfetch/host/haze.txt +++ /dev/null @@ -1,13 +0,0 @@ - - [?25l ▄▄▄ ▄▄▄ ▄▄▄  - ▄▄▄▄ ▄▄▄▄▄▄▄  - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄▄  - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄░▄  - ▄▄▄▄▄ ▄▄▄▄▄▄  - ▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄░ - ▄▄▄▄▄▄ ▄▄▄  - ░▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄  - ▄ ▄▄▄▄▄▄▄▄▄░░▄▄▄▄  - ▄▄▄▄▄▄▄ ▄░▄  - ▄▄▄ ▄▄▄▄ ▄▄▄  - [?25h \ No newline at end of file diff --git a/home/global/core/fastfetch/host/vm.txt b/home/global/core/fastfetch/host/vm.txt deleted file mode 100644 index d5c8e8f..0000000 --- a/home/global/core/fastfetch/host/vm.txt +++ /dev/null @@ -1,13 +0,0 @@ - - [?25l ▄▄▄ ▄▄▄ ▄▄▄  - ▄▄▄▄ ▄▄▄▄▄▄▄  - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄▄  - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄░▄  - ▄▄▄▄▄ ▄▄▄▄▄▄  - ▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄░ - ▄▄▄▄▄▄ ▄▄▄  - ░▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄  - ▄ ▄▄▄▄▄▄▄▄▄░░▄▄▄▄  - ▄▄▄▄▄▄▄ ▄░▄  - ▄▄▄ ▄▄▄▄ ▄▄▄  - [?25h \ No newline at end of file diff --git a/hosts/global/core/user.nix b/hosts/global/core/user.nix index 00999fb..cd9705f 100644 --- a/hosts/global/core/user.nix +++ b/hosts/global/core/user.nix @@ -16,7 +16,7 @@ let in { users.groups = { - ryot = lib.mkIf (!isMinimal) { + ryot = { gid = 1004; members = [ username ]; }; @@ -31,7 +31,7 @@ in homeMode = "750"; hashedPassword = user.hashedPassword or hostSpec.hashedPassword; uid = 1000; - group = if !isMinimal then "ryot" else "users"; + group = "ryot"; shell = hostSpec.shell or pkgs.fish; extraGroups = lib.flatten [ "wheel"