configurations/host/Old-materusPC/home/materus/default.nix

@@ -2,7 +2,7 @@
 {
   home.stateVersion = "22.11";
   home.homeDirectory = "/home/materus";
-  programs.wezterm.enable = true;
+
   programs.git = {
     userEmail = "materus@podkos.pl";
     userName = "materus";

configurations/profile/common/packages/fonts.nix

@@ -16,15 +16,15 @@ let
     pkgs.noto-fonts-cjk-serif
     pkgs.wqy_zenhei
     pkgs.corefonts
-    pkgs.hack-font
+    (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; })
-    (pkgs.nerdfonts.override { fonts = [ "Hack" ]; })
 
   ] ++ defaultFonts;
 
   moreFonts = [
     pkgs.ubuntu_font_family
     pkgs.monocraft
-    (pkgs.nerdfonts.override { fonts = [ "DroidSansMono" "Meslo" "ProFont" "FiraCode"]; })
+    pkgs.hack-font
+    (pkgs.nerdfonts.override { fonts = [ "DroidSansMono" "Meslo" "ProFont" ]; })
   ];
 in
 {

configurations/profile/home/default.nix

@@ -11,7 +11,6 @@ in
 
     ./shell
     ./editor
-    ./terminal
 
   ];
   options.materus.profile.enableDesktop = materusArg.pkgs.lib.mkBoolOpt false "Enable settings for desktop";

configurations/profile/home/shell/zsh.nix

@@ -18,7 +18,7 @@ let
     if [ ''$${var} = "${val}" ]; then 
     ${ret}
     fi
-  '';
+    '';
 
 
 
@@ -58,12 +58,7 @@ in
       pkgs.ripgrep
     ];
 
-    home.file = lib.mkMerge [
+    home.file = builtins.foldl' (a: b: a // b) { } (builtins.map (plugin: { ${plugin.path}.source = plugin.src; }) (builtins.attrValues extraPlugins));
-      (builtins.foldl' (a: b: a // b) { } (builtins.map (plugin: { ${plugin.path}.source = plugin.src; }) (builtins.attrValues extraPlugins)))
-      { "${relToDotDir ".zshrc"}".text = lib.mkAfter ''
-      ${lib.optionalString config.programs.wezterm.enable "source \"${config.programs.wezterm.package}/etc/profile.d/wezterm.sh\""}
-      ''; }
-    ];
 
     programs.zsh = {
       enable = true;
@@ -76,6 +71,11 @@ in
 
 
       envExtra = ''
+        
+        if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then 
+          __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-1}"; else
+          __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-0}"; 
+        fi
         ${makeEnv "__MATERUS_HM_ZSH" "1"}
         ${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt}
         ${makeEnv "__MATERUS_HM_ZSH_PRIVATE" "0"}
@@ -83,15 +83,10 @@ in
 
 
       initExtraFirst = ''
-
         ${makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" ''
             if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
               source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
             fi
-            if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then 
-              __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-1}"; else
-              __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-0}"; 
-            fi
             if [[ -f "${extraPlugins.powerlevel10k.fullPath}" ]]; then
               source "${extraPlugins.powerlevel10k.fullPath}"
             fi

configurations/profile/home/terminal/default.nix

@@ -1,8 +0,0 @@
-{...}:
-{
-
-  imports = [
-    ./wezterm.nix
-  ];
-    
-}

configurations/profile/home/terminal/wezterm.nix

@@ -1,31 +0,0 @@
-{ config, lib, materusArg, pkgs, ... }:
-let
-  cfg = config.materus.profile.wezterm;
-  cfgText = ''
-    config.hide_tab_bar_if_only_one_tab = true;
-    config.enable_scroll_bar = true;
-    config.font = wezterm.font 'Hack Nerd Font';
-  '';
-in
-{
-  options.materus.profile.wezterm.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableDesktop "Enable materus wezterm config";
-  options.materus.profile.wezterm.enableHackFont = materusArg.pkgs.lib.mkBoolOpt true "Enable hack nerd font for wezterm";
-  options.materus.profile.wezterm.config = lib.mkOption {
-    default = cfgText;
-    description = "Config for wezterm";
-    type = lib.types.string;
-  };
-  config = lib.mkIf cfg.enable {
-    programs.wezterm.enable = true;
-    programs.wezterm.colorSchemes = { };
-    programs.wezterm.extraConfig = ''
-      local config = wezterm.config_builder();
-
-      ${cfgText}
-
-      return config;
-    '';
-
-    home.packages = lib.mkIf cfg.enableHackFont [ (pkgs.nerdfonts.override { fonts = [ "Hack" ]; }) ];
-  };
-}