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

Reshuffling stuff

Browse Source
This commit is contained in:
Henro Veijer
2026-03-18 18:12:00 +00:00
parent 55a866e051
commit 57ce38939e
2 changed files with 20 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+10 -31
View File
@@ -1158,29 +1158,17 @@ 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
{ { lib, config, ... }:
lib,
config,
pkgs,
...
}:
{ {
# --- NixOS Configuration --- # Dendritic flake configuration for Zsh
environment.systemPackages = with pkgs; [ mySystem = {
zsh terminals.zsh = {
git
docker
];
# --- Home Manager Configuration ---
home-manager.users.henrov = {
programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
# Enable oh-my-zsh and use its plugins # Oh-My-Zsh configuration
oh-my-zsh = { ohMyZsh = {
enable = true; enable = true;
plugins = [ plugins = [
"git" "git"
@@ -1191,17 +1179,12 @@ This sets up the zsh terminal
"zsh-completions" "zsh-completions"
"zsh-history-substring-search" "zsh-history-substring-search"
]; ];
theme = "agnoster"; # Fallback, overridden below theme = "catppuccin-mocha"; # fallback / reference
}; };
# Source Nixpkgs-provided plugins explicitly # Optional initContent for advanced theming / plugin sourcing
initContent = '' initContent = ''
# Source plugins installed by Nix # Example prompt colors for Catppuccin Mocha
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
# Catppuccin Mocha theme for oh-my-zsh
local mocha_base="#1E1E2E" local mocha_base="#1E1E2E"
local mocha_surface0="#313244" local mocha_surface0="#313244"
local mocha_text="#CDD6F4" local mocha_text="#CDD6F4"
@@ -1238,14 +1221,10 @@ This sets up the zsh terminal
ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}" ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}"
ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})" ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})"
# Right prompt with Git status # Set custom theme
RPROMPT='$(git_prompt_info) %{$fg[$mocha_green]%}%T%{$reset_color%}'
# Set the custom theme
ZSH_THEME="catppuccin-mocha" ZSH_THEME="catppuccin-mocha"
''; '';
}; };
}; };
} }
#+END_SRC #+END_SRC
Droidnix/generated/modules/terminals/zsh.nix
+10 -31
View File
@@ -1,26 +1,14 @@
{ { lib, config, ... }:
lib,
config,
pkgs,
...
}:
{ {
# --- NixOS Configuration --- # Dendritic flake configuration for Zsh
environment.systemPackages = with pkgs; [ mySystem = {
zsh terminals.zsh = {
git
docker
];
# --- Home Manager Configuration ---
home-manager.users.henrov = {
programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
# Enable oh-my-zsh and use its plugins # Oh-My-Zsh configuration
oh-my-zsh = { ohMyZsh = {
enable = true; enable = true;
plugins = [ plugins = [
"git" "git"
@@ -31,17 +19,12 @@
"zsh-completions" "zsh-completions"
"zsh-history-substring-search" "zsh-history-substring-search"
]; ];
theme = "agnoster"; # Fallback, overridden below theme = "catppuccin-mocha"; # fallback / reference
}; };
# Source Nixpkgs-provided plugins explicitly # Optional initContent for advanced theming / plugin sourcing
initContent = '' initContent = ''
# Source plugins installed by Nix # Example prompt colors for Catppuccin Mocha
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
# Catppuccin Mocha theme for oh-my-zsh
local mocha_base="#1E1E2E" local mocha_base="#1E1E2E"
local mocha_surface0="#313244" local mocha_surface0="#313244"
local mocha_text="#CDD6F4" local mocha_text="#CDD6F4"
@@ -78,13 +61,9 @@
ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}" ZSH_THEME_VIRTUAL_ENV_PREFIX="(%{$fg[$mocha_teal]%}"
ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})" ZSH_THEME_VIRTUAL_ENV_SUFFIX="%{$reset_color%})"
# Right prompt with Git status # Set custom theme
RPROMPT='$(git_prompt_info) %{$fg[$mocha_green]%}%T%{$reset_color%}'
# Set the custom theme
ZSH_THEME="catppuccin-mocha" ZSH_THEME="catppuccin-mocha"
''; '';
}; };
}; };
} }