Regenerated
This commit is contained in:
+13
-16
@@ -290,7 +290,7 @@ let
|
|||||||
#################################
|
#################################
|
||||||
# Read package list from config file
|
# Read package list from config file
|
||||||
#################################
|
#################################
|
||||||
packagesConfPath = "${flakeRoot}/generated/.config/packages.conf";
|
packagesConfPath = "${flakeRoot}/generated/assets/packages.conf";
|
||||||
raw = builtins.readFile packagesConfPath;
|
raw = builtins.readFile packagesConfPath;
|
||||||
|
|
||||||
rawLines = lib.splitString "\n" raw;
|
rawLines = lib.splitString "\n" raw;
|
||||||
@@ -341,9 +341,9 @@ in {
|
|||||||
}
|
}
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** =generated/assets/apps/packages.conf=
|
** =generated/assets/packages.conf=
|
||||||
This is a list of additional apps to install
|
This is a list of additional apps to install
|
||||||
#+BEGIN_SRC conf :tangle generated/assets/apps/packages.conf :noweb tangle :mkdirp yes :eval never-html
|
#+BEGIN_SRC conf :tangle generated/assets/packages.conf :noweb tangle :mkdirp yes :eval never-html
|
||||||
#productivity
|
#productivity
|
||||||
todoist
|
todoist
|
||||||
|
|
||||||
@@ -1111,10 +1111,10 @@ in
|
|||||||
** =generated/modules/traveldroid/apps/zsh.nix=
|
** =generated/modules/traveldroid/apps/zsh.nix=
|
||||||
This sets up the zsh in the terminal
|
This sets up the zsh in the terminal
|
||||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb tangle :mkdirp yes :eval never-html
|
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb tangle :mkdirp yes :eval never-html
|
||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
|
generatedZsh = "${config.home.file.".config/zsh/.zshrc".source}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
@@ -1138,18 +1138,15 @@ in
|
|||||||
|
|
||||||
autosuggestions.enable = true;
|
autosuggestions.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
|
|
||||||
# Use initExtra instead of non-existent extraConfig
|
|
||||||
initExtra = ''
|
|
||||||
# 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
|
|
||||||
source "${generatedZsh}"
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Set ZDOTDIR globally in the user environment
|
||||||
|
home.sessionVariables = {
|
||||||
|
ZDOTDIR = "${config.home.homeDirectory}/.config/zsh";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Place the generated .zshrc file there
|
||||||
|
home.file.".config/zsh/.zshrc".source = generatedZsh;
|
||||||
}
|
}
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ let
|
|||||||
#################################
|
#################################
|
||||||
# Read package list from config file
|
# Read package list from config file
|
||||||
#################################
|
#################################
|
||||||
packagesConfPath = "${flakeRoot}/generated/.config/packages.conf";
|
packagesConfPath = "${flakeRoot}/generated/assets/packages.conf";
|
||||||
raw = builtins.readFile packagesConfPath;
|
raw = builtins.readFile packagesConfPath;
|
||||||
|
|
||||||
rawLines = lib.splitString "\n" raw;
|
rawLines = lib.splitString "\n" raw;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
|
generatedZsh = "${config.home.file.".config/zsh/.zshrc".source}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
@@ -25,16 +25,13 @@ in
|
|||||||
|
|
||||||
autosuggestions.enable = true;
|
autosuggestions.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
|
|
||||||
# Use initExtra instead of non-existent extraConfig
|
|
||||||
initExtra = ''
|
|
||||||
# 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
|
|
||||||
source "${generatedZsh}"
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Set ZDOTDIR globally in the user environment
|
||||||
|
home.sessionVariables = {
|
||||||
|
ZDOTDIR = "${config.home.homeDirectory}/.config/zsh";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Place the generated .zshrc file there
|
||||||
|
home.file.".config/zsh/.zshrc".source = generatedZsh;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user