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:16:08 +00:00
parent b7c9be916e
commit 98c570d38c
2 changed files with 79 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+40 -44
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 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, ... }:
@@ -1316,51 +1316,47 @@ in
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";
# Let op: config komt van NixOS module args, niet top-level config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
config = { home-manager.users.${username} = {
# mkIf kan hier veilig config.mySystem gebruiken programs.zsh.enable = true;
home-manager.users.${username} = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { programs.zsh.enableCompletion = true;
programs.zsh = {
programs.zsh.ohMyZsh = {
enable = true; enable = true;
enableCompletion = true; theme = "catppuccin-mocha";
plugins = [
ohMyZsh = { "git"
enable = true; "docker"
theme = "catppuccin-mocha"; "direnv"
plugins = [ "zsh-autosuggestions"
"git" "zsh-completions"
"docker" "zsh-history-substring-search"
"direnv" "zsh-syntax-highlighting"
"zsh-autosuggestions" ];
"zsh-completions"
"zsh-history-substring-search"
"zsh-syntax-highlighting"
];
};
initExtra = ''
# Catppuccin Mocha kleuren
local mocha_base="#1E1E2E"
local mocha_surface0="#313244"
local mocha_text="#CDD6F4"
local mocha_lavender="#B4BEFE"
local mocha_blue="#89B4FA"
local mocha_sapphire="#74C7EC"
local mocha_teal="#94D2D5"
local mocha_green="#A6E3A1"
local mocha_yellow="#F9E2AF"
local mocha_peach="#FAB387"
local mocha_maroon="#EBA0AC"
local mocha_red="#F38BA8"
local mocha_mauve="#CBA6F7"
local mocha_pink="#F5E2C7"
local mocha_flamingo="#F2CDCD"
local mocha_rosewater="#F5E0DC"
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%}'
'';
}; };
programs.zsh.initExtra = ''
# Catppuccin Mocha kleuren
local mocha_base="#1E1E2E"
local mocha_surface0="#313244"
local mocha_text="#CDD6F4"
local mocha_lavender="#B4BEFE"
local mocha_blue="#89B4FA"
local mocha_sapphire="#74C7EC"
local mocha_teal="#94D2D5"
local mocha_green="#A6E3A1"
local mocha_yellow="#F9E2AF"
local mocha_peach="#FAB387"
local mocha_maroon="#EBA0AC"
local mocha_red="#F38BA8"
local mocha_mauve="#CBA6F7"
local mocha_pink="#F5E2C7"
local mocha_flamingo="#F2CDCD"
local mocha_rosewater="#F5E0DC"
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%}'
'';
}; };
}; };
} }
Droidnix/generated/modules/terminals/zsh.nix
+39 -43
View File
@@ -7,51 +7,47 @@ in
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";
# Let op: config komt van NixOS module args, niet top-level config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
config = { home-manager.users.${username} = {
# mkIf kan hier veilig config.mySystem gebruiken programs.zsh.enable = true;
home-manager.users.${username} = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { programs.zsh.enableCompletion = true;
programs.zsh = {
programs.zsh.ohMyZsh = {
enable = true; enable = true;
enableCompletion = true; theme = "catppuccin-mocha";
plugins = [
ohMyZsh = { "git"
enable = true; "docker"
theme = "catppuccin-mocha"; "direnv"
plugins = [ "zsh-autosuggestions"
"git" "zsh-completions"
"docker" "zsh-history-substring-search"
"direnv" "zsh-syntax-highlighting"
"zsh-autosuggestions" ];
"zsh-completions"
"zsh-history-substring-search"
"zsh-syntax-highlighting"
];
};
initExtra = ''
# Catppuccin Mocha kleuren
local mocha_base="#1E1E2E"
local mocha_surface0="#313244"
local mocha_text="#CDD6F4"
local mocha_lavender="#B4BEFE"
local mocha_blue="#89B4FA"
local mocha_sapphire="#74C7EC"
local mocha_teal="#94D2D5"
local mocha_green="#A6E3A1"
local mocha_yellow="#F9E2AF"
local mocha_peach="#FAB387"
local mocha_maroon="#EBA0AC"
local mocha_red="#F38BA8"
local mocha_mauve="#CBA6F7"
local mocha_pink="#F5E2C7"
local mocha_flamingo="#F2CDCD"
local mocha_rosewater="#F5E0DC"
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%}'
'';
}; };
programs.zsh.initExtra = ''
# Catppuccin Mocha kleuren
local mocha_base="#1E1E2E"
local mocha_surface0="#313244"
local mocha_text="#CDD6F4"
local mocha_lavender="#B4BEFE"
local mocha_blue="#89B4FA"
local mocha_sapphire="#74C7EC"
local mocha_teal="#94D2D5"
local mocha_green="#A6E3A1"
local mocha_yellow="#F9E2AF"
local mocha_peach="#FAB387"
local mocha_maroon="#EBA0AC"
local mocha_red="#F38BA8"
local mocha_mauve="#CBA6F7"
local mocha_pink="#F5E2C7"
local mocha_flamingo="#F2CDCD"
local mocha_rosewater="#F5E0DC"
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%}'
'';
}; };
}; };
} }