From ba5458e3caed36ff21b793391bac6c81d514a7ff Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Thu, 26 Aug 2021 21:55:53 +0200 Subject: [PATCH] some changes --- configs/common.nix | 2 ++ configs/gui.nix | 3 ++- configs/p10k-config/p10k.zsh | 46 ++++++++++++++++++------------------ configs/user-gui.nix | 2 +- configs/user.nix | 3 +++ 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/configs/common.nix b/configs/common.nix index 8f4b727..237b0c0 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -87,6 +87,8 @@ in wget youtube-dl zsh + unixtools.xxd + ranger ]; documentation.enable = false; diff --git a/configs/gui.nix b/configs/gui.nix index 2ce03cf..040c277 100644 --- a/configs/gui.nix +++ b/configs/gui.nix @@ -50,7 +50,6 @@ mangohud meld minecraft - mojave-gtk-theme mpv nextcloud-client pantheon.elementary-gtk-theme @@ -73,6 +72,8 @@ megapixels obs-studio fswebcam + python39Packages.python-miio + python39Packages.pyyaml ]; programs = { diff --git a/configs/p10k-config/p10k.zsh b/configs/p10k-config/p10k.zsh index 463219b..25711a5 100644 --- a/configs/p10k-config/p10k.zsh +++ b/configs/p10k-config/p10k.zsh @@ -49,15 +49,15 @@ command_execution_time # duration of the last command background_jobs # presence of background jobs direnv # direnv status (https://direnv.net/) - asdf # asdf version manager (https://github.com/asdf-vm/asdf) - virtualenv # python virtual environment (https://docs.python.org/3/library/venv.html) - anaconda # conda environment (https://conda.io/) - pyenv # python environment (https://github.com/pyenv/pyenv) - goenv # go environment (https://github.com/syndbg/goenv) - nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) + # asdf # asdf version manager (https://github.com/asdf-vm/asdf) + # virtualenv # python virtual environment (https://docs.python.org/3/library/venv.html) + # anaconda # conda environment (https://conda.io/) + # pyenv # python environment (https://github.com/pyenv/pyenv) + # goenv # go environment (https://github.com/syndbg/goenv) + # nodenv # node.js version from nodenv (https://github.com/nodenv/nodenv) nvm # node.js version from nvm (https://github.com/nvm-sh/nvm) nodeenv # node.js environment (https://github.com/ekalinin/nodeenv) - # node_version # node.js version + node_version # node.js version # go_version # go version (https://golang.org) # rust_version # rustc version (https://www.rust-lang.org) # dotnet_version # .NET version (https://dotnet.microsoft.com) @@ -65,24 +65,24 @@ # laravel_version # laravel php framework version (https://laravel.com/) # java_version # java version (https://www.java.com/) # package # name@version from package.json (https://docs.npmjs.com/files/package.json) - rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) - rvm # ruby version from rvm (https://rvm.io) - fvm # flutter version management (https://github.com/leoafarias/fvm) - luaenv # lua version from luaenv (https://github.com/cehoffman/luaenv) - jenv # java version from jenv (https://github.com/jenv/jenv) - plenv # perl version from plenv (https://github.com/tokuhirom/plenv) - phpenv # php version from phpenv (https://github.com/phpenv/phpenv) - scalaenv # scala version from scalaenv (https://github.com/scalaenv/scalaenv) - haskell_stack # haskell version from stack (https://haskellstack.org/) + # rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) + # rvm # ruby version from rvm (https://rvm.io) + # fvm # flutter version management (https://github.com/leoafarias/fvm) + # luaenv # lua version from luaenv (https://github.com/cehoffman/luaenv) + # jenv # java version from jenv (https://github.com/jenv/jenv) + # plenv # perl version from plenv (https://github.com/tokuhirom/plenv) + # phpenv # php version from phpenv (https://github.com/phpenv/phpenv) + # scalaenv # scala version from scalaenv (https://github.com/scalaenv/scalaenv) + # haskell_stack # haskell version from stack (https://haskellstack.org/) kubecontext # current kubernetes context (https://kubernetes.io/) - terraform # terraform workspace (https://www.terraform.io) - aws # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) - aws_eb_env # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) - azure # azure account name (https://docs.microsoft.com/en-us/cli/azure) - gcloud # google cloud cli account and project (https://cloud.google.com/) - google_app_cred # google application credentials (https://cloud.google.com/docs/authentication/production) + # terraform # terraform workspace (https://www.terraform.io) + # aws # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) + # aws_eb_env # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) + # azure # azure account name (https://docs.microsoft.com/en-us/cli/azure) + # gcloud # google cloud cli account and project (https://cloud.google.com/) + # google_app_cred # google application credentials (https://cloud.google.com/docs/authentication/production) context # user@hostname - nordvpn # nordvpn connection status, linux only (https://nordvpn.com/) + # nordvpn # nordvpn connection status, linux only (https://nordvpn.com/) ranger # ranger shell (https://github.com/ranger/ranger) nnn # nnn shell (https://github.com/jarun/nnn) vim_shell # vim shell indicator (:sh) diff --git a/configs/user-gui.nix b/configs/user-gui.nix index badf5eb..7aa7f16 100644 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -15,9 +15,9 @@ package = pkgs.vscode; extensions = with pkgs.vscode-extensions; [ bbenoist.Nix - justusadam.language-haskell editorconfig.editorconfig ms-azuretools.vscode-docker + ms-vsliveshare.vsliveshare #hsnazar.hyper-term-theme #rafaelmaiolla.remote-vscode eamodio.gitlens diff --git a/configs/user.nix b/configs/user.nix index fc520dd..5eb12bb 100644 --- a/configs/user.nix +++ b/configs/user.nix @@ -88,6 +88,9 @@ extraConfig = { push = { default = "current"; }; pull = { rebase = true; }; + credential.helper = "${ + pkgs.git.override { withLibsecret = true; } + }/bin/git-credential-libsecret"; }; };