Regenerated
This commit is contained in:
+5
-5
@@ -1114,7 +1114,6 @@ This sets up the zsh in the terminal
|
|||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
{ config, pkgs, lib, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
username = config.defaultUser or "henrov";
|
|
||||||
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
|
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@@ -1122,9 +1121,6 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|
||||||
# Set Zsh dotfiles location
|
|
||||||
dotDir = "${config.xdg.configHome}/zsh";
|
|
||||||
|
|
||||||
ohMyZsh = {
|
ohMyZsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "";
|
theme = "";
|
||||||
@@ -1143,8 +1139,12 @@ in
|
|||||||
autosuggestions.enable = true;
|
autosuggestions.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
|
|
||||||
# Load your generated .zshrc if it exists
|
# Instead of dotDir, just set ZDOTDIR and source generated file
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
# Tell Zsh to use ~/.config/zsh as main config dir
|
||||||
|
export ZDOTDIR="$HOME/.config/zsh"
|
||||||
|
|
||||||
|
# Source generated .zshrc if it exists
|
||||||
if [ -f "${generatedZsh}" ]; then
|
if [ -f "${generatedZsh}" ]; then
|
||||||
source "${generatedZsh}"
|
source "${generatedZsh}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
{ config, pkgs, lib, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
username = config.defaultUser or "henrov";
|
|
||||||
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
|
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@@ -9,9 +8,6 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|
||||||
# Set Zsh dotfiles location
|
|
||||||
dotDir = "${config.xdg.configHome}/zsh";
|
|
||||||
|
|
||||||
ohMyZsh = {
|
ohMyZsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "";
|
theme = "";
|
||||||
@@ -30,8 +26,12 @@ in
|
|||||||
autosuggestions.enable = true;
|
autosuggestions.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
|
|
||||||
# Load your generated .zshrc if it exists
|
# Instead of dotDir, just set ZDOTDIR and source generated file
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
# Tell Zsh to use ~/.config/zsh as main config dir
|
||||||
|
export ZDOTDIR="$HOME/.config/zsh"
|
||||||
|
|
||||||
|
# Source generated .zshrc if it exists
|
||||||
if [ -f "${generatedZsh}" ]; then
|
if [ -f "${generatedZsh}" ]; then
|
||||||
source "${generatedZsh}"
|
source "${generatedZsh}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user