From b74b778413716f81b406745e9155986783be6658 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 19 Mar 2026 07:23:06 +0000 Subject: [PATCH] Working on reshuffling --- Droidnix/README.org | 102 +++++++++---------- Droidnix/generated/modules/terminals/zsh.nix | 102 +++++++++---------- 2 files changed, 92 insertions(+), 112 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 23175f930..9f3c95b40 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1309,70 +1309,60 @@ This sets up the zsh in the terminal #+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html { lib, pkgs, ... }: -let +flake.nixosModules.zsh = { config, pkgs, lib, ... }: let username = "henrov"; in { - # Declare a module option to enable Zsh options.mySystem.terminals.zsh.enable = lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; - # Flake-style nixosModule - flake.nixosModules.zsh = { config, ... }: let - enableZsh = config.mySystem.terminals.zsh.enable or false; - in - { - config = lib.mkIf enableZsh { + config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { + home-manager.users.${username} = { + programs.zsh.enable = true; + programs.zsh.enableCompletion = true; - # Home Manager scope for the user - home-manager.users.${username} = { - - programs.zsh.enable = true; - programs.zsh.enableCompletion = true; - - programs.zsh.ohMyZsh = { - enable = true; - theme = "catppuccin-mocha"; - plugins = [ - "git" - "docker" - "direnv" - "zsh-autosuggestions" - "zsh-completions" - "zsh-history-substring-search" - # zsh-syntax-highlighting will be sourced in initExtra - ]; - }; - - programs.zsh.initExtra = '' - # Catppuccin Mocha colors - 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 - 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%}' - - # Source zsh-syntax-highlighting - 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 - fi - ''; + programs.zsh.ohMyZsh = { + enable = true; + theme = "catppuccin-mocha"; + plugins = [ + "git" + "docker" + "direnv" + "zsh-autosuggestions" + "zsh-completions" + "zsh-history-substring-search" + # zsh-syntax-highlighting is sourced in initExtra + ]; }; + + programs.zsh.initExtra = '' + # Catppuccin Mocha colors + 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 + 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%}' + + # Source zsh-syntax-highlighting + 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 + fi + ''; }; }; } diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix index 2e51dee4a..3b5e3820d 100644 --- a/Droidnix/generated/modules/terminals/zsh.nix +++ b/Droidnix/generated/modules/terminals/zsh.nix @@ -1,69 +1,59 @@ { lib, pkgs, ... }: -let +flake.nixosModules.zsh = { config, pkgs, lib, ... }: let username = "henrov"; in { - # Declare a module option to enable Zsh options.mySystem.terminals.zsh.enable = lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh"; - # Flake-style nixosModule - flake.nixosModules.zsh = { config, ... }: let - enableZsh = config.mySystem.terminals.zsh.enable or false; - in - { - config = lib.mkIf enableZsh { + config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) { + home-manager.users.${username} = { + programs.zsh.enable = true; + programs.zsh.enableCompletion = true; - # Home Manager scope for the user - home-manager.users.${username} = { - - programs.zsh.enable = true; - programs.zsh.enableCompletion = true; - - programs.zsh.ohMyZsh = { - enable = true; - theme = "catppuccin-mocha"; - plugins = [ - "git" - "docker" - "direnv" - "zsh-autosuggestions" - "zsh-completions" - "zsh-history-substring-search" - # zsh-syntax-highlighting will be sourced in initExtra - ]; - }; - - programs.zsh.initExtra = '' - # Catppuccin Mocha colors - 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 - 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%}' - - # Source zsh-syntax-highlighting - 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 - fi - ''; + programs.zsh.ohMyZsh = { + enable = true; + theme = "catppuccin-mocha"; + plugins = [ + "git" + "docker" + "direnv" + "zsh-autosuggestions" + "zsh-completions" + "zsh-history-substring-search" + # zsh-syntax-highlighting is sourced in initExtra + ]; }; + + programs.zsh.initExtra = '' + # Catppuccin Mocha colors + 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 + 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%}' + + # Source zsh-syntax-highlighting + 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 + fi + ''; }; }; }