diff --git a/nixos/configs/sternchen/packages.nix b/nixos/configs/sternchen/packages.nix index 0b5938d..9889187 100644 --- a/nixos/configs/sternchen/packages.nix +++ b/nixos/configs/sternchen/packages.nix @@ -37,12 +37,12 @@ # #tor-browser-bundle-bin (tor-browser-bundle-bin.overrideAttrs (old: rec { - version = "10.5"; + version = "10.5.8"; name = "tor-browser-bundle-${version}"; src = pkgs.fetchurl { url = - "https://dist.torproject.org/torbrowser/10.5/tor-browser-linux64-10.5_en-US.tar.xz"; - sha256 = "1dq9jys60rn2w37dvb2a69gmqsi7278b782am14wci57kmajlpvm"; + "https://dist.torproject.org/torbrowser/10.5.10/tor-browser-linux64-10.5.10_en-US.tar.xz"; + sha256 = "2dq9jys60rn2w37dvb2a69gmqsi7278b782am14wci57kmajlpvm"; }; })) ]; diff --git a/nixos/configs/sterni/packages.nix b/nixos/configs/sterni/packages.nix index 1e9e125..4454afa 100644 --- a/nixos/configs/sterni/packages.nix +++ b/nixos/configs/sterni/packages.nix @@ -23,9 +23,7 @@ in { exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" '') - #zeal # offline documentation - #keepassxc - sweethome3d.application + #sweethome3d.application pkgs.polygon-art.polygon-art # bluetooth gui @@ -36,30 +34,26 @@ in { inkscape imagemagick - bitwig-studio3 - sonic-pi - jack2 - sononym-crawler - darktable + #bitwig-studio3 + #sononym-crawler + #darktable # rust development environment - #cargo - #rustc - rustup - jetbrains.clion + #rustup + #jetbrains.clion # general - jetbrains.idea-ultimate - vscode + #jetbrains.idea-ultimate + #vscode # python - python3Full - jetbrains.pycharm-professional - jetbrains.datagrip + #python3Full + #jetbrains.pycharm-professional + #jetbrains.datagrip - element-desktop + #element-desktop - tor-browser-bundle-bin + #tor-browser-bundle-bin #(tor-browser-bundle-bin.overrideAttrs (old: rec { # version = "10.0.15"; # name = "tor-browser-bundle-${version}"; diff --git a/nixos/modules/programs/shell-zsh.nix b/nixos/modules/programs/shell-zsh.nix index ed8395a..ba4b52f 100644 --- a/nixos/modules/programs/shell-zsh.nix +++ b/nixos/modules/programs/shell-zsh.nix @@ -37,7 +37,6 @@ in { # powerline themes # ---------------- - #theme = "agnoster"; theme = "powerlevel9k/powerlevel9k"; plugins = [ diff --git a/nixos/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix index 306c4a7..890ef11 100644 --- a/nixos/system/desktop/home-manager.nix +++ b/nixos/system/desktop/home-manager.nix @@ -57,14 +57,23 @@ in { # use z instead of cd # use zi to fuzzy search through all registered directories - programs.zoxide.enable = true; + programs.zoxide = { + enable = true; + enableZshIntegration = true; + }; # provide better `Ctrl+r` command in terminal programs.mcfly = { enable = true; keyScheme = "vim"; - enableLightTheme = true; + #enableLightTheme = true; enableFuzzySearch = true; + enableZshIntegration = true; + }; + + programs.zsh = { + enable = true; + defaultKeymap = "viins"; }; home.git-pull = { @@ -127,10 +136,6 @@ in { mpd_port = 6600 ''; - home.file.".zshrc".text = '' - # a fix for https://github.com/NixOS/nixpkgs/issues/27587 - autoload -U compinit && compinit - ''; programs.git = { enable = true;