Working on reshuffling
This commit is contained in:
+7
-11
@@ -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,15 +1316,12 @@ 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 = {
|
|
||||||
enable = true;
|
|
||||||
enableCompletion = true;
|
|
||||||
|
|
||||||
ohMyZsh = {
|
programs.zsh.ohMyZsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "catppuccin-mocha";
|
theme = "catppuccin-mocha";
|
||||||
plugins = [
|
plugins = [
|
||||||
@@ -1338,7 +1335,7 @@ in
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
initExtra = ''
|
programs.zsh.initExtra = ''
|
||||||
# Catppuccin Mocha kleuren
|
# Catppuccin Mocha kleuren
|
||||||
local mocha_base="#1E1E2E"
|
local mocha_base="#1E1E2E"
|
||||||
local mocha_surface0="#313244"
|
local mocha_surface0="#313244"
|
||||||
@@ -1362,7 +1359,6 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
|
|||||||
@@ -7,15 +7,12 @@ 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 = {
|
|
||||||
enable = true;
|
|
||||||
enableCompletion = true;
|
|
||||||
|
|
||||||
ohMyZsh = {
|
programs.zsh.ohMyZsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "catppuccin-mocha";
|
theme = "catppuccin-mocha";
|
||||||
plugins = [
|
plugins = [
|
||||||
@@ -29,7 +26,7 @@ in
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
initExtra = ''
|
programs.zsh.initExtra = ''
|
||||||
# Catppuccin Mocha kleuren
|
# Catppuccin Mocha kleuren
|
||||||
local mocha_base="#1E1E2E"
|
local mocha_base="#1E1E2E"
|
||||||
local mocha_surface0="#313244"
|
local mocha_surface0="#313244"
|
||||||
@@ -53,5 +50,4 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user