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:09:26 +00:00
parent 544cc3bff1
commit 2958eeef8d
2 changed files with 102 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+11 -12
View File
@@ -1311,16 +1311,21 @@ in
** =generated/modules/terminals/zsh.nix= ** =generated/modules/terminals/zsh.nix=
This sets up the zsh terminal This sets up the zsh 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
{ config, pkgs, lib, ... }: { lib, pkgs, ... }:
let let
username = "henrov"; username = "henrov";
in in
{ {
# Activeer Home Manager (als NixOS module) # Home Manager configuratie
programs.home-manager.enable = true; homeConfigurations = {
${username} = lib.recursiveUpdate (import <home-manager/nixos> {
inherit pkgs lib;
# eventueel: extraModules = [ ... ];
}) {
home.username = username;
home.homeDirectory = "/home/${username}";
home-manager.users.${username} = {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
@@ -1328,8 +1333,6 @@ in
ohMyZsh = { ohMyZsh = {
enable = true; enable = true;
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
# Plugins in de juiste volgorde
plugins = [ plugins = [
"git" "git"
"docker" "docker"
@@ -1337,11 +1340,9 @@ in
"zsh-autosuggestions" "zsh-autosuggestions"
"zsh-completions" "zsh-completions"
"zsh-history-substring-search" "zsh-history-substring-search"
# zsh-syntax-highlighting wordt apart in initExtra gesourced
]; ];
}; };
# Extra init script om syntax-highlighting correct te laden
initExtra = '' initExtra = ''
# Catppuccin Mocha kleuren # Catppuccin Mocha kleuren
local mocha_base="#1E1E2E" local mocha_base="#1E1E2E"
@@ -1361,19 +1362,17 @@ in
local mocha_flamingo="#F2CDCD" local mocha_flamingo="#F2CDCD"
local mocha_rosewater="#F5E0DC" local mocha_rosewater="#F5E0DC"
# Prompt configuratie
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%}'
# Zsh-syntax-highlighting correct sourcen # Zsh-syntax-highlighting sourcen
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
# Zsh-autosuggestions en andere plugins worden automatisch geladen via oh-my-zsh
''; '';
}; };
}; };
};
} }
#+END_SRC #+END_SRC
Droidnix/generated/modules/terminals/zsh.nix
+11 -12
View File
@@ -1,13 +1,18 @@
{ config, pkgs, lib, ... }: { lib, pkgs, ... }:
let let
username = "henrov"; username = "henrov";
in in
{ {
# Activeer Home Manager (als NixOS module) # Home Manager configuratie
programs.home-manager.enable = true; homeConfigurations = {
${username} = lib.recursiveUpdate (import <home-manager/nixos> {
inherit pkgs lib;
# eventueel: extraModules = [ ... ];
}) {
home.username = username;
home.homeDirectory = "/home/${username}";
home-manager.users.${username} = {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
@@ -15,8 +20,6 @@ in
ohMyZsh = { ohMyZsh = {
enable = true; enable = true;
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
# Plugins in de juiste volgorde
plugins = [ plugins = [
"git" "git"
"docker" "docker"
@@ -24,11 +27,9 @@ in
"zsh-autosuggestions" "zsh-autosuggestions"
"zsh-completions" "zsh-completions"
"zsh-history-substring-search" "zsh-history-substring-search"
# zsh-syntax-highlighting wordt apart in initExtra gesourced
]; ];
}; };
# Extra init script om syntax-highlighting correct te laden
initExtra = '' initExtra = ''
# Catppuccin Mocha kleuren # Catppuccin Mocha kleuren
local mocha_base="#1E1E2E" local mocha_base="#1E1E2E"
@@ -48,17 +49,15 @@ in
local mocha_flamingo="#F2CDCD" local mocha_flamingo="#F2CDCD"
local mocha_rosewater="#F5E0DC" local mocha_rosewater="#F5E0DC"
# Prompt configuratie
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%}'
# Zsh-syntax-highlighting correct sourcen # Zsh-syntax-highlighting sourcen
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
# Zsh-autosuggestions en andere plugins worden automatisch geladen via oh-my-zsh
''; '';
}; };
}; };
};
} }