working on zsh

This commit is contained in:
2026-03-09 19:47:30 +01:00
parent 6b076115a1
commit 30a97d3bc9
4 changed files with 337 additions and 345 deletions
+335 -338
View File
File diff suppressed because it is too large Load Diff
+1 -4
View File
@@ -650,7 +650,7 @@ This will import all packages listed in ./assets/common/apps/packlages.conf
#+BEGIN_SRC nix :tangle generated/system/applications/packages.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/system/applications/packages.nix :noweb tangle :mkdirp yes :eval never-html
{ config, lib, pkgs, flakeRoot, inputs, ... }: { config, lib, pkgs, flakeRoot, inputs, ... }:
let let
packagesConfPath = flakeRoot.outPath + "/assets/conf/apps/packages.conf"; packagesConfPath = "${builtins.toString flakeRoot.outPath}/assets/conf/apps/packages.conf";
raw = builtins.readFile packagesConfPath; raw = builtins.readFile packagesConfPath;
# IMPORTANT: explicit "\n" so we never accidentally split into characters # IMPORTANT: explicit "\n" so we never accidentally split into characters
rawLines = lib.splitString "\n" raw; rawLines = lib.splitString "\n" raw;
@@ -1329,7 +1329,6 @@ in
zsh-syntax-highlighting zsh-syntax-highlighting
starship starship
]; ];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
@@ -1352,12 +1351,10 @@ in
ll = "exa --icons -la --group-directories-first"; ll = "exa --icons -la --group-directories-first";
}; };
}; };
# Use the .zshrc file from assets # Use the .zshrc file from assets
xdg.configFile."zsh/.zshrc".source = "${assetsDir}/.zshrc"; xdg.configFile."zsh/.zshrc".source = "${assetsDir}/.zshrc";
}; };
} }
#+END_SRC #+END_SRC
@@ -1,6 +1,6 @@
{ config, lib, pkgs, flakeRoot, inputs, ... }: { config, lib, pkgs, flakeRoot, inputs, ... }:
let let
packagesConfPath = flakeRoot.outPath + "/assets/conf/apps/packages.conf"; packagesConfPath = "${builtins.toString flakeRoot.outPath}/assets/conf/apps/packages.conf";
raw = builtins.readFile packagesConfPath; raw = builtins.readFile packagesConfPath;
# IMPORTANT: explicit "\n" so we never accidentally split into characters # IMPORTANT: explicit "\n" so we never accidentally split into characters
rawLines = lib.splitString "\n" raw; rawLines = lib.splitString "\n" raw;
@@ -9,7 +9,6 @@ in
zsh-syntax-highlighting zsh-syntax-highlighting
starship starship
]; ];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
@@ -32,7 +31,6 @@ in
ll = "exa --icons -la --group-directories-first"; ll = "exa --icons -la --group-directories-first";
}; };
}; };
# Use the .zshrc file from assets # Use the .zshrc file from assets
xdg.configFile."zsh/.zshrc".source = "${assetsDir}/.zshrc"; xdg.configFile."zsh/.zshrc".source = "${assetsDir}/.zshrc";
}; };