materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:61ca7ef3bb1cf071d6a9120d4cfbf48290d73356
Branches Tags
materus:master
materus:experimental
materus:inputs
..
compare: materus:0c31caf113eaa3197801f6f04b2d97516ee33077
Branches Tags
materus:experimental
materus:master
materus:inputs

7 Commits
61ca7ef3bb ... 0c31caf113

Author SHA1 Message Date
Mateusz Słodkowicz 0c31caf113
home-profile: updates 2024-04-01 22:14:27 +02:00
Mateusz Słodkowicz e4a320cbc8
home-profile: updates 2024-04-01 22:10:17 +02:00
Mateusz Słodkowicz fd039ff7cd
home-profile: zsh remove starship option 2024-04-01 22:06:42 +02:00
Mateusz Słodkowicz e69a55340e
home-profile: zsh and wezterm change 2024-04-01 21:57:25 +02:00
Mateusz Słodkowicz a19b5b9a3f
home-profile: zsh ignore all hist dups 2024-04-01 21:15:32 +02:00
Mateusz Słodkowicz f0ae63d1b6
home-profile: change zsh keybind 2024-04-01 21:10:56 +02:00
Mateusz Słodkowicz 48e82bb70f
os-profile: use hack instead firacode 2024-04-01 19:13:49 +02:00
7 changed files with 13 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
configurations/host/Old-materusPC/configuration.nix
View File

@ -241,7 +241,7 @@
fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ]; fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ];
fonts.fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font Mono" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ]; fonts.fontconfig.defaultFonts.monospace = [ "Hack Nerd Font" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ];
environment.enableAllTerminfo = true; environment.enableAllTerminfo = true;

2
configurations/profile/home/shell/bash.nix
View File

@ -9,7 +9,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.bash = { programs.bash = {
enable = lib.mkDefault true; enable = true;
enableCompletion = lib.mkDefault true; enableCompletion = lib.mkDefault true;
enableVteIntegration = lib.mkDefault true; enableVteIntegration = lib.mkDefault true;
historyControl = lib.mkDefault [ "erasedups" "ignorespace" ]; historyControl = lib.mkDefault [ "erasedups" "ignorespace" ];

2
configurations/profile/home/shell/fish.nix
View File

@ -6,7 +6,7 @@ in
options.materus.profile.fish.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus fish config"; options.materus.profile.fish.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus fish config";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.fish = { programs.fish = {
enable = lib.mkDefault true; enable = true;
}; };
}; };
} }

4
configurations/profile/home/shell/starship.nix
View File

@ -4,10 +4,10 @@ let
cfg = config.materus.profile.starship; cfg = config.materus.profile.starship;
in in
{ {
options.materus.profile.starship.enable = materusArg.pkgs.lib.mkBoolOpt (profile.zsh.enable || profile.bash.enable || profile.fish.enable) "Enable materus fish config"; options.materus.profile.starship.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable materus starship config";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.starship.enable = lib.mkDefault cfg.enable; programs.starship.enable = true;
programs.starship.settings = { programs.starship.settings = {

14
configurations/profile/home/shell/zsh.nix
View File

@ -49,7 +49,7 @@ in
{ {
options.materus.profile.zsh.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus zsh config"; options.materus.profile.zsh.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus zsh config";
options.materus.profile.zsh.prompt = lib.mkOption { options.materus.profile.zsh.prompt = lib.mkOption {
type = lib.types.enum [ "p10k" "starship" ]; type = lib.types.enum [ "p10k" ];
example = "p10k"; example = "p10k";
default = "p10k"; default = "p10k";
}; };
@ -85,10 +85,7 @@ in
${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt} ${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt}
${makeEnv "__MATERUS_HM_ZSH_PRIVATE" "0"} ${makeEnv "__MATERUS_HM_ZSH_PRIVATE" "0"}
''; '';
initExtraFirst = '' initExtraFirst = ''
${makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" '' ${makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" ''
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
@ -124,6 +121,7 @@ in
size = 100000; size = 100000;
share = true; share = true;
ignoreDups = true; ignoreDups = true;
ignoreAllDups = true;
ignoreSpace = true; ignoreSpace = true;
}; };
@ -145,10 +143,10 @@ in
bindkey -r "^[" bindkey -r "^["
bindkey ";5C" forward-word bindkey "^[[1;5C" forward-word
bindkey ";5D" backward-word bindkey "^[[1;5D" backward-word
bindkey ";5A" history-substring-search-up-prefixed bindkey "^[[1;5A" history-substring-search-up-prefixed
bindkey ";5B" history-substring-search-down-prefixed bindkey "^[[1;5B" history-substring-search-down-prefixed
zsh-private() { zsh-private() {
__MATERUS_HM_ZSH_PRIVATE=1 ${lib.getExe config.programs.zsh.package} __MATERUS_HM_ZSH_PRIVATE=1 ${lib.getExe config.programs.zsh.package}

1
configurations/profile/home/terminal/wezterm.nix
View File

@ -18,6 +18,7 @@ in
{ {
programs.wezterm.enable = true; programs.wezterm.enable = true;
programs.wezterm.colorSchemes = { }; programs.wezterm.colorSchemes = { };
programs.wezterm.enableZshIntegration = false;
programs.wezterm.extraConfig = '' programs.wezterm.extraConfig = ''
package.path = package.path .. ";${materusArg.cfg.path}/extraFiles/config/wezterm/?.lua" package.path = package.path .. ";${materusArg.cfg.path}/extraFiles/config/wezterm/?.lua"

2
configurations/profile/os/fonts.nix
View File

@ -17,7 +17,7 @@ in
fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ]; fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ];
fonts.fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font Mono" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ]; fonts.fontconfig.defaultFonts.monospace = [ "Hack Nerd Font" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ];
fonts.fontDir.enable = lib.mkDefault true; fonts.fontDir.enable = lib.mkDefault true;
}; };