configurations/host/Old-materusPC/configuration.nix

@@ -90,6 +90,7 @@ in
   ];
   nix.settings.trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.firefox.enablePlasmaBrowserIntegration = 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 ];
 
   environment.systemPackages = with pkgs; [
-    config.materus.profile.packages.firefox
-
+    firefox
     steam
     steam.run
     gamescope
@@ -606,7 +606,7 @@ in
     openal
     gnupg
     pinentry
-    pinentry-gnome3
+    pinentry-gnome
     pinentry-curses
     ncurses
     monkeysphere

configurations/profile/home/shell/zsh.nix

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