henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on reshuffling

Browse Source
This commit is contained in:
Henro Veijer
2026-03-19 07:20:36 +00:00
parent 385bc35226
commit 82907d13b6
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+6 -8
View File
@@ -1305,7 +1305,7 @@ in
#+END_SRC #+END_SRC
** =generated/modules/terminals/zsh.nix= ** =generated/modules/terminals/zsh.nix=
This sets up the zsh in the terminal This sets up the zsh in the terminal
#+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html
{ lib, pkgs, ... }: { lib, pkgs, ... }:
@@ -1313,20 +1313,19 @@ let
username = "henrov"; username = "henrov";
in in
{ {
# Define a toggle option for enabling Zsh # Declare a module option to enable Zsh
options.mySystem.terminals.zsh.enable = options.mySystem.terminals.zsh.enable =
lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
# Module config block # Only evaluate Home Manager config if enabled
config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { config = lib.mkIf (lib.getOption "mySystem.terminals.zsh.enable" or false) {
# Home Manager scope for the user # Home Manager scope
home-manager.users.${username} = { home-manager.users.${username} = {
programs.zsh.enable = true; programs.zsh.enable = true;
programs.zsh.enableCompletion = true; programs.zsh.enableCompletion = true;
# Oh-My-Zsh configuration
programs.zsh.ohMyZsh = { programs.zsh.ohMyZsh = {
enable = true; enable = true;
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
@@ -1341,7 +1340,6 @@ in
]; ];
}; };
# Extra init content
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
# Catppuccin Mocha colors # Catppuccin Mocha colors
local mocha_base="#1E1E2E" local mocha_base="#1E1E2E"
@@ -1365,7 +1363,7 @@ in
PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} ' PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}' RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
# Source zsh-syntax-highlighting properly # Source zsh-syntax-highlighting
if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then
source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
fi fi
Droidnix/generated/modules/terminals/zsh.nix
+5 -7
View File
@@ -4,20 +4,19 @@ let
username = "henrov"; username = "henrov";
in in
{ {
# Define a toggle option for enabling Zsh # Declare a module option to enable Zsh
options.mySystem.terminals.zsh.enable = options.mySystem.terminals.zsh.enable =
lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
# Module config block # Only evaluate Home Manager config if enabled
config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { config = lib.mkIf (lib.getOption "mySystem.terminals.zsh.enable" or false) {
# Home Manager scope for the user # Home Manager scope
home-manager.users.${username} = { home-manager.users.${username} = {
programs.zsh.enable = true; programs.zsh.enable = true;
programs.zsh.enableCompletion = true; programs.zsh.enableCompletion = true;
# Oh-My-Zsh configuration
programs.zsh.ohMyZsh = { programs.zsh.ohMyZsh = {
enable = true; enable = true;
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
@@ -32,7 +31,6 @@ in
]; ];
}; };
# Extra init content
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
# Catppuccin Mocha colors # Catppuccin Mocha colors
local mocha_base="#1E1E2E" local mocha_base="#1E1E2E"
@@ -56,7 +54,7 @@ in
PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} ' PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}' RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
# Source zsh-syntax-highlighting properly # Source zsh-syntax-highlighting
if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then if [ -f ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then
source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
fi fi