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:01c2d9809ad3f5096c18108474bd6729c8a37c7e
Branches Tags
materus:master
materus:experimental
materus:inputs
..
compare: materus:170cc0fc101d041c4f5fac3644caa1b2356b731b
Branches Tags
materus:experimental
materus:master
materus:inputs

No commits in common. "01c2d9809ad3f5096c18108474bd6729c8a37c7e" and "170cc0fc101d041c4f5fac3644caa1b2356b731b" have entirely different histories.
01c2d9809a ... 170cc0fc10

2 changed files with 9 additions and 36 deletions
Show Stats Expand all files Collapse all files

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

@ -90,6 +90,7 @@ in
]; ];
nix.settings.trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; nix.settings.trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
services.xserver.displayManager.startx.enable = true; services.xserver.displayManager.startx.enable = true;
@ -541,8 +542,7 @@ in
i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.libsForQt5.fcitx5-qt ]; i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.libsForQt5.fcitx5-qt ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
config.materus.profile.packages.firefox firefox
steam steam
steam.run steam.run
gamescope gamescope
@ -606,7 +606,7 @@ in
openal openal
gnupg gnupg
pinentry pinentry
pinentry-gnome3 pinentry-gnome
pinentry-curses pinentry-curses
ncurses ncurses
monkeysphere monkeysphere

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

@ -17,8 +17,7 @@ let
makeIfVar = var: val: ret: '' makeIfVar = var: val: ret: ''
if [ ''$${var} = "${val}" ]; then if [ ''$${var} = "${val}" ]; then
${ret} ${ret}
fi fi'';
'';
@ -65,14 +64,13 @@ in
enableSyntaxHighlighting = true; enableSyntaxHighlighting = true;
enableVteIntegration = true; enableVteIntegration = true;
historySubstringSearch.enable = true; historySubstringSearch.enable = true;
historySubstringSearch.searchUpKey = "$key[Up]"; historySubstringSearch.searchUpKey = ";5A";
historySubstringSearch.searchDownKey = "$key[Down]"; historySubstringSearch.searchDownKey = ";5B";
envExtra = '' envExtra = ''
${makeEnv "__MATERUS_HM_ZSH" "1"} ${makeEnv "__MATERUS_HM_ZSH" "1"}
${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt} ${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt}
${makeEnv "__MATERUS_HM_ZSH_PRIVATE" "0"}
''; '';
@ -96,7 +94,7 @@ in
extended = true; extended = true;
save = 100000; save = 100000;
size = 100000; size = 100000;
share = true; share = false;
ignoreDups = true; ignoreDups = true;
ignoreSpace = true; ignoreSpace = true;
}; };
@ -106,29 +104,9 @@ in
. ${zshcfg}/zinputrc . ${zshcfg}/zinputrc
source ${zshcfg}/zshcompletion.zsh source ${zshcfg}/zshcompletion.zsh
history-substring-search-up-prefixed(){
HISTORY_SUBSTRING_SEARCH_PREFIXED=1 history-substring-search-up
}
history-substring-search-down-prefixed(){
HISTORY_SUBSTRING_SEARCH_PREFIXED=1 history-substring-search-down
}
zle -N history-substring-search-up-prefixed
zle -N history-substring-search-down-prefixed
bindkey -r "^[" bindkey -r "^["
bindkey ";5C" forward-word bindkey ";5C" forward-word
bindkey ";5D" backward-word bindkey ";5D" backward-word
bindkey ";5A" history-substring-search-up-prefixed
bindkey ";5B" history-substring-search-down-prefixed
zsh-private() {
__MATERUS_HM_ZSH_PRIVATE=1 ${lib.getExe config.programs.zsh.package}
}
'' + '' +
makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" '' makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" ''
if zmodload zsh/terminfo && (( terminfo[colors] >= 256 )); then if zmodload zsh/terminfo && (( terminfo[colors] >= 256 )); then
@ -136,12 +114,7 @@ in
else else
[[ ! -f ${p10kcfg}/compatibility.zsh ]] || source ${p10kcfg}/compatibility.zsh [[ ! -f ${p10kcfg}/compatibility.zsh ]] || source ${p10kcfg}/compatibility.zsh
fi fi
'' + makeIfVar "__MATERUS_HM_ZSH_PRIVATE" "1" '' '';
unset HISTFILE
${lib.optionalString config.programs.zsh.history.share "unsetopt SHARE_HISTORY"}
''
;
}; };