From 8a3ac3e93e60e2eb5381250c0f6da9a68d142300 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 25 Jul 2021 22:50:35 +0200 Subject: [PATCH 001/303] use nixpkgs-fmt from inputs --- lefthook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lefthook.yml b/lefthook.yml index 2a636efe..322f6944 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -3,4 +3,4 @@ pre-commit: commands: formatting: glob: "*.nix" - run: nixpkgs-fmt --check {all_files} + run: nix shell --inputs-from . nixpkgs-2105#nixpkgs-fmt -c nixpkgs-fmt --check {all_files} From 758abf2f18bb9dd8689bb8a0ee0daa37288a9404 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 25 Jul 2021 22:52:54 +0200 Subject: [PATCH 002/303] remove GHA --- .github/workflows/build.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 1c973402..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: "Test" -on: - pull_request: - push: -jobs: - builds: - name: Build configuration for ${{ matrix.host }} - runs-on: ubuntu-latest - strategy: - matrix: - host: - - delly-nixos - - nixos - - tux-nixos - steps: - - uses: actions/checkout@v2.3.4 - with: - fetch-depth: 0 # Nix Flakes doesn't work on shallow clones - - uses: cachix/install-nix-action@v13 - with: - install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-3.0pre20200820_4d77513/install - extra_nix_config: | - experimental-features = nix-command flakes - - uses: cachix/cachix-action@v10 - with: - name: nobbz - signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - - run: nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel -L From dbce561629850b6f478c64781a562e7e7c87b98e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 25 Jul 2021 22:58:18 +0200 Subject: [PATCH 003/303] move old stuff out of the way! --- {home => oldstuff/home}/.envrc | 0 {home => oldstuff/home}/.github/dependabot.yml | 0 {home => oldstuff/home}/.github/workflows/environments.yml | 0 {home => oldstuff/home}/.gitignore | 0 {home => oldstuff/home}/.gitlab-ci.yml | 0 {home => oldstuff/home}/LICENSE | 0 {home => oldstuff/home}/README.adoc | 0 {home => oldstuff/home}/flake.lock | 0 {home => oldstuff/home}/flake.nix | 0 {home => oldstuff/home}/home.nix | 0 {home => oldstuff/home}/hosts/WS0005.nix | 0 {home => oldstuff/home}/hosts/delly-nixos.nix | 0 {home => oldstuff/home}/hosts/nixos.nix | 0 {home => oldstuff/home}/hosts/tux-nixos.nix | 0 {home => oldstuff/home}/modules/advcp/default.nix | 0 {home => oldstuff/home}/modules/awesome/default.nix | 0 {home => oldstuff/home}/modules/default.nix | 0 {home => oldstuff/home}/modules/emacs/beacon.nix | 0 {home => oldstuff/home}/modules/emacs/company.nix | 0 {home => oldstuff/home}/modules/emacs/default.nix | 0 {home => oldstuff/home}/modules/emacs/helm.nix | 0 {home => oldstuff/home}/modules/emacs/lsp.nix | 0 {home => oldstuff/home}/modules/emacs/polymode/default.nix | 0 {home => oldstuff/home}/modules/emacs/projectile.nix | 0 {home => oldstuff/home}/modules/emacs/telephoneline.nix | 0 {home => oldstuff/home}/modules/emacs/whichkey/default.nix | 0 {home => oldstuff/home}/modules/exa/default.nix | 0 {home => oldstuff/home}/modules/keyleds/default.nix | 0 {home => oldstuff/home}/modules/languages/agda/default.nix | 0 {home => oldstuff/home}/modules/languages/c++/default.nix | 0 {home => oldstuff/home}/modules/languages/c/default.nix | 0 {home => oldstuff/home}/modules/languages/clojure/default.nix | 0 {home => oldstuff/home}/modules/languages/default.nix | 0 {home => oldstuff/home}/modules/languages/elixir/default.nix | 0 {home => oldstuff/home}/modules/languages/erlang/default.nix | 0 {home => oldstuff/home}/modules/languages/go/default.nix | 0 {home => oldstuff/home}/modules/languages/lua/default.nix | 0 {home => oldstuff/home}/modules/languages/nix/default.nix | 0 {home => oldstuff/home}/modules/languages/ocaml/default.nix | 0 {home => oldstuff/home}/modules/languages/python/default.nix | 0 {home => oldstuff/home}/modules/languages/rust/default.nix | 0 {home => oldstuff/home}/modules/languages/terraform/default.nix | 0 {home => oldstuff/home}/modules/languages/tex/default.nix | 0 {home => oldstuff/home}/modules/openshift/default.nix | 0 {home => oldstuff/home}/modules/zshell/default.nix | 0 {home => oldstuff/home}/nix/default.nix | 0 {home => oldstuff/home}/nix/myOverlay/default.nix | 0 {home => oldstuff/home}/nix/myOverlay/lib/default.nix | 0 {home => oldstuff/home}/overlays.nix | 0 {home => oldstuff/home}/packages/advcp/default.nix | 0 {home => oldstuff/home}/packages/dracula/konsole.nix | 0 {home => oldstuff/home}/packages/elixir-lsp/default.nix | 0 {home => oldstuff/home}/packages/elixir-lsp/fetch-mix-deps.nix | 0 {home => oldstuff/home}/packages/elixir-lsp/source.json | 0 {home => oldstuff/home}/packages/erlang-ls/default.nix | 0 {home => oldstuff/home}/packages/erlang-ls/source.json | 0 {home => oldstuff/home}/packages/gnucash-de/default.nix | 0 {home => oldstuff/home}/packages/keyleds/default.nix | 0 {home => oldstuff/home}/packages/kmymoney-de/default.nix | 0 {home => oldstuff/home}/packages/rofi-unicode/default.nix | 0 {home => oldstuff/home}/packages/rofi-unicode/rofi-unicode.json | 0 {home => oldstuff/home}/profiles/base/default.nix | 0 {home => oldstuff/home}/profiles/base/nix-completions.sh | 0 {home => oldstuff/home}/profiles/base/p10k-config/p10k.zsh | 0 {home => oldstuff/home}/profiles/browsing/default.nix | 0 {home => oldstuff/home}/profiles/default.nix | 0 {home => oldstuff/home}/profiles/development/default.nix | 0 {home => oldstuff/home}/profiles/home-office/default.nix | 0 {home => oldstuff/home}/scripts/build-config/default.nix | 0 {home => oldstuff/home}/scripts/bump-version/default.nix | 0 {home => oldstuff/home}/scripts/switch-config/default.nix | 0 {home => oldstuff/home}/scripts/update-config/default.nix | 0 {lib => oldstuff/lib}/default.nix | 0 {lib => oldstuff/lib}/mk_home_config.nix | 0 {nixos => oldstuff/nixos}/hosts/default.nix | 0 {nixos => oldstuff/nixos}/hosts/hardware/delly-nixos.nix | 0 {nixos => oldstuff/nixos}/hosts/hardware/nixos.nix | 0 {nixos => oldstuff/nixos}/hosts/hardware/tux-nixos.nix | 0 {nixos => oldstuff/nixos}/hosts/legacy/delly-nixos.nix | 0 {nixos => oldstuff/nixos}/hosts/legacy/nixos.nix | 0 {nixos => oldstuff/nixos}/hosts/legacy/tux-nixos.nix | 0 {nixos => oldstuff/nixos}/modules/cachix.nix | 0 {nixos => oldstuff/nixos}/modules/cachix/ca-nix.nix | 0 {nixos => oldstuff/nixos}/modules/cachix/nix-community.nix | 0 {nixos => oldstuff/nixos}/modules/cachix/nobbz.nix | 0 {nixos => oldstuff/nixos}/modules/cachix/ts-helper.nix | 0 {nixos => oldstuff/nixos}/modules/default.nix | 0 {nixos => oldstuff/nixos}/modules/flake.nix | 0 {nixos => oldstuff/nixos}/modules/gc.nix | 0 {nixos => oldstuff/nixos}/modules/intel.nix | 0 {nixos => oldstuff/nixos}/modules/k3s.nix | 0 {nixos => oldstuff/nixos}/modules/kubernetes.nix | 0 {nixos => oldstuff/nixos}/modules/packet-iscsi.nix | 0 {nixos => oldstuff/nixos}/modules/version.nix | 0 {nixos => oldstuff/nixos}/modules/virtualbox-demo.nix | 0 {packages => oldstuff/packages}/devShell.nix | 0 {scripts => oldstuff/scripts}/build-config.nix | 0 {scripts => oldstuff/scripts}/default.nix | 0 {scripts => oldstuff/scripts}/switch-config.nix | 0 99 files changed, 0 insertions(+), 0 deletions(-) rename {home => oldstuff/home}/.envrc (100%) rename {home => oldstuff/home}/.github/dependabot.yml (100%) rename {home => oldstuff/home}/.github/workflows/environments.yml (100%) rename {home => oldstuff/home}/.gitignore (100%) rename {home => oldstuff/home}/.gitlab-ci.yml (100%) rename {home => oldstuff/home}/LICENSE (100%) rename {home => oldstuff/home}/README.adoc (100%) rename {home => oldstuff/home}/flake.lock (100%) rename {home => oldstuff/home}/flake.nix (100%) rename {home => oldstuff/home}/home.nix (100%) rename {home => oldstuff/home}/hosts/WS0005.nix (100%) rename {home => oldstuff/home}/hosts/delly-nixos.nix (100%) rename {home => oldstuff/home}/hosts/nixos.nix (100%) rename {home => oldstuff/home}/hosts/tux-nixos.nix (100%) rename {home => oldstuff/home}/modules/advcp/default.nix (100%) rename {home => oldstuff/home}/modules/awesome/default.nix (100%) rename {home => oldstuff/home}/modules/default.nix (100%) rename {home => oldstuff/home}/modules/emacs/beacon.nix (100%) rename {home => oldstuff/home}/modules/emacs/company.nix (100%) rename {home => oldstuff/home}/modules/emacs/default.nix (100%) rename {home => oldstuff/home}/modules/emacs/helm.nix (100%) rename {home => oldstuff/home}/modules/emacs/lsp.nix (100%) rename {home => oldstuff/home}/modules/emacs/polymode/default.nix (100%) rename {home => oldstuff/home}/modules/emacs/projectile.nix (100%) rename {home => oldstuff/home}/modules/emacs/telephoneline.nix (100%) rename {home => oldstuff/home}/modules/emacs/whichkey/default.nix (100%) rename {home => oldstuff/home}/modules/exa/default.nix (100%) rename {home => oldstuff/home}/modules/keyleds/default.nix (100%) rename {home => oldstuff/home}/modules/languages/agda/default.nix (100%) rename {home => oldstuff/home}/modules/languages/c++/default.nix (100%) rename {home => oldstuff/home}/modules/languages/c/default.nix (100%) rename {home => oldstuff/home}/modules/languages/clojure/default.nix (100%) rename {home => oldstuff/home}/modules/languages/default.nix (100%) rename {home => oldstuff/home}/modules/languages/elixir/default.nix (100%) rename {home => oldstuff/home}/modules/languages/erlang/default.nix (100%) rename {home => oldstuff/home}/modules/languages/go/default.nix (100%) rename {home => oldstuff/home}/modules/languages/lua/default.nix (100%) rename {home => oldstuff/home}/modules/languages/nix/default.nix (100%) rename {home => oldstuff/home}/modules/languages/ocaml/default.nix (100%) rename {home => oldstuff/home}/modules/languages/python/default.nix (100%) rename {home => oldstuff/home}/modules/languages/rust/default.nix (100%) rename {home => oldstuff/home}/modules/languages/terraform/default.nix (100%) rename {home => oldstuff/home}/modules/languages/tex/default.nix (100%) rename {home => oldstuff/home}/modules/openshift/default.nix (100%) rename {home => oldstuff/home}/modules/zshell/default.nix (100%) rename {home => oldstuff/home}/nix/default.nix (100%) rename {home => oldstuff/home}/nix/myOverlay/default.nix (100%) rename {home => oldstuff/home}/nix/myOverlay/lib/default.nix (100%) rename {home => oldstuff/home}/overlays.nix (100%) rename {home => oldstuff/home}/packages/advcp/default.nix (100%) rename {home => oldstuff/home}/packages/dracula/konsole.nix (100%) rename {home => oldstuff/home}/packages/elixir-lsp/default.nix (100%) rename {home => oldstuff/home}/packages/elixir-lsp/fetch-mix-deps.nix (100%) rename {home => oldstuff/home}/packages/elixir-lsp/source.json (100%) rename {home => oldstuff/home}/packages/erlang-ls/default.nix (100%) rename {home => oldstuff/home}/packages/erlang-ls/source.json (100%) rename {home => oldstuff/home}/packages/gnucash-de/default.nix (100%) rename {home => oldstuff/home}/packages/keyleds/default.nix (100%) rename {home => oldstuff/home}/packages/kmymoney-de/default.nix (100%) rename {home => oldstuff/home}/packages/rofi-unicode/default.nix (100%) rename {home => oldstuff/home}/packages/rofi-unicode/rofi-unicode.json (100%) rename {home => oldstuff/home}/profiles/base/default.nix (100%) rename {home => oldstuff/home}/profiles/base/nix-completions.sh (100%) rename {home => oldstuff/home}/profiles/base/p10k-config/p10k.zsh (100%) rename {home => oldstuff/home}/profiles/browsing/default.nix (100%) rename {home => oldstuff/home}/profiles/default.nix (100%) rename {home => oldstuff/home}/profiles/development/default.nix (100%) rename {home => oldstuff/home}/profiles/home-office/default.nix (100%) rename {home => oldstuff/home}/scripts/build-config/default.nix (100%) rename {home => oldstuff/home}/scripts/bump-version/default.nix (100%) rename {home => oldstuff/home}/scripts/switch-config/default.nix (100%) rename {home => oldstuff/home}/scripts/update-config/default.nix (100%) rename {lib => oldstuff/lib}/default.nix (100%) rename {lib => oldstuff/lib}/mk_home_config.nix (100%) rename {nixos => oldstuff/nixos}/hosts/default.nix (100%) rename {nixos => oldstuff/nixos}/hosts/hardware/delly-nixos.nix (100%) rename {nixos => oldstuff/nixos}/hosts/hardware/nixos.nix (100%) rename {nixos => oldstuff/nixos}/hosts/hardware/tux-nixos.nix (100%) rename {nixos => oldstuff/nixos}/hosts/legacy/delly-nixos.nix (100%) rename {nixos => oldstuff/nixos}/hosts/legacy/nixos.nix (100%) rename {nixos => oldstuff/nixos}/hosts/legacy/tux-nixos.nix (100%) rename {nixos => oldstuff/nixos}/modules/cachix.nix (100%) rename {nixos => oldstuff/nixos}/modules/cachix/ca-nix.nix (100%) rename {nixos => oldstuff/nixos}/modules/cachix/nix-community.nix (100%) rename {nixos => oldstuff/nixos}/modules/cachix/nobbz.nix (100%) rename {nixos => oldstuff/nixos}/modules/cachix/ts-helper.nix (100%) rename {nixos => oldstuff/nixos}/modules/default.nix (100%) rename {nixos => oldstuff/nixos}/modules/flake.nix (100%) rename {nixos => oldstuff/nixos}/modules/gc.nix (100%) rename {nixos => oldstuff/nixos}/modules/intel.nix (100%) rename {nixos => oldstuff/nixos}/modules/k3s.nix (100%) rename {nixos => oldstuff/nixos}/modules/kubernetes.nix (100%) rename {nixos => oldstuff/nixos}/modules/packet-iscsi.nix (100%) rename {nixos => oldstuff/nixos}/modules/version.nix (100%) rename {nixos => oldstuff/nixos}/modules/virtualbox-demo.nix (100%) rename {packages => oldstuff/packages}/devShell.nix (100%) rename {scripts => oldstuff/scripts}/build-config.nix (100%) rename {scripts => oldstuff/scripts}/default.nix (100%) rename {scripts => oldstuff/scripts}/switch-config.nix (100%) diff --git a/home/.envrc b/oldstuff/home/.envrc similarity index 100% rename from home/.envrc rename to oldstuff/home/.envrc diff --git a/home/.github/dependabot.yml b/oldstuff/home/.github/dependabot.yml similarity index 100% rename from home/.github/dependabot.yml rename to oldstuff/home/.github/dependabot.yml diff --git a/home/.github/workflows/environments.yml b/oldstuff/home/.github/workflows/environments.yml similarity index 100% rename from home/.github/workflows/environments.yml rename to oldstuff/home/.github/workflows/environments.yml diff --git a/home/.gitignore b/oldstuff/home/.gitignore similarity index 100% rename from home/.gitignore rename to oldstuff/home/.gitignore diff --git a/home/.gitlab-ci.yml b/oldstuff/home/.gitlab-ci.yml similarity index 100% rename from home/.gitlab-ci.yml rename to oldstuff/home/.gitlab-ci.yml diff --git a/home/LICENSE b/oldstuff/home/LICENSE similarity index 100% rename from home/LICENSE rename to oldstuff/home/LICENSE diff --git a/home/README.adoc b/oldstuff/home/README.adoc similarity index 100% rename from home/README.adoc rename to oldstuff/home/README.adoc diff --git a/home/flake.lock b/oldstuff/home/flake.lock similarity index 100% rename from home/flake.lock rename to oldstuff/home/flake.lock diff --git a/home/flake.nix b/oldstuff/home/flake.nix similarity index 100% rename from home/flake.nix rename to oldstuff/home/flake.nix diff --git a/home/home.nix b/oldstuff/home/home.nix similarity index 100% rename from home/home.nix rename to oldstuff/home/home.nix diff --git a/home/hosts/WS0005.nix b/oldstuff/home/hosts/WS0005.nix similarity index 100% rename from home/hosts/WS0005.nix rename to oldstuff/home/hosts/WS0005.nix diff --git a/home/hosts/delly-nixos.nix b/oldstuff/home/hosts/delly-nixos.nix similarity index 100% rename from home/hosts/delly-nixos.nix rename to oldstuff/home/hosts/delly-nixos.nix diff --git a/home/hosts/nixos.nix b/oldstuff/home/hosts/nixos.nix similarity index 100% rename from home/hosts/nixos.nix rename to oldstuff/home/hosts/nixos.nix diff --git a/home/hosts/tux-nixos.nix b/oldstuff/home/hosts/tux-nixos.nix similarity index 100% rename from home/hosts/tux-nixos.nix rename to oldstuff/home/hosts/tux-nixos.nix diff --git a/home/modules/advcp/default.nix b/oldstuff/home/modules/advcp/default.nix similarity index 100% rename from home/modules/advcp/default.nix rename to oldstuff/home/modules/advcp/default.nix diff --git a/home/modules/awesome/default.nix b/oldstuff/home/modules/awesome/default.nix similarity index 100% rename from home/modules/awesome/default.nix rename to oldstuff/home/modules/awesome/default.nix diff --git a/home/modules/default.nix b/oldstuff/home/modules/default.nix similarity index 100% rename from home/modules/default.nix rename to oldstuff/home/modules/default.nix diff --git a/home/modules/emacs/beacon.nix b/oldstuff/home/modules/emacs/beacon.nix similarity index 100% rename from home/modules/emacs/beacon.nix rename to oldstuff/home/modules/emacs/beacon.nix diff --git a/home/modules/emacs/company.nix b/oldstuff/home/modules/emacs/company.nix similarity index 100% rename from home/modules/emacs/company.nix rename to oldstuff/home/modules/emacs/company.nix diff --git a/home/modules/emacs/default.nix b/oldstuff/home/modules/emacs/default.nix similarity index 100% rename from home/modules/emacs/default.nix rename to oldstuff/home/modules/emacs/default.nix diff --git a/home/modules/emacs/helm.nix b/oldstuff/home/modules/emacs/helm.nix similarity index 100% rename from home/modules/emacs/helm.nix rename to oldstuff/home/modules/emacs/helm.nix diff --git a/home/modules/emacs/lsp.nix b/oldstuff/home/modules/emacs/lsp.nix similarity index 100% rename from home/modules/emacs/lsp.nix rename to oldstuff/home/modules/emacs/lsp.nix diff --git a/home/modules/emacs/polymode/default.nix b/oldstuff/home/modules/emacs/polymode/default.nix similarity index 100% rename from home/modules/emacs/polymode/default.nix rename to oldstuff/home/modules/emacs/polymode/default.nix diff --git a/home/modules/emacs/projectile.nix b/oldstuff/home/modules/emacs/projectile.nix similarity index 100% rename from home/modules/emacs/projectile.nix rename to oldstuff/home/modules/emacs/projectile.nix diff --git a/home/modules/emacs/telephoneline.nix b/oldstuff/home/modules/emacs/telephoneline.nix similarity index 100% rename from home/modules/emacs/telephoneline.nix rename to oldstuff/home/modules/emacs/telephoneline.nix diff --git a/home/modules/emacs/whichkey/default.nix b/oldstuff/home/modules/emacs/whichkey/default.nix similarity index 100% rename from home/modules/emacs/whichkey/default.nix rename to oldstuff/home/modules/emacs/whichkey/default.nix diff --git a/home/modules/exa/default.nix b/oldstuff/home/modules/exa/default.nix similarity index 100% rename from home/modules/exa/default.nix rename to oldstuff/home/modules/exa/default.nix diff --git a/home/modules/keyleds/default.nix b/oldstuff/home/modules/keyleds/default.nix similarity index 100% rename from home/modules/keyleds/default.nix rename to oldstuff/home/modules/keyleds/default.nix diff --git a/home/modules/languages/agda/default.nix b/oldstuff/home/modules/languages/agda/default.nix similarity index 100% rename from home/modules/languages/agda/default.nix rename to oldstuff/home/modules/languages/agda/default.nix diff --git a/home/modules/languages/c++/default.nix b/oldstuff/home/modules/languages/c++/default.nix similarity index 100% rename from home/modules/languages/c++/default.nix rename to oldstuff/home/modules/languages/c++/default.nix diff --git a/home/modules/languages/c/default.nix b/oldstuff/home/modules/languages/c/default.nix similarity index 100% rename from home/modules/languages/c/default.nix rename to oldstuff/home/modules/languages/c/default.nix diff --git a/home/modules/languages/clojure/default.nix b/oldstuff/home/modules/languages/clojure/default.nix similarity index 100% rename from home/modules/languages/clojure/default.nix rename to oldstuff/home/modules/languages/clojure/default.nix diff --git a/home/modules/languages/default.nix b/oldstuff/home/modules/languages/default.nix similarity index 100% rename from home/modules/languages/default.nix rename to oldstuff/home/modules/languages/default.nix diff --git a/home/modules/languages/elixir/default.nix b/oldstuff/home/modules/languages/elixir/default.nix similarity index 100% rename from home/modules/languages/elixir/default.nix rename to oldstuff/home/modules/languages/elixir/default.nix diff --git a/home/modules/languages/erlang/default.nix b/oldstuff/home/modules/languages/erlang/default.nix similarity index 100% rename from home/modules/languages/erlang/default.nix rename to oldstuff/home/modules/languages/erlang/default.nix diff --git a/home/modules/languages/go/default.nix b/oldstuff/home/modules/languages/go/default.nix similarity index 100% rename from home/modules/languages/go/default.nix rename to oldstuff/home/modules/languages/go/default.nix diff --git a/home/modules/languages/lua/default.nix b/oldstuff/home/modules/languages/lua/default.nix similarity index 100% rename from home/modules/languages/lua/default.nix rename to oldstuff/home/modules/languages/lua/default.nix diff --git a/home/modules/languages/nix/default.nix b/oldstuff/home/modules/languages/nix/default.nix similarity index 100% rename from home/modules/languages/nix/default.nix rename to oldstuff/home/modules/languages/nix/default.nix diff --git a/home/modules/languages/ocaml/default.nix b/oldstuff/home/modules/languages/ocaml/default.nix similarity index 100% rename from home/modules/languages/ocaml/default.nix rename to oldstuff/home/modules/languages/ocaml/default.nix diff --git a/home/modules/languages/python/default.nix b/oldstuff/home/modules/languages/python/default.nix similarity index 100% rename from home/modules/languages/python/default.nix rename to oldstuff/home/modules/languages/python/default.nix diff --git a/home/modules/languages/rust/default.nix b/oldstuff/home/modules/languages/rust/default.nix similarity index 100% rename from home/modules/languages/rust/default.nix rename to oldstuff/home/modules/languages/rust/default.nix diff --git a/home/modules/languages/terraform/default.nix b/oldstuff/home/modules/languages/terraform/default.nix similarity index 100% rename from home/modules/languages/terraform/default.nix rename to oldstuff/home/modules/languages/terraform/default.nix diff --git a/home/modules/languages/tex/default.nix b/oldstuff/home/modules/languages/tex/default.nix similarity index 100% rename from home/modules/languages/tex/default.nix rename to oldstuff/home/modules/languages/tex/default.nix diff --git a/home/modules/openshift/default.nix b/oldstuff/home/modules/openshift/default.nix similarity index 100% rename from home/modules/openshift/default.nix rename to oldstuff/home/modules/openshift/default.nix diff --git a/home/modules/zshell/default.nix b/oldstuff/home/modules/zshell/default.nix similarity index 100% rename from home/modules/zshell/default.nix rename to oldstuff/home/modules/zshell/default.nix diff --git a/home/nix/default.nix b/oldstuff/home/nix/default.nix similarity index 100% rename from home/nix/default.nix rename to oldstuff/home/nix/default.nix diff --git a/home/nix/myOverlay/default.nix b/oldstuff/home/nix/myOverlay/default.nix similarity index 100% rename from home/nix/myOverlay/default.nix rename to oldstuff/home/nix/myOverlay/default.nix diff --git a/home/nix/myOverlay/lib/default.nix b/oldstuff/home/nix/myOverlay/lib/default.nix similarity index 100% rename from home/nix/myOverlay/lib/default.nix rename to oldstuff/home/nix/myOverlay/lib/default.nix diff --git a/home/overlays.nix b/oldstuff/home/overlays.nix similarity index 100% rename from home/overlays.nix rename to oldstuff/home/overlays.nix diff --git a/home/packages/advcp/default.nix b/oldstuff/home/packages/advcp/default.nix similarity index 100% rename from home/packages/advcp/default.nix rename to oldstuff/home/packages/advcp/default.nix diff --git a/home/packages/dracula/konsole.nix b/oldstuff/home/packages/dracula/konsole.nix similarity index 100% rename from home/packages/dracula/konsole.nix rename to oldstuff/home/packages/dracula/konsole.nix diff --git a/home/packages/elixir-lsp/default.nix b/oldstuff/home/packages/elixir-lsp/default.nix similarity index 100% rename from home/packages/elixir-lsp/default.nix rename to oldstuff/home/packages/elixir-lsp/default.nix diff --git a/home/packages/elixir-lsp/fetch-mix-deps.nix b/oldstuff/home/packages/elixir-lsp/fetch-mix-deps.nix similarity index 100% rename from home/packages/elixir-lsp/fetch-mix-deps.nix rename to oldstuff/home/packages/elixir-lsp/fetch-mix-deps.nix diff --git a/home/packages/elixir-lsp/source.json b/oldstuff/home/packages/elixir-lsp/source.json similarity index 100% rename from home/packages/elixir-lsp/source.json rename to oldstuff/home/packages/elixir-lsp/source.json diff --git a/home/packages/erlang-ls/default.nix b/oldstuff/home/packages/erlang-ls/default.nix similarity index 100% rename from home/packages/erlang-ls/default.nix rename to oldstuff/home/packages/erlang-ls/default.nix diff --git a/home/packages/erlang-ls/source.json b/oldstuff/home/packages/erlang-ls/source.json similarity index 100% rename from home/packages/erlang-ls/source.json rename to oldstuff/home/packages/erlang-ls/source.json diff --git a/home/packages/gnucash-de/default.nix b/oldstuff/home/packages/gnucash-de/default.nix similarity index 100% rename from home/packages/gnucash-de/default.nix rename to oldstuff/home/packages/gnucash-de/default.nix diff --git a/home/packages/keyleds/default.nix b/oldstuff/home/packages/keyleds/default.nix similarity index 100% rename from home/packages/keyleds/default.nix rename to oldstuff/home/packages/keyleds/default.nix diff --git a/home/packages/kmymoney-de/default.nix b/oldstuff/home/packages/kmymoney-de/default.nix similarity index 100% rename from home/packages/kmymoney-de/default.nix rename to oldstuff/home/packages/kmymoney-de/default.nix diff --git a/home/packages/rofi-unicode/default.nix b/oldstuff/home/packages/rofi-unicode/default.nix similarity index 100% rename from home/packages/rofi-unicode/default.nix rename to oldstuff/home/packages/rofi-unicode/default.nix diff --git a/home/packages/rofi-unicode/rofi-unicode.json b/oldstuff/home/packages/rofi-unicode/rofi-unicode.json similarity index 100% rename from home/packages/rofi-unicode/rofi-unicode.json rename to oldstuff/home/packages/rofi-unicode/rofi-unicode.json diff --git a/home/profiles/base/default.nix b/oldstuff/home/profiles/base/default.nix similarity index 100% rename from home/profiles/base/default.nix rename to oldstuff/home/profiles/base/default.nix diff --git a/home/profiles/base/nix-completions.sh b/oldstuff/home/profiles/base/nix-completions.sh similarity index 100% rename from home/profiles/base/nix-completions.sh rename to oldstuff/home/profiles/base/nix-completions.sh diff --git a/home/profiles/base/p10k-config/p10k.zsh b/oldstuff/home/profiles/base/p10k-config/p10k.zsh similarity index 100% rename from home/profiles/base/p10k-config/p10k.zsh rename to oldstuff/home/profiles/base/p10k-config/p10k.zsh diff --git a/home/profiles/browsing/default.nix b/oldstuff/home/profiles/browsing/default.nix similarity index 100% rename from home/profiles/browsing/default.nix rename to oldstuff/home/profiles/browsing/default.nix diff --git a/home/profiles/default.nix b/oldstuff/home/profiles/default.nix similarity index 100% rename from home/profiles/default.nix rename to oldstuff/home/profiles/default.nix diff --git a/home/profiles/development/default.nix b/oldstuff/home/profiles/development/default.nix similarity index 100% rename from home/profiles/development/default.nix rename to oldstuff/home/profiles/development/default.nix diff --git a/home/profiles/home-office/default.nix b/oldstuff/home/profiles/home-office/default.nix similarity index 100% rename from home/profiles/home-office/default.nix rename to oldstuff/home/profiles/home-office/default.nix diff --git a/home/scripts/build-config/default.nix b/oldstuff/home/scripts/build-config/default.nix similarity index 100% rename from home/scripts/build-config/default.nix rename to oldstuff/home/scripts/build-config/default.nix diff --git a/home/scripts/bump-version/default.nix b/oldstuff/home/scripts/bump-version/default.nix similarity index 100% rename from home/scripts/bump-version/default.nix rename to oldstuff/home/scripts/bump-version/default.nix diff --git a/home/scripts/switch-config/default.nix b/oldstuff/home/scripts/switch-config/default.nix similarity index 100% rename from home/scripts/switch-config/default.nix rename to oldstuff/home/scripts/switch-config/default.nix diff --git a/home/scripts/update-config/default.nix b/oldstuff/home/scripts/update-config/default.nix similarity index 100% rename from home/scripts/update-config/default.nix rename to oldstuff/home/scripts/update-config/default.nix diff --git a/lib/default.nix b/oldstuff/lib/default.nix similarity index 100% rename from lib/default.nix rename to oldstuff/lib/default.nix diff --git a/lib/mk_home_config.nix b/oldstuff/lib/mk_home_config.nix similarity index 100% rename from lib/mk_home_config.nix rename to oldstuff/lib/mk_home_config.nix diff --git a/nixos/hosts/default.nix b/oldstuff/nixos/hosts/default.nix similarity index 100% rename from nixos/hosts/default.nix rename to oldstuff/nixos/hosts/default.nix diff --git a/nixos/hosts/hardware/delly-nixos.nix b/oldstuff/nixos/hosts/hardware/delly-nixos.nix similarity index 100% rename from nixos/hosts/hardware/delly-nixos.nix rename to oldstuff/nixos/hosts/hardware/delly-nixos.nix diff --git a/nixos/hosts/hardware/nixos.nix b/oldstuff/nixos/hosts/hardware/nixos.nix similarity index 100% rename from nixos/hosts/hardware/nixos.nix rename to oldstuff/nixos/hosts/hardware/nixos.nix diff --git a/nixos/hosts/hardware/tux-nixos.nix b/oldstuff/nixos/hosts/hardware/tux-nixos.nix similarity index 100% rename from nixos/hosts/hardware/tux-nixos.nix rename to oldstuff/nixos/hosts/hardware/tux-nixos.nix diff --git a/nixos/hosts/legacy/delly-nixos.nix b/oldstuff/nixos/hosts/legacy/delly-nixos.nix similarity index 100% rename from nixos/hosts/legacy/delly-nixos.nix rename to oldstuff/nixos/hosts/legacy/delly-nixos.nix diff --git a/nixos/hosts/legacy/nixos.nix b/oldstuff/nixos/hosts/legacy/nixos.nix similarity index 100% rename from nixos/hosts/legacy/nixos.nix rename to oldstuff/nixos/hosts/legacy/nixos.nix diff --git a/nixos/hosts/legacy/tux-nixos.nix b/oldstuff/nixos/hosts/legacy/tux-nixos.nix similarity index 100% rename from nixos/hosts/legacy/tux-nixos.nix rename to oldstuff/nixos/hosts/legacy/tux-nixos.nix diff --git a/nixos/modules/cachix.nix b/oldstuff/nixos/modules/cachix.nix similarity index 100% rename from nixos/modules/cachix.nix rename to oldstuff/nixos/modules/cachix.nix diff --git a/nixos/modules/cachix/ca-nix.nix b/oldstuff/nixos/modules/cachix/ca-nix.nix similarity index 100% rename from nixos/modules/cachix/ca-nix.nix rename to oldstuff/nixos/modules/cachix/ca-nix.nix diff --git a/nixos/modules/cachix/nix-community.nix b/oldstuff/nixos/modules/cachix/nix-community.nix similarity index 100% rename from nixos/modules/cachix/nix-community.nix rename to oldstuff/nixos/modules/cachix/nix-community.nix diff --git a/nixos/modules/cachix/nobbz.nix b/oldstuff/nixos/modules/cachix/nobbz.nix similarity index 100% rename from nixos/modules/cachix/nobbz.nix rename to oldstuff/nixos/modules/cachix/nobbz.nix diff --git a/nixos/modules/cachix/ts-helper.nix b/oldstuff/nixos/modules/cachix/ts-helper.nix similarity index 100% rename from nixos/modules/cachix/ts-helper.nix rename to oldstuff/nixos/modules/cachix/ts-helper.nix diff --git a/nixos/modules/default.nix b/oldstuff/nixos/modules/default.nix similarity index 100% rename from nixos/modules/default.nix rename to oldstuff/nixos/modules/default.nix diff --git a/nixos/modules/flake.nix b/oldstuff/nixos/modules/flake.nix similarity index 100% rename from nixos/modules/flake.nix rename to oldstuff/nixos/modules/flake.nix diff --git a/nixos/modules/gc.nix b/oldstuff/nixos/modules/gc.nix similarity index 100% rename from nixos/modules/gc.nix rename to oldstuff/nixos/modules/gc.nix diff --git a/nixos/modules/intel.nix b/oldstuff/nixos/modules/intel.nix similarity index 100% rename from nixos/modules/intel.nix rename to oldstuff/nixos/modules/intel.nix diff --git a/nixos/modules/k3s.nix b/oldstuff/nixos/modules/k3s.nix similarity index 100% rename from nixos/modules/k3s.nix rename to oldstuff/nixos/modules/k3s.nix diff --git a/nixos/modules/kubernetes.nix b/oldstuff/nixos/modules/kubernetes.nix similarity index 100% rename from nixos/modules/kubernetes.nix rename to oldstuff/nixos/modules/kubernetes.nix diff --git a/nixos/modules/packet-iscsi.nix b/oldstuff/nixos/modules/packet-iscsi.nix similarity index 100% rename from nixos/modules/packet-iscsi.nix rename to oldstuff/nixos/modules/packet-iscsi.nix diff --git a/nixos/modules/version.nix b/oldstuff/nixos/modules/version.nix similarity index 100% rename from nixos/modules/version.nix rename to oldstuff/nixos/modules/version.nix diff --git a/nixos/modules/virtualbox-demo.nix b/oldstuff/nixos/modules/virtualbox-demo.nix similarity index 100% rename from nixos/modules/virtualbox-demo.nix rename to oldstuff/nixos/modules/virtualbox-demo.nix diff --git a/packages/devShell.nix b/oldstuff/packages/devShell.nix similarity index 100% rename from packages/devShell.nix rename to oldstuff/packages/devShell.nix diff --git a/scripts/build-config.nix b/oldstuff/scripts/build-config.nix similarity index 100% rename from scripts/build-config.nix rename to oldstuff/scripts/build-config.nix diff --git a/scripts/default.nix b/oldstuff/scripts/default.nix similarity index 100% rename from scripts/default.nix rename to oldstuff/scripts/default.nix diff --git a/scripts/switch-config.nix b/oldstuff/scripts/switch-config.nix similarity index 100% rename from scripts/switch-config.nix rename to oldstuff/scripts/switch-config.nix From 1e4815a32bf294c4ea58f961399a524a621c3f5c Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 25 Jul 2021 23:23:32 +0200 Subject: [PATCH 004/303] create TODO list and clean flake --- README.org | 44 ++++++++++++++++++++++++++++++++ flake.nix | 74 ++++++------------------------------------------------ 2 files changed, 52 insertions(+), 66 deletions(-) create mode 100644 README.org diff --git a/README.org b/README.org new file mode 100644 index 00000000..bc541488 --- /dev/null +++ b/README.org @@ -0,0 +1,44 @@ +#+TITLE: README +#+AUTHOR: Norbert Melzer + + +* TODO Overhaul [0/34] +** TODO Systemconfiguration [0/3] +*** TODO =tux-nixos= +*** TODO =delly-nixos= +*** TODO =nixos= +** TODO Homeconfiguration [0/3] +*** TODO =tux-nixos= +*** TODO =delly-nixos= +*** TODO =nixos= +** TODO Helper functions [0/3] +*** TODO apply overlays +*** TODO create home config +*** TODO create system config +** TODO Overlay [0/11] +*** TODO re-expose ~emacs-overlay~ +*** TODO expose each package +**** TODO ~advcp~ +**** TODO ~elixir-lsp~ +**** TODO ~erlang-ls~ +**** TODO ~keyleds~ +**** TODO ~rofi-unicode~ +**** TODO ~dracula-console~ +**** TODO ~gnucash-de~ +**** TODO ~kmymoney-de~ +**** TODO ~emacs~ +** TODO Packages [0/9] +*** TODO ~advcp~ +*** TODO ~elixir-lsp~ +*** TODO ~erlang-ls~ +*** TODO ~keyleds~ +*** TODO ~rofi-unicode~ +*** TODO ~dracula-console~ +*** TODO ~gnucash-de~ +*** TODO ~kmymoney-de~ +*** TODO ~emacs~ + + +# Local Variables: +# org-hierarchical-todo-statistics: nil +# End: diff --git a/flake.nix b/flake.nix index a84d43f1..ee0e9813 100644 --- a/flake.nix +++ b/flake.nix @@ -14,76 +14,18 @@ inputs.emacs.url = "github:nix-community/emacs-overlay"; inputs.emacs.inputs.nixpkgs.follows = "master"; - outputs = { self, nixpkgs-2009, nixpkgs-2105, unstable, flake-utils, emacs, ... }@inputs: - let - pkgs = nixpkgs-2009.legacyPackages.x86_64-linux; - upkgs = unstable.legacyPackages.x86_64-linux; - mpkgs = inputs.master.legacyPackages.x86_64-linux; - epkgs = import unstable { system = "x86_64-linux"; overlays = [ self.overlays.emacs ]; }; - nixos = pkgs.lib.attrsets.mapAttrs' - (k: v: { - name = "nixos/configs/${k}"; - value = v.config.system.build.toplevel; - }) - self.nixosConfigurations; - home = pkgs.lib.attrsets.mapAttrs' - (k: v: { - name = "home/configs/${k}"; - value = v.activationPackage; - }) - self.homeConfigurations; - in + outputs = { self, ... }@inputs: { - devShell.x86_64-linux = - nixpkgs-2105.legacyPackages.x86_64-linux.callPackage - ./packages/devShell.nix - { }; + nixosModules = { }; + nixosConfigurations = { }; - nixosModules = import ./nixos/modules; - nixosConfigurations = import ./nixos/hosts inputs; + homeModules = { }; + homeConfigurations = { }; - homeModules = import ./home/modules pkgs.lib; - homeConfigurations = { - tux-nixos = self.lib.mkHomeConfig "nmelzer" ./home/hosts/tux-nixos.nix; - delly-nixos = self.lib.mkHomeConfig "nmelzer" ./home/hosts/delly-nixos.nix; - nixos = self.lib.mkHomeConfig "demo" ./home/hosts/nixos.nix; - WS0005 = self.lib.mkHomeConfig "WS0005" ./home/hosts/WS0005.nix; - }; + lib = { }; - overlay = import ./home/nix/myOverlay; + checks = { }; - overlays = { - inputs = final: prev: { inherit inputs; }; - emacs = emacs.overlay; - self = self.overlay; - }; - - packages.x86_64-linux = { - advcp = upkgs.callPackage ./home/packages/advcp { }; - elixir-lsp = upkgs.beam.packages.erlang.callPackage ./home/packages/elixir-lsp { - rebar3 = pkgs.beam.packages.erlang.rebar3; - }; - erlang-ls = upkgs.beam.packages.erlang.callPackage ./home/packages/erlang-ls { }; - keyleds = upkgs.callPackage ./home/packages/keyleds { - stdenv = upkgs.gcc8Stdenv; - }; - rofi-unicode = upkgs.callPackage ./home/packages/rofi-unicode { }; - dracula-konsole = upkgs.callPackage ./home/packages/dracula/konsole.nix { }; - gnucash-de = mpkgs.callPackage ./home/packages/gnucash-de { }; - kmymoney-de = upkgs.callPackage ./home/packages/kmymoney-de { }; - emacs = epkgs.emacsGcc; - } // (import ./scripts inputs) - // home - // nixos; - - lib = import ./lib inputs; - - checks.x86_64-linux = self.packages.x86_64-linux; - # flake-utils.lib.flattenTree (pkgs.recurseIntoAttrs { inherit nixos; }); - - apps.x86_64-linux = { - build = { type = "app"; program = "${self.packages.x86_64-linux.build-config}/bin/build-config.sh"; }; - switch = { type = "app"; program = "${self.packages.x86_64-linux.switch-config}/bin/switch-config.sh"; }; - }; + apps = { }; }; } From a3f95f281f50bea664f7e1ceb5ffe76c55d46306 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 26 Jul 2021 08:01:33 +0200 Subject: [PATCH 005/303] mimas: initial working state --- README.org | 10 +++++----- flake.nix | 6 +++--- lib/default.nix | 5 +++++ lib/mk_system.nix | 19 +++++++++++++++++++ nixos/configurations/default.nix | 5 +++++ .../configurations/mimas-hardware.nix | 0 .../configurations/mimas.nix | 1 - nixos/modules/default.nix | 3 +++ nixos/modules/flake.nix | 16 ++++++++++++++++ 9 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 lib/default.nix create mode 100644 lib/mk_system.nix create mode 100644 nixos/configurations/default.nix rename oldstuff/nixos/hosts/hardware/tux-nixos.nix => nixos/configurations/mimas-hardware.nix (100%) rename oldstuff/nixos/hosts/legacy/tux-nixos.nix => nixos/configurations/mimas.nix (99%) create mode 100644 nixos/modules/default.nix create mode 100644 nixos/modules/flake.nix diff --git a/README.org b/README.org index bc541488..5ddd405a 100644 --- a/README.org +++ b/README.org @@ -2,19 +2,19 @@ #+AUTHOR: Norbert Melzer -* TODO Overhaul [0/34] -** TODO Systemconfiguration [0/3] -*** TODO =tux-nixos= +* TODO Overhaul [2/34] +** TODO Systemconfiguration [1/3] +*** DONE =tux-nixos= => =mimas= *** TODO =delly-nixos= *** TODO =nixos= ** TODO Homeconfiguration [0/3] *** TODO =tux-nixos= *** TODO =delly-nixos= *** TODO =nixos= -** TODO Helper functions [0/3] +** TODO Helper functions [1/3] *** TODO apply overlays *** TODO create home config -*** TODO create system config +*** DONE create system config ** TODO Overlay [0/11] *** TODO re-expose ~emacs-overlay~ *** TODO expose each package diff --git a/flake.nix b/flake.nix index ee0e9813..9db74852 100644 --- a/flake.nix +++ b/flake.nix @@ -16,13 +16,13 @@ outputs = { self, ... }@inputs: { - nixosModules = { }; - nixosConfigurations = { }; + nixosModules = import ./nixos/modules; + nixosConfigurations = import ./nixos/configurations inputs; homeModules = { }; homeConfigurations = { }; - lib = { }; + lib = import ./lib inputs; checks = { }; diff --git a/lib/default.nix b/lib/default.nix new file mode 100644 index 00000000..f21d4db4 --- /dev/null +++ b/lib/default.nix @@ -0,0 +1,5 @@ +inputs: + +{ + mkSystem = import ./mk_system.nix inputs; +} diff --git a/lib/mk_system.nix b/lib/mk_system.nix new file mode 100644 index 00000000..08d29500 --- /dev/null +++ b/lib/mk_system.nix @@ -0,0 +1,19 @@ +{ self, ... }@inputs: + +let + args = inputs; +in +name: nixpkgs: +nixpkgs.lib.nixosSystem ({ + system = "x86_64-linux"; + + modules = [ + { + _module.args = args; + networking.hostName = name; + nix.flakes.enable = true; + } + (./. + "/../nixos/configurations/${name}.nix") + (./. + "/../nixos/configurations/${name}-hardware.nix") + ] ++ __attrValues self.nixosModules; +}) diff --git a/nixos/configurations/default.nix b/nixos/configurations/default.nix new file mode 100644 index 00000000..f8159111 --- /dev/null +++ b/nixos/configurations/default.nix @@ -0,0 +1,5 @@ +{ self, ... }@inputs: + +{ + mimas = self.lib.mkSystem "mimas" inputs.nixpkgs-2105; +} diff --git a/oldstuff/nixos/hosts/hardware/tux-nixos.nix b/nixos/configurations/mimas-hardware.nix similarity index 100% rename from oldstuff/nixos/hosts/hardware/tux-nixos.nix rename to nixos/configurations/mimas-hardware.nix diff --git a/oldstuff/nixos/hosts/legacy/tux-nixos.nix b/nixos/configurations/mimas.nix similarity index 99% rename from oldstuff/nixos/hosts/legacy/tux-nixos.nix rename to nixos/configurations/mimas.nix index affee864..eae42d89 100644 --- a/oldstuff/nixos/hosts/legacy/tux-nixos.nix +++ b/nixos/configurations/mimas.nix @@ -26,7 +26,6 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in hardware.enableRedistributableFirmware = true; # networking.enableRalinkFirmware = true; - networking.hostName = "tux-nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # The global useDHCP flag is deprecated, therefore explicitly set to false here. diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix new file mode 100644 index 00000000..e3d72165 --- /dev/null +++ b/nixos/modules/default.nix @@ -0,0 +1,3 @@ +{ + flake = import ./flake.nix; +} diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix new file mode 100644 index 00000000..6a28dcfc --- /dev/null +++ b/nixos/modules/flake.nix @@ -0,0 +1,16 @@ +{ config, pkgs, nixpkgs-2105, nix, lib, ... }: + +{ + options.nix.flakes.enable = lib.mkEnableOption "nix flakes"; + + config = lib.mkIf config.nix.flakes.enable { + nix = { + package = lib.mkDefault nix.packages.x86_64-linux.nix; # pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes + ''; + + registry.nixpkgs.flake = nixpkgs-2105; + }; + }; +} From d1d4b042f624b45a22007998c721ef71a355eaac Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 26 Jul 2021 08:14:33 +0200 Subject: [PATCH 006/303] mimas: properly configure intel HW --- nixos/configurations/mimas-hardware.nix | 11 ++++++++++- oldstuff/nixos/modules/intel.nix | 14 -------------- 2 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 oldstuff/nixos/modules/intel.nix diff --git a/nixos/configurations/mimas-hardware.nix b/nixos/configurations/mimas-hardware.nix index 317ae731..22163b80 100644 --- a/nixos/configurations/mimas-hardware.nix +++ b/nixos/configurations/mimas-hardware.nix @@ -8,10 +8,12 @@ [ ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.initrd.kernelModules = [ "dm-snapshot" "i915" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + fileSystems."/" = { device = "/dev/disk/by-uuid/440c8ce1-1799-4239-936f-a54c879941a5"; @@ -45,4 +47,11 @@ nix.maxJobs = lib.mkDefault 4; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + + hardware.opengl.extraPackages = with pkgs; [ + vaapiIntel + vaapiVdpau + libvdpau-va-gl + intel-media-driver + ]; } diff --git a/oldstuff/nixos/modules/intel.nix b/oldstuff/nixos/modules/intel.nix deleted file mode 100644 index a3e4ad4c..00000000 --- a/oldstuff/nixos/modules/intel.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot.initrd.kernelModules = [ "i915" ]; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - hardware.opengl.extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-media-driver - ]; -} From 6643d9160cb630563df70654a91fc35676f8066c Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 26 Jul 2021 08:21:36 +0200 Subject: [PATCH 007/303] apply a version tag --- lib/mk_system.nix | 1 + oldstuff/nixos/modules/version.nix | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 oldstuff/nixos/modules/version.nix diff --git a/lib/mk_system.nix b/lib/mk_system.nix index 08d29500..ae98a835 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -12,6 +12,7 @@ nixpkgs.lib.nixosSystem ({ _module.args = args; networking.hostName = name; nix.flakes.enable = true; + system.configurationRevision = self.rev or "dirty"; } (./. + "/../nixos/configurations/${name}.nix") (./. + "/../nixos/configurations/${name}-hardware.nix") diff --git a/oldstuff/nixos/modules/version.nix b/oldstuff/nixos/modules/version.nix deleted file mode 100644 index caa26d4c..00000000 --- a/oldstuff/nixos/modules/version.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ self, ... }: -{ - system.configurationRevision = self.rev or "dirty"; -} From 403f5218d2b245b301a9577651b02adb845ff184 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 26 Jul 2021 08:43:05 +0200 Subject: [PATCH 008/303] add 'nix' module --- nixos/modules/default.nix | 1 + nixos/modules/flake.nix | 4 +--- nixos/modules/nix.nix | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 nixos/modules/nix.nix diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index e3d72165..731b86cf 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,3 +1,4 @@ { flake = import ./flake.nix; + nix = import ./nix.nix; } diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index 6a28dcfc..960bda33 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -6,9 +6,7 @@ config = lib.mkIf config.nix.flakes.enable { nix = { package = lib.mkDefault nix.packages.x86_64-linux.nix; # pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; + experimentalFeatures = "nix-command flakes"; registry.nixpkgs.flake = nixpkgs-2105; }; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix new file mode 100644 index 00000000..3d6c31f2 --- /dev/null +++ b/nixos/modules/nix.nix @@ -0,0 +1,17 @@ +{ config, lib, ... }: + +{ + options.nix.experimentalFeatures = lib.mkOption { + type = lib.types.separatedString " "; + default = ""; + description = '' + Enables experimental features + ''; + }; + + config = lib.mkIf (config.nix.experimentalFeatures != "") { + nix.extraOptions = '' + experimental-features = ${config.nix.experimentalFeatures} + ''; + }; +} From 0713b5a2652f486a348cac75d2116fa5110b692b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 26 Jul 2021 11:22:32 +0200 Subject: [PATCH 009/303] typo in README --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 5ddd405a..cf58f9aa 100644 --- a/README.org +++ b/README.org @@ -4,7 +4,7 @@ * TODO Overhaul [2/34] ** TODO Systemconfiguration [1/3] -*** DONE =tux-nixos= => =mimas= +*** DONE =tux-nixos= -> =mimas= *** TODO =delly-nixos= *** TODO =nixos= ** TODO Homeconfiguration [0/3] From 3c74c12d40161bbeb431fa98b33a1840346d47ec Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 26 Jul 2021 22:19:20 +0200 Subject: [PATCH 010/303] add 'nixos/config/*' helper --- flake.nix | 2 ++ lib/default.nix | 1 + lib/nixos_configurations_as_packages.nix | 12 ++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 lib/nixos_configurations_as_packages.nix diff --git a/flake.nix b/flake.nix index 9db74852..4cfc4e85 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,8 @@ homeModules = { }; homeConfigurations = { }; + packages = self.lib.nixosConfigurationsAsPackages; + lib = import ./lib inputs; checks = { }; diff --git a/lib/default.nix b/lib/default.nix index f21d4db4..3fddc88d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -2,4 +2,5 @@ inputs: { mkSystem = import ./mk_system.nix inputs; + nixosConfigurationsAsPackages = import ./nixos_configurations_as_packages.nix inputs; } diff --git a/lib/nixos_configurations_as_packages.nix b/lib/nixos_configurations_as_packages.nix new file mode 100644 index 00000000..bbefffcb --- /dev/null +++ b/lib/nixos_configurations_as_packages.nix @@ -0,0 +1,12 @@ +{ self, ... }@inputs: + +let + pkgs = import inputs.nixpkgs-2105 { system = "x86_64-linux"; }; + + inherit (pkgs.lib) genAttrs mapAttrs'; + + hostNames = __attrNames self.nixosConfigurations; + attrHostNames = genAttrs hostNames (name: "nixos/config/${name}"); + configs = mapAttrs' (name: pname: { name = pname; value = self.nixosConfigurations.${name}.config.system.build.toplevel; }) attrHostNames; +in +{ x86_64-linux = configs; } From 07ad743ac7c52dc9a61538fdb7c52f2ab5b864fd Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 26 Jul 2021 22:28:57 +0200 Subject: [PATCH 011/303] change the way a hardware file is found --- lib/mk_system.nix | 2 +- nixos/configurations/{mimas-hardware.nix => hardware/mimas.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename nixos/configurations/{mimas-hardware.nix => hardware/mimas.nix} (100%) diff --git a/lib/mk_system.nix b/lib/mk_system.nix index ae98a835..2c08778e 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -15,6 +15,6 @@ nixpkgs.lib.nixosSystem ({ system.configurationRevision = self.rev or "dirty"; } (./. + "/../nixos/configurations/${name}.nix") - (./. + "/../nixos/configurations/${name}-hardware.nix") + (./. + "/../nixos/configurations/hardware/${name}.nix") ] ++ __attrValues self.nixosModules; }) diff --git a/nixos/configurations/mimas-hardware.nix b/nixos/configurations/hardware/mimas.nix similarity index 100% rename from nixos/configurations/mimas-hardware.nix rename to nixos/configurations/hardware/mimas.nix From b92c939614b959a962570ea98d38c80641970388 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 27 Jul 2021 07:27:20 +0200 Subject: [PATCH 012/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/22ae5aea4e421aa6191c38f3790d4b007c6f3b87' -> 'github:nix-community/emacs-overlay/2d55ee6549e9dfa06c05ced470ccd44dcb2af482' * Updated 'home-manager': 'github:nix-community/home-manager/0423a7b40cd29aec0bb02fa30f61ffe60f5dfc19' -> 'github:nix-community/home-manager/f6f6990fc811454cb3082ba3662b711488fd0554' * Updated 'master': 'github:nixos/nixpkgs/9df5935217ef8979adb7b14004fadc9fdcc898d4' -> 'github:nixos/nixpkgs/e22631727b4b1ee5426397a583be3ea107bed8d6' * Updated 'nix': 'github:nixos/nix/97be92569ca8294a8bc0977cb59ce7dcbdbc6c36' -> 'github:nixos/nix/da552104030fb294ca547f26113e3fb7f796877b' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/63ee5cd99a2e193d5e4c879feb9683ddec23fa03' -> 'github:nixos/nixpkgs/91903ceb294dbe63a696759bfba3d23ee667f2dc' --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 991a6f97..739a1210 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1627178902, - "narHash": "sha256-yxyk4uSt0BTXsHldSsmAvp6W0s/oB4yzz3+mDk6D0Uo=", + "lastModified": 1627350017, + "narHash": "sha256-2EHNMn8+86gSRJiO84eX+p9ISfFu7OfpGFBpE7o9AvA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "22ae5aea4e421aa6191c38f3790d4b007c6f3b87", + "rev": "2d55ee6549e9dfa06c05ced470ccd44dcb2af482", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1627144340, - "narHash": "sha256-RzJ1fFLQ879J1okpH0WbYFY9qgHcglwVDl2bYqlRvw8=", + "lastModified": 1627312560, + "narHash": "sha256-h2mpDJIu/rd4nZX4i5U1AFA/3MGXrmFRFy04FDxnvhE=", "owner": "nix-community", "repo": "home-manager", - "rev": "0423a7b40cd29aec0bb02fa30f61ffe60f5dfc19", + "rev": "f6f6990fc811454cb3082ba3662b711488fd0554", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1627197643, - "narHash": "sha256-damXxpqWrLriBccE6q04JrjppNx2H+hghUKEuXbIkpE=", + "lastModified": 1627358328, + "narHash": "sha256-QYKM8Bxm2FlS4luhWyGy9L5fz10r5ZAnMwc/dfn+i40=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df5935217ef8979adb7b14004fadc9fdcc898d4", + "rev": "e22631727b4b1ee5426397a583be3ea107bed8d6", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1627065645, - "narHash": "sha256-+thK23X+Ev2t8MLofBrD065mDO06yOJ0VdmgT2FTOKw=", + "lastModified": 1627302543, + "narHash": "sha256-AoOJQn/KdPq7qWXrg080TBt8R/3EAY8lFaU/86RZiK4=", "owner": "nixos", "repo": "nix", - "rev": "97be92569ca8294a8bc0977cb59ce7dcbdbc6c36", + "rev": "da552104030fb294ca547f26113e3fb7f796877b", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1626834727, - "narHash": "sha256-ToGgus+UImnLNaLgv+xfo/cI3J/NQl2KB5kvyErXays=", + "lastModified": 1627284088, + "narHash": "sha256-w0YVOW6MKl/wlvuAPCh04vOp+nfUn3e1pQCTfETkt8I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63ee5cd99a2e193d5e4c879feb9683ddec23fa03", + "rev": "91903ceb294dbe63a696759bfba3d23ee667f2dc", "type": "github" }, "original": { From fff6fb418e45fc452d2eaf726f64b0a705872a01 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 28 Jul 2021 22:46:23 +0200 Subject: [PATCH 013/303] active pstate for mimas --- nixos/configurations/hardware/mimas.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index 22163b80..e5ed05fb 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -10,6 +10,7 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ "dm-snapshot" "i915" ]; boot.kernelModules = [ "kvm-intel" ]; + boot.kernelParams = [ "intel_pstate=active" ]; boot.extraModulePackages = [ ]; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; From 3123a240944eb17d0d80d34dbf04a23a2bb51a91 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 28 Jul 2021 22:48:02 +0200 Subject: [PATCH 014/303] mimas: disable IPFS --- nixos/configurations/mimas.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index eae42d89..8bd6f3fe 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -74,8 +74,6 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in # Enable the OpenSSH daemon. services.openssh.enable = true; - services.ipfs.enable = true; - services.zerotierone.enable = true; services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; From 27190fbd993fe6f94b26d1a8fe5b15b3aafbcd01 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 28 Jul 2021 22:49:10 +0200 Subject: [PATCH 015/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/2d55ee6549e9dfa06c05ced470ccd44dcb2af482' -> 'github:nix-community/emacs-overlay/ddb0d59fb57b0f274a2a61881fbbad10ab79ee4c' * Updated 'home-manager': 'github:nix-community/home-manager/f6f6990fc811454cb3082ba3662b711488fd0554' -> 'github:nix-community/home-manager/2272fc312d5dc477e70816d94e550d08729b307b' * Updated 'master': 'github:nixos/nixpkgs/e22631727b4b1ee5426397a583be3ea107bed8d6' -> 'github:nixos/nixpkgs/3cc3160fe6cb3b85ac9b8f77b4c5d3b68f9c2962' * Updated 'nix': 'github:nixos/nix/da552104030fb294ca547f26113e3fb7f796877b' -> 'github:nixos/nix/c5ade241f0f3384b3a7142c8c1d9fa25678dcdbc' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/91903ceb294dbe63a696759bfba3d23ee667f2dc' -> 'github:nixos/nixpkgs/382039c05a16827a7f0731183e862366b66b422f' * Updated 'unstable': 'github:nixos/nixpkgs/dd14e5d78e90a2ccd6007e569820de9b4861a6c2' -> 'github:nixos/nixpkgs/8ecc61c91a596df7d3293603a9c2384190c1b89a' --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 739a1210..261453c5 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1627350017, - "narHash": "sha256-2EHNMn8+86gSRJiO84eX+p9ISfFu7OfpGFBpE7o9AvA=", + "lastModified": 1627492758, + "narHash": "sha256-F0MvuI2klvuJHctBxzptT2jXcTO8QydkyzmeXw7HiBI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2d55ee6549e9dfa06c05ced470ccd44dcb2af482", + "rev": "ddb0d59fb57b0f274a2a61881fbbad10ab79ee4c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1627312560, - "narHash": "sha256-h2mpDJIu/rd4nZX4i5U1AFA/3MGXrmFRFy04FDxnvhE=", + "lastModified": 1627501942, + "narHash": "sha256-rG2PUTgzmXvf/fSDCWKhlRwZjZs1/0TySC5eYHVJrmg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6f6990fc811454cb3082ba3662b711488fd0554", + "rev": "2272fc312d5dc477e70816d94e550d08729b307b", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1627358328, - "narHash": "sha256-QYKM8Bxm2FlS4luhWyGy9L5fz10r5ZAnMwc/dfn+i40=", + "lastModified": 1627504642, + "narHash": "sha256-9UTSW9fx77LCNcVj3hnjx25mOqLzvqGptneT6e16r0w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e22631727b4b1ee5426397a583be3ea107bed8d6", + "rev": "3cc3160fe6cb3b85ac9b8f77b4c5d3b68f9c2962", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1627302543, - "narHash": "sha256-AoOJQn/KdPq7qWXrg080TBt8R/3EAY8lFaU/86RZiK4=", + "lastModified": 1627502270, + "narHash": "sha256-wNsDLEWw58L4cDSlAirqfbX92A1i0O2CK+iW2Yw+PCc=", "owner": "nixos", "repo": "nix", - "rev": "da552104030fb294ca547f26113e3fb7f796877b", + "rev": "c5ade241f0f3384b3a7142c8c1d9fa25678dcdbc", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1627284088, - "narHash": "sha256-w0YVOW6MKl/wlvuAPCh04vOp+nfUn3e1pQCTfETkt8I=", + "lastModified": 1627460592, + "narHash": "sha256-jdJqJi9DSPiGOY9xlZSi0ufDJpS6ezvDdx8AQq5VuyI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91903ceb294dbe63a696759bfba3d23ee667f2dc", + "rev": "382039c05a16827a7f0731183e862366b66b422f", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1627128856, - "narHash": "sha256-yw3lA8zyNFhj309lmxvNByEEymRT1rRy5oE+jEPnsP4=", + "lastModified": 1627391865, + "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", + "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a", "type": "github" }, "original": { From cb3052c3a822116dd72a4ab7a1d56be813f2bd62 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 07:20:38 +0200 Subject: [PATCH 016/303] Prepare enceladeus --- README.org | 6 +++--- nixos/configurations/default.nix | 1 + .../delly-nixos.nix => nixos/configurations/enceladeus.nix | 1 - .../configurations/hardware/enceladeus.nix | 0 nixos/modules/default.nix | 1 + {oldstuff/nixos => nixos}/modules/gc.nix | 0 6 files changed, 5 insertions(+), 4 deletions(-) rename oldstuff/nixos/hosts/legacy/delly-nixos.nix => nixos/configurations/enceladeus.nix (99%) rename oldstuff/nixos/hosts/hardware/delly-nixos.nix => nixos/configurations/hardware/enceladeus.nix (100%) rename {oldstuff/nixos => nixos}/modules/gc.nix (100%) diff --git a/README.org b/README.org index cf58f9aa..3f8e9467 100644 --- a/README.org +++ b/README.org @@ -2,10 +2,10 @@ #+AUTHOR: Norbert Melzer -* TODO Overhaul [2/34] -** TODO Systemconfiguration [1/3] +* TODO Overhaul [3/34] +** TODO Systemconfiguration [2/3] *** DONE =tux-nixos= -> =mimas= -*** TODO =delly-nixos= +*** DONE =delly-nixos= -> =enceladeus= *** TODO =nixos= ** TODO Homeconfiguration [0/3] *** TODO =tux-nixos= diff --git a/nixos/configurations/default.nix b/nixos/configurations/default.nix index f8159111..0ac4e45d 100644 --- a/nixos/configurations/default.nix +++ b/nixos/configurations/default.nix @@ -2,4 +2,5 @@ { mimas = self.lib.mkSystem "mimas" inputs.nixpkgs-2105; + enceladeus = self.lib.mkSystem "enceladeus" inputs.unstable; } diff --git a/oldstuff/nixos/hosts/legacy/delly-nixos.nix b/nixos/configurations/enceladeus.nix similarity index 99% rename from oldstuff/nixos/hosts/legacy/delly-nixos.nix rename to nixos/configurations/enceladeus.nix index 45bf5196..3c792864 100644 --- a/oldstuff/nixos/hosts/legacy/delly-nixos.nix +++ b/nixos/configurations/enceladeus.nix @@ -107,7 +107,6 @@ ing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; "vm.swappiness" = 75; }; - networking.hostName = "delly-nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # The global useDHCP flag is deprecated, therefore explicitly set to false here. diff --git a/oldstuff/nixos/hosts/hardware/delly-nixos.nix b/nixos/configurations/hardware/enceladeus.nix similarity index 100% rename from oldstuff/nixos/hosts/hardware/delly-nixos.nix rename to nixos/configurations/hardware/enceladeus.nix diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 731b86cf..3db94148 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,4 +1,5 @@ { flake = import ./flake.nix; + gc = import ./gc.nix; nix = import ./nix.nix; } diff --git a/oldstuff/nixos/modules/gc.nix b/nixos/modules/gc.nix similarity index 100% rename from oldstuff/nixos/modules/gc.nix rename to nixos/modules/gc.nix From a001a301c475b116252f1680fc2678f570a4577d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 07:25:39 +0200 Subject: [PATCH 017/303] gc: remove module --- nixos/modules/gc.nix | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 nixos/modules/gc.nix diff --git a/nixos/modules/gc.nix b/nixos/modules/gc.nix deleted file mode 100644 index ba07fbaf..00000000 --- a/nixos/modules/gc.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.programs.gc = { - enable = lib.mkEnableOption "enable GC tool"; - - maxAge = lib.mkOption { - type = lib.types.str; - default = "180d"; - }; - }; - - config = lib.mkIf config.programs.gc.enable { - environment.systemPackages = [ - (pkgs.writeShellScriptBin "gc" '' - sudo ${config.nix.package}/bin/nix-collect-garbage --delete-older-than ${config.programs.gc.maxAge} --verbose - '') - ]; - }; -} From c1bded7b751e85d25b1b7003509749f93d829cf0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 07:34:33 +0200 Subject: [PATCH 018/303] enceladeus: remove gc script generation --- nixos/configurations/enceladeus.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 3c792864..a81b309e 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -198,9 +198,6 @@ ing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; # virtualbox.host.enable = true; }; - programs.gc.enable = true; - programs.gc.maxAge = "30d"; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users = { nmelzer = { From dedf6a1e5f2be6e033be17a3bee23d5101a43caa Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 07:36:20 +0200 Subject: [PATCH 019/303] enceladeus: remove CA related overlays --- nixos/configurations/enceladeus.nix | 68 ----------------------------- 1 file changed, 68 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index a81b309e..649ca976 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -8,74 +8,6 @@ nixpkgs.config.allowUnfree = true; nixpkgs.config.contentAddressedByDefault = false; - nixpkgs.overlays = [ - (final: prev: { - mercurial = prev.mercurial.overrideAttrs (o: { - patches = [ - (prev.fetchpatch { - name = "D10638.diff"; - url = "https://phab.mercurial-scm.org/D10638?download=true"; - sha256 = "sha256-rigsbfmVO0vdOG48p4bF3t9cXl0PyNEsO1QAHYkY0VU="; - }) - (prev.fetchpatch { - name = "D10639.diff"; - url = "https://phab.mercurial-scm.org/D10639?download=true"; - sha256 = "sha256-iyEmQh/7IM5U48qTlH3rALa+WQ2TOG2yS+iELlqmsUA="; - }) - ]; - }); - - SDL = with prev; prev.SDL.overrideAttrs (o: { - patches = [ - # "${prev.pkgs}/pkgs/development/libraries/SDL/find-headers.patch" - "${builtins.head o.patches}" - - # Fix window resizing issues, e.g. for xmonad - # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430 - (fetchpatch { - name = "fix_window_resizing.diff"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=66 -5779"; - sha256 = "1z35azc73vvi19pzi6byck31132a8w1vzrghp1x3hy4a4f9z4gc6"; - }) - # Fix drops of keyboard events for SDL_EnableUNICODE - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch"; - sha256 = "sha256-5V6K0oTN56RRi48XLPQsjgLzt0a6GsjajDrda3ZEhTw="; - }) - # Ignore insane joystick axis events - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch"; - sha256 = "sha256-uussXT9Spsg8WUX5CNHZ6HthYy3HE381xi03Ygv3hwU="; - }) - # https://bugzilla.libsdl.org/show_bug.cgi?id=1769 - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch"; - sha256 = "sha256-JvMP7+P/NmWLNsCGfElDLdlA99Nbggw+5jskD572fXU="; - }) - # Workaround X11 bug to allow changing gamma - # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 - (fetchpatch { - name = "SDL_SetGamma.patch"; - url = "https://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-chang -ing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; - sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv"; - }) - # Fix a build failure on OS X Mavericks - # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch"; - sha256 = "sha256-CPcLE+8JMKoiJEdIWNVphIMIgDOIJBmkSNO1zuM97B8="; - }) - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch"; - sha256 = "sha256-6CdDVsrka8zlqFrZ2SCo62DuiSWiGJIfLi/rMX2v0W4="; - }) - ]; - }); - }) - ]; - imports = [ ]; # nix.useSandbox = false; From 3d53a39977c647353ebbaa73f58eac897bc2736d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 07:37:24 +0200 Subject: [PATCH 020/303] move imports to the top --- nixos/configurations/enceladeus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 649ca976..acccb0ac 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -5,11 +5,11 @@ { config, pkgs, ... }: { + imports = [ ]; + nixpkgs.config.allowUnfree = true; nixpkgs.config.contentAddressedByDefault = false; - imports = [ ]; - # nix.useSandbox = false; nix.autoOptimiseStore = true; nix.buildCores = 1; From 3620a1f1e61137ffb3f4d783775a09a7fb230e2f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 07:49:51 +0200 Subject: [PATCH 021/303] gc: remove module from index --- nixos/modules/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 3db94148..731b86cf 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,5 +1,4 @@ { flake = import ./flake.nix; - gc = import ./gc.nix; nix = import ./nix.nix; } From 9b4a0882bdb2864222b8964d7a5ec62d384f2de7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 07:50:20 +0200 Subject: [PATCH 022/303] enceladeus: explicit naming of unfree packages --- nixos/configurations/enceladeus.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index acccb0ac..04b2f7ef 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -2,12 +2,16 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ]; - nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (lib.getName pkg) [ + "b43-firmware" + "broadcom-sta" + "zerotierone" + ]); nixpkgs.config.contentAddressedByDefault = false; # nix.useSandbox = false; From 827a00efe52977a445122667ee6c175cf8f67325 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 08:16:10 +0200 Subject: [PATCH 023/303] enceladeus: enable scheduled GC --- nixos/configurations/enceladeus.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 04b2f7ef..358a6595 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -18,7 +18,8 @@ nix.autoOptimiseStore = true; nix.buildCores = 1; nix.maxJobs = 2; - # nix.gc.automatic = true; + nix.gc.automatic = true; + nix.gc.options = "--delete-older-than 10d"; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; From 245f84fd0e9bdf1fffbb12b06c8d4f0a71af312a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 14:09:54 +0200 Subject: [PATCH 024/303] nixos: rename to thetys --- README.org | 6 +++--- nixos/configurations/default.nix | 1 + .../nixos.nix => nixos/configurations/hardware/thetys.nix | 0 .../legacy/nixos.nix => nixos/configurations/thetys.nix | 7 ++++--- oldstuff/nixos/modules/virtualbox-demo.nix | 5 ----- 5 files changed, 8 insertions(+), 11 deletions(-) rename oldstuff/nixos/hosts/hardware/nixos.nix => nixos/configurations/hardware/thetys.nix (100%) rename oldstuff/nixos/hosts/legacy/nixos.nix => nixos/configurations/thetys.nix (93%) delete mode 100644 oldstuff/nixos/modules/virtualbox-demo.nix diff --git a/README.org b/README.org index 3f8e9467..15a5a3d0 100644 --- a/README.org +++ b/README.org @@ -2,11 +2,11 @@ #+AUTHOR: Norbert Melzer -* TODO Overhaul [3/34] -** TODO Systemconfiguration [2/3] +* TODO Overhaul [4/34] +** TODO Systemconfiguration [3/3] *** DONE =tux-nixos= -> =mimas= *** DONE =delly-nixos= -> =enceladeus= -*** TODO =nixos= +*** DONE =nixos= -> =thetys= ** TODO Homeconfiguration [0/3] *** TODO =tux-nixos= *** TODO =delly-nixos= diff --git a/nixos/configurations/default.nix b/nixos/configurations/default.nix index 0ac4e45d..d3fcd9ef 100644 --- a/nixos/configurations/default.nix +++ b/nixos/configurations/default.nix @@ -3,4 +3,5 @@ { mimas = self.lib.mkSystem "mimas" inputs.nixpkgs-2105; enceladeus = self.lib.mkSystem "enceladeus" inputs.unstable; + thetys = self.lib.mkSystem "thetys" inputs.unstable; } diff --git a/oldstuff/nixos/hosts/hardware/nixos.nix b/nixos/configurations/hardware/thetys.nix similarity index 100% rename from oldstuff/nixos/hosts/hardware/nixos.nix rename to nixos/configurations/hardware/thetys.nix diff --git a/oldstuff/nixos/hosts/legacy/nixos.nix b/nixos/configurations/thetys.nix similarity index 93% rename from oldstuff/nixos/hosts/legacy/nixos.nix rename to nixos/configurations/thetys.nix index e7ccea32..7e8f999b 100644 --- a/oldstuff/nixos/hosts/legacy/nixos.nix +++ b/nixos/configurations/thetys.nix @@ -1,6 +1,9 @@ -{ self, config, pkgs, nixpkgs-2105, ... }: +{ self, config, pkgs, nixpkgs-2105, modulesPath, ... }: { + # TODO: 👇 move import of `virtualbox-demo.nix` into extra module 👇 + imports = [ (modulesPath + "/installer/virtualbox-demo.nix") ]; + nixpkgs.config.allowUnfree = true; # environment.extraSetup = '' @@ -82,8 +85,6 @@ services.openssh.enable = true; - programs.gc.enable = true; - swapDevices = [{ device = "/var/swap-2"; size = 2048 * 4; diff --git a/oldstuff/nixos/modules/virtualbox-demo.nix b/oldstuff/nixos/modules/virtualbox-demo.nix deleted file mode 100644 index 618311ce..00000000 --- a/oldstuff/nixos/modules/virtualbox-demo.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ modulesPath, ... }: - -{ - imports = [ (modulesPath + "/installer/virtualbox-demo.nix") ]; -} From 54383ca8e81cd68e3ddc3f9e2215b3ee8b0b632e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 14:46:52 +0200 Subject: [PATCH 025/303] thetys: open firewall for common dev-ports --- nixos/configurations/thetys.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 7e8f999b..63467e18 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -90,6 +90,13 @@ size = 2048 * 4; }]; + networking.firewall.allowedTCPPorts = [ + # ports often used for development, that I want to expose for easier access from the host + 3000 + 8080 + 8081 + ]; + nix.distributedBuilds = false; nix.buildMachines = [ { From 9a4a52ae25f8a225d03c81687c37cfb169b273b1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 14:53:57 +0200 Subject: [PATCH 026/303] thetys: remove some comments --- nixos/configurations/thetys.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 63467e18..1a94789e 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -6,13 +6,6 @@ nixpkgs.config.allowUnfree = true; - # environment.extraSetup = '' - # ln -s ${pkgs.pinentry-gtk2}/bin/pinentry $out/bin/pinentry-gtk-2 - # ln -s ${pkgs.pinentry-curses}/bin/pinentry $out/bin/pinentry-curses - # ln -s ${pkgs.pinentry}/bin/pinentry $out/bin/pinentry-tty - # ln -s $out/bin/pinentry-tty $out/bin/pinentry - # ''; - programs.gnupg = { agent = { enable = true; @@ -21,8 +14,6 @@ }; }; - # security.pam.services.login.gnupg.enable = true; - users.users.demo = { isNormalUser = true; @@ -66,23 +57,12 @@ serviceConfig.ExecStart = "@${config.boot.kernelPackages.virtualboxGuestAdditions}/bin/VBoxClient -fv --vmsvga"; }; - # environment.systemPackages = [ pkgs.pinentry.gnome3 ]; - services.zerotierone.enable = true; services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; services.zerotierone.package = (import nixpkgs-2105 { config.allowUnfree = true; system = pkgs.system; }).zerotierone; services.ipfs.enable = true; - # Mount a VirtualBox shared folder. - # This is configurable in the VirtualBox menu at - # Machine / Settings / Shared Folders. - # fileSystems."/mnt" = { - # fsType = "vboxsf"; - # device = "nameofdevicetomount"; - # options = [ "rw" ]; - # }; - services.openssh.enable = true; swapDevices = [{ From 0bff633b83b0b59e6b25a238c98561779e0dcfcf Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 14:56:57 +0200 Subject: [PATCH 027/303] all: allow nixos-rebuild without password for wheel --- nixos/configurations/enceladeus.nix | 11 +++++++++++ nixos/configurations/thetys.nix | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 358a6595..c478ab0a 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -156,4 +156,15 @@ # should. system.stateVersion = "19.09"; # Did you read the comment? + security.sudo.extraRules = [ + { + commands = [ + { + command = "/run/current-system/sw/bin/nixos-rebuild"; + options = [ "NOPASSWD" ]; + } + ]; + groups = [ "wheel" ]; + } + ]; } diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 1a94789e..07ff1171 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -88,4 +88,16 @@ mandatoryFeatures = [ ]; } ]; + + security.sudo.extraRules = [ + { + commands = [ + { + command = "/run/current-system/sw/bin/nixos-rebuild"; + options = [ "NOPASSWD" ]; + } + ]; + groups = [ "wheel" ]; + } + ]; } From 29a21fd77d556c8881dc05a515c82499d7d9a36a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 18:06:35 +0200 Subject: [PATCH 028/303] flake module: remove from oldstauff as it has already been moved --- oldstuff/nixos/modules/flake.nix | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 oldstuff/nixos/modules/flake.nix diff --git a/oldstuff/nixos/modules/flake.nix b/oldstuff/nixos/modules/flake.nix deleted file mode 100644 index 0acf5399..00000000 --- a/oldstuff/nixos/modules/flake.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, nixpkgs-2105, nix, lib, ... }: -let - hostname = __trace config.networking.hostName config.networking.hostName; - caEnabled = __elem hostname [ "delly-nixos" "tux-nixos" ]; - caOpts = __trace (lib.optionalString caEnabled "ca-derivations ca-references") (lib.optionalString caEnabled "ca-derivations ca-references"); -in -{ - nix = { - package = nix.packages.x86_64-linux.nix; # pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes ${caOpts} - ''; - - registry.nixpkgs.flake = nixpkgs-2105; - }; - - environment.systemPackages = [ nix.packages.x86_64-linux.nix ]; -} From 3b4e1dbac4c73d7394989e41f315d496a1686a7e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 22:17:19 +0200 Subject: [PATCH 029/303] thetys: set stateVersion --- nixos/configurations/thetys.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 07ff1171..d57fe080 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -21,7 +21,7 @@ extraGroups = [ "wheel" "docker" ]; uid = 1000; shell = pkgs.zsh; - }; + } // (__trace config.system.stateVersion { }); boot.kernel.sysctl = { "vm.max_map_count" = 262144; @@ -100,4 +100,6 @@ groups = [ "wheel" ]; } ]; + + system.stateVersion = "19.09"; } From a378b7f438bb56fc27efc6121847ff88c0ad9229 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 22:25:32 +0200 Subject: [PATCH 030/303] remove debug output --- nixos/configurations/thetys.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index d57fe080..6deee795 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -21,7 +21,7 @@ extraGroups = [ "wheel" "docker" ]; uid = 1000; shell = pkgs.zsh; - } // (__trace config.system.stateVersion { }); + }; boot.kernel.sysctl = { "vm.max_map_count" = 262144; From 27a8151a00048f5f878dde62629c31c4481addfe Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 22:26:58 +0200 Subject: [PATCH 031/303] thetys: remove usage of unfree packages --- nixos/configurations/thetys.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 6deee795..e038a7cd 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -4,8 +4,6 @@ # TODO: 👇 move import of `virtualbox-demo.nix` into extra module 👇 imports = [ (modulesPath + "/installer/virtualbox-demo.nix") ]; - nixpkgs.config.allowUnfree = true; - programs.gnupg = { agent = { enable = true; From 83037262f6835c85ffae2f7c76a75f9abe2d0d90 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 29 Jul 2021 22:56:35 +0200 Subject: [PATCH 032/303] nix-module: create easier way to deal with unfree software --- nixos/configurations/enceladeus.nix | 6 +----- nixos/configurations/mimas.nix | 5 +---- nixos/modules/nix.nix | 30 +++++++++++++++++++++++------ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index c478ab0a..3a6d6e9a 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -7,11 +7,7 @@ { imports = [ ]; - nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (lib.getName pkg) [ - "b43-firmware" - "broadcom-sta" - "zerotierone" - ]); + nix.allowedUnfree = [ "b43-firmware" "broadcom-sta" "zerotierone" ]; nixpkgs.config.contentAddressedByDefault = false; # nix.useSandbox = false; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 8bd6f3fe..55ec73ad 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -7,10 +7,7 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in { imports = [ ]; - nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (lib.getName pkg) [ - "hplip" - "zerotierone" - ]); + nix.allowedUnfree = [ "hplip" "zerotierone" ]; nix.autoOptimiseStore = true; nix.gc.automatic = true; nix.gc.options = "--delete-older-than 10d"; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 3d6c31f2..00ac0fc7 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -1,17 +1,35 @@ { config, lib, ... }: +let + allowed = config.nix.allowedUnfree; +in { - options.nix.experimentalFeatures = lib.mkOption { - type = lib.types.separatedString " "; - default = ""; - description = '' - Enables experimental features - ''; + options.nix = { + experimentalFeatures = lib.mkOption { + type = lib.types.separatedString " "; + default = ""; + description = '' + Enables experimental features + ''; + }; + + allowedUnfree = lib.mkOption { + type = lib.types.listOf lib.types.string; + default = [ ]; + description = '' + Allows for unfree packages by their name. + ''; + }; }; config = lib.mkIf (config.nix.experimentalFeatures != "") { nix.extraOptions = '' experimental-features = ${config.nix.experimentalFeatures} ''; + + nixpkgs.config.allowUnfreePredicate = + if (allowed == [ ]) + then (_: false) + else (pkg: __elem (lib.getName pkg) allowed); }; } From 0c1e9dd7f0238e13c2d0846c6910a910a5df0971 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 30 Jul 2021 07:58:41 +0200 Subject: [PATCH 033/303] nix: make autoOptimise the default --- nixos/configurations/enceladeus.nix | 1 - nixos/configurations/mimas.nix | 1 - nixos/configurations/thetys.nix | 1 - nixos/modules/nix.nix | 18 +++++++++--------- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 3a6d6e9a..e34be69a 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -11,7 +11,6 @@ nixpkgs.config.contentAddressedByDefault = false; # nix.useSandbox = false; - nix.autoOptimiseStore = true; nix.buildCores = 1; nix.maxJobs = 2; nix.gc.automatic = true; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 55ec73ad..c8da343d 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -8,7 +8,6 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in imports = [ ]; nix.allowedUnfree = [ "hplip" "zerotierone" ]; - nix.autoOptimiseStore = true; nix.gc.automatic = true; nix.gc.options = "--delete-older-than 10d"; diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index e038a7cd..bb00daa0 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -29,7 +29,6 @@ programs.zsh.enableCompletion = false; nix.useSandbox = true; - nix.autoOptimiseStore = true; virtualisation = { docker.enable = true; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 00ac0fc7..1600e816 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -22,14 +22,14 @@ in }; }; - config = lib.mkIf (config.nix.experimentalFeatures != "") { - nix.extraOptions = '' - experimental-features = ${config.nix.experimentalFeatures} - ''; + config.nix.extraOptions = lib.mkIf (config.nix.experimentalFeatures != "") '' + experimental-features = ${config.nix.experimentalFeatures} + ''; - nixpkgs.config.allowUnfreePredicate = - if (allowed == [ ]) - then (_: false) - else (pkg: __elem (lib.getName pkg) allowed); - }; + config.nix.autoOptimiseStore = lib.mkDefault true; + + config.nixpkgs.config.allowUnfreePredicate = + if (allowed == [ ]) + then (_: false) + else (pkg: __elem (lib.getName pkg) allowed); } From e1eb3251e5db8aec060ceb7b1e29195b90ff2099 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 30 Jul 2021 08:05:29 +0200 Subject: [PATCH 034/303] nix: enable scheduled GC by default --- nixos/configurations/enceladeus.nix | 2 -- nixos/configurations/mimas.nix | 2 -- nixos/modules/nix.nix | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index e34be69a..47f3b4e0 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -13,8 +13,6 @@ # nix.useSandbox = false; nix.buildCores = 1; nix.maxJobs = 2; - nix.gc.automatic = true; - nix.gc.options = "--delete-older-than 10d"; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index c8da343d..13b201df 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -8,8 +8,6 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in imports = [ ]; nix.allowedUnfree = [ "hplip" "zerotierone" ]; - nix.gc.automatic = true; - nix.gc.options = "--delete-older-than 10d"; security.chromiumSuidSandbox.enable = true; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 1600e816..ef5335bb 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -28,6 +28,9 @@ in config.nix.autoOptimiseStore = lib.mkDefault true; + config.nix.gc.automatic = lib.mkDefault true; + config.nix.gc.options = lib.mkDefault "--delete-older-than 10d"; + config.nixpkgs.config.allowUnfreePredicate = if (allowed == [ ]) then (_: false) From 85d43f477a346f403b81a1925b78a6c4c1c642ad Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 30 Jul 2021 08:10:17 +0200 Subject: [PATCH 035/303] mimas: remove ZFS services --- nixos/configurations/mimas.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 13b201df..9dbc75fb 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -126,20 +126,6 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in services.transmission.enable = true; systemd.services.transmission.after = [ "var-lib-transmission.mount" ]; - services.zfs = { - trim.enable = false; - autoScrub.enable = true; - autoSnapshot = { - enable = true; - flags = "-k -p -u"; - frequent = 6 * 4; # 6 hours! - hourly = 12; - daily = 3; - weekly = 4; - monthly = 2; - }; - }; - programs = { # steam.enable = true; zsh.enable = true; From e31b0bff15beda40c5c113201ca444778f8d6881 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 30 Jul 2021 08:11:48 +0200 Subject: [PATCH 036/303] mimas: remove support for BTRFS and ZFS --- nixos/configurations/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 9dbc75fb..267aae84 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -14,7 +14,7 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = [ "zfs" "ntfs" "btrfs" "exfat" "avfs" ]; + boot.supportedFilesystems = [ "ntfs" "exfat" "avfs" ]; boot.cleanTmpDir = true; hardware.enableRedistributableFirmware = true; From 1280557842f1f7886e7e7e09105bf87af9b3312b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 30 Jul 2021 09:18:45 +0200 Subject: [PATCH 037/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/ddb0d59fb57b0f274a2a61881fbbad10ab79ee4c' -> 'github:nix-community/emacs-overlay/de00abcd9631b104ef2868e1e0a877b1ec6b5633' * Updated 'home-manager': 'github:nix-community/home-manager/2272fc312d5dc477e70816d94e550d08729b307b' -> 'github:nix-community/home-manager/7f976da06840c268cc291a021bab7532b923713c' * Updated 'master': 'github:nixos/nixpkgs/3cc3160fe6cb3b85ac9b8f77b4c5d3b68f9c2962' -> 'github:nixos/nixpkgs/e8d67ac8fc5294a32fd257c757548d9cb0f81190' * Updated 'nix': 'github:nixos/nix/c5ade241f0f3384b3a7142c8c1d9fa25678dcdbc' -> 'github:nixos/nix/48e35585a6f23b05647cef12bcc85eeab3ae1d59' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/382039c05a16827a7f0731183e862366b66b422f' -> 'github:nixos/nixpkgs/2262d7863a6af007274a698367484bf4903a3299' --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 261453c5..6eb7cca4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1627492758, - "narHash": "sha256-F0MvuI2klvuJHctBxzptT2jXcTO8QydkyzmeXw7HiBI=", + "lastModified": 1627579950, + "narHash": "sha256-MUbgLOeNjgTUVxzVWZ4Gjek2PlgC4r206PgVkNslrmY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ddb0d59fb57b0f274a2a61881fbbad10ab79ee4c", + "rev": "de00abcd9631b104ef2868e1e0a877b1ec6b5633", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1627501942, - "narHash": "sha256-rG2PUTgzmXvf/fSDCWKhlRwZjZs1/0TySC5eYHVJrmg=", + "lastModified": 1627592512, + "narHash": "sha256-+bauwACGl+/dTQB047XImRz5P6Lp6vxl5ruiKjtENxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "2272fc312d5dc477e70816d94e550d08729b307b", + "rev": "7f976da06840c268cc291a021bab7532b923713c", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1627504642, - "narHash": "sha256-9UTSW9fx77LCNcVj3hnjx25mOqLzvqGptneT6e16r0w=", + "lastModified": 1627627671, + "narHash": "sha256-h0aJ/9oCKHYrSZFmu2vamAlCaxCWjxlul894JloeAa0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3cc3160fe6cb3b85ac9b8f77b4c5d3b68f9c2962", + "rev": "e8d67ac8fc5294a32fd257c757548d9cb0f81190", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1627502270, - "narHash": "sha256-wNsDLEWw58L4cDSlAirqfbX92A1i0O2CK+iW2Yw+PCc=", + "lastModified": 1627505905, + "narHash": "sha256-B6fop0p49C+ELrQkdPhClaxIKcVR6JBRY7qPUy+QvxQ=", "owner": "nixos", "repo": "nix", - "rev": "c5ade241f0f3384b3a7142c8c1d9fa25678dcdbc", + "rev": "48e35585a6f23b05647cef12bcc85eeab3ae1d59", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1627460592, - "narHash": "sha256-jdJqJi9DSPiGOY9xlZSi0ufDJpS6ezvDdx8AQq5VuyI=", + "lastModified": 1627528535, + "narHash": "sha256-+E0LxCLav1GmbQbqwCKP39DRMn6NeEq00drC8udnYIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "382039c05a16827a7f0731183e862366b66b422f", + "rev": "2262d7863a6af007274a698367484bf4903a3299", "type": "github" }, "original": { From ed00f65f4e6ef0ab7cea5bdc07f48fb303abf41d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 31 Jul 2021 00:49:03 +0200 Subject: [PATCH 038/303] nmelzer@mimas: get modules for HM over --- home/configurations/default.nix | 5 + home/configurations/nmelzer@mimas.nix | 88 + home/modules/default.nix | 28 + home/modules/languages/agda/default.nix | 23 + home/modules/languages/c++/default.nix | 29 + home/modules/languages/clojure/default.nix | 26 + home/modules/languages/default.nix | 13 + home/modules/languages/elixir/default.nix | 50 + home/modules/languages/erlang/default.nix | 45 + home/modules/languages/go/default.nix | 31 + home/modules/languages/nix/default.nix | 31 + home/modules/languages/python/default.nix | 58 + home/modules/languages/rust/default.nix | 29 + home/modules/languages/tex/default.nix | 27 + home/modules/misc/awesome/default.nix | 640 +++++++ home/modules/profiles/base/default.nix | 224 +++ home/modules/profiles/base/nix-completions.sh | 22 + .../profiles/base/p10k-config/p10k.zsh | 1469 +++++++++++++++++ home/modules/profiles/browsing/default.nix | 15 + home/modules/profiles/default.nix | 13 + home/modules/profiles/development/default.nix | 81 + home/modules/profiles/home-office/default.nix | 58 + home/modules/programs/advcp/default.nix | 18 + home/modules/programs/emacs/beacon.nix | 28 + home/modules/programs/emacs/company.nix | 36 + home/modules/programs/emacs/default.nix | 176 ++ home/modules/programs/emacs/helm.nix | 30 + home/modules/programs/emacs/lsp.nix | 65 + .../programs/emacs/polymode/default.nix | 33 + home/modules/programs/emacs/projectile.nix | 22 + home/modules/programs/emacs/telephoneline.nix | 28 + .../programs/emacs/whichkey/default.nix | 66 + home/modules/programs/openshift/default.nix | 21 + home/modules/programs/zshell/default.nix | 44 + home/modules/services/keyleds/default.nix | 43 + lib/default.nix | 1 + lib/home_configurations_as_packages.nix | 12 + lib/mk_home.nix | 21 + 38 files changed, 3649 insertions(+) create mode 100644 home/configurations/default.nix create mode 100644 home/configurations/nmelzer@mimas.nix create mode 100644 home/modules/default.nix create mode 100644 home/modules/languages/agda/default.nix create mode 100644 home/modules/languages/c++/default.nix create mode 100644 home/modules/languages/clojure/default.nix create mode 100644 home/modules/languages/default.nix create mode 100644 home/modules/languages/elixir/default.nix create mode 100644 home/modules/languages/erlang/default.nix create mode 100644 home/modules/languages/go/default.nix create mode 100644 home/modules/languages/nix/default.nix create mode 100644 home/modules/languages/python/default.nix create mode 100644 home/modules/languages/rust/default.nix create mode 100644 home/modules/languages/tex/default.nix create mode 100644 home/modules/misc/awesome/default.nix create mode 100644 home/modules/profiles/base/default.nix create mode 100644 home/modules/profiles/base/nix-completions.sh create mode 100644 home/modules/profiles/base/p10k-config/p10k.zsh create mode 100644 home/modules/profiles/browsing/default.nix create mode 100644 home/modules/profiles/default.nix create mode 100644 home/modules/profiles/development/default.nix create mode 100644 home/modules/profiles/home-office/default.nix create mode 100644 home/modules/programs/advcp/default.nix create mode 100644 home/modules/programs/emacs/beacon.nix create mode 100644 home/modules/programs/emacs/company.nix create mode 100644 home/modules/programs/emacs/default.nix create mode 100644 home/modules/programs/emacs/helm.nix create mode 100644 home/modules/programs/emacs/lsp.nix create mode 100644 home/modules/programs/emacs/polymode/default.nix create mode 100644 home/modules/programs/emacs/projectile.nix create mode 100644 home/modules/programs/emacs/telephoneline.nix create mode 100644 home/modules/programs/emacs/whichkey/default.nix create mode 100644 home/modules/programs/openshift/default.nix create mode 100644 home/modules/programs/zshell/default.nix create mode 100644 home/modules/services/keyleds/default.nix create mode 100644 lib/home_configurations_as_packages.nix create mode 100644 lib/mk_home.nix diff --git a/home/configurations/default.nix b/home/configurations/default.nix new file mode 100644 index 00000000..8b6fe2a9 --- /dev/null +++ b/home/configurations/default.nix @@ -0,0 +1,5 @@ +{ self, ... }@inputs: + +{ + "nmelzer@mimas" = self.lib.mkHome "nmelzer" "mimas" "x86_64-linux" inputs.unstable; +} diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix new file mode 100644 index 00000000..0bb4962b --- /dev/null +++ b/home/configurations/nmelzer@mimas.nix @@ -0,0 +1,88 @@ +{ pkgs, unstable, self, ... }: +let + keepassWithPlugins = + pkgs.keepass.override { plugins = [ pkgs.keepass-keepasshttp ]; }; +in +{ + config = { + activeProfiles = [ "browsing" "development" "home-office" ]; + + dconf.enable = true; + + enabledLanguages = [ + "agda" + "clojure" + "cpp" + "elixir" + "erlang" + "go" + "nix" + # "ocaml" + "python" + "rust" + "tex" + ]; + + languages.python.useMS = true; + + programs.emacs.splashScreen = false; + + home.packages = + let + p = pkgs; + s = self; + in + [ + p.insync + p.handbrake + p.keybase-gui + p.minikube + p.lutris + p.steam + p.gnome3.gnome-tweaks + + s.gnucash-de + + keepassWithPlugins + ]; + + programs.obs-studio.enable = true; + programs.htop = { + detailedCpuTime = true; + meters.right = [ + { kind = "Battery"; mode = 1; } + "Tasks" + "LoadAverage" + "Uptime" + ]; + }; + + xsession.windowManager.awesome.autostart = [ + "${pkgs.blueman}/bin/blueman-applet" + "${pkgs.networkmanagerapplet}/bin/nm-applet" + ]; + + services = { + keyleds.enable = true; + keybase.enable = true; + kbfs.enable = true; + }; + + systemd.user.services = { + keybase-gui = { + Unit = { + Description = "Keybase GUI"; + Requires = [ "keybase.service" "kbfs.service" ]; + After = [ "keybase.service" "kbfs.service" ]; + }; + Service = { + ExecStart = "${pkgs.keybase-gui}/share/keybase/Keybase"; + PrivateTmp = true; + # Slice = "keybase.slice"; + }; + }; + }; + }; + # environment.pathsToLink = [ "/share/zsh" ]; +} +# /nix/store/7skqa8vxfydq7w3cix55ffvkmjb3b5da-python-2.7.18 diff --git a/home/modules/default.nix b/home/modules/default.nix new file mode 100644 index 00000000..b8f20b87 --- /dev/null +++ b/home/modules/default.nix @@ -0,0 +1,28 @@ +{ + "profiles" = import ./profiles; + "profiles/base" = import ./profiles/base; + "profiles/browsing" = import ./profiles/browsing; + "profiles/development" = import ./profiles/development; + "profiles/home-office" = import ./profiles/home-office; + + "languages" = import ./languages; + "languages/agda" = import ./languages/agda; + "languages/c++" = import ./languages/c++; + "languages/clojure" = import ./languages/clojure; + "languages/elixir" = import ./languages/elixir; + "languages/erlang" = import ./languages/erlang; + "languages/go" = import ./languages/go; + "languages/nix" = import ./languages/nix; + "languages/python" = import ./languages/python; + "languages/rust" = import ./languages/rust; + "languages/tex" = import ./languages/tex; + + "programs/advcp" = import ./programs/advcp; + "programs/emacs" = import ./programs/emacs; + "programs/openshift" = import ./programs/openshift; + "programs/zshell" = import ./programs/zshell; + + "services/keyleds" = import ./services/keyleds; + + "misc/awesome" = import ./misc/awesome; +} diff --git a/home/modules/languages/agda/default.nix b/home/modules/languages/agda/default.nix new file mode 100644 index 00000000..811ac3dc --- /dev/null +++ b/home/modules/languages/agda/default.nix @@ -0,0 +1,23 @@ +{ config, lib, ... }: +let cfg = config.languages.agda; + +in +{ + options.languages.agda = { + enable = lib.mkEnableOption "Agda language support"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs = { + localPackages."init-agda" = { + tag = "Setup Agda"; + comments = [ ]; + requires = [ ]; + packageRequires = ep: with ep.melpaStablePackages; [ agda2-mode eri annotation ]; + code = '' + (load-library "agda2-mode") + ''; + }; + }; + }; +} diff --git a/home/modules/languages/c++/default.nix b/home/modules/languages/c++/default.nix new file mode 100644 index 00000000..6ab09ee3 --- /dev/null +++ b/home/modules/languages/c++/default.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.languages.cpp; + + inherit (pkgs) ccls; +in +{ + options.languages.cpp = { + enable = lib.mkEnableOption "Enable support for C++ language"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs = { + localPackages."init-cpp" = { + tag = "Setup C++"; + requires = [ "ccls" ]; + packageRequires = ep: [ ep.ccls ]; + comments = [ ]; + code = '' + (setq ccls-executable "${ccls}/bin/ccls") + ''; + }; + }; + + programs.git.ignores = [ + ".ccls-cache/" + ]; + }; +} diff --git a/home/modules/languages/clojure/default.nix b/home/modules/languages/clojure/default.nix new file mode 100644 index 00000000..4bf20dde --- /dev/null +++ b/home/modules/languages/clojure/default.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: +let cfg = config.languages.clojure; + +in +{ + options.languages.clojure = { + enable = lib.mkEnableOption "Enable support for the clojure language"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs = { + extraPackages = ep: [ ep.clojure-mode ]; + + lsp-mode = { + enable = true; + languages = [ "clojure" ]; + }; + + extraConfig = '' + (setenv "PATH" + (concat "${pkgs.leiningen}/bin:" (getenv "PATH"))) + (setq lsp-clojure-server-command '("${pkgs.bash}/bin/bash" "-c" "${pkgs.clojure-lsp}/bin/clojure-lsp")) + ''; + }; + }; +} diff --git a/home/modules/languages/default.nix b/home/modules/languages/default.nix new file mode 100644 index 00000000..bdb56cf2 --- /dev/null +++ b/home/modules/languages/default.nix @@ -0,0 +1,13 @@ +{ config, lib, ... }: +let + langsEnabler = + let reducer = l: r: { "${r}".enable = true; } // l; + in builtins.foldl' reducer { } config.enabledLanguages; + +in +{ + options.enabledLanguages = + lib.mkOption { type = lib.types.listOf lib.types.str; }; + + config = { languages = langsEnabler; }; +} diff --git a/home/modules/languages/elixir/default.nix b/home/modules/languages/elixir/default.nix new file mode 100644 index 00000000..a5a0966c --- /dev/null +++ b/home/modules/languages/elixir/default.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, self, ... }: +let + cfg = config.languages.elixir; + + inherit (self) elixir-lsp; +in +{ + options.languages.elixir = { + enable = lib.mkEnableOption "Enable support for elixir language"; + }; + + config = lib.mkIf cfg.enable { + programs.zshell.aliases = { + mdg = "mix deps.get"; + mic = "mix compile"; + mit = "mix test"; + }; + + programs.emacs = { + lsp-mode = { + enable = true; + languages = [ "elixir" ]; + }; + + localPackages."init-elixir" = { + tag = "Setup elixir"; + comments = [ ]; + requires = [ "company" "flycheck" ]; + packageRequires = ep: [ + ep.company + ep.elixir-mode + ep.flycheck + ep.lsp-mode + ]; + code = '' + (add-to-list 'exec-path "${elixir-lsp}/bin") + (setq lsp-elixir-server-command '("elixir-ls")) + + (add-hook 'elixir-mode-hook + (lambda () + (subword-mode) + (company-mode) + (flycheck-mode) + (lsp-lens-mode) + (add-hook 'before-save-hook #'lsp-format-buffer nil t))) + ''; + }; + }; + }; +} diff --git a/home/modules/languages/erlang/default.nix b/home/modules/languages/erlang/default.nix new file mode 100644 index 00000000..3c5ee44e --- /dev/null +++ b/home/modules/languages/erlang/default.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, self, ... }: +let + cfg = config.languages.erlang; + + inherit (self) erlang-ls; +in +{ + options.languages.erlang = { + enable = lib.mkEnableOption "Enable support for erlang language"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs.extraPackages = ep: [ + (ep.erlang.overrideAttrs (oa: { + buildInputs = oa.buildInputs ++ [ pkgs.perl pkgs.ncurses ]; + })) + ]; + + programs.emacs.lsp-mode = { + enable = true; + languages = [ "erlang" ]; + }; + + programs.emacs.extraConfig = '' + ;; Configure erlang related stuff + (setq lsp-erlang-server-path "${erlang-ls}/bin/erlang_ls") + + (eval-after-load 'erlang + '(define-key erlang-mode-map (kbd "C-M-i") #'company-lsp)) + + (add-hook 'erlang-mode-hook + (lambda () + (linum-mode) + ('column-number-mode) + (lsp) + (add-hook 'before-save-hook 'lsp-format-buffer nil t) + (subword-mode) + (company-mode) + (flycheck-mode))) + + (add-hook 'origami-mode-hook 'lsp-origami-mode) + (add-hook 'erlang-mode-hook 'origami-mode) + ''; + }; +} diff --git a/home/modules/languages/go/default.nix b/home/modules/languages/go/default.nix new file mode 100644 index 00000000..60755bc6 --- /dev/null +++ b/home/modules/languages/go/default.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: +let cfg = config.languages.go; + +in +{ + options.languages.go = { + enable = lib.mkEnableOption "Enable support for the go language"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs.extraPackages = ep: [ ep.go-mode ]; + + programs.emacs.lsp-mode = { + enable = true; + languages = [ "go" ]; + }; + + home.packages = [ pkgs.go ]; + + programs.emacs.extraConfig = '' + (add-to-list 'exec-path "${pkgs.gopls}/bin") + + (add-hook 'go-mode-hook + (lambda () + (subword-mode) + (company-mode) + (flymake-mode) + (add-hook 'before-save-hook #'lsp-format-buffer nil t))) + ''; + }; +} diff --git a/home/modules/languages/nix/default.nix b/home/modules/languages/nix/default.nix new file mode 100644 index 00000000..442b7755 --- /dev/null +++ b/home/modules/languages/nix/default.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: +let cfg = config.languages.nix; + +in +{ + options.languages.nix = { + enable = lib.mkEnableOption "Enable support for the nix language"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs.extraPackages = ep: [ ep.lsp-mode ep.nix-mode ep.flycheck ]; + + programs.emacs.extraConfig = '' + (require 'lsp-mode) + + ;; make lsp-mode aware of nix + (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix")) + (lsp-register-client + (make-lsp-client :new-connection (lsp-stdio-connection '("${pkgs.rnix-lsp}/bin/rnix-lsp")) + :major-modes '(nix-mode) + :server-id 'nix)) + + (add-hook 'nix-mode-hook + (lambda () + (lsp) + (subword-mode) + (company-mode) + (flycheck-mode))) + ''; + }; +} diff --git a/home/modules/languages/python/default.nix b/home/modules/languages/python/default.nix new file mode 100644 index 00000000..23c45b9f --- /dev/null +++ b/home/modules/languages/python/default.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.languages.python; + pyls = "${pkgs.python37Packages.python-language-server}/bin/pyls"; + mspyls = "${pkgs.python-language-server}/bin/python-language-server"; + + lsBin = if cfg.useMS then mspyls else pyls; + + lsHook = + if cfg.useMS then + "(add-hook 'python-mode-hook (lambda () (require 'lsp-python-ms) (lsp)))" + else + ""; + lsExec = + if cfg.useMS then + ''(setq lsp-python-ms-executable "${lsBin}")'' + else + ''(setq lsp-pyls-server-command '("${lsBin}"))''; +in +{ + options.languages.python = { + enable = lib.mkEnableOption "Enable support for python language"; + useMS = lib.mkEnableOption "Use MS language server rather than palantirs"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs.lsp-mode = { + enable = true; + languages = if cfg.useMS then [ ] else [ "python" ]; + }; + + programs.emacs.localPackages."init-python" = { + tag = "Setup and prepare the python language modes"; + comments = [ ]; + requires = [ ]; + packageRequires = (ep: + [ + ep.lsp-pyright + ep.python-docstring + (config.programs.emacs.localPackages."init-lsp".packageRequires ep) + ] ++ (if cfg.useMS then [ ep.lsp-python-ms ] else [ ])); + code = '' + ${lsHook} + + ${lsExec} + + (add-hook 'python-mode-hook + (lambda () + (require 'lsp-pyright) + (subword-mode) + (company-mode) + (flycheck-mode) + (python-docstring-mode) + (lsp))) + ''; + }; + }; +} diff --git a/home/modules/languages/rust/default.nix b/home/modules/languages/rust/default.nix new file mode 100644 index 00000000..864837e4 --- /dev/null +++ b/home/modules/languages/rust/default.nix @@ -0,0 +1,29 @@ +{ config, lib, ... }: +let cfg = config.languages.rust; + +in +{ + options.languages.rust = { + enable = lib.mkEnableOption "Enable support for Rust language"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs.extraPackages = ep: [ ep.rust-mode ]; + + programs.emacs.lsp-mode = { + enable = true; + languages = [ "rust" ]; + }; + + programs.emacs.extraConfig = '' + (setq lsp-rust-rls-server-command "rls") + + (add-hook 'rust-mode-hook + (lambda () + (subword-mode) + (company-mode) + (flycheck-mode) + (add-hook 'before-save-hook #'lsp-format-buffer nil t))) + ''; + }; +} diff --git a/home/modules/languages/tex/default.nix b/home/modules/languages/tex/default.nix new file mode 100644 index 00000000..030f480b --- /dev/null +++ b/home/modules/languages/tex/default.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: +let cfg = config.languages.tex; + +in +{ + options.languages.tex = { + enable = lib.mkEnableOption "LaTeX language support"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs.extraPackages = ep: [ ep.auctex ]; + + programs.emacs.lsp-mode = { + enable = true; + }; + + programs.emacs.extraConfig = '' + (add-to-list 'exec-path "${pkgs.texlab}/bin") + + (add-hook 'tex-mode-hook + (lambda () + (company-mode) + (flymake-mode) + (lsp))) + ''; + }; +} diff --git a/home/modules/misc/awesome/default.nix b/home/modules/misc/awesome/default.nix new file mode 100644 index 00000000..e814be88 --- /dev/null +++ b/home/modules/misc/awesome/default.nix @@ -0,0 +1,640 @@ +{ config, lib, pkgs, self, ... }: +let + cfg = config.xsession.windowManager.awesome; + + rofi = pkgs.rofi.override { + plugins = [ pkgs.rofi-emoji ]; + }; + + autostartScript = + let + entries = builtins.map (e: "\"${e}\",") cfg.autostart; + in + '' + -- Autorun programs + autorunApps = { + ${builtins.concatStringsSep "\n " entries} + } + + for app = 1, #autorunApps do + awful.util.spawn(autorunApps[app]) + end + -- }}} + ''; + + errorHandling = '' + -- {{{ Error handling + if awesome.startup_errors then + naughty.notify({ + preset = naughty.config.presets.critical, + title = "Oops, there were errors during startup!", + text = awesome.startup_errors + }) + end + + do + local in_error = false + awesome.connect_signal( + "debug::error", + function (err) + if in_error then return end + in_error = true + + naughty.notify({ + preset = naughty.config.presets.critical, + title = "Oops, an error happened!", + text = tostring(err) + }) + in_error = false + end) + end + -- }}} + ''; +in +{ + options.xsession.windowManager.awesome = { + terminalEmulator = lib.mkOption { + type = lib.types.str; + default = "${pkgs.konsole}/bin/konsole"; + }; + + launcher = lib.mkOption { + type = lib.types.str; + default = "${rofi}/bin/rofi -modi drun#run#window#ssh#emoji#unicode:${self.rofi-unicode}/bin/rofiunicode.sh -show drun -show-icons"; + }; + + autostart = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + }; + }; + + config = lib.mkIf cfg.enable { + xsession.enable = true; + home.file.".config/awesome/rc.lua".text = '' + --[[ + Awesome WM configuration + by Norbert Melzer + + This file is generated by home-manager. + --]] + + -- {{{ Loading libraries + local gears = require("gears") + local awful = require("awful") + local autofocus = require("awful.autofocus") + local wibox = require("wibox") + local beautiful = require("beautiful") + local naughty = require("naughty") + local menubar = require("menubar") + local hotkeys_popup = require("awful.hotkeys_popup").widget + -- local volume_control = require("volume-control") + -- }}} + + ${errorHandling} + + -- load the volume widget code + -- volumecfg = volume_control({}) + + beautiful.notification_icon_size = 100 + + -- {{{ Variable definitions and initialisations + local hostname = io.popen("hostname"):read() + local modkey = "Mod4" + local theme_path = gears.filesystem.get_themes_dir() .. "default/theme.lua" + local terminal = "${cfg.terminalEmulator}" -- sets the default terminal + local editor = os.getenv("EDITOR") or "emacsclient -t" -- sets the default editor + local editor_cmd = terminal .. " -e " .. editor -- sets the default command that is used to start the editor + + beautiful.init(theme_path) + + -- Table of layouts to cover with awful.layout.inc, order matters. + awful.layout.layouts = { + awful.layout.suit.floating, + awful.layout.suit.tile, + awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, + awful.layout.suit.tile.top, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, + awful.layout.suit.spiral, + awful.layout.suit.spiral.dwindle, + awful.layout.suit.max, + awful.layout.suit.max.fullscreen, + awful.layout.suit.magnifier, + awful.layout.suit.corner.nw, + -- awful.layout.suit.corner.ne, + -- awful.layout.suit.corner.sw, + -- awful.layout.suit.corner.se, + } + -- }}} + + -- {{{ Helper functions + local function client_menu_toggle_fn() + local instance = nil + + return function () + if instance and instance.wibox.visible then + instance:hide() + instance = nil + else + instance = awful.menu.clients({ theme = { width = 250 } }) + end + end + end + -- }}} + + -- {{{ Menu + -- Create a launcher widget and a main menu + myawesomemenu = { + { "launcher", '${cfg.launcher}' }, + { "hotkeys", function() return false, hotkeys_popup.show_help end}, + { "manual", terminal .. " -e man awesome" }, + { "edit config", editor_cmd .. " " .. awesome.conffile }, + { "lock session", '${pkgs.i3lock}/bin/i3lock' }, + { "restart", awesome.restart }, + { "quit", function() awesome.quit() end} + } + + mymainmenu = awful.menu({ + items = { + { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal } + } + }) + + mylauncher = awful.widget.launcher({ + image = beautiful.awesome_icon, + menu = mymainmenu + }) + + -- Menubar configuration + menubar.utils.terminal = terminal -- Set the terminal for applications that require it + -- }}} + + -- Keyboard map indicator and switcher + mykeyboardlayout = awful.widget.keyboardlayout() + + -- {{{ Wibar + -- Create a textclock widget + mytextclock = wibox.widget.textclock() + + -- Create a wibox for each screen and add it + local taglist_buttons = gears.table.join( + awful.button({ }, 1, function(t) t:view_only() end), + awful.button({ modkey }, 1, function(t) + if client.focus then + client.focus:move_to_tag(t) + end + end), + awful.button({ }, 3, awful.tag.viewtoggle), + awful.button({ modkey }, 3, function(t) + if client.focus then + client.focus:toggle_tag(t) + end + end), + awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) + ) + + local tasklist_buttons = gears.table.join( + awful.button({ }, 1, function (c) + if c == client.focus then + c.minimized = true + else + -- Without this, the following + -- :isvisible() makes no sense + c.minimized = false + if not c:isvisible() and c.first_tag then + c.first_tag:view_only() + end + -- This will also un-minimize + -- the client, if needed + client.focus = c + c:raise() + end + end), + awful.button({ }, 3, client_menu_toggle_fn()), + awful.button({ }, 4, function () + awful.client.focus.byidx(1) + end), + awful.button({ }, 5, function () + awful.client.focus.byidx(-1) + end)) + + local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + end + gears.wallpaper.maximized(wallpaper, s, true) + end + end + + -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) + screen.connect_signal("property::geometry", set_wallpaper) + + awful.screen.connect_for_each_screen(function(s) + -- Wallpaper + set_wallpaper(s) + + -- Each screen has its own tag table. + local names = { "1:main", "2:web", "3", "4", "5", "6", "7", "8", "9" } + local l = awful.layout.suit + local layouts = { l.tile, l.tile, l.tile, l.tile, l.tile, l.tile, l.tile, l.tile, l.tile } + awful.tag(names, s, layouts) + + -- Create a promptbox for each screen + s.mypromptbox = awful.widget.prompt() + -- Create an imagebox widget which will contain an icon indicating which layout we're using. + -- We need one layoutbox per screen. + s.mylayoutbox = awful.widget.layoutbox(s) + s.mylayoutbox:buttons( + gears.table.join( + awful.button({ }, 1, function () awful.layout.inc( 1) end), + awful.button({ }, 3, function () awful.layout.inc(-1) end), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) + -- Create a taglist widget + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) + + -- Create a tasklist widget + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) + + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s }) + + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + mylauncher, + s.mytaglist, + s.mypromptbox, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + mykeyboardlayout, + wibox.widget.systray(), + -- require("battery-widget") {}, + -- volumecfg.widget, + mytextclock, + s.mylayoutbox, + }, + } + end) + -- }}} + + -- {{{ Mouse bindings + root.buttons(gears.table.join( + awful.button({ }, 3, function () mymainmenu:toggle() end), + awful.button({ }, 4, awful.tag.viewnext), + awful.button({ }, 5, awful.tag.viewprev) + )) + -- }}} + + -- {{{ Key bindings + globalkeys = gears.table.join( + awful.key({ modkey, }, "s", hotkeys_popup.show_help, + {description="show help", group="awesome"}), + awful.key({ modkey, }, "Left", awful.tag.viewprev, + {description = "view previous", group = "tag"}), + awful.key({ modkey, }, "Right", awful.tag.viewnext, + {description = "view next", group = "tag"}), + awful.key({ modkey, }, "Escape", awful.tag.history.restore, + {description = "go back", group = "tag"}), + + awful.key({ modkey, }, "j", + function () + awful.client.focus.byidx( 1) + end, + {description = "focus next by index", group = "client"} + ), + awful.key({ modkey, }, "k", + function () + awful.client.focus.byidx(-1) + end, + {description = "focus previous by index", group = "client"} + ), + awful.key({ modkey, }, "w", function () mymainmenu:show() end, + {description = "show main menu", group = "awesome"}), + + -- Layout manipulation + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, + {description = "swap with next client by index", group = "client"}), + awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end, + {description = "swap with previous client by index", group = "client"}), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, + {description = "focus the next screen", group = "screen"}), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, + {description = "focus the previous screen", group = "screen"}), + awful.key({ modkey, }, "u", awful.client.urgent.jumpto, + {description = "jump to urgent client", group = "client"}), + awful.key({ modkey, }, "Tab", + function () + awful.client.focus.history.previous() + if client.focus then + client.focus:raise() + end + end, + {description = "go back", group = "client"}), + + -- Standard program + awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, + {description = "open a terminal", group = "launcher"}), + awful.key({ modkey, "Control" }, "r", awesome.restart, + {description = "reload awesome", group = "awesome"}), + awful.key({ modkey, "Shift" }, "q", awesome.quit, + {description = "quit awesome", group = "awesome"}), + + awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, + {description = "increase master width factor", group = "layout"}), + awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, + {description = "decrease master width factor", group = "layout"}), + awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, + {description = "increase the number of master clients", group = "layout"}), + awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end, + {description = "decrease the number of master clients", group = "layout"}), + awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end, + {description = "increase the number of columns", group = "layout"}), + awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end, + {description = "decrease the number of columns", group = "layout"}), + awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end, + {description = "select next", group = "layout"}), + awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end, + {description = "select previous", group = "layout"}), + + awful.key({ modkey, "Control" }, "n", + function () + local c = awful.client.restore() + -- Focus restored client + if c then + client.focus = c + c:raise() + end + end, + {description = "restore minimized", group = "client"}), + + -- Prompt + awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, + {description = "run prompt", group = "launcher"}), + + awful.key({ modkey }, "d", function () awful.util.spawn('${cfg.launcher}') end), + awful.key({ modkey }, "y", function () awful.util.spawn('${pkgs.i3lock}/bin/i3lock') end), + + awful.key({ modkey }, "x", + function () + awful.prompt.run { + prompt = "Run Lua code: ", + textbox = awful.screen.focused().mypromptbox.widget, + exe_callback = awful.util.eval, + history_path = awful.util.get_cache_dir() .. "/history_eval" + } + end, + {description = "lua execute prompt", group = "awesome"}), + -- Menubar + awful.key({ modkey }, "p", function() menubar.show() end, + {description = "show the menubar", group = "launcher"}) + ) + + clientkeys = gears.table.join( + awful.key({ modkey, }, "f", + function (c) + c.fullscreen = not c.fullscreen + c:raise() + end, + {description = "toggle fullscreen", group = "client"}), + awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end, + {description = "close", group = "client"}), + awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle , + {description = "toggle floating", group = "client"}), + awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end, + {description = "move to master", group = "client"}), + awful.key({ modkey, }, "o", function (c) c:move_to_screen() end, + {description = "move to screen", group = "client"}), + awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end, + {description = "toggle keep on top", group = "client"}), + awful.key({ modkey, }, "n", + function (c) + -- The client currently has the input focus, so it cannot be + -- minimized, since minimized clients can't have the focus. + c.minimized = true + end , + {description = "minimize", group = "client"}), + awful.key({ modkey, }, "m", + function (c) + c.maximized = not c.maximized + c:raise() + end , + {description = "(un)maximize", group = "client"}), + awful.key({ modkey, "Control" }, "m", + function (c) + c.maximized_vertical = not c.maximized_vertical + c:raise() + end , + {description = "(un)maximize vertically", group = "client"}), + awful.key({ modkey, "Shift" }, "m", + function (c) + c.maximized_horizontal = not c.maximized_horizontal + c:raise() + end , + {description = "(un)maximize horizontally", group = "client"}) + ) + + -- Bind all key numbers to tags. + -- Be careful: we use keycodes to make it work on any keyboard layout. + -- This should map on the top row of your keyboard, usually 1 to 9. + for i = 1, 9 do + globalkeys = gears.table.join( + globalkeys, + -- View tag only. + awful.key({ modkey }, "#" .. i + 9, + function () + local screen = awful.screen.focused() + local tag = screen.tags[i] + if tag then + tag:view_only() + end + end, + {description = "view tag #"..i, group = "tag"}), + -- Toggle tag display. + awful.key({ modkey, "Control" }, "#" .. i + 9, + function () + local screen = awful.screen.focused() + local tag = screen.tags[i] + if tag then + awful.tag.viewtoggle(tag) + end + end, + {description = "toggle tag #" .. i, group = "tag"}), + -- Move client to tag. + awful.key({ modkey, "Shift" }, "#" .. i + 9, + function () + if client.focus then + local tag = client.focus.screen.tags[i] + if tag then + client.focus:move_to_tag(tag) + end + end + end, + {description = "move focused client to tag #"..i, group = "tag"}), + -- Toggle tag on focused client. + awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, + function () + if client.focus then + local tag = client.focus.screen.tags[i] + if tag then + client.focus:toggle_tag(tag) + end + end + end, + {description = "toggle focused client on tag #" .. i, group = "tag"}) + ) + end + + clientbuttons = gears.table.join( + awful.button({ }, 1, function (c) client.focus = c; c:raise() end), + awful.button({ modkey }, 1, awful.mouse.client.move), + awful.button({ modkey }, 3, awful.mouse.client.resize)) + + -- Set keys + root.keys(globalkeys) + -- }}} + + -- {{{ Rules + -- Rules to apply to new clients (through the "manage" signal). + awful.rules.rules = { + -- All clients will match this rule. + { rule = { }, + properties = { + border_width = beautiful.border_width, + border_color = beautiful.border_normal, + focus = awful.client.focus.filter, + raise = true, + keys = clientkeys, + buttons = clientbuttons, + screen = awful.screen.preferred, + placement = awful.placement.no_overlap+awful.placement.no_offscreen + } + }, + + -- Floating clients. + { + rule_any = { + instance = { + "DTA", -- Firefox addon DownThemAll. + "copyq", -- Includes session name in class. + }, + class = { + "Arandr", + "Gpick", + "Kruler", + "MessageWin", -- kalarm. + "Sxiv", + "Wpa_gui", + "pinentry", + "veromix", + "xtightvncviewer" + }, + name = { + "Event Tester", -- xev. + }, + role = { + "AlarmWindow", -- Thunderbird's calendar. + "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. + } + }, properties = { floating = true }}, + + -- Add titlebars to normal clients and dialogs + { rule_any = { + type = { "normal", "dialog" } + }, properties = { titlebars_enabled = true } + }, + + -- Set Firefox to always map on the tag named "2" on screen 1. + -- { rule = { class = "Firefox" }, + -- properties = { screen = 1, tag = "2" } }, + } + -- }}} + + -- {{{ Signals + -- Signal function to execute when a new client appears. + client.connect_signal( + "manage", function (c) + -- Set the windows at the slave, + -- i.e. put it at the end of others instead of setting it master. + -- if not awesome.startup then awful.client.setslave(c) end + + if awesome.startup and + not c.size_hints.user_position + and not c.size_hints.program_position then + -- Prevent clients from being unreachable after screen count changes. + awful.placement.no_offscreen(c) + end + end) + + -- Add a titlebar if titlebars_enabled is set to true in the rules. + client.connect_signal( + "request::titlebars", function(c) + -- buttons for the titlebar + local buttons = gears.table.join( + awful.button({ }, 1, function() + client.focus = c + c:raise() + awful.mouse.client.move(c) + end), + awful.button({ }, 3, function() + client.focus = c + c:raise() + awful.mouse.client.resize(c) + end) + ) + + awful.titlebar(c) : setup { + { -- Left + awful.titlebar.widget.iconwidget(c), + buttons = buttons, + layout = wibox.layout.fixed.horizontal + }, + { -- Middle + { -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c) + }, + buttons = buttons, + layout = wibox.layout.flex.horizontal + }, + { -- Right + awful.titlebar.widget.floatingbutton (c), + awful.titlebar.widget.maximizedbutton(c), + awful.titlebar.widget.stickybutton (c), + awful.titlebar.widget.ontopbutton (c), + awful.titlebar.widget.closebutton (c), + layout = wibox.layout.fixed.horizontal() + }, + layout = wibox.layout.align.horizontal + } + end) + + -- Enable sloppy focus, so that focus follows mouse. + client.connect_signal( + "mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c + end + end) + + client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) + client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) + -- }}} + + ${lib.optionalString (cfg.autostart != [ ]) autostartScript} + ''; + }; +} diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix new file mode 100644 index 00000000..b4d6de98 --- /dev/null +++ b/home/modules/profiles/base/default.nix @@ -0,0 +1,224 @@ +{ config, lib, pkgs, inputs, ... }: +let + cfg = config.profiles.base; + + inherit (inputs.self.packages.x86_64-linux) emacs; + + dag = lib.hm.dag; + + # TODO: make these a bit more nice, so that repeating the hosts and individual config isn't necessary. + zerotierHosts = [ "delly-nixos.adoring_suess.zerotier" "tux-nixos.adoring_suess.zerotier" "nixos.adoring_suess.zerotier" ]; + + zsh-complete = pkgs.stdenv.mkDerivation { + pname = "nix-zsh-completion-with-flakes"; + version = "git"; + + src = ./nix-completions.sh; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out + cp $src $out/_nix + ''; + }; +in +{ + options.profiles.base = { + enable = lib.mkEnableOption "The base profile, should be always enabled"; + }; + + config = lib.mkIf cfg.enable { + home.sessionVariables = rec { + EDITOR = "emacs -nw"; + VISUAL = "emacs"; + GIT_EDITOR = EDITOR; + }; + + gtk.enable = true; + gtk.theme.package = pkgs.gnome3.gnome_themes_standard; + gtk.theme.name = "Adwaita-dark"; + + home.keyboard.layout = "de"; + home.packages = [ pkgs.hydra-check pkgs.gnome3.dconf ]; + + xsession = { + enable = true; + numlock.enable = true; + profileExtra = '' + setxkbmap de + ''; + }; + + programs = { + advancedCopy.enable = true; + bat.enable = true; + direnv.enable = true; + exa.enable = true; + home-manager.enable = true; + htop.enable = true; + jq.enable = true; + openshift.enable = true; + + ssh = { + enable = true; + compression = true; + + matchBlocks = { + "*.adoring_suess.zerotier" = dag.entryAfter zerotierHosts { + identityFile = "~/.ssh/id_rsa"; + user = "nmelzer"; + }; + + "delly-nixos.adoring_suess.zerotier" = { + hostname = "172.24.199.101"; + }; + "ryzen-ubuntu.adoring_suess.zerotier" = { + hostname = "172.24.237.73"; + }; + "tux-nixos.adoring_suess.zerotier" = { + hostname = "172.24.152.168"; + localForwards = [ + { + bind.port = 60080; + host.address = "fritz.box"; + host.port = 80; + } + ]; + }; + "nixos.adoring_suess.zerotier" = { + hostname = "172.24.231.199"; + user = "demo"; + }; + + "*.nobbz.dev" = { + identityFile = "~/.ssh/nobbz_dev"; + user = "root"; + }; + + "gitlab.com" = { + addressFamily = "inet"; + identityFile = "~/.ssh/gitlab"; + }; + + "github.com" = { + identityFile = "~/.ssh/github"; + }; + + "*.actum.internal" = { + user = "norbert.melzer"; + identityFile = "~/.ssh/actum-gitlab"; + }; + + "*.vcp.internal" = { + user = "cloudseeds"; + identityFile = "~/.ssh/vogel"; + }; + + "deploy-vogel.custpoc.cloudseeds.de" = dag.entryBefore [ + "*.custpoc.cloudseeds.de" + "*.cloudseeds.de" + ] + { + user = "cloudseeds"; + identityFile = "~/.ssh/vogel"; + }; + + "repo.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + identityFile = "~/.ssh/id_rsa"; + }; + + "*.custpoc.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + user = "norbert.melzer"; + identityFile = "~/.ssh/actum-gitlab"; + }; + + "*.cloudseeds.de" = { + user = "norbert.melzer"; + identityFile = "~/.ssh/cloudseeds"; + }; + }; + }; + + emacs = { + enable = true; + package = emacs; + }; + + tmux = { + enable = true; + + clock24 = true; + historyLimit = 10000; + terminal = "screen-256color"; + + plugins = let tp = pkgs.tmuxPlugins; in + [ + # { + # plugin = tp.dracula; + # extraConfig = '' + # set -g @dracula-show-battery true + # set -g @dracula-show-powerline true + # set -g @dracula-refresh-rate 10 + # ''; + # } + ]; + }; + + zsh = { + enable = true; + + enableCompletion = true; + enableAutosuggestions = true; + + autocd = true; + + dotDir = ".config/zsh"; + + defaultKeymap = "emacs"; + + plugins = [ + { + name = "nix-zsh-complete.zsh"; + src = zsh-complete; + file = "_nix"; + } + { + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + } + { + name = "powerlevel10k-config"; + src = lib.cleanSource ./p10k-config; + file = "p10k.zsh"; + } + { + name = "zsh-syntax-highlighting"; + src = pkgs.fetchFromGitHub { + owner = "zsh-users"; + repo = "zsh-syntax-highlighting"; + rev = "0.7.1"; + sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0"; + }; + } + ]; + + initExtra = '' + bindkey "^[[1;5D" backward-word + bindkey "^[[1;5C" forward-word + ''; + + sessionVariables = { + # NIX_PATH = builtins.concatStringsSep ":" [ + # "nixpkgs=${inputs.nixpkgs}" + # "nixos-config=/etc/nixos/configuration.nix" + # "/nix/var/nix/profiles/per-user/root/channels" + # ]; + }; + + shellAliases = config.programs.zshell.aliases; + }; + }; + }; +} diff --git a/home/modules/profiles/base/nix-completions.sh b/home/modules/profiles/base/nix-completions.sh new file mode 100644 index 00000000..c107ca7a --- /dev/null +++ b/home/modules/profiles/base/nix-completions.sh @@ -0,0 +1,22 @@ + +function _nix() { + local ifs_bk="$IFS" + local input=("${(Q)words[@]}") + IFS=$'\n' + local res=($(NIX_GET_COMPLETIONS=$((CURRENT - 1)) "$input[@]")) + IFS="$ifs_bk" + local tpe="${${res[1]}%%> *}" + local -a suggestions + declare -a suggestions + for suggestion in ${res:1}; do + # FIXME: This doesn't work properly if the suggestion word contains a `:` + # itself + suggestions+="${suggestion/ /:}" + done + if [[ "$tpe" == filenames ]]; then + compadd -f + fi + _describe 'nix' suggestions +} + +compdef _nix nix diff --git a/home/modules/profiles/base/p10k-config/p10k.zsh b/home/modules/profiles/base/p10k-config/p10k.zsh new file mode 100644 index 00000000..8705be08 --- /dev/null +++ b/home/modules/profiles/base/p10k-config/p10k.zsh @@ -0,0 +1,1469 @@ +# Generated by Powerlevel10k configuration wizard on 2020-02-27 at 13:48 UTC. +# Based on romkatv/powerlevel10k/config/p10k-classic.zsh. +# Wizard options: powerline, classic, darkest, time, angled separators, sharp heads, +# flat tails, 2 lines, solid, full frame, compact, concise, transient_prompt, +# instant_prompt=off. +# Type `p10k configure` to generate another config. +# +# Config for Powerlevel10k with classic powerline prompt style. Type `p10k configure` to generate +# your own config based on it. +# +# Tip: Looking for a nice color? Here's a one-liner to print colormap. +# +# for i in {0..255}; do print -Pn "%K{$i} %k%F{$i}${(l:3::0:)i}%f " ${${(M)$((i%8)):#7}:+$'\n'}; done + +# Temporarily change options. +'builtin' 'local' '-a' 'p10k_config_opts' +[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') +[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') +[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') +'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' + +() { + emulate -L zsh + setopt no_unset extended_glob + + # Unset all configuration options. This allows you to apply configiguration changes without + # restarting zsh. Edit ~/.p10k.zsh and type `source ~/.p10k.zsh`. + unset -m 'POWERLEVEL9K_*' + + autoload -Uz is-at-least && is-at-least 5.1 || return + + zmodload zsh/langinfo + if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then + local LC_ALL=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8} + fi + + # The list of segments shown on the left. Fill it with the most important segments. + typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( + # =========================[ Line #1 ]========================= + # os_icon # os identifier + dir # current directory + vcs # git status + # =========================[ Line #2 ]========================= + newline # \n + # prompt_char # prompt symbol + ) + + # The list of segments shown on the right. Fill it with less important segments. + # Right prompt on the last prompt line (where you are typing your commands) gets + # automatically hidden when the input line reaches it. Right prompt above the + # last prompt line gets hidden if it would overlap with left prompt. + typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( + # =========================[ Line #1 ]========================= + status # exit code of the last command + 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) + 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 + # go_version # go version (https://golang.org) + # rust_version # rustc version (https://www.rust-lang.org) + # dotnet_version # .NET version (https://dotnet.microsoft.com) + # php_version # php version (https://www.php.net/) + # laravel_version # laravel php framework version (https://laravel.com/) + 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) + 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) + context # user@hostname + 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) + midnight_commander # midnight commander shell (https://midnight-commander.org/) + nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) + vi_mode # vi mode (you don't need this if you've enabled prompt_char) + # vpn_ip # virtual private network indicator + # load # CPU load + # disk_usage # disk usage + # ram # free RAM + # swap # used swap + todo # todo items (https://github.com/todotxt/todo.txt-cli) + timewarrior # timewarrior tracking status (https://timewarrior.net/) + taskwarrior # taskwarrior task count (https://taskwarrior.org/) + time # current time + # =========================[ Line #2 ]========================= + newline # \n + # ip # ip address and bandwidth usage for a specified network interface + # public_ip # public IP address + # proxy # system-wide http/https/ftp proxy + # battery # internal battery + # wifi # wifi speed + # example # example user-defined segment (see prompt_example function below) + ) + + # To enable default icons for all segments, don't define POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION + # or set it to '${P9K_VISUAL_IDENTIFIER}'. + # + # To remove trailing space from all default icons, set POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION + # to '${P9K_VISUAL_IDENTIFIER% }'. + # + # To enable default icons for one segment (e.g., dir), set + # POWERLEVEL9K_DIR_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}'. + # + # To assign a specific icon to one segment (e.g., dir), set + # POWERLEVEL9K_DIR_VISUAL_IDENTIFIER_EXPANSION='⭐'. + # + # To assign a specific icon to a segment in a given state (e.g., dir in state NOT_WRITABLE), + # set POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='⭐'. + # + # Note: You can use $'\u2B50' instead of '⭐'. It's especially convenient when specifying + # icons that your text editor cannot render. Don't forget to put $ and use single quotes when + # defining icons via Unicode codepoints. + # + # Note: Many default icons cannot be displayed with system fonts. You'll need to install a + # capable font to use them. See POWERLEVEL9K_MODE below. + typeset -g POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}' + + # This option makes a difference only when default icons are enabled for all or some prompt + # segments (see POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION above). LOCK_ICON can be printed as + # $'\uE0A2', $'\uE138' or $'\uF023' depending on POWERLEVEL9K_MODE. The correct value of this + # parameter depends on the provider of the font your terminal is using. + # + # Font Provider | POWERLEVEL9K_MODE + # ---------------------------------+------------------- + # Powerline | powerline + # Font Awesome | awesome-fontconfig + # Adobe Source Code Pro | awesome-fontconfig + # Source Code Pro | awesome-fontconfig + # Awesome-Terminal Fonts (regular) | awesome-fontconfig + # Awesome-Terminal Fonts (patched) | awesome-patched + # Nerd Fonts | nerdfont-complete + # Other | compatible + # + # If this looks overwhelming, either stick with a preinstalled system font and set + # POWERLEVEL9K_MODE=compatible, or install the recommended Powerlevel10k font from + # https://github.com/romkatv/powerlevel10k/#recommended-meslo-nerd-font-patched-for-powerlevel10k + # and set POWERLEVEL9K_MODE=nerdfont-complete. + typeset -g POWERLEVEL9K_MODE=powerline + + # When set to true, icons appear before content on both sides of the prompt. When set + # to false, icons go after content. If empty or not set, icons go before content in the left + # prompt and after content in the right prompt. + # + # You can also override it for a specific segment: + # + # POWERLEVEL9K_STATUS_ICON_BEFORE_CONTENT=false + # + # Or for a specific segment in specific state: + # + # POWERLEVEL9K_DIR_NOT_WRITABLE_ICON_BEFORE_CONTENT=false + typeset -g POWERLEVEL9K_ICON_BEFORE_CONTENT= + + # Add an empty line before each prompt. + typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false + + # Connect left prompt lines with these symbols. You'll probably want to use the same color + # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%238F╭─' + typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%238F├─' + typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%238F╰─' + # Connect right prompt lines with these symbols. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%238F─╮' + typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%238F─┤' + typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%238F─╯' + + # Filler between left and right prompt on the first prompt line. You can set it to ' ', '·' or + # '─'. The last two make it easier to see the alignment between left and right prompt and to + # separate prompt from command output. You might want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false + # for more compact prompt if using using this option. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='─' + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND= + if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then + # The color of the filler. You'll probably want to match the color of POWERLEVEL9K_MULTILINE + # ornaments defined above. + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238 + # Start filler from the edge of the screen if there are no left segments on the first line. + typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}' + # End filler on the edge of the screen if there are no right segments on the first line. + typeset -g POWERLEVEL9K_EMPTY_LINE_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='%{%}' + fi + + # Default background color. + typeset -g POWERLEVEL9K_BACKGROUND=234 + + # Separator between same-color segments on the left. + typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='%242F\uE0B1' + # Separator between same-color segments on the right. + typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='%242F\uE0B3' + # Separator between different-color segments on the left. + typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\uE0B0' + # Separator between different-color segments on the right. + typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\uE0B2' + # The right end of left prompt. + typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0' + # The left end of right prompt. + typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2' + # The left end of left prompt. + typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='' + # The right end of right prompt. + typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='' + # Left prompt terminator for lines without any segments. + typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL= + + #################################[ os_icon: os identifier ]################################## + # OS identifier color. + typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=255 + # Make the icon bold. + typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='%B${P9K_CONTENT}' + + ################################[ prompt_char: prompt symbol ]################################ + # Transparent background. + typeset -g POWERLEVEL9K_PROMPT_CHAR_BACKGROUND= + # Green prompt symbol if the last command succeeded. + typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=76 + # Red prompt symbol if the last command failed. + typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196 + # Default prompt symbol. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯' + # Prompt symbol in command vi mode. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' + # Prompt symbol in visual vi mode. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='Ⅴ' + # Prompt symbol in overwrite vi mode. + typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶' + typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true + # No line terminator if prompt_char is the last segment. + typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL= + # No line introducer if prompt_char is the first segment. + typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= + # No surrounding whitespace. + typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_{LEFT,RIGHT}_WHITESPACE= + + ##################################[ dir: current directory ]################################## + # Default current directory color. + typeset -g POWERLEVEL9K_DIR_FOREGROUND=31 + # If directory is too long, shorten some of its segments to the shortest possible unique + # prefix. The shortened directory can be tab-completed to the original. + typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique + # Replace removed segment suffixes with this symbol. + typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= + # Color of the shortened directory segments. + typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=103 + # Color of the anchor directory segments. Anchor segments are never shortened. The first + # segment is always an anchor. + typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=39 + # Display anchor directory segments in bold. + typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true + # Don't shorten directories that contain any of these files. They are anchors. + local anchor_files=( + .bzr + .citc + .git + .hg + .node-version + .python-version + .go-version + .ruby-version + .lua-version + .java-version + .perl-version + .php-version + .tool-version + .shorten_folder_marker + .svn + .terraform + CVS + Cargo.toml + composer.json + go.mod + package.json + ) + typeset -g POWERLEVEL9K_SHORTEN_FOLDER_MARKER="(${(j:|:)anchor_files})" + # If set to true, remove everything before the last (deepest) subdirectory that contains files + # matching $POWERLEVEL9K_SHORTEN_FOLDER_MARKER. For example, when the current directory is + # /foo/bar/git_repo/baz, prompt will display git_repo/baz. This assumes that /foo/bar/git_repo + # contains a marker (.git) and other directories don't. + typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false + # Don't shorten this many last directory segments. They are anchors. + typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1 + # Shorten directory if it's longer than this even if there is space for it. The value can + # be either absolute (e.g., '80') or a percentage of terminal width (e.g, '50%'). If empty, + # directory will be shortened only when prompt doesn't fit or when other parameters demand it + # (see POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS and POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT below). + # If set to `0`, directory will always be shortened to its minimum length. + typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80 + # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least this + # many columns for typing commands. + typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40 + # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least + # COLUMNS * POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT * 0.01 columns for typing commands. + typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT=50 + # If set to true, embed a hyperlink into the directory. Useful for quickly + # opening a directory in the file manager simply by clicking the link. + # Can also be handy when the directory is shortened, as it allows you to see + # the full directory that was used in previous commands. + typeset -g POWERLEVEL9K_DIR_HYPERLINK=false + + # Enable special styling for non-writable directories. + typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=true + # Show this icon when the current directory is not writable. POWERLEVEL9K_DIR_SHOW_WRITABLE + # above must be set to true for this parameter to have effect. + typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='∅' + + # Custom prefix. + # typeset -g POWERLEVEL9K_DIR_PREFIX='%244Fin ' + + # POWERLEVEL9K_DIR_CLASSES allows you to specify custom icons for different directories. + # It must be an array with 3 * N elements. Each triplet consists of: + # + # 1. A pattern against which the current directory is matched. Matching is done with + # extended_glob option enabled. + # 2. Directory class for the purpose of styling. + # 3. Icon. + # + # Triplets are tried in order. The first triplet whose pattern matches $PWD wins. If there + # are no matches, the directory will have no icon. + # + # Example: + # + # typeset -g POWERLEVEL9K_DIR_CLASSES=( + # '~/work(|/*)' WORK '(╯°□°）╯︵ ┻━┻' + # '~(|/*)' HOME '⌂' + # '*' DEFAULT '') + # + # With these settings, the current directory in the prompt may look like this: + # + # (╯°□°）╯︵ ┻━┻ ~/work/projects/important/urgent + # + # Or like this: + # + # ⌂ ~/best/powerlevel10k + # + # You can also set different colors for directories of different classes. Remember to override + # FOREGROUND, SHORTENED_FOREGROUND and ANCHOR_FOREGROUND for every directory class that you wish + # to have its own color. + # + # typeset -g POWERLEVEL9K_DIR_WORK_FOREGROUND=31 + # typeset -g POWERLEVEL9K_DIR_WORK_SHORTENED_FOREGROUND=103 + # typeset -g POWERLEVEL9K_DIR_WORK_ANCHOR_FOREGROUND=39 + # + typeset -g POWERLEVEL9K_DIR_CLASSES=() + + #####################################[ vcs: git status ]###################################### + # Branch icon. Set this parameter to '\uF126 ' for the popular Powerline branch icon. + typeset -g POWERLEVEL9K_VCS_BRANCH_ICON= + POWERLEVEL9K_VCS_BRANCH_ICON=${(g::)POWERLEVEL9K_VCS_BRANCH_ICON} + + # Untracked files icon. It's really a question mark, your font isn't broken. + # Change the value of this parameter to show a different icon. + typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON='?' + POWERLEVEL9K_VCS_UNTRACKED_ICON=${(g::)POWERLEVEL9K_VCS_UNTRACKED_ICON} + + # Formatter for Git status. + # + # Example output: master ⇣42⇡42 *42 merge ~42 +42 !42 ?42. + # + # You can edit the function to customize how Git status looks. + # + # VCS_STATUS_* parameters are set by gitstatus plugin. See reference: + # https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh. + function my_git_formatter() { + emulate -L zsh + + if [[ -n $P9K_CONTENT ]]; then + # If P9K_CONTENT is not empty, use it. It's either "loading" or from vcs_info (not from + # gitstatus plugin). VCS_STATUS_* parameters are not available in this case. + typeset -g my_git_format=$P9K_CONTENT + return + fi + + if (( $1 )); then + # Styling for up-to-date Git status. + local meta='%244F' # grey foreground + local clean='%76F' # green foreground + local modified='%178F' # yellow foreground + local untracked='%39F' # blue foreground + local conflicted='%196F' # red foreground + else + # Styling for incomplete and stale Git status. + local meta='%244F' # grey foreground + local clean='%244F' # grey foreground + local modified='%244F' # grey foreground + local untracked='%244F' # grey foreground + local conflicted='%244F' # grey foreground + fi + + local res + local where # branch or tag + if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then + res+="${clean}${POWERLEVEL9K_VCS_BRANCH_ICON}" + where=${(V)VCS_STATUS_LOCAL_BRANCH} + elif [[ -n $VCS_STATUS_TAG ]]; then + res+="${meta}#" + where=${(V)VCS_STATUS_TAG} + fi + + # If local branch name or tag is at most 32 characters long, show it in full. + # Otherwise show the first 12 … the last 12. + (( $#where > 32 )) && where[13,-13]="…" + res+="${clean}${where//\%/%%}" # escape % + + # Display the current Git commit if there is no branch or tag. + # Tip: To always display the current Git commit, remove `[[ -z $where ]] &&` from the next line. + [[ -z $where ]] && res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}" + + # Show tracking branch name if it differs from local branch. + if [[ -n ${VCS_STATUS_REMOTE_BRANCH:#$VCS_STATUS_LOCAL_BRANCH} ]]; then + res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape % + fi + + # ⇣42 if behind the remote. + (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" + # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42. + (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" " + (( VCS_STATUS_COMMITS_AHEAD )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}" + # ⇠42 if behind the push remote. + (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}" + (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" " + # ⇢42 if ahead of the push remote; no leading space if also behind: ⇠42⇢42. + (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && res+="${clean}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}" + # *42 if have stashes. + (( VCS_STATUS_STASHES )) && res+=" ${clean}*${VCS_STATUS_STASHES}" + # 'merge' if the repo is in an unusual state. + [[ -n $VCS_STATUS_ACTION ]] && res+=" ${conflicted}${VCS_STATUS_ACTION}" + # ~42 if have merge conflicts. + (( VCS_STATUS_NUM_CONFLICTED )) && res+=" ${conflicted}~${VCS_STATUS_NUM_CONFLICTED}" + # +42 if have staged changes. + (( VCS_STATUS_NUM_STAGED )) && res+=" ${modified}+${VCS_STATUS_NUM_STAGED}" + # !42 if have unstaged changes. + (( VCS_STATUS_NUM_UNSTAGED )) && res+=" ${modified}!${VCS_STATUS_NUM_UNSTAGED}" + # ?42 if have untracked files. It's really a question mark, your font isn't broken. + # See POWERLEVEL9K_VCS_UNTRACKED_ICON above if you want to use a different icon. + # Remove the next line if you don't want to see untracked files at all. + (( VCS_STATUS_NUM_UNTRACKED )) && res+=" ${untracked}${POWERLEVEL9K_VCS_UNTRACKED_ICON}${VCS_STATUS_NUM_UNTRACKED}" + # "─" if the number of unstaged files is unknown. This can happen due to + # POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY (see below) being set to a non-negative number lower + # than the number of files in the Git index, or due to bash.showDirtyState being set to false + # in the repository config. The number of staged and untracked files may also be unknown + # in this case. + (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}─" + + typeset -g my_git_format=$res + } + functions -M my_git_formatter 2>/dev/null + + # Don't count the number of unstaged, untracked and conflicted files in Git repositories with + # more than this many files in the index. Negative value means infinity. + # + # If you are working in Git repositories with tens of millions of files and seeing performance + # sagging, try setting POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY to a number lower than the output + # of `git ls-files | wc -l`. Alternatively, add `bash.showDirtyState = false` to the repository's + # config: `git config bash.showDirtyState false`. + typeset -g POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY=-1 + + # Don't show Git status in prompt for repositories whose workdir matches this pattern. + # For example, if set to '~', the Git repository at $HOME/.git will be ignored. + # Multiple patterns can be combined with '|': '~|~/some/dir'. + typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~' + + # Disable the default Git status formatting. + typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true + # Install our own Git status formatter. + typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}' + typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter(0)))+${my_git_format}}' + # Enable counters for staged, unstaged, etc. + typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 + + # Icon color. + typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76 + typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244 + # Custom icon. + typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION= + # Custom prefix. + # typeset -g POWERLEVEL9K_VCS_PREFIX='%244Fon ' + + # Show status of repositories of these types. You can add svn and/or hg if you are + # using them. If you do, your prompt may become slow even when your current directory + # isn't in an svn or hg reposotiry. + typeset -g POWERLEVEL9K_VCS_BACKENDS=(git) + + # These settings are used for respositories other than Git or when gitstatusd fails and + # Powerlevel10k has to fall back to using vcs_info. + typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=76 + typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=76 + typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=178 + + ##########################[ status: exit code of the last command ]########################### + # Enable OK_PIPE, ERROR_PIPE and ERROR_SIGNAL status states to allow us to enable, disable and + # style them independently from the regular OK and ERROR state. + typeset -g POWERLEVEL9K_STATUS_EXTENDED_STATES=true + + # Status on success. No content, just an icon. No need to show it if prompt_char is enabled as + # it will signify success by turning green. + typeset -g POWERLEVEL9K_STATUS_OK=true + typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND=70 + typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='✔' + + # Status when some part of a pipe command fails but the overall exit status is zero. It may look + # like this: 1|0. + typeset -g POWERLEVEL9K_STATUS_OK_PIPE=true + typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND=70 + typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='✔' + + # Status when it's just an error code (e.g., '1'). No need to show it if prompt_char is enabled as + # it will signify error by turning red. + typeset -g POWERLEVEL9K_STATUS_ERROR=true + typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND=160 + typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='✘' + + # Status when the last command was terminated by a signal. + typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL=true + typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND=160 + # Use terse signal names: "INT" instead of "SIGINT(2)". + typeset -g POWERLEVEL9K_STATUS_VERBOSE_SIGNAME=false + typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION='✘' + + # Status when some part of a pipe command fails and the overall exit status is also non-zero. + # It may look like this: 1|0. + typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE=true + typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND=160 + typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='✘' + + ###################[ command_execution_time: duration of the last command ]################### + # Show duration of the last command if takes longer than this many seconds. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3 + # Show this many fractional digits. Zero means round to seconds. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 + # Execution time color. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=248 + # Duration format: 1d 2h 3m 4s. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' + # Custom icon. + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION= + # Custom prefix. + # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%244Ftook ' + + #######################[ background_jobs: presence of background jobs ]####################### + # Don't show the number of background jobs. + typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE=false + # Background jobs color. + typeset -g POWERLEVEL9K_BACKGROUND_JOBS_FOREGROUND=37 + # Custom icon. + typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VISUAL_IDENTIFIER_EXPANSION='≡' + + #######################[ direnv: direnv status (https://direnv.net/) ]######################## + # Direnv color. + typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=178 + # Custom icon. + # typeset -g POWERLEVEL9K_DIRENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###############[ asdf: asdf version manager (https://github.com/asdf-vm/asdf) ]############### + # Default asdf color. Only used to display tools for which there is no color override (see below). + typeset -g POWERLEVEL9K_ASDF_FOREGROUND=66 + + # There are four parameters that can be used to hide asdf tools. Each parameter describes + # conditions under which a tool gets hidden. Parameters can hide tools but not unhide them. If at + # least one parameter decides to hide a tool, that tool gets hidden. If no parameter decides to + # hide a tool, it gets shown. + # + # Special note on the difference between POWERLEVEL9K_ASDF_SOURCES and + # POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW. Consider the effect of the following commands: + # + # asdf local python 3.8.1 + # asdf global python 3.8.1 + # + # After running both commands the current python version is 3.8.1 and its source is "local" as + # it takes precedence over "global". If POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW is set to false, + # it'll hide python version in this case because 3.8.1 is the same as the global version. + # POWERLEVEL9K_ASDF_SOURCES will hide python version only if the value of this parameter doesn't + # contain "local". + + # Hide tool versions that don't come from one of these sources. + # + # Available sources: + # + # - shell `asdf current` says "set by ASDF_${TOOL}_VERSION environment variable" + # - local `asdf current` says "set by /some/not/home/directory/file" + # - global `asdf current` says "set by /home/username/file" + # + # Note: If this parameter is set to (shell local global), it won't hide tools. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SOURCES. + typeset -g POWERLEVEL9K_ASDF_SOURCES=(shell local global) + + # If set to false, hide tool versions that are the same as global. + # + # Note: The name of this parameter doesn't reflect its meaning at all. + # Note: If this parameter is set to true, it won't hide tools. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_PROMPT_ALWAYS_SHOW. + typeset -g POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW=false + + # If set to false, hide tool versions that are equal to "system". + # + # Note: If this parameter is set to true, it won't hide tools. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_SYSTEM. + typeset -g POWERLEVEL9K_ASDF_SHOW_SYSTEM=true + + # If set to non-empty value, hide tools unless there is a file matching the specified file pattern + # in the current directory, or its parent diretory, or its grandparent directory, and so on. + # + # Note: If this parameter is set to empty value, it won't hide tools. + # Note: SHOW_ON_UPGLOB isn't specific to asdf. It works with all prompt segments. + # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_ON_UPGLOB. + # + # Example: Hide nodejs version when there is no package.json and no *.js files in the current + # directory, in `..`, in `../..` and so on. + # + # typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.js|package.json' + typeset -g POWERLEVEL9K_ASDF_SHOW_ON_UPGLOB= + + # Ruby version from asdf. + typeset -g POWERLEVEL9K_ASDF_RUBY_FOREGROUND=168 + # typeset -g POWERLEVEL9K_ASDF_RUBY_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_RUBY_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Python version from asdf. + typeset -g POWERLEVEL9K_ASDF_PYTHON_FOREGROUND=37 + # typeset -g POWERLEVEL9K_ASDF_PYTHON_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_PYTHON_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Go version from asdf. + typeset -g POWERLEVEL9K_ASDF_GO_FOREGROUND=37 + # typeset -g POWERLEVEL9K_ASDF_GO_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_GO_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Node.js version from asdf. + typeset -g POWERLEVEL9K_ASDF_NODEJS_FOREGROUND=70 + # typeset -g POWERLEVEL9K_ASDF_NODEJS_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Rust version from asdf. + typeset -g POWERLEVEL9K_ASDF_RUST_FOREGROUND=37 + # typeset -g POWERLEVEL9K_ASDF_RUST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_RUST_SHOW_ON_UPGLOB='*.foo|*.bar' + + # .NET Core version from asdf. + typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_FOREGROUND=134 + # typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Flutter version from asdf. + typeset -g POWERLEVEL9K_ASDF_FLUTTER_FOREGROUND=38 + # typeset -g POWERLEVEL9K_ASDF_FLUTTER_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_FLUTTER_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Lua version from asdf. + typeset -g POWERLEVEL9K_ASDF_LUA_FOREGROUND=32 + # typeset -g POWERLEVEL9K_ASDF_LUA_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_LUA_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Java version from asdf. + typeset -g POWERLEVEL9K_ASDF_JAVA_FOREGROUND=32 + # typeset -g POWERLEVEL9K_ASDF_JAVA_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_JAVA_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Perl version from asdf. + typeset -g POWERLEVEL9K_ASDF_PERL_FOREGROUND=67 + # typeset -g POWERLEVEL9K_ASDF_PERL_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_PERL_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Erlang version from asdf. + typeset -g POWERLEVEL9K_ASDF_ERLANG_FOREGROUND=125 + # typeset -g POWERLEVEL9K_ASDF_ERLANG_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_ERLANG_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Elixir version from asdf. + typeset -g POWERLEVEL9K_ASDF_ELIXIR_FOREGROUND=129 + # typeset -g POWERLEVEL9K_ASDF_ELIXIR_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_ELIXIR_SHOW_ON_UPGLOB='*.foo|*.bar' + + # Postgres version from asdf. + typeset -g POWERLEVEL9K_ASDF_POSTGRES_FOREGROUND=31 + # typeset -g POWERLEVEL9K_ASDF_POSTGRES_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_POSTGRES_SHOW_ON_UPGLOB='*.foo|*.bar' + + # PHP version from asdf. + typeset -g POWERLEVEL9K_ASDF_PHP_FOREGROUND=99 + # typeset -g POWERLEVEL9K_ASDF_PHP_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_ASDF_PHP_SHOW_ON_UPGLOB='*.foo|*.bar' + + ##########[ nordvpn: nordvpn connection status, linux only (https://nordvpn.com/) ]########### + # NordVPN connection indicator color. + typeset -g POWERLEVEL9K_NORDVPN_FOREGROUND=39 + # Hide NordVPN connection indicator when not connected. + typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_CONTENT_EXPANSION= + typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_VISUAL_IDENTIFIER_EXPANSION= + # Custom icon. + # typeset -g POWERLEVEL9K_NORDVPN_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #################[ ranger: ranger shell (https://github.com/ranger/ranger) ]################## + # Ranger shell color. + typeset -g POWERLEVEL9K_RANGER_FOREGROUND=178 + # Custom icon. + typeset -g POWERLEVEL9K_RANGER_VISUAL_IDENTIFIER_EXPANSION='▲' + + ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]####################### + # Nnn shell color. + typeset -g POWERLEVEL9K_NNN_FOREGROUND=72 + # Custom icon. + # typeset -g POWERLEVEL9K_NNN_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########################[ vim_shell: vim shell indicator (:sh) ]########################### + # Vim shell indicator color. + typeset -g POWERLEVEL9K_VIM_SHELL_FOREGROUND=34 + # Custom icon. + # typeset -g POWERLEVEL9K_VIM_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ######[ midnight_commander: midnight commander shell (https://midnight-commander.org/) ]###### + # Midnight Commander shell color. + typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_FOREGROUND=178 + # Custom icon. + # typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #[ nix_shell: nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) ]## + # Nix shell color. + typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74 + + # Tip: If you want to see just the icon without "pure" and "impure", uncomment the next line. + # typeset -g POWERLEVEL9K_NIX_SHELL_CONTENT_EXPANSION= + + # Custom icon. + # typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##################################[ disk_usgae: disk usage ]################################## + # Colors for different levels of disk usage. + typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35 + typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_FOREGROUND=220 + typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_FOREGROUND=160 + # Thresholds for different levels of disk usage (percentage points). + typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL=90 + typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_LEVEL=95 + # If set to true, hide disk usage when below $POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL percent. + typeset -g POWERLEVEL9K_DISK_USAGE_ONLY_WARNING=false + # Custom icon. + # typeset -g POWERLEVEL9K_DISK_USAGE_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ vi_mode: vi mode (you don't need this if you've enabled prompt_char) ]########### + # Text and color for normal (a.k.a. command) vi mode. + typeset -g POWERLEVEL9K_VI_COMMAND_MODE_STRING=NORMAL + typeset -g POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND=106 + # Text and color for visual vi mode. + typeset -g POWERLEVEL9K_VI_VISUAL_MODE_STRING=VISUAL + typeset -g POWERLEVEL9K_VI_MODE_VISUAL_FOREGROUND=68 + # Text and color for overtype (a.k.a. overwrite and replace) vi mode. + typeset -g POWERLEVEL9K_VI_OVERWRITE_MODE_STRING=OVERTYPE + typeset -g POWERLEVEL9K_VI_MODE_OVERWRITE_FOREGROUND=172 + # Text and color for insert vi mode. + typeset -g POWERLEVEL9K_VI_INSERT_MODE_STRING= + typeset -g POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND=66 + + # Custom icon. + typeset -g POWERLEVEL9K_RANGER_VISUAL_IDENTIFIER_EXPANSION='▲' + + ######################################[ ram: free RAM ]####################################### + # RAM color. + typeset -g POWERLEVEL9K_RAM_FOREGROUND=66 + # Custom icon. + # typeset -g POWERLEVEL9K_RAM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #####################################[ swap: used swap ]###################################### + # Swap color. + typeset -g POWERLEVEL9K_SWAP_FOREGROUND=96 + # Custom icon. + # typeset -g POWERLEVEL9K_SWAP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ######################################[ load: CPU load ]###################################### + # Show average CPU load over this many last minutes. Valid values are 1, 5 and 15. + typeset -g POWERLEVEL9K_LOAD_WHICH=5 + # Load color when load is under 50%. + typeset -g POWERLEVEL9K_LOAD_NORMAL_FOREGROUND=66 + # Load color when load is between 50% and 70%. + typeset -g POWERLEVEL9K_LOAD_WARNING_FOREGROUND=178 + # Load color when load is over 70%. + typeset -g POWERLEVEL9K_LOAD_CRITICAL_FOREGROUND=166 + # Custom icon. + # typeset -g POWERLEVEL9K_LOAD_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################[ todo: todo items (https://github.com/todotxt/todo.txt-cli) ]################ + # Todo color. + typeset -g POWERLEVEL9K_TODO_FOREGROUND=110 + # Hide todo when the total number of tasks is zero. + typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_TOTAL=true + # Hide todo when the number of tasks after filtering is zero. + typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_FILTERED=false + + # Todo format. The following parameters are available within the expansion. + # + # - P9K_TODO_TOTAL_TASK_COUNT The total number of tasks. + # - P9K_TODO_FILTERED_TASK_COUNT The number of tasks after filtering. + # + # These variables correspond to the last line of the output of `todo.sh -p ls`: + # + # TODO: 24 of 42 tasks shown + # + # Here 24 is P9K_TODO_FILTERED_TASK_COUNT and 42 is P9K_TODO_TOTAL_TASK_COUNT. + # + # typeset -g POWERLEVEL9K_TODO_CONTENT_EXPANSION='$P9K_TODO_FILTERED_TASK_COUNT' + + # Custom icon. + # typeset -g POWERLEVEL9K_TODO_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ timewarrior: timewarrior tracking status (https://timewarrior.net/) ]############ + # Timewarrior color. + typeset -g POWERLEVEL9K_TIMEWARRIOR_FOREGROUND=110 + # If the tracked task is longer than 24 characters, truncate and append "…". + # Tip: To always display tasks without truncation, delete the following parameter. + # Tip: To hide task names and display just the icon when time tracking is enabled, set the + # value of the following parameter to "". + typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+…}' + + # Custom icon. + # typeset -g POWERLEVEL9K_TIMEWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##############[ taskwarrior: taskwarrior task count (https://taskwarrior.org/) ]############## + # Taskwarrior color. + typeset -g POWERLEVEL9K_TASKWARRIOR_FOREGROUND=74 + + # Taskwarrior segment format. The following parameters are available within the expansion. + # + # - P9K_TASKWARRIOR_PENDING_COUNT The number of pending tasks: `task +PENDING count`. + # - P9K_TASKWARRIOR_OVERDUE_COUNT The number of overdue tasks: `task +OVERDUE count`. + # + # Zero values are represented as empty parameters. + # + # The default format: + # + # '${P9K_TASKWARRIOR_OVERDUE_COUNT:+"!$P9K_TASKWARRIOR_OVERDUE_COUNT/"}$P9K_TASKWARRIOR_PENDING_COUNT' + # + # typeset -g POWERLEVEL9K_TASKWARRIOR_CONTENT_EXPANSION='$P9K_TASKWARRIOR_PENDING_COUNT' + + # Custom icon. + # typeset -g POWERLEVEL9K_TASKWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##################################[ context: user@hostname ]################################## + # Context color when running with privileges. + typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=178 + # Context color in SSH without privileges. + typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=180 + # Default context color (no privileges, no SSH). + typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=180 + + # Context format when running with privileges: bold user@hostname. + typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%B%n@%m' + # Context format when in SSH without privileges: user@hostname. + typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_TEMPLATE='%n@%m' + # Default context format (no privileges, no SSH): user@hostname. + typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE='%n@%m' + + # Don't show context unless running with privileges or in SSH. + # Tip: Remove the next line to always show context. + typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION= + + # Custom icon. + # typeset -g POWERLEVEL9K_CONTEXT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Custom prefix. + # typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%244Fwith ' + + ###[ virtualenv: python virtual environment (https://docs.python.org/3/library/venv.html) ]### + # Python virtual environment color. + typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=37 + # Don't show Python version next to the virtual environment name. + typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false + # Separate environment name from Python version only with a space. + typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= + # Custom icon. + # typeset -g POWERLEVEL9K_VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #####################[ anaconda: conda environment (https://conda.io/) ]###################### + # Anaconda environment color. + typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=37 + # Don't show Python version next to the anaconda environment name. + typeset -g POWERLEVEL9K_ANACONDA_SHOW_PYTHON_VERSION=false + # Separate environment name from Python version only with a space. + typeset -g POWERLEVEL9K_ANACONDA_{LEFT,RIGHT}_DELIMITER= + # Custom icon. + # typeset -g POWERLEVEL9K_ANACONDA_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################[ pyenv: python environment (https://github.com/pyenv/pyenv) ]################ + # Pyenv color. + typeset -g POWERLEVEL9K_PYENV_FOREGROUND=37 + # Hide python version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_PYENV_SOURCES=(shell local global) + # If set to false, hide python version if it's the same as global: + # $(pyenv version-name) == $(pyenv global). + typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################[ goenv: go environment (https://github.com/syndbg/goenv) ]################ + # Goenv color. + typeset -g POWERLEVEL9K_GOENV_FOREGROUND=37 + # Hide go version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_GOENV_SOURCES=(shell local global) + # If set to false, hide go version if it's the same as global: + # $(goenv version-name) == $(goenv global). + typeset -g POWERLEVEL9K_GOENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_GOENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ nodenv: node.js version from nodenv (https://github.com/nodenv/nodenv) ]########## + # Nodenv color. + typeset -g POWERLEVEL9K_NODENV_FOREGROUND=70 + # Don't show node version if it's the same as global: $(nodenv version-name) == $(nodenv global). + typeset -g POWERLEVEL9K_NODENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_NODENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##############[ nvm: node.js version from nvm (https://github.com/nvm-sh/nvm) ]############### + # Nvm color. + typeset -g POWERLEVEL9K_NVM_FOREGROUND=70 + # Custom icon. + # typeset -g POWERLEVEL9K_NVM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ############[ nodeenv: node.js environment (https://github.com/ekalinin/nodeenv) ]############ + # Nodeenv color. + typeset -g POWERLEVEL9K_NODEENV_FOREGROUND=70 + # Don't show Node version next to the environment name. + typeset -g POWERLEVEL9K_NODEENV_SHOW_NODE_VERSION=false + # Separate environment name from Node version only with a space. + typeset -g POWERLEVEL9K_NODEENV_{LEFT,RIGHT}_DELIMITER= + # Custom icon. + # typeset -g POWERLEVEL9K_NODEENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##############################[ node_version: node.js version ]############################### + # Node version color. + typeset -g POWERLEVEL9K_NODE_VERSION_FOREGROUND=70 + # Show node version only when in a directory tree containing package.json. + typeset -g POWERLEVEL9K_NODE_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_NODE_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #######################[ go_version: go version (https://golang.org) ]######################## + # Go version color. + typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=37 + # Show go version only when in a go project subdirectory. + typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_GO_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #################[ rust_version: rustc version (https://www.rust-lang.org) ]################## + # Rust version color. + typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=37 + # Show rust version only when in a rust project subdirectory. + typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_RUST_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###############[ dotnet_version: .NET version (https://dotnet.microsoft.com) ]################ + # .NET version color. + typeset -g POWERLEVEL9K_DOTNET_VERSION_FOREGROUND=134 + # Show .NET version only when in a .NET project subdirectory. + typeset -g POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_DOTNET_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #####################[ php_version: php version (https://www.php.net/) ]###################### + # PHP version color. + typeset -g POWERLEVEL9K_PHP_VERSION_FOREGROUND=99 + # Show PHP version only when in a PHP project subdirectory. + typeset -g POWERLEVEL9K_PHP_VERSION_PROJECT_ONLY=true + # Custom icon. + # typeset -g POWERLEVEL9K_PHP_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ laravel_version: laravel php framework version (https://laravel.com/) ]########### + # Laravel version color. + typeset -g POWERLEVEL9K_LARAVEL_VERSION_FOREGROUND=161 + # Custom icon. + # typeset -g POWERLEVEL9K_LARAVEL_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #############[ rbenv: ruby version from rbenv (https://github.com/rbenv/rbenv) ]############## + # Rbenv color. + typeset -g POWERLEVEL9K_RBENV_FOREGROUND=168 + # Hide ruby version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_RBENV_SOURCES=(shell local global) + # If set to false, hide ruby version if it's the same as global: + # $(rbenv version-name) == $(rbenv global). + typeset -g POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_RBENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #######################[ rvm: ruby version from rvm (https://rvm.io) ]######################## + # Rvm color. + typeset -g POWERLEVEL9K_RVM_FOREGROUND=168 + # Don't show @gemset at the end. + typeset -g POWERLEVEL9K_RVM_SHOW_GEMSET=false + # Don't show ruby- at the front. + typeset -g POWERLEVEL9K_RVM_SHOW_PREFIX=false + # Custom icon. + # typeset -g POWERLEVEL9K_RVM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ fvm: flutter version management (https://github.com/leoafarias/fvm) ]############ + # Fvm color. + typeset -g POWERLEVEL9K_FVM_FOREGROUND=38 + # Custom icon. + # typeset -g POWERLEVEL9K_FVM_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ##########[ luaenv: lua version from luaenv (https://github.com/cehoffman/luaenv) ]########### + # Lua color. + typeset -g POWERLEVEL9K_LUAENV_FOREGROUND=32 + # Hide lua version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_LUAENV_SOURCES=(shell local global) + # If set to false, hide lua version if it's the same as global: + # $(luaenv version-name) == $(luaenv global). + typeset -g POWERLEVEL9K_LUAENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_LUAENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###############[ jenv: java version from jenv (https://github.com/jenv/jenv) ]################ + # Java color. + typeset -g POWERLEVEL9K_JENV_FOREGROUND=32 + # Hide java version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_JENV_SOURCES=(shell local global) + # If set to false, hide java version if it's the same as global: + # $(jenv version-name) == $(jenv global). + typeset -g POWERLEVEL9K_JENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_JENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ plenv: perl version from plenv (https://github.com/tokuhirom/plenv) ]############ + # Perl color. + typeset -g POWERLEVEL9K_PLENV_FOREGROUND=67 + # Hide perl version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_PLENV_SOURCES=(shell local global) + # If set to false, hide perl version if it's the same as global: + # $(plenv version-name) == $(plenv global). + typeset -g POWERLEVEL9K_PLENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_PLENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ############[ phpenv: php version from phpenv (https://github.com/phpenv/phpenv) ]############ + # PHP color. + typeset -g POWERLEVEL9K_PHPENV_FOREGROUND=99 + # Hide php version if it doesn't come from one of these sources. + typeset -g POWERLEVEL9K_PHPENV_SOURCES=(shell local global) + # If set to false, hide php version if it's the same as global: + # $(phpenv version-name) == $(phpenv global). + typeset -g POWERLEVEL9K_PHPENV_PROMPT_ALWAYS_SHOW=false + # Custom icon. + # typeset -g POWERLEVEL9K_PHPENV_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################[ terraform: terraform workspace (https://www.terraform.io) ]################# + # POWERLEVEL9K_TERRAFORM_CLASSES is an array with even number of elements. The first element + # in each pair defines a pattern against which the current terraform workspace gets matched. + # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) + # that gets matched. If you unset all POWERLEVEL9K_TERRAFORM_*CONTENT_EXPANSION parameters, + # you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_TERRAFORM_CLASSES defines the workspace class. Patterns are tried in order. The + # first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( + # '*prod*' PROD + # '*test*' TEST + # '*' DEFAULT) + # + # If your current terraform workspace is "project_test", its class is TEST because "project_test" + # doesn't match the pattern '*prod*' but does match '*test*'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_TERRAFORM_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_TERRAFORM_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_TERRAFORM_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' + typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( + # '*prod*' PROD # These values are examples that are unlikely + # '*test*' TEST # to match your needs. Customize them as needed. + '*' DEFAULT) + typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_FOREGROUND=38 + # typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]############# + # Show kubecontext only when the the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show kubecontext. + typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc' + + # Kubernetes context classes for the purpose of using different colors, icons and expansions with + # different contexts. + # + # POWERLEVEL9K_KUBECONTEXT_CLASSES is an array with even number of elements. The first element + # in each pair defines a pattern against which the current kubernetes context gets matched. + # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) + # that gets matched. If you unset all POWERLEVEL9K_KUBECONTEXT_*CONTENT_EXPANSION parameters, + # you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_KUBECONTEXT_CLASSES defines the context class. Patterns are tried in order. The + # first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( + # '*prod*' PROD + # '*test*' TEST + # '*' DEFAULT) + # + # If your current kubernetes context is "deathray-testing/default", its class is TEST + # because "deathray-testing/default" doesn't match the pattern '*prod*' but does match '*test*'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' + typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( + # '*prod*' PROD # These values are examples that are unlikely + # '*test*' TEST # to match your needs. Customize them as needed. + '*' DEFAULT) + typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_FOREGROUND=134 + typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='○' + + # Use POWERLEVEL9K_KUBECONTEXT_CONTENT_EXPANSION to specify the content displayed by kubecontext + # segment. Parameter expansions are very flexible and fast, too. See reference: + # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion. + # + # Within the expansion the following parameters are always available: + # + # - P9K_CONTENT The content that would've been displayed if there was no content + # expansion defined. + # - P9K_KUBECONTEXT_NAME The current context's name. Corresponds to column NAME in the + # output of `kubectl config get-contexts`. + # - P9K_KUBECONTEXT_CLUSTER The current context's cluster. Corresponds to column CLUSTER in the + # output of `kubectl config get-contexts`. + # - P9K_KUBECONTEXT_NAMESPACE The current context's namespace. Corresponds to column NAMESPACE + # in the output of `kubectl config get-contexts`. If there is no + # namespace, the parameter is set to "default". + # - P9K_KUBECONTEXT_USER The current context's user. Corresponds to column AUTHINFO in the + # output of `kubectl config get-contexts`. + # + # If the context points to Google Kubernetes Engine (GKE) or Elastic Kubernetes Service (EKS), + # the following extra parameters are available: + # + # - P9K_KUBECONTEXT_CLOUD_NAME Either "gke" or "eks". + # - P9K_KUBECONTEXT_CLOUD_ACCOUNT Account/project ID. + # - P9K_KUBECONTEXT_CLOUD_ZONE Availability zone. + # - P9K_KUBECONTEXT_CLOUD_CLUSTER Cluster. + # + # P9K_KUBECONTEXT_CLOUD_* parameters are derived from P9K_KUBECONTEXT_CLUSTER. For example, + # if P9K_KUBECONTEXT_CLUSTER is "gke_my-account_us-east1-a_my-cluster-01": + # + # - P9K_KUBECONTEXT_CLOUD_NAME=gke + # - P9K_KUBECONTEXT_CLOUD_ACCOUNT=my-account + # - P9K_KUBECONTEXT_CLOUD_ZONE=us-east1-a + # - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01 + # + # If P9K_KUBECONTEXT_CLUSTER is "arn:aws:eks:us-east-1:123456789012:cluster/my-cluster-01": + # + # - P9K_KUBECONTEXT_CLOUD_NAME=eks + # - P9K_KUBECONTEXT_CLOUD_ACCOUNT=123456789012 + # - P9K_KUBECONTEXT_CLOUD_ZONE=us-east-1 + # - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01 + typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION= + # Show P9K_KUBECONTEXT_CLOUD_CLUSTER if it's not empty and fall back to P9K_KUBECONTEXT_NAME. + POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${P9K_KUBECONTEXT_CLOUD_CLUSTER:-${P9K_KUBECONTEXT_NAME}}' + # Append the current context's namespace if it's not "default". + POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}' + + # Custom prefix. + # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%244Fat ' + + #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]# + # Show aws only when the the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show aws. + typeset -g POWERLEVEL9K_AWS_SHOW_ON_COMMAND='aws|awless|terraform|pulumi' + + # POWERLEVEL9K_AWS_CLASSES is an array with even number of elements. The first element + # in each pair defines a pattern against which the current AWS profile gets matched. + # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) + # that gets matched. If you unset all POWERLEVEL9K_AWS_*CONTENT_EXPANSION parameters, + # you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_AWS_CLASSES defines the profile class. Patterns are tried in order. The + # first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_AWS_CLASSES=( + # '*prod*' PROD + # '*test*' TEST + # '*' DEFAULT) + # + # If your current AWS profile is "company_test", its class is TEST + # because "company_test" doesn't match the pattern '*prod*' but does match '*test*'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_AWS_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_AWS_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_AWS_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' + typeset -g POWERLEVEL9K_AWS_CLASSES=( + # '*prod*' PROD # These values are examples that are unlikely + # '*test*' TEST # to match your needs. Customize them as needed. + '*' DEFAULT) + typeset -g POWERLEVEL9K_AWS_DEFAULT_FOREGROUND=208 + # typeset -g POWERLEVEL9K_AWS_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #[ aws_eb_env: aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) ]# + # AWS Elastic Beanstalk environment color. + typeset -g POWERLEVEL9K_AWS_EB_ENV_FOREGROUND=70 + # Custom icon. + typeset -g POWERLEVEL9K_AWS_EB_ENV_VISUAL_IDENTIFIER_EXPANSION='eb' + + ##########[ azure: azure account name (https://docs.microsoft.com/en-us/cli/azure) ]########## + # Show azure only when the the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show azure. + typeset -g POWERLEVEL9K_AZURE_SHOW_ON_COMMAND='az|terraform|pulumi' + # Azure account name color. + typeset -g POWERLEVEL9K_AZURE_FOREGROUND=32 + # Custom icon. + typeset -g POWERLEVEL9K_AZURE_VISUAL_IDENTIFIER_EXPANSION='az' + + ##########[ gcloud: google cloud account and project (https://cloud.google.com/) ]########### + # Show gcloud only when the the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show gcloud. + typeset -g POWERLEVEL9K_GCLOUD_SHOW_ON_COMMAND='gcloud|gcs' + # Google cloud color. + typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=32 + + # Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION if the default + # is too verbose or not informative enough. + # + # P9K_GCLOUD_ACCOUNT: the output of `gcloud config get-value account` + # P9K_GCLOUD_PROJECT: the output of `gcloud config get-value project` + # ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'. + # + typeset -g POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT//\%/%%}' + + # Custom icon. + # typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #[ google_app_cred: google application credentials (https://cloud.google.com/docs/authentication/production) ]# + # Show google_app_cred only when the the command you are typing invokes one of these tools. + # Tip: Remove the next line to always show google_app_cred. + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_SHOW_ON_COMMAND='terraform|pulumi' + + # Google application credentials classes for the purpose of using different colors, icons and + # expansions with different credentials. + # + # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES is an array with even number of elements. The first + # element in each pair defines a pattern against which the current kubernetes context gets + # matched. More specifically, it's P9K_CONTENT prior to the application of context expansion + # (see below) that gets matched. If you unset all POWERLEVEL9K_GOOGLE_APP_CRED_*CONTENT_EXPANSION + # parameters, you'll see this value in your prompt. The second element of each pair in + # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES defines the context class. Patterns are tried in order. + # The first match wins. + # + # For example, given these settings: + # + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( + # '*:*prod*:*' PROD + # '*:*test*:*' TEST + # '*' DEFAULT) + # + # If your current Google application credentials is "service_account deathray-testing x@y.com", + # its class is TEST because it doesn't match the pattern '* *prod* *' but does match '* *test* *'. + # + # You can define different colors, icons and content expansions for different classes: + # + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_FOREGROUND=28 + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_CONTENT_EXPANSION='$P9K_GOOGLE_APP_CRED_PROJECT_ID' + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( + # '*:*prod*:*' PROD # These values are examples that are unlikely + # '*:*test*:*' TEST # to match your needs. Customize them as needed. + '*' DEFAULT) + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_FOREGROUND=32 + # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # Use POWERLEVEL9K_GOOGLE_APP_CRED_CONTENT_EXPANSION to specify the content displayed by + # google_app_cred segment. Parameter expansions are very flexible and fast, too. See reference: + # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion. + # + # You can use the following parameters in the expansion. Each of them corresponds to one of the + # fields in the JSON file pointed to by GOOGLE_APPLICATION_CREDENTIALS. + # + # Parameter | JSON key file field + # ---------------------------------+--------------- + # P9K_GOOGLE_APP_CRED_TYPE | type + # P9K_GOOGLE_APP_CRED_PROJECT_ID | project_id + # P9K_GOOGLE_APP_CRED_CLIENT_EMAIL | client_email + # + # Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurences of '%' replaced by '%%'. + typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_CONTENT_EXPANSION='${P9K_GOOGLE_APP_CRED_PROJECT_ID//\%/%%}' + + ###############################[ public_ip: public IP address ]############################### + # Public IP color. + typeset -g POWERLEVEL9K_PUBLIC_IP_FOREGROUND=94 + # Custom icon. + # typeset -g POWERLEVEL9K_PUBLIC_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ########################[ vpn_ip: virtual private network indicator ]######################### + # VPN IP color. + typeset -g POWERLEVEL9K_VPN_IP_FOREGROUND=81 + # When on VPN, show just an icon without the IP address. + # Tip: To display the private IP address when on VPN, remove the next line. + typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION= + # Regular expression for the VPN network interface. Run `ifconfig` or `ip -4 a show` while on VPN + # to see the name of the interface. + typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(wg|(.*tun))[0-9]*' + # If set to true, show one segment per matching network interface. If set to false, show only + # one segment corresponding to the first matching network interface. + # Tip: If you set it to true, you'll probably want to unset POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION. + typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=false + # Custom icon. + # typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ###########[ ip: ip address and bandwidth usage for a specified network interface ]########### + # IP color. + typeset -g POWERLEVEL9K_IP_FOREGROUND=38 + # The following parameters are accessible within the expansion: + # + # Parameter | Meaning + # ----------------------+--------------- + # P9K_IP_IP | IP address + # P9K_IP_INTERFACE | network interface + # P9K_IP_RX_BYTES | total number of bytes received + # P9K_IP_TX_BYTES | total number of bytes sent + # P9K_IP_RX_RATE | receive rate (since last prompt) + # P9K_IP_TX_RATE | send rate (since last prompt) + typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='${P9K_IP_RX_RATE:+%70F⇣$P9K_IP_RX_RATE }${P9K_IP_TX_RATE:+%215F⇡$P9K_IP_TX_RATE }%38F$P9K_IP_IP' + # Show information for the first network interface whose name matches this regular expression. + # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. + typeset -g POWERLEVEL9K_IP_INTERFACE='e.*' + # Custom icon. + # typeset -g POWERLEVEL9K_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' + + #########################[ proxy: system-wide http/https/ftp proxy ]########################## + # Proxy color. + typeset -g POWERLEVEL9K_PROXY_FOREGROUND=68 + # Custom icon. + # typeset -g POWERLEVEL9K_PROXY_VISUAL_IDENTIFIER_EXPANSION='⭐' + + ################################[ battery: internal battery ]################################# + # Show battery in red when it's below this level and not connected to power supply. + typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20 + typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160 + # Show battery in green when it's charging or fully charged. + typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70 + # Show battery in yellow when it's discharging. + typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178 + # Battery pictograms going from low to high level of charge. + typeset -g POWERLEVEL9K_BATTERY_STAGES=('%K{232}▁' '%K{232}▂' '%K{232}▃' '%K{232}▄' '%K{232}▅' '%K{232}▆' '%K{232}▇' '%K{232}█') + # Don't show the remaining time to charge/discharge. + typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false + + #####################################[ wifi: wifi speed ]##################################### + # WiFi color. + typeset -g POWERLEVEL9K_WIFI_FOREGROUND=68 + # Custom icon. + # typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # Use different colors and icons depending on signal strength ($P9K_WIFI_BARS). + # + # # Wifi colors and icons for different signal strength levels (low to high). + # typeset -g my_wifi_fg=(68 68 68 68 68) # <-- change these values + # typeset -g my_wifi_icon=('WiFi' 'WiFi' 'WiFi' 'WiFi' 'WiFi') # <-- change these values + # + # typeset -g POWERLEVEL9K_WIFI_CONTENT_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}$P9K_WIFI_LAST_TX_RATE Mbps' + # typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}${my_wifi_icon[P9K_WIFI_BARS+1]}' + # + # The following parameters are accessible within the expansions: + # + # Parameter | Meaning + # ----------------------+--------------- + # P9K_WIFI_SSID | service set identifier, a.k.a. network name + # P9K_WIFI_LINK_AUTH | authentication protocol such as "wpa2-psk" or "none" + # P9K_WIFI_LAST_TX_RATE | wireless transmit rate in megabits per second + # P9K_WIFI_RSSI | signal strength in dBm, from -120 to 0 + # P9K_WIFI_NOISE | noise in dBm, from -120 to 0 + # P9K_WIFI_BARS | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE) + # + # All parameters except P9K_WIFI_BARS are extracted from the output of the following command: + # + # /System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I + + ####################################[ time: current time ]#################################### + # Current time color. + typeset -g POWERLEVEL9K_TIME_FOREGROUND=66 + # Format for the current time: 09:51:02. See `man 3 strftime`. + typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' + # If set to true, time will update when you hit enter. This way prompts for the past + # commands will contain the start times of their commands as opposed to the default + # behavior where they contain the end times of their preceding commands. + typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false + # Custom icon. + typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION= + # Custom prefix. + # typeset -g POWERLEVEL9K_TIME_PREFIX='%244Fat ' + + # Example of a user-defined prompt segment. Function prompt_example will be called on every + # prompt if `example` prompt segment is added to POWERLEVEL9K_LEFT_PROMPT_ELEMENTS or + # POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS. It displays an icon and orange text greeting the user. + # + # Type `p10k help segment` for documentation and a more sophisticated example. + function prompt_example() { + p10k segment -f 208 -i '⭐' -t 'hello, %n' + } + + # User-defined prompt segments may optionally provide an instant_prompt_* function. Its job + # is to generate the prompt segment for display in instant prompt. See + # https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt. + # + # Powerlevel10k will call instant_prompt_* at the same time as the regular prompt_* function + # and will record all `p10k segment` calls it makes. When displaying instant prompt, Powerlevel10k + # will replay these calls without actually calling instant_prompt_*. It is imperative that + # instant_prompt_* always makes the same `p10k segment` calls regardless of environment. If this + # rule is not observed, the content of instant prompt will be incorrect. + # + # Usually, you should either not define instant_prompt_* or simply call prompt_* from it. If + # instant_prompt_* is not defined for a segment, the segment won't be shown in instant prompt. + function instant_prompt_example() { + # Since prompt_example always makes the same `p10k segment` calls, we can call it from + # instant_prompt_example. This will give us the same `example` prompt segment in the instant + # and regular prompts. + prompt_example + } + + # User-defined prompt segments can be customized the same way as built-in segments. + # typeset -g POWERLEVEL9K_EXAMPLE_FOREGROUND=208 + # typeset -g POWERLEVEL9K_EXAMPLE_VISUAL_IDENTIFIER_EXPANSION='⭐' + + # Transient prompt works similarly to the builtin transient_rprompt option. It trims down prompt + # when accepting a command line. Supported values: + # + # - off: Don't change prompt when accepting a command line. + # - always: Trim down prompt when accepting a command line. + # - same-dir: Trim down prompt when accepting a command line unless this is the first command + # typed after changing current working directory. + typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=always + + # Instant prompt mode. + # + # - off: Disable instant prompt. Choose this if you've tried instant prompt and found + # it incompatible with your zsh configuration files. + # - quiet: Enable instant prompt and don't print warnings when detecting console output + # during zsh initialization. Choose this if you've read and understood + # https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt. + # - verbose: Enable instant prompt and print a warning when detecting console output during + # zsh initialization. Choose this if you've never tried instant prompt, haven't + # seen the warning, or if you are unsure what this all means. + typeset -g POWERLEVEL9K_INSTANT_PROMPT=off + + # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. + # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload + # can slow down prompt by 1-2 milliseconds, so it's better to keep it turned off unless you + # really need it. + typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true + + # If p10k is already loaded, reload configuration. + # This works even with POWERLEVEL9K_DISABLE_HOT_RELOAD=true. + (( ! $+functions[p10k] )) || p10k reload +} + +(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} +'builtin' 'unset' 'p10k_config_opts' diff --git a/home/modules/profiles/browsing/default.nix b/home/modules/profiles/browsing/default.nix new file mode 100644 index 00000000..44f1448d --- /dev/null +++ b/home/modules/profiles/browsing/default.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: +let cfg = config.profiles.browsing; + +in +{ + options.profiles.browsing = { + enable = lib.mkEnableOption + "A profile that enables a browser for the GUI and the terminal"; + }; + + config = lib.mkIf cfg.enable { + nixpkgs.config = { google-chrome = { enableWideVine = true; }; }; + home.packages = with pkgs; [ google-chrome lynx ]; + }; +} diff --git a/home/modules/profiles/default.nix b/home/modules/profiles/default.nix new file mode 100644 index 00000000..af9d9a85 --- /dev/null +++ b/home/modules/profiles/default.nix @@ -0,0 +1,13 @@ +{ config, lib, ... }: +let + profileEnabler = + let + reducer = l: r: { "${r}".enable = true; } // l; + in + builtins.foldl' reducer { } config.activeProfiles; +in +{ + options.activeProfiles = lib.mkOption { type = lib.types.listOf lib.types.str; }; + + config.profiles = profileEnabler; +} diff --git a/home/modules/profiles/development/default.nix b/home/modules/profiles/development/default.nix new file mode 100644 index 00000000..90c8aa6e --- /dev/null +++ b/home/modules/profiles/development/default.nix @@ -0,0 +1,81 @@ +{ config, pkgs, lib, ... }: +let cfg = config.profiles.development; + +in +{ + options.profiles.development = { + enable = lib.mkEnableOption + "A profile that enables the system to be used for developing programs"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs = { + extraPackages = ep: [ ep.magit ]; + extraConfig = '' + ;; prepare magit use from shell + (require 'magit) + (global-git-commit-mode) + + ;; let magit autorefresh on file save within emacs + (add-hook 'after-save-hook 'magit-after-save-refresh-status t) + ''; + }; + + programs.gh.enable = true; + programs.git = { + enable = true; + + userName = "Norbert Melzer"; + userEmail = "timmelzer@gmail.com"; + + aliases = { + graph = + "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold cyan)%h%C(reset) - %C(green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"; + co = "checkout"; + br = "branch"; + st = "status"; + ps = "push"; + pl = "pull"; + root = "rev-parse --show-toplevel"; + }; + + extraConfig = { + init.defaultBranch = "main"; + pull.rebase = false; + }; + + ignores = [ + # IntelliJ files and folders + ".idea/" + "*.iml" + # backupfiles and shadow copies done by editors + "*~" + "\\#*\\#" + ".#*" + # Elixir language server + "/.elixir_ls" + # MyPy Cache + ".mypy_cache" + # Visual Studio Code project configuration + "/.vscode" + # Result folder for nix builds + "result" + "result-*" + # direnv caches + ".direnv/" + # emacs/python stuff + "flycheck_*.py" + ]; + + includes = [{ + condition = "gitdir:~/cloudseeds/**"; + contents = { + init.defaultBranch = "master"; + user.email = "norbert.melzer@cloudseeds.de"; + }; + }]; + }; + + home.packages = [ pkgs.ripgrep ]; + }; +} diff --git a/home/modules/profiles/home-office/default.nix b/home/modules/profiles/home-office/default.nix new file mode 100644 index 00000000..7de750c1 --- /dev/null +++ b/home/modules/profiles/home-office/default.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: +let cfg = config.profiles.home-office; + +in +{ + options.profiles.home-office = { + enable = lib.mkEnableOption + "A profile that enables remote desktop to the workingplace"; + + user = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = ""; + example = "jon.doe"; + description = '' + The username used to login to the RDP host + ''; + }; + + pass = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = ""; + example = "secret"; + description = '' + The password used to login to the RDP host + ''; + }; + + domain = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = ""; + example = "secret"; + description = '' + The domain used to login to the RDP host + ''; + }; + + host = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = ""; + example = "example.com"; + description = '' + The hostname or IP of the RDP host + ''; + }; + }; + + config = lib.mkIf cfg.enable { + # TODO: add assertions for `user`, `pass`, and `host` beeing set. + + home.packages = [ + (pkgs.writeShellScriptBin "home-office" '' + ${pkgs.freerdp}/bin/xfreerdp '/u:${cfg.user}' '/p:${cfg.pass}' '/d:${cfg.domain}' '/v:${cfg.host}' /dynamic-resolution + '') + + pkgs.teamspeak_client + ]; + }; +} diff --git a/home/modules/programs/advcp/default.nix b/home/modules/programs/advcp/default.nix new file mode 100644 index 00000000..917c166c --- /dev/null +++ b/home/modules/programs/advcp/default.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, self, ... }: +let cfg = config.programs.advancedCopy; + +in +{ + options.programs.advancedCopy = { + enable = lib.mkEnableOption "CP and MV with a progressbar"; + }; + + config = lib.mkIf cfg.enable { + home.packages = [ self.advcp ]; + + programs.zshell.aliases = { + cp = "advcp -g"; + mv = "advmv -g"; + }; + }; +} diff --git a/home/modules/programs/emacs/beacon.nix b/home/modules/programs/emacs/beacon.nix new file mode 100644 index 00000000..0514bec3 --- /dev/null +++ b/home/modules/programs/emacs/beacon.nix @@ -0,0 +1,28 @@ +{ config, lib, ... }: +let cfg = config.programs.emacs.packages.beacon; +in +{ + options.programs.emacs.packages.beacon = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable `beacon' for emacs. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + programs.emacs.localPackages."init-beacon" = { + tag = "Setup beacon"; + comments = [ ]; + requires = [ ]; + code = '' + ;; enable the beacon minor mode globally. + (beacon-mode 1) + ''; + }; + + programs.emacs.extraPackages = ep: [ ep.beacon ]; + }; +} diff --git a/home/modules/programs/emacs/company.nix b/home/modules/programs/emacs/company.nix new file mode 100644 index 00000000..f5d12496 --- /dev/null +++ b/home/modules/programs/emacs/company.nix @@ -0,0 +1,36 @@ +{ config, lib, ... }: + +with lib; +let emacs = config.programs.emacs; +in +{ + config = lib.mkIf emacs.enable { + programs.emacs.extraPackages = ep: [ ep.company ]; + + programs.emacs.localPackages."init-company" = { + tag = "Setup and initialise company"; + comments = [ ]; + requires = [ ]; + code = '' + ;; company + (setq tab-always-indent 'complete) + (add-to-list 'completion-styles 'initials t) + + ;; (eval-when-compile (require 'company)) + + (add-hook 'after-init-hook 'global-company-mode) + (with-eval-after-load 'company + + ;; (diminish 'company-mode "CMP") + (define-key company-mode-map (kbd "M-+") '("complete" . 'company-complete)) + (define-key company-active-map (kbd "M-+") '("change backend" . 'company-other-backend)) + (define-key company-active-map (kbd "C-n") '("next" . 'company-select-next)) + (define-key company-active-map (kbd "C-p") '("previous" . 'company-select-previous)) + (setq-default company-dabbrev-other-buffers 'all + company-tooltip-align-annotations t + company-minimum-prefix-length 1 + company-idle-delay 0.05)) + ''; + }; + }; +} diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix new file mode 100644 index 00000000..27b19031 --- /dev/null +++ b/home/modules/programs/emacs/default.nix @@ -0,0 +1,176 @@ +{ config, lib, pkgs, ... }: +let + emacsEnabled = config.programs.emacs.enable; + cfg = config.programs.emacs; + + bool2Lisp = b: if b then "t" else "nil"; + + confPackages = + let + fileContent = lib.attrsets.mapAttrs' + (k: v: { + name = "${k}"; + value = { + ep = v.packageRequires; + src = pkgs.nobbzLib.emacs.generatePackage k v.tag v.comments v.requires + v.code; + }; + }) + cfg.localPackages; + derivations = lib.attrsets.mapAttrs + (k: v: { + ep = v.ep; + src = pkgs.writeText "${k}.el" v.src; + }) + fileContent; + in + derivations; + + lispRequires = + let + names = lib.attrsets.mapAttrsToList (n: _: n) cfg.localPackages; + sorted = builtins.sort (l: r: l < r) names; + required = builtins.map (r: "(require '${r})") sorted; + in + builtins.concatStringsSep "\n" required; + +in +{ + imports = [ + ./beacon.nix + ./company.nix + ./helm.nix + ./lsp.nix + ./projectile.nix + ./telephoneline.nix + ./whichkey + ]; + + options.programs.emacs = { + splashScreen = lib.mkOption { + type = lib.types.bool; + default = true; + example = false; + description = '' + Enable the startup screen. + ''; + }; + + localPackages = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule ({ ... }: { + options = { + tag = lib.mkOption { type = lib.types.str; }; + comments = lib.mkOption { type = lib.types.listOf lib.types.str; }; + requires = lib.mkOption { type = lib.types.listOf lib.types.str; }; + code = lib.mkOption { type = lib.types.str; }; + packageRequires = lib.mkOption { + type = lib.types.unspecified; + default = _: [ ]; + }; + }; + })); + }; + + extraConfig = lib.mkOption { + type = lib.types.lines; + default = ""; + description = '' + Extra preferences to add to init.el. + ''; + }; + + module = lib.mkOption { + description = "Attribute set of modules to link into emacs configuration"; + default = { }; + }; + }; + + config = lib.mkIf emacsEnabled { + programs.emacs.extraConfig = '' + ;; adjust the load-path to find further down required files + (add-to-list 'load-path + (expand-file-name "lisp" user-emacs-directory)) + + (fset 'yes-or-no-p 'y-or-n-p) + + ;; Move backups and autosaves out of the way + (setq backup-directory-alist + `((".*" . ,temporary-file-directory))) + (setq auto-save-file-name-transforms + `((".*" ,temporary-file-directory))) + + ;; use a dark theme + (load-theme 'dracula t) + + ;; Set a font + (add-to-list 'default-frame-alist + '(font . "Cascadia Code PL-10")) + + ;; require all those local packages + ${lispRequires} + + (global-auto-revert-mode) + (global-whitespace-mode) + (global-linum-mode) + + (setq-default indent-tabs-mode nil) + (setq-default tab-width 2) + (setq-default whitespace-style + '(face + tabs + spaces + trailing + lines-tail + newline + missing-newline-at-eof + space-before-tab + indentation + empty + space-after-tab + space-mark + tab-mark + newline-mark)) + + ;; set splash screen + (setq inhibit-startup-screen ${bool2Lisp (!cfg.splashScreen)}) + ''; + + programs.emacs.extraPackages = ep: + [ + ep.company-go + ep.dracula-theme + ep.docker-compose-mode + ep.dockerfile-mode + ep.go-mode + ep.markdown-mode + ep.yaml-mode + ep.adoc-mode + ep.k8s-mode + ep.buttercup + ep.adoc-mode + ep.hledger-mode + ep.typescript-mode + + ep.ledger-mode + + # ep.bazel-mode + + # (ep.trivialBuild { pname = "configuration"; src = confPackages; }) + ] ++ lib.attrsets.mapAttrsToList + (pname: v: + ep.trivialBuild { + inherit pname; + src = v.src; + packageRequires = v.ep ep; + }) + confPackages; + + home.file = { + ".emacs.d/init.el" = { + text = pkgs.nobbzLib.emacs.generatePackage "init" + "Initialises emacs configuration" [ ] [ ] + cfg.extraConfig; + }; + }; + }; +} diff --git a/home/modules/programs/emacs/helm.nix b/home/modules/programs/emacs/helm.nix new file mode 100644 index 00000000..d42118dd --- /dev/null +++ b/home/modules/programs/emacs/helm.nix @@ -0,0 +1,30 @@ +{ config, lib, ... }: +let emacsCfg = config.programs.emacs; +in +{ + config = lib.mkIf emacsCfg.enable { + programs.emacs = { + localPackages."init-helm" = { + tag = "Setup helm"; + comments = [ ]; + requires = [ "helm" ]; + packageRequires = ep: [ ep.helm ep.helm-rg ]; + code = '' + ;; enable and configure auto resize + (helm-autoresize-mode t) + (setq-default + helm-autoresize-max-height 20 ; take at most 20% of the screen + helm-autoresize-min-height 1) ; get as small as necessary + + ;; set up key bindings + (global-set-key (kbd "M-x") 'helm-M-x) + (global-set-key (kbd "C-x C-f") 'helm-find-files) + (global-set-key (kbd "C-x C-b") 'helm-buffers-list) + + ;; enable helm + (helm-mode t) + ''; + }; + }; + }; +} diff --git a/home/modules/programs/emacs/lsp.nix b/home/modules/programs/emacs/lsp.nix new file mode 100644 index 00000000..2edef0da --- /dev/null +++ b/home/modules/programs/emacs/lsp.nix @@ -0,0 +1,65 @@ +{ config, lib, ... }: +let + cfg = config.programs.emacs.lsp-mode; + + mode-hooks = with lib; + let + sorted = builtins.sort (l: r: l < r) cfg.languages; + uni = unique sorted; + hooks = builtins.map (l: "'${l}-mode-hook") uni; + add-hooks = builtins.map (h: "(add-hook ${h} #'lsp)") hooks; + in + builtins.concatStringsSep "\n" add-hooks; + +in +{ + options.programs.emacs.lsp-mode = { + enable = lib.mkEnableOption "Enables and installs lsp-mode"; + + languages = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + The prefixes of the prog-mode that shall be handled through lsp-mode. + ''; + example = [ "erlang" ]; + }; + }; + + config = lib.mkIf cfg.enable { + programs.emacs = { + localPackages."init-lsp" = { + tag = "Setup and prepare the LSP mode"; + comments = [ ]; + requires = [ "lsp-mode" ]; + packageRequires = ep: [ + # ep.company-lsp + ep.helm-lsp + ep.lsp-mode + ep.lsp-origami + ep.lsp-ui + ep.yasnippet + ]; + code = '' + (yas-global-mode t) + + (setq lsp-log-io t) + (setq lsp-ui-sideline-enable t) + (setq lsp-ui-doc-enable t) + (setq lsp-ui-doc-position 'bottom) + + (eval-after-load 'company + '(push 'company-lsp company-backend)) + + (dolist (match + '("[/\\\\].direnv$" + "[/\\\\]node_modules$" + "/nix/store")) + (add-to-list 'lsp-file-watch-ignored match)) + + ${mode-hooks} + ''; + }; + }; + }; +} diff --git a/home/modules/programs/emacs/polymode/default.nix b/home/modules/programs/emacs/polymode/default.nix new file mode 100644 index 00000000..e76d99c3 --- /dev/null +++ b/home/modules/programs/emacs/polymode/default.nix @@ -0,0 +1,33 @@ +{ config, lib, ... }: + +with lib; +let emacs = config.programs.emacs; +in +{ + config = lib.mkIf emacs.enable { + programs.emacs.extraPackages = ep: [ ep.polymode ]; + + programs.emacs.localPackages."init-polymode" = { + tag = "Setup and initialise polymode"; + comments = [ ]; + requires = [ ]; + code = '' + ;; polymode + (add-to-list 'auto-mode-alist '("\\.nix$" . poly-nix-mode)) + + (define-hostmode poly-nix-hostmode :mode 'nix-mode) + + (define-innermode poly-elisp-expr-nix-innermode + :mode 'emacs-lisp-mode + :head-matcher (cons "'''\n\\( *;;.*\n\\)" 1) + :tail-matcher " *''';$" + :head-mode 'body + :tail-mode 'host) + + (define-polymode poly-nix-mode + :hostmode 'poly-nix-hostmode + :innermodes '(poly-elisp-expr-nix-innermode)) + ''; + }; + }; +} diff --git a/home/modules/programs/emacs/projectile.nix b/home/modules/programs/emacs/projectile.nix new file mode 100644 index 00000000..15e47dc4 --- /dev/null +++ b/home/modules/programs/emacs/projectile.nix @@ -0,0 +1,22 @@ +{ config, lib, ... }: +let emacsCfg = config.programs.emacs; +in +{ + config = lib.mkIf emacsCfg.enable { + programs.emacs = { + localPackages."init-projectile" = { + tag = "Setup projectile"; + comments = [ ]; + requires = [ "projectile" "helm-projectile" "tramp" ]; + packageRequires = ep: [ ep.projectile ep.helm-projectile ]; + code = '' + ;; enable projectile + (projectile-mode t) + (helm-projectile-on) + + (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) + ''; + }; + }; + }; +} diff --git a/home/modules/programs/emacs/telephoneline.nix b/home/modules/programs/emacs/telephoneline.nix new file mode 100644 index 00000000..dbaf7577 --- /dev/null +++ b/home/modules/programs/emacs/telephoneline.nix @@ -0,0 +1,28 @@ +{ config, lib, ... }: +let ecfg = config.programs.emacs; +in +{ + config = lib.mkIf ecfg.enable { + programs.emacs.localPackages."init-telephoneline" = { + tag = "Setup telephone line"; + comments = [ ]; + requires = [ ]; + code = '' + ;; set up telephone line + (setq-default + telephone-line-lhs '((accent . (telephone-line-vc-segment + telephone-line-erc-modified-channels-segment + telephone-line-process-segment)) + (nil . (telephone-line-minor-mode-segment + telephone-line-buffer-segment))) + telephone-line-rhs '((nil . (telephone-line-misc-info-segment)) + (accent . (telephone-line-major-mode-segment)) + (accent . (telephone-line-airline-position-segment)))) + + (telephone-line-mode t) + ''; + }; + + programs.emacs.extraPackages = ep: [ ep.telephone-line ]; + }; +} diff --git a/home/modules/programs/emacs/whichkey/default.nix b/home/modules/programs/emacs/whichkey/default.nix new file mode 100644 index 00000000..c5de1225 --- /dev/null +++ b/home/modules/programs/emacs/whichkey/default.nix @@ -0,0 +1,66 @@ +{ config, lib, ... }: + +with lib; +let + cfg = config.programs.emacs.whichkey; + enabled = config.programs.emacs.enable; + + keyReplacementType = types.listOf (types.submodule ({ ... }: { + options = { + keys = lib.mkOption { + type = types.str; + description = '' + Keys that shall get a description. + ''; + }; + replace = lib.mkOption { + type = types.str; + description = '' + Human readable description for the keycombination + ''; + }; + }; + })); + + replacements = lib.concatStringsSep "\n " + (builtins.map ({ keys, replace, ... }: ''"${keys}" "${replace}"'') + cfg.replacement); +in +{ + options.programs.emacs.whichkey = { + replacement = lib.mkOption { type = keyReplacementType; }; + }; + + config = lib.mkIf enabled { + programs.emacs = { + whichkey.replacement = [ + { + keys = "C-x C-f"; + replace = "find file"; + } + { + keys = "C-x C-s"; + replace = "write file"; + } + { + keys = "C-x C-c"; + replace = "leave emacs"; + } + ]; + extraPackages = ep: [ ep.which-key ]; + localPackages."init-whichkey" = { + tag = "Setup and initialise whichkey"; + comments = [ ]; + requires = [ ]; + code = '' + ;; which-key + (which-key-mode t) + (setq-default which-key-idle-delay 0.1) + + (which-key-add-key-based-replacements + ${replacements}) + ''; + }; + }; + }; +} diff --git a/home/modules/programs/openshift/default.nix b/home/modules/programs/openshift/default.nix new file mode 100644 index 00000000..db2ea7e0 --- /dev/null +++ b/home/modules/programs/openshift/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, config, ... }: +let cfg = config.programs.openshift; + +in +{ + options.programs.openshift = { + enable = lib.mkEnableOption "Tools to manage openshift instances"; + }; + + config = lib.mkIf cfg.enable { + home.packages = + [ pkgs.sops pkgs.openshift (lib.setPrio 0 pkgs.kubectl) pkgs.kubernetes-helm ]; + + programs.zsh.initExtra = '' + # Enable autocomplete for oc, kubectl and helm + eval "$(${pkgs.openshift}/bin/oc completion zsh)" + eval "$(${pkgs.kubectl}/bin/kubectl completion zsh)" + eval "$(${pkgs.kubernetes-helm}/bin/helm completion zsh)" + ''; + }; +} diff --git a/home/modules/programs/zshell/default.nix b/home/modules/programs/zshell/default.nix new file mode 100644 index 00000000..514002aa --- /dev/null +++ b/home/modules/programs/zshell/default.nix @@ -0,0 +1,44 @@ +{ config, lib, ... }: +let + cfg = config.programs.zshell; + aliasesStr = lib.concatStringsSep "\n" + (lib.mapAttrsToList (k: v: "alias ${k}=${lib.escapeShellArg v}") + cfg.aliases); + sourcesStr = + lib.concatStringsSep "\n" (builtins.map (s: ". ${s}") cfg.sources); +in +{ + options.programs.zshell = { + aliases = lib.mkOption { + default = { }; + example = { + ll = "ls -l"; + ".." = "cd .."; + }; + description = '' + An attribute set that maps aliases (the top level attribute names in + this option) to command strings or directly to build outputs. + ''; + type = lib.types.attrsOf lib.types.str; + }; + sources = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.str; + }; + }; + + config = { + home.file = { + ".zsh/boot/aliases.zsh" = { + text = '' + ${aliasesStr} + ''; + }; + ".zsh/boot/sourcing.zsh" = { + text = '' + ${sourcesStr} + ''; + }; + }; + }; +} diff --git a/home/modules/services/keyleds/default.nix b/home/modules/services/keyleds/default.nix new file mode 100644 index 00000000..08ab887e --- /dev/null +++ b/home/modules/services/keyleds/default.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, self, ... }: +let + cfg = config.services.keyleds; +in +{ + options.services.keyleds = { + enable = lib.mkEnableOption + "Logitech Keyboard animation for Linux — G410, G513, G610, G810, G910, GPro"; + + package = lib.mkOption { + type = lib.types.package; + default = self.keyleds; + defaultText = lib.literalExample "pkgs.keyleds"; + example = lib.literalExample "pkgs.keyleds"; + description = '' + Keyleds derivation to use. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + home.packages = [ cfg.package ]; + + systemd.user.services.keyleds = { + Unit = { + Description = + "Logitech Keyboard animation for Linux — G410, G513, G610, G810, G910, GPro"; + After = [ "graphical-session-pre.target" ]; + PartOf = [ "graphical-session.target" ]; + }; + + Install = { WantedBy = [ "graphical-session.target" ]; }; + + Service = { + Environment = "XDG_DATA_DIRS=${cfg.package}/share"; + ExecStart = + "${cfg.package}/bin/keyledsd --config ${cfg.package}/share/keyledsd/keyledsd.conf.sample"; + Restart = "always"; + RestartSec = 3; + }; + }; + }; +} diff --git a/lib/default.nix b/lib/default.nix index 3fddc88d..60f1c561 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -3,4 +3,5 @@ inputs: { mkSystem = import ./mk_system.nix inputs; nixosConfigurationsAsPackages = import ./nixos_configurations_as_packages.nix inputs; + homeConfigurationsAsPackages = import ./home_configurations_as_packages.nix inputs; } diff --git a/lib/home_configurations_as_packages.nix b/lib/home_configurations_as_packages.nix new file mode 100644 index 00000000..aa4aa0d1 --- /dev/null +++ b/lib/home_configurations_as_packages.nix @@ -0,0 +1,12 @@ +{ self, ... }@inputs: + +let + pkgs = import inputs.nixpkgs-2105 { system = "x86_64-linux"; }; + + inherit (pkgs.lib) genAttrs mapAttrs'; + + hostNames = __attrNames self.homeConfigurations; + attrHostNames = genAttrs hostNames (name: "home/config/${name}"); + configs = mapAttrs' (name: pname: { name = pname; value = self.homeConfigurations.${name}.activationPackage; }) attrHostNames; +in +{ x86_64-linux = configs; } diff --git a/lib/mk_home.nix b/lib/mk_home.nix new file mode 100644 index 00000000..7894bcbd --- /dev/null +++ b/lib/mk_home.nix @@ -0,0 +1,21 @@ +{ home-manager, self, ... }@inputs: + +username: host: system: nixpkgs: +let + args = inputs; + entrypoint = "${self}/home/configurations/${username}@${hostname}.nix"; +in + +home-manager.lib.homeManagerConfiguration { + inherit username system; + homeDirectory = "/home/${username}"; + + pkgs = nixpkgs.legacyPackages.${system}; + + configuration = { lib, ... }: { + _module = { inherit args; }; + imports = [ + entrypoint + ]; + }; +} From c92b0fca8dd3c68106d2f90e9258c2c5424d6619 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 31 Jul 2021 01:22:30 +0200 Subject: [PATCH 039/303] first move towards new HM --- flake.nix | 8 +- home/configurations/nmelzer@mimas.nix | 4 +- home/modules/default.nix | 1 + home/modules/programs/nixpkgs/default.nix | 20 + home/modules/services/keyleds/default.nix | 3 +- lib/default.nix | 1 + lib/mk_home.nix | 4 +- oldstuff/home/hosts/tux-nixos.nix | 88 - oldstuff/home/modules/advcp/default.nix | 18 - oldstuff/home/modules/awesome/default.nix | 640 ------- oldstuff/home/modules/emacs/beacon.nix | 28 - oldstuff/home/modules/emacs/company.nix | 36 - oldstuff/home/modules/emacs/default.nix | 176 -- oldstuff/home/modules/emacs/helm.nix | 30 - oldstuff/home/modules/emacs/lsp.nix | 65 - .../home/modules/emacs/polymode/default.nix | 33 - oldstuff/home/modules/emacs/projectile.nix | 22 - oldstuff/home/modules/emacs/telephoneline.nix | 28 - .../home/modules/emacs/whichkey/default.nix | 66 - oldstuff/home/modules/keyleds/default.nix | 43 - .../home/modules/languages/agda/default.nix | 23 - .../home/modules/languages/c++/default.nix | 29 - .../modules/languages/clojure/default.nix | 26 - oldstuff/home/modules/languages/default.nix | 30 - .../home/modules/languages/elixir/default.nix | 50 - .../home/modules/languages/erlang/default.nix | 45 - .../home/modules/languages/go/default.nix | 31 - .../home/modules/languages/nix/default.nix | 31 - .../home/modules/languages/python/default.nix | 58 - .../home/modules/languages/rust/default.nix | 29 - .../home/modules/languages/tex/default.nix | 27 - oldstuff/home/modules/openshift/default.nix | 21 - oldstuff/home/modules/zshell/default.nix | 44 - oldstuff/home/profiles/base/default.nix | 224 --- .../home/profiles/base/nix-completions.sh | 22 - .../home/profiles/base/p10k-config/p10k.zsh | 1469 ----------------- oldstuff/home/profiles/browsing/default.nix | 15 - oldstuff/home/profiles/default.nix | 15 - .../home/profiles/development/default.nix | 81 - .../home/profiles/home-office/default.nix | 58 - .../packages => packages}/advcp/default.nix | 0 packages/default.nix | 12 + .../gnucash-de/default.nix | 0 .../packages => packages}/keyleds/default.nix | 0 44 files changed, 46 insertions(+), 3608 deletions(-) create mode 100644 home/modules/programs/nixpkgs/default.nix delete mode 100644 oldstuff/home/hosts/tux-nixos.nix delete mode 100644 oldstuff/home/modules/advcp/default.nix delete mode 100644 oldstuff/home/modules/awesome/default.nix delete mode 100644 oldstuff/home/modules/emacs/beacon.nix delete mode 100644 oldstuff/home/modules/emacs/company.nix delete mode 100644 oldstuff/home/modules/emacs/default.nix delete mode 100644 oldstuff/home/modules/emacs/helm.nix delete mode 100644 oldstuff/home/modules/emacs/lsp.nix delete mode 100644 oldstuff/home/modules/emacs/polymode/default.nix delete mode 100644 oldstuff/home/modules/emacs/projectile.nix delete mode 100644 oldstuff/home/modules/emacs/telephoneline.nix delete mode 100644 oldstuff/home/modules/emacs/whichkey/default.nix delete mode 100644 oldstuff/home/modules/keyleds/default.nix delete mode 100644 oldstuff/home/modules/languages/agda/default.nix delete mode 100644 oldstuff/home/modules/languages/c++/default.nix delete mode 100644 oldstuff/home/modules/languages/clojure/default.nix delete mode 100644 oldstuff/home/modules/languages/default.nix delete mode 100644 oldstuff/home/modules/languages/elixir/default.nix delete mode 100644 oldstuff/home/modules/languages/erlang/default.nix delete mode 100644 oldstuff/home/modules/languages/go/default.nix delete mode 100644 oldstuff/home/modules/languages/nix/default.nix delete mode 100644 oldstuff/home/modules/languages/python/default.nix delete mode 100644 oldstuff/home/modules/languages/rust/default.nix delete mode 100644 oldstuff/home/modules/languages/tex/default.nix delete mode 100644 oldstuff/home/modules/openshift/default.nix delete mode 100644 oldstuff/home/modules/zshell/default.nix delete mode 100644 oldstuff/home/profiles/base/default.nix delete mode 100644 oldstuff/home/profiles/base/nix-completions.sh delete mode 100644 oldstuff/home/profiles/base/p10k-config/p10k.zsh delete mode 100644 oldstuff/home/profiles/browsing/default.nix delete mode 100644 oldstuff/home/profiles/default.nix delete mode 100644 oldstuff/home/profiles/development/default.nix delete mode 100644 oldstuff/home/profiles/home-office/default.nix rename {oldstuff/home/packages => packages}/advcp/default.nix (100%) create mode 100644 packages/default.nix rename {oldstuff/home/packages => packages}/gnucash-de/default.nix (100%) rename {oldstuff/home/packages => packages}/keyleds/default.nix (100%) diff --git a/flake.nix b/flake.nix index 4cfc4e85..d51bbc4a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,10 +19,12 @@ nixosModules = import ./nixos/modules; nixosConfigurations = import ./nixos/configurations inputs; - homeModules = { }; - homeConfigurations = { }; + homeModules = import ./home/modules; + homeConfigurations = import ./home/configurations inputs; - packages = self.lib.nixosConfigurationsAsPackages; + packages.x86_64-linux = (import ./packages inputs) + // self.lib.nixosConfigurationsAsPackages.x86_64-linux + // self.lib.homeConfigurationsAsPackages.x86_64-linux; lib = import ./lib inputs; diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index 0bb4962b..41e6747f 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -5,6 +5,8 @@ let in { config = { + nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" "insync" "steam" "steam-original" "steam-runtime" ]; + activeProfiles = [ "browsing" "development" "home-office" ]; dconf.enable = true; @@ -30,7 +32,7 @@ in home.packages = let p = pkgs; - s = self; + s = self.packages.x86_64-linux; in [ p.insync diff --git a/home/modules/default.nix b/home/modules/default.nix index b8f20b87..8c40e2fb 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -21,6 +21,7 @@ "programs/emacs" = import ./programs/emacs; "programs/openshift" = import ./programs/openshift; "programs/zshell" = import ./programs/zshell; + "programs/nixpkgs" = import ./programs/nixpkgs; "services/keyleds" = import ./services/keyleds; diff --git a/home/modules/programs/nixpkgs/default.nix b/home/modules/programs/nixpkgs/default.nix new file mode 100644 index 00000000..92653a13 --- /dev/null +++ b/home/modules/programs/nixpkgs/default.nix @@ -0,0 +1,20 @@ +{ config, lib, ... }: + +let + allowed = config.nixpkgs.allowedUnfree; +in + +{ + options.nixpkgs.allowedUnfree = lib.mkOption { + type = lib.types.listOf lib.types.string; + default = [ ]; + description = '' + Allows for unfree packages by their name. + ''; + }; + + config.nixpkgs.config.allowUnfreePredicate = + if (allowed == [ ]) + then (_: false) + else (pkg: __elem (lib.getName pkg) allowed); +} diff --git a/home/modules/services/keyleds/default.nix b/home/modules/services/keyleds/default.nix index 08ab887e..671c40c0 100644 --- a/home/modules/services/keyleds/default.nix +++ b/home/modules/services/keyleds/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, self, ... }: let cfg = config.services.keyleds; + self' = self.packages.x86_64-linux; in { options.services.keyleds = { @@ -9,7 +10,7 @@ in package = lib.mkOption { type = lib.types.package; - default = self.keyleds; + default = self'.keyleds; defaultText = lib.literalExample "pkgs.keyleds"; example = lib.literalExample "pkgs.keyleds"; description = '' diff --git a/lib/default.nix b/lib/default.nix index 60f1c561..b75be102 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -2,6 +2,7 @@ inputs: { mkSystem = import ./mk_system.nix inputs; + mkHome = import ./mk_home.nix inputs; nixosConfigurationsAsPackages = import ./nixos_configurations_as_packages.nix inputs; homeConfigurationsAsPackages = import ./home_configurations_as_packages.nix inputs; } diff --git a/lib/mk_home.nix b/lib/mk_home.nix index 7894bcbd..e885de98 100644 --- a/lib/mk_home.nix +++ b/lib/mk_home.nix @@ -1,6 +1,6 @@ { home-manager, self, ... }@inputs: -username: host: system: nixpkgs: +username: hostname: system: nixpkgs: let args = inputs; entrypoint = "${self}/home/configurations/${username}@${hostname}.nix"; @@ -16,6 +16,6 @@ home-manager.lib.homeManagerConfiguration { _module = { inherit args; }; imports = [ entrypoint - ]; + ] ++ __attrValues self.homeModules; }; } diff --git a/oldstuff/home/hosts/tux-nixos.nix b/oldstuff/home/hosts/tux-nixos.nix deleted file mode 100644 index 0bb4962b..00000000 --- a/oldstuff/home/hosts/tux-nixos.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ pkgs, unstable, self, ... }: -let - keepassWithPlugins = - pkgs.keepass.override { plugins = [ pkgs.keepass-keepasshttp ]; }; -in -{ - config = { - activeProfiles = [ "browsing" "development" "home-office" ]; - - dconf.enable = true; - - enabledLanguages = [ - "agda" - "clojure" - "cpp" - "elixir" - "erlang" - "go" - "nix" - # "ocaml" - "python" - "rust" - "tex" - ]; - - languages.python.useMS = true; - - programs.emacs.splashScreen = false; - - home.packages = - let - p = pkgs; - s = self; - in - [ - p.insync - p.handbrake - p.keybase-gui - p.minikube - p.lutris - p.steam - p.gnome3.gnome-tweaks - - s.gnucash-de - - keepassWithPlugins - ]; - - programs.obs-studio.enable = true; - programs.htop = { - detailedCpuTime = true; - meters.right = [ - { kind = "Battery"; mode = 1; } - "Tasks" - "LoadAverage" - "Uptime" - ]; - }; - - xsession.windowManager.awesome.autostart = [ - "${pkgs.blueman}/bin/blueman-applet" - "${pkgs.networkmanagerapplet}/bin/nm-applet" - ]; - - services = { - keyleds.enable = true; - keybase.enable = true; - kbfs.enable = true; - }; - - systemd.user.services = { - keybase-gui = { - Unit = { - Description = "Keybase GUI"; - Requires = [ "keybase.service" "kbfs.service" ]; - After = [ "keybase.service" "kbfs.service" ]; - }; - Service = { - ExecStart = "${pkgs.keybase-gui}/share/keybase/Keybase"; - PrivateTmp = true; - # Slice = "keybase.slice"; - }; - }; - }; - }; - # environment.pathsToLink = [ "/share/zsh" ]; -} -# /nix/store/7skqa8vxfydq7w3cix55ffvkmjb3b5da-python-2.7.18 diff --git a/oldstuff/home/modules/advcp/default.nix b/oldstuff/home/modules/advcp/default.nix deleted file mode 100644 index 917c166c..00000000 --- a/oldstuff/home/modules/advcp/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, self, ... }: -let cfg = config.programs.advancedCopy; - -in -{ - options.programs.advancedCopy = { - enable = lib.mkEnableOption "CP and MV with a progressbar"; - }; - - config = lib.mkIf cfg.enable { - home.packages = [ self.advcp ]; - - programs.zshell.aliases = { - cp = "advcp -g"; - mv = "advmv -g"; - }; - }; -} diff --git a/oldstuff/home/modules/awesome/default.nix b/oldstuff/home/modules/awesome/default.nix deleted file mode 100644 index e814be88..00000000 --- a/oldstuff/home/modules/awesome/default.nix +++ /dev/null @@ -1,640 +0,0 @@ -{ config, lib, pkgs, self, ... }: -let - cfg = config.xsession.windowManager.awesome; - - rofi = pkgs.rofi.override { - plugins = [ pkgs.rofi-emoji ]; - }; - - autostartScript = - let - entries = builtins.map (e: "\"${e}\",") cfg.autostart; - in - '' - -- Autorun programs - autorunApps = { - ${builtins.concatStringsSep "\n " entries} - } - - for app = 1, #autorunApps do - awful.util.spawn(autorunApps[app]) - end - -- }}} - ''; - - errorHandling = '' - -- {{{ Error handling - if awesome.startup_errors then - naughty.notify({ - preset = naughty.config.presets.critical, - title = "Oops, there were errors during startup!", - text = awesome.startup_errors - }) - end - - do - local in_error = false - awesome.connect_signal( - "debug::error", - function (err) - if in_error then return end - in_error = true - - naughty.notify({ - preset = naughty.config.presets.critical, - title = "Oops, an error happened!", - text = tostring(err) - }) - in_error = false - end) - end - -- }}} - ''; -in -{ - options.xsession.windowManager.awesome = { - terminalEmulator = lib.mkOption { - type = lib.types.str; - default = "${pkgs.konsole}/bin/konsole"; - }; - - launcher = lib.mkOption { - type = lib.types.str; - default = "${rofi}/bin/rofi -modi drun#run#window#ssh#emoji#unicode:${self.rofi-unicode}/bin/rofiunicode.sh -show drun -show-icons"; - }; - - autostart = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - }; - }; - - config = lib.mkIf cfg.enable { - xsession.enable = true; - home.file.".config/awesome/rc.lua".text = '' - --[[ - Awesome WM configuration - by Norbert Melzer - - This file is generated by home-manager. - --]] - - -- {{{ Loading libraries - local gears = require("gears") - local awful = require("awful") - local autofocus = require("awful.autofocus") - local wibox = require("wibox") - local beautiful = require("beautiful") - local naughty = require("naughty") - local menubar = require("menubar") - local hotkeys_popup = require("awful.hotkeys_popup").widget - -- local volume_control = require("volume-control") - -- }}} - - ${errorHandling} - - -- load the volume widget code - -- volumecfg = volume_control({}) - - beautiful.notification_icon_size = 100 - - -- {{{ Variable definitions and initialisations - local hostname = io.popen("hostname"):read() - local modkey = "Mod4" - local theme_path = gears.filesystem.get_themes_dir() .. "default/theme.lua" - local terminal = "${cfg.terminalEmulator}" -- sets the default terminal - local editor = os.getenv("EDITOR") or "emacsclient -t" -- sets the default editor - local editor_cmd = terminal .. " -e " .. editor -- sets the default command that is used to start the editor - - beautiful.init(theme_path) - - -- Table of layouts to cover with awful.layout.inc, order matters. - awful.layout.layouts = { - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.left, - awful.layout.suit.tile.bottom, - awful.layout.suit.tile.top, - awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, - awful.layout.suit.spiral, - awful.layout.suit.spiral.dwindle, - awful.layout.suit.max, - awful.layout.suit.max.fullscreen, - awful.layout.suit.magnifier, - awful.layout.suit.corner.nw, - -- awful.layout.suit.corner.ne, - -- awful.layout.suit.corner.sw, - -- awful.layout.suit.corner.se, - } - -- }}} - - -- {{{ Helper functions - local function client_menu_toggle_fn() - local instance = nil - - return function () - if instance and instance.wibox.visible then - instance:hide() - instance = nil - else - instance = awful.menu.clients({ theme = { width = 250 } }) - end - end - end - -- }}} - - -- {{{ Menu - -- Create a launcher widget and a main menu - myawesomemenu = { - { "launcher", '${cfg.launcher}' }, - { "hotkeys", function() return false, hotkeys_popup.show_help end}, - { "manual", terminal .. " -e man awesome" }, - { "edit config", editor_cmd .. " " .. awesome.conffile }, - { "lock session", '${pkgs.i3lock}/bin/i3lock' }, - { "restart", awesome.restart }, - { "quit", function() awesome.quit() end} - } - - mymainmenu = awful.menu({ - items = { - { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal } - } - }) - - mylauncher = awful.widget.launcher({ - image = beautiful.awesome_icon, - menu = mymainmenu - }) - - -- Menubar configuration - menubar.utils.terminal = terminal -- Set the terminal for applications that require it - -- }}} - - -- Keyboard map indicator and switcher - mykeyboardlayout = awful.widget.keyboardlayout() - - -- {{{ Wibar - -- Create a textclock widget - mytextclock = wibox.widget.textclock() - - -- Create a wibox for each screen and add it - local taglist_buttons = gears.table.join( - awful.button({ }, 1, function(t) t:view_only() end), - awful.button({ modkey }, 1, function(t) - if client.focus then - client.focus:move_to_tag(t) - end - end), - awful.button({ }, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 3, function(t) - if client.focus then - client.focus:toggle_tag(t) - end - end), - awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end), - awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) - ) - - local tasklist_buttons = gears.table.join( - awful.button({ }, 1, function (c) - if c == client.focus then - c.minimized = true - else - -- Without this, the following - -- :isvisible() makes no sense - c.minimized = false - if not c:isvisible() and c.first_tag then - c.first_tag:view_only() - end - -- This will also un-minimize - -- the client, if needed - client.focus = c - c:raise() - end - end), - awful.button({ }, 3, client_menu_toggle_fn()), - awful.button({ }, 4, function () - awful.client.focus.byidx(1) - end), - awful.button({ }, 5, function () - awful.client.focus.byidx(-1) - end)) - - local function set_wallpaper(s) - -- Wallpaper - if beautiful.wallpaper then - local wallpaper = beautiful.wallpaper - -- If wallpaper is a function, call it with the screen - if type(wallpaper) == "function" then - wallpaper = wallpaper(s) - end - gears.wallpaper.maximized(wallpaper, s, true) - end - end - - -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) - screen.connect_signal("property::geometry", set_wallpaper) - - awful.screen.connect_for_each_screen(function(s) - -- Wallpaper - set_wallpaper(s) - - -- Each screen has its own tag table. - local names = { "1:main", "2:web", "3", "4", "5", "6", "7", "8", "9" } - local l = awful.layout.suit - local layouts = { l.tile, l.tile, l.tile, l.tile, l.tile, l.tile, l.tile, l.tile, l.tile } - awful.tag(names, s, layouts) - - -- Create a promptbox for each screen - s.mypromptbox = awful.widget.prompt() - -- Create an imagebox widget which will contain an icon indicating which layout we're using. - -- We need one layoutbox per screen. - s.mylayoutbox = awful.widget.layoutbox(s) - s.mylayoutbox:buttons( - gears.table.join( - awful.button({ }, 1, function () awful.layout.inc( 1) end), - awful.button({ }, 3, function () awful.layout.inc(-1) end), - awful.button({ }, 4, function () awful.layout.inc( 1) end), - awful.button({ }, 5, function () awful.layout.inc(-1) end))) - -- Create a taglist widget - s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) - - -- Create a tasklist widget - s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) - - -- Create the wibox - s.mywibox = awful.wibar({ position = "top", screen = s }) - - -- Add widgets to the wibox - s.mywibox:setup { - layout = wibox.layout.align.horizontal, - { -- Left widgets - layout = wibox.layout.fixed.horizontal, - mylauncher, - s.mytaglist, - s.mypromptbox, - }, - s.mytasklist, -- Middle widget - { -- Right widgets - layout = wibox.layout.fixed.horizontal, - mykeyboardlayout, - wibox.widget.systray(), - -- require("battery-widget") {}, - -- volumecfg.widget, - mytextclock, - s.mylayoutbox, - }, - } - end) - -- }}} - - -- {{{ Mouse bindings - root.buttons(gears.table.join( - awful.button({ }, 3, function () mymainmenu:toggle() end), - awful.button({ }, 4, awful.tag.viewnext), - awful.button({ }, 5, awful.tag.viewprev) - )) - -- }}} - - -- {{{ Key bindings - globalkeys = gears.table.join( - awful.key({ modkey, }, "s", hotkeys_popup.show_help, - {description="show help", group="awesome"}), - awful.key({ modkey, }, "Left", awful.tag.viewprev, - {description = "view previous", group = "tag"}), - awful.key({ modkey, }, "Right", awful.tag.viewnext, - {description = "view next", group = "tag"}), - awful.key({ modkey, }, "Escape", awful.tag.history.restore, - {description = "go back", group = "tag"}), - - awful.key({ modkey, }, "j", - function () - awful.client.focus.byidx( 1) - end, - {description = "focus next by index", group = "client"} - ), - awful.key({ modkey, }, "k", - function () - awful.client.focus.byidx(-1) - end, - {description = "focus previous by index", group = "client"} - ), - awful.key({ modkey, }, "w", function () mymainmenu:show() end, - {description = "show main menu", group = "awesome"}), - - -- Layout manipulation - awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, - {description = "swap with next client by index", group = "client"}), - awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end, - {description = "swap with previous client by index", group = "client"}), - awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, - {description = "focus the next screen", group = "screen"}), - awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, - {description = "focus the previous screen", group = "screen"}), - awful.key({ modkey, }, "u", awful.client.urgent.jumpto, - {description = "jump to urgent client", group = "client"}), - awful.key({ modkey, }, "Tab", - function () - awful.client.focus.history.previous() - if client.focus then - client.focus:raise() - end - end, - {description = "go back", group = "client"}), - - -- Standard program - awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, - {description = "open a terminal", group = "launcher"}), - awful.key({ modkey, "Control" }, "r", awesome.restart, - {description = "reload awesome", group = "awesome"}), - awful.key({ modkey, "Shift" }, "q", awesome.quit, - {description = "quit awesome", group = "awesome"}), - - awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, - {description = "increase master width factor", group = "layout"}), - awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, - {description = "decrease master width factor", group = "layout"}), - awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, - {description = "increase the number of master clients", group = "layout"}), - awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end, - {description = "decrease the number of master clients", group = "layout"}), - awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end, - {description = "increase the number of columns", group = "layout"}), - awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end, - {description = "decrease the number of columns", group = "layout"}), - awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end, - {description = "select next", group = "layout"}), - awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end, - {description = "select previous", group = "layout"}), - - awful.key({ modkey, "Control" }, "n", - function () - local c = awful.client.restore() - -- Focus restored client - if c then - client.focus = c - c:raise() - end - end, - {description = "restore minimized", group = "client"}), - - -- Prompt - awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, - {description = "run prompt", group = "launcher"}), - - awful.key({ modkey }, "d", function () awful.util.spawn('${cfg.launcher}') end), - awful.key({ modkey }, "y", function () awful.util.spawn('${pkgs.i3lock}/bin/i3lock') end), - - awful.key({ modkey }, "x", - function () - awful.prompt.run { - prompt = "Run Lua code: ", - textbox = awful.screen.focused().mypromptbox.widget, - exe_callback = awful.util.eval, - history_path = awful.util.get_cache_dir() .. "/history_eval" - } - end, - {description = "lua execute prompt", group = "awesome"}), - -- Menubar - awful.key({ modkey }, "p", function() menubar.show() end, - {description = "show the menubar", group = "launcher"}) - ) - - clientkeys = gears.table.join( - awful.key({ modkey, }, "f", - function (c) - c.fullscreen = not c.fullscreen - c:raise() - end, - {description = "toggle fullscreen", group = "client"}), - awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end, - {description = "close", group = "client"}), - awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle , - {description = "toggle floating", group = "client"}), - awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end, - {description = "move to master", group = "client"}), - awful.key({ modkey, }, "o", function (c) c:move_to_screen() end, - {description = "move to screen", group = "client"}), - awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end, - {description = "toggle keep on top", group = "client"}), - awful.key({ modkey, }, "n", - function (c) - -- The client currently has the input focus, so it cannot be - -- minimized, since minimized clients can't have the focus. - c.minimized = true - end , - {description = "minimize", group = "client"}), - awful.key({ modkey, }, "m", - function (c) - c.maximized = not c.maximized - c:raise() - end , - {description = "(un)maximize", group = "client"}), - awful.key({ modkey, "Control" }, "m", - function (c) - c.maximized_vertical = not c.maximized_vertical - c:raise() - end , - {description = "(un)maximize vertically", group = "client"}), - awful.key({ modkey, "Shift" }, "m", - function (c) - c.maximized_horizontal = not c.maximized_horizontal - c:raise() - end , - {description = "(un)maximize horizontally", group = "client"}) - ) - - -- Bind all key numbers to tags. - -- Be careful: we use keycodes to make it work on any keyboard layout. - -- This should map on the top row of your keyboard, usually 1 to 9. - for i = 1, 9 do - globalkeys = gears.table.join( - globalkeys, - -- View tag only. - awful.key({ modkey }, "#" .. i + 9, - function () - local screen = awful.screen.focused() - local tag = screen.tags[i] - if tag then - tag:view_only() - end - end, - {description = "view tag #"..i, group = "tag"}), - -- Toggle tag display. - awful.key({ modkey, "Control" }, "#" .. i + 9, - function () - local screen = awful.screen.focused() - local tag = screen.tags[i] - if tag then - awful.tag.viewtoggle(tag) - end - end, - {description = "toggle tag #" .. i, group = "tag"}), - -- Move client to tag. - awful.key({ modkey, "Shift" }, "#" .. i + 9, - function () - if client.focus then - local tag = client.focus.screen.tags[i] - if tag then - client.focus:move_to_tag(tag) - end - end - end, - {description = "move focused client to tag #"..i, group = "tag"}), - -- Toggle tag on focused client. - awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, - function () - if client.focus then - local tag = client.focus.screen.tags[i] - if tag then - client.focus:toggle_tag(tag) - end - end - end, - {description = "toggle focused client on tag #" .. i, group = "tag"}) - ) - end - - clientbuttons = gears.table.join( - awful.button({ }, 1, function (c) client.focus = c; c:raise() end), - awful.button({ modkey }, 1, awful.mouse.client.move), - awful.button({ modkey }, 3, awful.mouse.client.resize)) - - -- Set keys - root.keys(globalkeys) - -- }}} - - -- {{{ Rules - -- Rules to apply to new clients (through the "manage" signal). - awful.rules.rules = { - -- All clients will match this rule. - { rule = { }, - properties = { - border_width = beautiful.border_width, - border_color = beautiful.border_normal, - focus = awful.client.focus.filter, - raise = true, - keys = clientkeys, - buttons = clientbuttons, - screen = awful.screen.preferred, - placement = awful.placement.no_overlap+awful.placement.no_offscreen - } - }, - - -- Floating clients. - { - rule_any = { - instance = { - "DTA", -- Firefox addon DownThemAll. - "copyq", -- Includes session name in class. - }, - class = { - "Arandr", - "Gpick", - "Kruler", - "MessageWin", -- kalarm. - "Sxiv", - "Wpa_gui", - "pinentry", - "veromix", - "xtightvncviewer" - }, - name = { - "Event Tester", -- xev. - }, - role = { - "AlarmWindow", -- Thunderbird's calendar. - "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. - } - }, properties = { floating = true }}, - - -- Add titlebars to normal clients and dialogs - { rule_any = { - type = { "normal", "dialog" } - }, properties = { titlebars_enabled = true } - }, - - -- Set Firefox to always map on the tag named "2" on screen 1. - -- { rule = { class = "Firefox" }, - -- properties = { screen = 1, tag = "2" } }, - } - -- }}} - - -- {{{ Signals - -- Signal function to execute when a new client appears. - client.connect_signal( - "manage", function (c) - -- Set the windows at the slave, - -- i.e. put it at the end of others instead of setting it master. - -- if not awesome.startup then awful.client.setslave(c) end - - if awesome.startup and - not c.size_hints.user_position - and not c.size_hints.program_position then - -- Prevent clients from being unreachable after screen count changes. - awful.placement.no_offscreen(c) - end - end) - - -- Add a titlebar if titlebars_enabled is set to true in the rules. - client.connect_signal( - "request::titlebars", function(c) - -- buttons for the titlebar - local buttons = gears.table.join( - awful.button({ }, 1, function() - client.focus = c - c:raise() - awful.mouse.client.move(c) - end), - awful.button({ }, 3, function() - client.focus = c - c:raise() - awful.mouse.client.resize(c) - end) - ) - - awful.titlebar(c) : setup { - { -- Left - awful.titlebar.widget.iconwidget(c), - buttons = buttons, - layout = wibox.layout.fixed.horizontal - }, - { -- Middle - { -- Title - align = "center", - widget = awful.titlebar.widget.titlewidget(c) - }, - buttons = buttons, - layout = wibox.layout.flex.horizontal - }, - { -- Right - awful.titlebar.widget.floatingbutton (c), - awful.titlebar.widget.maximizedbutton(c), - awful.titlebar.widget.stickybutton (c), - awful.titlebar.widget.ontopbutton (c), - awful.titlebar.widget.closebutton (c), - layout = wibox.layout.fixed.horizontal() - }, - layout = wibox.layout.align.horizontal - } - end) - - -- Enable sloppy focus, so that focus follows mouse. - client.connect_signal( - "mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - client.focus = c - end - end) - - client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) - client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) - -- }}} - - ${lib.optionalString (cfg.autostart != [ ]) autostartScript} - ''; - }; -} diff --git a/oldstuff/home/modules/emacs/beacon.nix b/oldstuff/home/modules/emacs/beacon.nix deleted file mode 100644 index 0514bec3..00000000 --- a/oldstuff/home/modules/emacs/beacon.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, ... }: -let cfg = config.programs.emacs.packages.beacon; -in -{ - options.programs.emacs.packages.beacon = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Enable `beacon' for emacs. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.localPackages."init-beacon" = { - tag = "Setup beacon"; - comments = [ ]; - requires = [ ]; - code = '' - ;; enable the beacon minor mode globally. - (beacon-mode 1) - ''; - }; - - programs.emacs.extraPackages = ep: [ ep.beacon ]; - }; -} diff --git a/oldstuff/home/modules/emacs/company.nix b/oldstuff/home/modules/emacs/company.nix deleted file mode 100644 index f5d12496..00000000 --- a/oldstuff/home/modules/emacs/company.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, ... }: - -with lib; -let emacs = config.programs.emacs; -in -{ - config = lib.mkIf emacs.enable { - programs.emacs.extraPackages = ep: [ ep.company ]; - - programs.emacs.localPackages."init-company" = { - tag = "Setup and initialise company"; - comments = [ ]; - requires = [ ]; - code = '' - ;; company - (setq tab-always-indent 'complete) - (add-to-list 'completion-styles 'initials t) - - ;; (eval-when-compile (require 'company)) - - (add-hook 'after-init-hook 'global-company-mode) - (with-eval-after-load 'company - - ;; (diminish 'company-mode "CMP") - (define-key company-mode-map (kbd "M-+") '("complete" . 'company-complete)) - (define-key company-active-map (kbd "M-+") '("change backend" . 'company-other-backend)) - (define-key company-active-map (kbd "C-n") '("next" . 'company-select-next)) - (define-key company-active-map (kbd "C-p") '("previous" . 'company-select-previous)) - (setq-default company-dabbrev-other-buffers 'all - company-tooltip-align-annotations t - company-minimum-prefix-length 1 - company-idle-delay 0.05)) - ''; - }; - }; -} diff --git a/oldstuff/home/modules/emacs/default.nix b/oldstuff/home/modules/emacs/default.nix deleted file mode 100644 index 27b19031..00000000 --- a/oldstuff/home/modules/emacs/default.nix +++ /dev/null @@ -1,176 +0,0 @@ -{ config, lib, pkgs, ... }: -let - emacsEnabled = config.programs.emacs.enable; - cfg = config.programs.emacs; - - bool2Lisp = b: if b then "t" else "nil"; - - confPackages = - let - fileContent = lib.attrsets.mapAttrs' - (k: v: { - name = "${k}"; - value = { - ep = v.packageRequires; - src = pkgs.nobbzLib.emacs.generatePackage k v.tag v.comments v.requires - v.code; - }; - }) - cfg.localPackages; - derivations = lib.attrsets.mapAttrs - (k: v: { - ep = v.ep; - src = pkgs.writeText "${k}.el" v.src; - }) - fileContent; - in - derivations; - - lispRequires = - let - names = lib.attrsets.mapAttrsToList (n: _: n) cfg.localPackages; - sorted = builtins.sort (l: r: l < r) names; - required = builtins.map (r: "(require '${r})") sorted; - in - builtins.concatStringsSep "\n" required; - -in -{ - imports = [ - ./beacon.nix - ./company.nix - ./helm.nix - ./lsp.nix - ./projectile.nix - ./telephoneline.nix - ./whichkey - ]; - - options.programs.emacs = { - splashScreen = lib.mkOption { - type = lib.types.bool; - default = true; - example = false; - description = '' - Enable the startup screen. - ''; - }; - - localPackages = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule ({ ... }: { - options = { - tag = lib.mkOption { type = lib.types.str; }; - comments = lib.mkOption { type = lib.types.listOf lib.types.str; }; - requires = lib.mkOption { type = lib.types.listOf lib.types.str; }; - code = lib.mkOption { type = lib.types.str; }; - packageRequires = lib.mkOption { - type = lib.types.unspecified; - default = _: [ ]; - }; - }; - })); - }; - - extraConfig = lib.mkOption { - type = lib.types.lines; - default = ""; - description = '' - Extra preferences to add to init.el. - ''; - }; - - module = lib.mkOption { - description = "Attribute set of modules to link into emacs configuration"; - default = { }; - }; - }; - - config = lib.mkIf emacsEnabled { - programs.emacs.extraConfig = '' - ;; adjust the load-path to find further down required files - (add-to-list 'load-path - (expand-file-name "lisp" user-emacs-directory)) - - (fset 'yes-or-no-p 'y-or-n-p) - - ;; Move backups and autosaves out of the way - (setq backup-directory-alist - `((".*" . ,temporary-file-directory))) - (setq auto-save-file-name-transforms - `((".*" ,temporary-file-directory))) - - ;; use a dark theme - (load-theme 'dracula t) - - ;; Set a font - (add-to-list 'default-frame-alist - '(font . "Cascadia Code PL-10")) - - ;; require all those local packages - ${lispRequires} - - (global-auto-revert-mode) - (global-whitespace-mode) - (global-linum-mode) - - (setq-default indent-tabs-mode nil) - (setq-default tab-width 2) - (setq-default whitespace-style - '(face - tabs - spaces - trailing - lines-tail - newline - missing-newline-at-eof - space-before-tab - indentation - empty - space-after-tab - space-mark - tab-mark - newline-mark)) - - ;; set splash screen - (setq inhibit-startup-screen ${bool2Lisp (!cfg.splashScreen)}) - ''; - - programs.emacs.extraPackages = ep: - [ - ep.company-go - ep.dracula-theme - ep.docker-compose-mode - ep.dockerfile-mode - ep.go-mode - ep.markdown-mode - ep.yaml-mode - ep.adoc-mode - ep.k8s-mode - ep.buttercup - ep.adoc-mode - ep.hledger-mode - ep.typescript-mode - - ep.ledger-mode - - # ep.bazel-mode - - # (ep.trivialBuild { pname = "configuration"; src = confPackages; }) - ] ++ lib.attrsets.mapAttrsToList - (pname: v: - ep.trivialBuild { - inherit pname; - src = v.src; - packageRequires = v.ep ep; - }) - confPackages; - - home.file = { - ".emacs.d/init.el" = { - text = pkgs.nobbzLib.emacs.generatePackage "init" - "Initialises emacs configuration" [ ] [ ] - cfg.extraConfig; - }; - }; - }; -} diff --git a/oldstuff/home/modules/emacs/helm.nix b/oldstuff/home/modules/emacs/helm.nix deleted file mode 100644 index d42118dd..00000000 --- a/oldstuff/home/modules/emacs/helm.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, lib, ... }: -let emacsCfg = config.programs.emacs; -in -{ - config = lib.mkIf emacsCfg.enable { - programs.emacs = { - localPackages."init-helm" = { - tag = "Setup helm"; - comments = [ ]; - requires = [ "helm" ]; - packageRequires = ep: [ ep.helm ep.helm-rg ]; - code = '' - ;; enable and configure auto resize - (helm-autoresize-mode t) - (setq-default - helm-autoresize-max-height 20 ; take at most 20% of the screen - helm-autoresize-min-height 1) ; get as small as necessary - - ;; set up key bindings - (global-set-key (kbd "M-x") 'helm-M-x) - (global-set-key (kbd "C-x C-f") 'helm-find-files) - (global-set-key (kbd "C-x C-b") 'helm-buffers-list) - - ;; enable helm - (helm-mode t) - ''; - }; - }; - }; -} diff --git a/oldstuff/home/modules/emacs/lsp.nix b/oldstuff/home/modules/emacs/lsp.nix deleted file mode 100644 index 2edef0da..00000000 --- a/oldstuff/home/modules/emacs/lsp.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.programs.emacs.lsp-mode; - - mode-hooks = with lib; - let - sorted = builtins.sort (l: r: l < r) cfg.languages; - uni = unique sorted; - hooks = builtins.map (l: "'${l}-mode-hook") uni; - add-hooks = builtins.map (h: "(add-hook ${h} #'lsp)") hooks; - in - builtins.concatStringsSep "\n" add-hooks; - -in -{ - options.programs.emacs.lsp-mode = { - enable = lib.mkEnableOption "Enables and installs lsp-mode"; - - languages = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = '' - The prefixes of the prog-mode that shall be handled through lsp-mode. - ''; - example = [ "erlang" ]; - }; - }; - - config = lib.mkIf cfg.enable { - programs.emacs = { - localPackages."init-lsp" = { - tag = "Setup and prepare the LSP mode"; - comments = [ ]; - requires = [ "lsp-mode" ]; - packageRequires = ep: [ - # ep.company-lsp - ep.helm-lsp - ep.lsp-mode - ep.lsp-origami - ep.lsp-ui - ep.yasnippet - ]; - code = '' - (yas-global-mode t) - - (setq lsp-log-io t) - (setq lsp-ui-sideline-enable t) - (setq lsp-ui-doc-enable t) - (setq lsp-ui-doc-position 'bottom) - - (eval-after-load 'company - '(push 'company-lsp company-backend)) - - (dolist (match - '("[/\\\\].direnv$" - "[/\\\\]node_modules$" - "/nix/store")) - (add-to-list 'lsp-file-watch-ignored match)) - - ${mode-hooks} - ''; - }; - }; - }; -} diff --git a/oldstuff/home/modules/emacs/polymode/default.nix b/oldstuff/home/modules/emacs/polymode/default.nix deleted file mode 100644 index e76d99c3..00000000 --- a/oldstuff/home/modules/emacs/polymode/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, lib, ... }: - -with lib; -let emacs = config.programs.emacs; -in -{ - config = lib.mkIf emacs.enable { - programs.emacs.extraPackages = ep: [ ep.polymode ]; - - programs.emacs.localPackages."init-polymode" = { - tag = "Setup and initialise polymode"; - comments = [ ]; - requires = [ ]; - code = '' - ;; polymode - (add-to-list 'auto-mode-alist '("\\.nix$" . poly-nix-mode)) - - (define-hostmode poly-nix-hostmode :mode 'nix-mode) - - (define-innermode poly-elisp-expr-nix-innermode - :mode 'emacs-lisp-mode - :head-matcher (cons "'''\n\\( *;;.*\n\\)" 1) - :tail-matcher " *''';$" - :head-mode 'body - :tail-mode 'host) - - (define-polymode poly-nix-mode - :hostmode 'poly-nix-hostmode - :innermodes '(poly-elisp-expr-nix-innermode)) - ''; - }; - }; -} diff --git a/oldstuff/home/modules/emacs/projectile.nix b/oldstuff/home/modules/emacs/projectile.nix deleted file mode 100644 index 15e47dc4..00000000 --- a/oldstuff/home/modules/emacs/projectile.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, ... }: -let emacsCfg = config.programs.emacs; -in -{ - config = lib.mkIf emacsCfg.enable { - programs.emacs = { - localPackages."init-projectile" = { - tag = "Setup projectile"; - comments = [ ]; - requires = [ "projectile" "helm-projectile" "tramp" ]; - packageRequires = ep: [ ep.projectile ep.helm-projectile ]; - code = '' - ;; enable projectile - (projectile-mode t) - (helm-projectile-on) - - (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) - ''; - }; - }; - }; -} diff --git a/oldstuff/home/modules/emacs/telephoneline.nix b/oldstuff/home/modules/emacs/telephoneline.nix deleted file mode 100644 index dbaf7577..00000000 --- a/oldstuff/home/modules/emacs/telephoneline.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, ... }: -let ecfg = config.programs.emacs; -in -{ - config = lib.mkIf ecfg.enable { - programs.emacs.localPackages."init-telephoneline" = { - tag = "Setup telephone line"; - comments = [ ]; - requires = [ ]; - code = '' - ;; set up telephone line - (setq-default - telephone-line-lhs '((accent . (telephone-line-vc-segment - telephone-line-erc-modified-channels-segment - telephone-line-process-segment)) - (nil . (telephone-line-minor-mode-segment - telephone-line-buffer-segment))) - telephone-line-rhs '((nil . (telephone-line-misc-info-segment)) - (accent . (telephone-line-major-mode-segment)) - (accent . (telephone-line-airline-position-segment)))) - - (telephone-line-mode t) - ''; - }; - - programs.emacs.extraPackages = ep: [ ep.telephone-line ]; - }; -} diff --git a/oldstuff/home/modules/emacs/whichkey/default.nix b/oldstuff/home/modules/emacs/whichkey/default.nix deleted file mode 100644 index c5de1225..00000000 --- a/oldstuff/home/modules/emacs/whichkey/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ config, lib, ... }: - -with lib; -let - cfg = config.programs.emacs.whichkey; - enabled = config.programs.emacs.enable; - - keyReplacementType = types.listOf (types.submodule ({ ... }: { - options = { - keys = lib.mkOption { - type = types.str; - description = '' - Keys that shall get a description. - ''; - }; - replace = lib.mkOption { - type = types.str; - description = '' - Human readable description for the keycombination - ''; - }; - }; - })); - - replacements = lib.concatStringsSep "\n " - (builtins.map ({ keys, replace, ... }: ''"${keys}" "${replace}"'') - cfg.replacement); -in -{ - options.programs.emacs.whichkey = { - replacement = lib.mkOption { type = keyReplacementType; }; - }; - - config = lib.mkIf enabled { - programs.emacs = { - whichkey.replacement = [ - { - keys = "C-x C-f"; - replace = "find file"; - } - { - keys = "C-x C-s"; - replace = "write file"; - } - { - keys = "C-x C-c"; - replace = "leave emacs"; - } - ]; - extraPackages = ep: [ ep.which-key ]; - localPackages."init-whichkey" = { - tag = "Setup and initialise whichkey"; - comments = [ ]; - requires = [ ]; - code = '' - ;; which-key - (which-key-mode t) - (setq-default which-key-idle-delay 0.1) - - (which-key-add-key-based-replacements - ${replacements}) - ''; - }; - }; - }; -} diff --git a/oldstuff/home/modules/keyleds/default.nix b/oldstuff/home/modules/keyleds/default.nix deleted file mode 100644 index 08ab887e..00000000 --- a/oldstuff/home/modules/keyleds/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, lib, pkgs, self, ... }: -let - cfg = config.services.keyleds; -in -{ - options.services.keyleds = { - enable = lib.mkEnableOption - "Logitech Keyboard animation for Linux — G410, G513, G610, G810, G910, GPro"; - - package = lib.mkOption { - type = lib.types.package; - default = self.keyleds; - defaultText = lib.literalExample "pkgs.keyleds"; - example = lib.literalExample "pkgs.keyleds"; - description = '' - Keyleds derivation to use. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; - - systemd.user.services.keyleds = { - Unit = { - Description = - "Logitech Keyboard animation for Linux — G410, G513, G610, G810, G910, GPro"; - After = [ "graphical-session-pre.target" ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { WantedBy = [ "graphical-session.target" ]; }; - - Service = { - Environment = "XDG_DATA_DIRS=${cfg.package}/share"; - ExecStart = - "${cfg.package}/bin/keyledsd --config ${cfg.package}/share/keyledsd/keyledsd.conf.sample"; - Restart = "always"; - RestartSec = 3; - }; - }; - }; -} diff --git a/oldstuff/home/modules/languages/agda/default.nix b/oldstuff/home/modules/languages/agda/default.nix deleted file mode 100644 index 811ac3dc..00000000 --- a/oldstuff/home/modules/languages/agda/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, ... }: -let cfg = config.languages.agda; - -in -{ - options.languages.agda = { - enable = lib.mkEnableOption "Agda language support"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs = { - localPackages."init-agda" = { - tag = "Setup Agda"; - comments = [ ]; - requires = [ ]; - packageRequires = ep: with ep.melpaStablePackages; [ agda2-mode eri annotation ]; - code = '' - (load-library "agda2-mode") - ''; - }; - }; - }; -} diff --git a/oldstuff/home/modules/languages/c++/default.nix b/oldstuff/home/modules/languages/c++/default.nix deleted file mode 100644 index 6ab09ee3..00000000 --- a/oldstuff/home/modules/languages/c++/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.languages.cpp; - - inherit (pkgs) ccls; -in -{ - options.languages.cpp = { - enable = lib.mkEnableOption "Enable support for C++ language"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs = { - localPackages."init-cpp" = { - tag = "Setup C++"; - requires = [ "ccls" ]; - packageRequires = ep: [ ep.ccls ]; - comments = [ ]; - code = '' - (setq ccls-executable "${ccls}/bin/ccls") - ''; - }; - }; - - programs.git.ignores = [ - ".ccls-cache/" - ]; - }; -} diff --git a/oldstuff/home/modules/languages/clojure/default.nix b/oldstuff/home/modules/languages/clojure/default.nix deleted file mode 100644 index 4bf20dde..00000000 --- a/oldstuff/home/modules/languages/clojure/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.clojure; - -in -{ - options.languages.clojure = { - enable = lib.mkEnableOption "Enable support for the clojure language"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs = { - extraPackages = ep: [ ep.clojure-mode ]; - - lsp-mode = { - enable = true; - languages = [ "clojure" ]; - }; - - extraConfig = '' - (setenv "PATH" - (concat "${pkgs.leiningen}/bin:" (getenv "PATH"))) - (setq lsp-clojure-server-command '("${pkgs.bash}/bin/bash" "-c" "${pkgs.clojure-lsp}/bin/clojure-lsp")) - ''; - }; - }; -} diff --git a/oldstuff/home/modules/languages/default.nix b/oldstuff/home/modules/languages/default.nix deleted file mode 100644 index 198eb4f4..00000000 --- a/oldstuff/home/modules/languages/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, lib, ... }: -let - langsEnabler = - let reducer = l: r: { "${r}".enable = true; } // l; - in builtins.foldl' reducer { } config.enabledLanguages; - -in -{ - imports = [ - ./agda - ./c - ./c++ - ./clojure - ./elixir - ./erlang - ./go - ./lua - ./nix - ./ocaml - ./python - ./rust - ./terraform - ./tex - ]; - - options.enabledLanguages = - lib.mkOption { type = lib.types.listOf lib.types.str; }; - - config = { languages = langsEnabler; }; -} diff --git a/oldstuff/home/modules/languages/elixir/default.nix b/oldstuff/home/modules/languages/elixir/default.nix deleted file mode 100644 index a5a0966c..00000000 --- a/oldstuff/home/modules/languages/elixir/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config, lib, pkgs, self, ... }: -let - cfg = config.languages.elixir; - - inherit (self) elixir-lsp; -in -{ - options.languages.elixir = { - enable = lib.mkEnableOption "Enable support for elixir language"; - }; - - config = lib.mkIf cfg.enable { - programs.zshell.aliases = { - mdg = "mix deps.get"; - mic = "mix compile"; - mit = "mix test"; - }; - - programs.emacs = { - lsp-mode = { - enable = true; - languages = [ "elixir" ]; - }; - - localPackages."init-elixir" = { - tag = "Setup elixir"; - comments = [ ]; - requires = [ "company" "flycheck" ]; - packageRequires = ep: [ - ep.company - ep.elixir-mode - ep.flycheck - ep.lsp-mode - ]; - code = '' - (add-to-list 'exec-path "${elixir-lsp}/bin") - (setq lsp-elixir-server-command '("elixir-ls")) - - (add-hook 'elixir-mode-hook - (lambda () - (subword-mode) - (company-mode) - (flycheck-mode) - (lsp-lens-mode) - (add-hook 'before-save-hook #'lsp-format-buffer nil t))) - ''; - }; - }; - }; -} diff --git a/oldstuff/home/modules/languages/erlang/default.nix b/oldstuff/home/modules/languages/erlang/default.nix deleted file mode 100644 index 3c5ee44e..00000000 --- a/oldstuff/home/modules/languages/erlang/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, lib, pkgs, self, ... }: -let - cfg = config.languages.erlang; - - inherit (self) erlang-ls; -in -{ - options.languages.erlang = { - enable = lib.mkEnableOption "Enable support for erlang language"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ - (ep.erlang.overrideAttrs (oa: { - buildInputs = oa.buildInputs ++ [ pkgs.perl pkgs.ncurses ]; - })) - ]; - - programs.emacs.lsp-mode = { - enable = true; - languages = [ "erlang" ]; - }; - - programs.emacs.extraConfig = '' - ;; Configure erlang related stuff - (setq lsp-erlang-server-path "${erlang-ls}/bin/erlang_ls") - - (eval-after-load 'erlang - '(define-key erlang-mode-map (kbd "C-M-i") #'company-lsp)) - - (add-hook 'erlang-mode-hook - (lambda () - (linum-mode) - ('column-number-mode) - (lsp) - (add-hook 'before-save-hook 'lsp-format-buffer nil t) - (subword-mode) - (company-mode) - (flycheck-mode))) - - (add-hook 'origami-mode-hook 'lsp-origami-mode) - (add-hook 'erlang-mode-hook 'origami-mode) - ''; - }; -} diff --git a/oldstuff/home/modules/languages/go/default.nix b/oldstuff/home/modules/languages/go/default.nix deleted file mode 100644 index 60755bc6..00000000 --- a/oldstuff/home/modules/languages/go/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.go; - -in -{ - options.languages.go = { - enable = lib.mkEnableOption "Enable support for the go language"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.go-mode ]; - - programs.emacs.lsp-mode = { - enable = true; - languages = [ "go" ]; - }; - - home.packages = [ pkgs.go ]; - - programs.emacs.extraConfig = '' - (add-to-list 'exec-path "${pkgs.gopls}/bin") - - (add-hook 'go-mode-hook - (lambda () - (subword-mode) - (company-mode) - (flymake-mode) - (add-hook 'before-save-hook #'lsp-format-buffer nil t))) - ''; - }; -} diff --git a/oldstuff/home/modules/languages/nix/default.nix b/oldstuff/home/modules/languages/nix/default.nix deleted file mode 100644 index 442b7755..00000000 --- a/oldstuff/home/modules/languages/nix/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.nix; - -in -{ - options.languages.nix = { - enable = lib.mkEnableOption "Enable support for the nix language"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.lsp-mode ep.nix-mode ep.flycheck ]; - - programs.emacs.extraConfig = '' - (require 'lsp-mode) - - ;; make lsp-mode aware of nix - (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix")) - (lsp-register-client - (make-lsp-client :new-connection (lsp-stdio-connection '("${pkgs.rnix-lsp}/bin/rnix-lsp")) - :major-modes '(nix-mode) - :server-id 'nix)) - - (add-hook 'nix-mode-hook - (lambda () - (lsp) - (subword-mode) - (company-mode) - (flycheck-mode))) - ''; - }; -} diff --git a/oldstuff/home/modules/languages/python/default.nix b/oldstuff/home/modules/languages/python/default.nix deleted file mode 100644 index 23c45b9f..00000000 --- a/oldstuff/home/modules/languages/python/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.languages.python; - pyls = "${pkgs.python37Packages.python-language-server}/bin/pyls"; - mspyls = "${pkgs.python-language-server}/bin/python-language-server"; - - lsBin = if cfg.useMS then mspyls else pyls; - - lsHook = - if cfg.useMS then - "(add-hook 'python-mode-hook (lambda () (require 'lsp-python-ms) (lsp)))" - else - ""; - lsExec = - if cfg.useMS then - ''(setq lsp-python-ms-executable "${lsBin}")'' - else - ''(setq lsp-pyls-server-command '("${lsBin}"))''; -in -{ - options.languages.python = { - enable = lib.mkEnableOption "Enable support for python language"; - useMS = lib.mkEnableOption "Use MS language server rather than palantirs"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.lsp-mode = { - enable = true; - languages = if cfg.useMS then [ ] else [ "python" ]; - }; - - programs.emacs.localPackages."init-python" = { - tag = "Setup and prepare the python language modes"; - comments = [ ]; - requires = [ ]; - packageRequires = (ep: - [ - ep.lsp-pyright - ep.python-docstring - (config.programs.emacs.localPackages."init-lsp".packageRequires ep) - ] ++ (if cfg.useMS then [ ep.lsp-python-ms ] else [ ])); - code = '' - ${lsHook} - - ${lsExec} - - (add-hook 'python-mode-hook - (lambda () - (require 'lsp-pyright) - (subword-mode) - (company-mode) - (flycheck-mode) - (python-docstring-mode) - (lsp))) - ''; - }; - }; -} diff --git a/oldstuff/home/modules/languages/rust/default.nix b/oldstuff/home/modules/languages/rust/default.nix deleted file mode 100644 index 864837e4..00000000 --- a/oldstuff/home/modules/languages/rust/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, ... }: -let cfg = config.languages.rust; - -in -{ - options.languages.rust = { - enable = lib.mkEnableOption "Enable support for Rust language"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.rust-mode ]; - - programs.emacs.lsp-mode = { - enable = true; - languages = [ "rust" ]; - }; - - programs.emacs.extraConfig = '' - (setq lsp-rust-rls-server-command "rls") - - (add-hook 'rust-mode-hook - (lambda () - (subword-mode) - (company-mode) - (flycheck-mode) - (add-hook 'before-save-hook #'lsp-format-buffer nil t))) - ''; - }; -} diff --git a/oldstuff/home/modules/languages/tex/default.nix b/oldstuff/home/modules/languages/tex/default.nix deleted file mode 100644 index 030f480b..00000000 --- a/oldstuff/home/modules/languages/tex/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.tex; - -in -{ - options.languages.tex = { - enable = lib.mkEnableOption "LaTeX language support"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.auctex ]; - - programs.emacs.lsp-mode = { - enable = true; - }; - - programs.emacs.extraConfig = '' - (add-to-list 'exec-path "${pkgs.texlab}/bin") - - (add-hook 'tex-mode-hook - (lambda () - (company-mode) - (flymake-mode) - (lsp))) - ''; - }; -} diff --git a/oldstuff/home/modules/openshift/default.nix b/oldstuff/home/modules/openshift/default.nix deleted file mode 100644 index db2ea7e0..00000000 --- a/oldstuff/home/modules/openshift/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, lib, config, ... }: -let cfg = config.programs.openshift; - -in -{ - options.programs.openshift = { - enable = lib.mkEnableOption "Tools to manage openshift instances"; - }; - - config = lib.mkIf cfg.enable { - home.packages = - [ pkgs.sops pkgs.openshift (lib.setPrio 0 pkgs.kubectl) pkgs.kubernetes-helm ]; - - programs.zsh.initExtra = '' - # Enable autocomplete for oc, kubectl and helm - eval "$(${pkgs.openshift}/bin/oc completion zsh)" - eval "$(${pkgs.kubectl}/bin/kubectl completion zsh)" - eval "$(${pkgs.kubernetes-helm}/bin/helm completion zsh)" - ''; - }; -} diff --git a/oldstuff/home/modules/zshell/default.nix b/oldstuff/home/modules/zshell/default.nix deleted file mode 100644 index 514002aa..00000000 --- a/oldstuff/home/modules/zshell/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.programs.zshell; - aliasesStr = lib.concatStringsSep "\n" - (lib.mapAttrsToList (k: v: "alias ${k}=${lib.escapeShellArg v}") - cfg.aliases); - sourcesStr = - lib.concatStringsSep "\n" (builtins.map (s: ". ${s}") cfg.sources); -in -{ - options.programs.zshell = { - aliases = lib.mkOption { - default = { }; - example = { - ll = "ls -l"; - ".." = "cd .."; - }; - description = '' - An attribute set that maps aliases (the top level attribute names in - this option) to command strings or directly to build outputs. - ''; - type = lib.types.attrsOf lib.types.str; - }; - sources = lib.mkOption { - default = [ ]; - type = lib.types.listOf lib.types.str; - }; - }; - - config = { - home.file = { - ".zsh/boot/aliases.zsh" = { - text = '' - ${aliasesStr} - ''; - }; - ".zsh/boot/sourcing.zsh" = { - text = '' - ${sourcesStr} - ''; - }; - }; - }; -} diff --git a/oldstuff/home/profiles/base/default.nix b/oldstuff/home/profiles/base/default.nix deleted file mode 100644 index b4d6de98..00000000 --- a/oldstuff/home/profiles/base/default.nix +++ /dev/null @@ -1,224 +0,0 @@ -{ config, lib, pkgs, inputs, ... }: -let - cfg = config.profiles.base; - - inherit (inputs.self.packages.x86_64-linux) emacs; - - dag = lib.hm.dag; - - # TODO: make these a bit more nice, so that repeating the hosts and individual config isn't necessary. - zerotierHosts = [ "delly-nixos.adoring_suess.zerotier" "tux-nixos.adoring_suess.zerotier" "nixos.adoring_suess.zerotier" ]; - - zsh-complete = pkgs.stdenv.mkDerivation { - pname = "nix-zsh-completion-with-flakes"; - version = "git"; - - src = ./nix-completions.sh; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out - cp $src $out/_nix - ''; - }; -in -{ - options.profiles.base = { - enable = lib.mkEnableOption "The base profile, should be always enabled"; - }; - - config = lib.mkIf cfg.enable { - home.sessionVariables = rec { - EDITOR = "emacs -nw"; - VISUAL = "emacs"; - GIT_EDITOR = EDITOR; - }; - - gtk.enable = true; - gtk.theme.package = pkgs.gnome3.gnome_themes_standard; - gtk.theme.name = "Adwaita-dark"; - - home.keyboard.layout = "de"; - home.packages = [ pkgs.hydra-check pkgs.gnome3.dconf ]; - - xsession = { - enable = true; - numlock.enable = true; - profileExtra = '' - setxkbmap de - ''; - }; - - programs = { - advancedCopy.enable = true; - bat.enable = true; - direnv.enable = true; - exa.enable = true; - home-manager.enable = true; - htop.enable = true; - jq.enable = true; - openshift.enable = true; - - ssh = { - enable = true; - compression = true; - - matchBlocks = { - "*.adoring_suess.zerotier" = dag.entryAfter zerotierHosts { - identityFile = "~/.ssh/id_rsa"; - user = "nmelzer"; - }; - - "delly-nixos.adoring_suess.zerotier" = { - hostname = "172.24.199.101"; - }; - "ryzen-ubuntu.adoring_suess.zerotier" = { - hostname = "172.24.237.73"; - }; - "tux-nixos.adoring_suess.zerotier" = { - hostname = "172.24.152.168"; - localForwards = [ - { - bind.port = 60080; - host.address = "fritz.box"; - host.port = 80; - } - ]; - }; - "nixos.adoring_suess.zerotier" = { - hostname = "172.24.231.199"; - user = "demo"; - }; - - "*.nobbz.dev" = { - identityFile = "~/.ssh/nobbz_dev"; - user = "root"; - }; - - "gitlab.com" = { - addressFamily = "inet"; - identityFile = "~/.ssh/gitlab"; - }; - - "github.com" = { - identityFile = "~/.ssh/github"; - }; - - "*.actum.internal" = { - user = "norbert.melzer"; - identityFile = "~/.ssh/actum-gitlab"; - }; - - "*.vcp.internal" = { - user = "cloudseeds"; - identityFile = "~/.ssh/vogel"; - }; - - "deploy-vogel.custpoc.cloudseeds.de" = dag.entryBefore [ - "*.custpoc.cloudseeds.de" - "*.cloudseeds.de" - ] - { - user = "cloudseeds"; - identityFile = "~/.ssh/vogel"; - }; - - "repo.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { - identityFile = "~/.ssh/id_rsa"; - }; - - "*.custpoc.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { - user = "norbert.melzer"; - identityFile = "~/.ssh/actum-gitlab"; - }; - - "*.cloudseeds.de" = { - user = "norbert.melzer"; - identityFile = "~/.ssh/cloudseeds"; - }; - }; - }; - - emacs = { - enable = true; - package = emacs; - }; - - tmux = { - enable = true; - - clock24 = true; - historyLimit = 10000; - terminal = "screen-256color"; - - plugins = let tp = pkgs.tmuxPlugins; in - [ - # { - # plugin = tp.dracula; - # extraConfig = '' - # set -g @dracula-show-battery true - # set -g @dracula-show-powerline true - # set -g @dracula-refresh-rate 10 - # ''; - # } - ]; - }; - - zsh = { - enable = true; - - enableCompletion = true; - enableAutosuggestions = true; - - autocd = true; - - dotDir = ".config/zsh"; - - defaultKeymap = "emacs"; - - plugins = [ - { - name = "nix-zsh-complete.zsh"; - src = zsh-complete; - file = "_nix"; - } - { - name = "powerlevel10k"; - src = pkgs.zsh-powerlevel10k; - file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; - } - { - name = "powerlevel10k-config"; - src = lib.cleanSource ./p10k-config; - file = "p10k.zsh"; - } - { - name = "zsh-syntax-highlighting"; - src = pkgs.fetchFromGitHub { - owner = "zsh-users"; - repo = "zsh-syntax-highlighting"; - rev = "0.7.1"; - sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0"; - }; - } - ]; - - initExtra = '' - bindkey "^[[1;5D" backward-word - bindkey "^[[1;5C" forward-word - ''; - - sessionVariables = { - # NIX_PATH = builtins.concatStringsSep ":" [ - # "nixpkgs=${inputs.nixpkgs}" - # "nixos-config=/etc/nixos/configuration.nix" - # "/nix/var/nix/profiles/per-user/root/channels" - # ]; - }; - - shellAliases = config.programs.zshell.aliases; - }; - }; - }; -} diff --git a/oldstuff/home/profiles/base/nix-completions.sh b/oldstuff/home/profiles/base/nix-completions.sh deleted file mode 100644 index c107ca7a..00000000 --- a/oldstuff/home/profiles/base/nix-completions.sh +++ /dev/null @@ -1,22 +0,0 @@ - -function _nix() { - local ifs_bk="$IFS" - local input=("${(Q)words[@]}") - IFS=$'\n' - local res=($(NIX_GET_COMPLETIONS=$((CURRENT - 1)) "$input[@]")) - IFS="$ifs_bk" - local tpe="${${res[1]}%%> *}" - local -a suggestions - declare -a suggestions - for suggestion in ${res:1}; do - # FIXME: This doesn't work properly if the suggestion word contains a `:` - # itself - suggestions+="${suggestion/ /:}" - done - if [[ "$tpe" == filenames ]]; then - compadd -f - fi - _describe 'nix' suggestions -} - -compdef _nix nix diff --git a/oldstuff/home/profiles/base/p10k-config/p10k.zsh b/oldstuff/home/profiles/base/p10k-config/p10k.zsh deleted file mode 100644 index 8705be08..00000000 --- a/oldstuff/home/profiles/base/p10k-config/p10k.zsh +++ /dev/null @@ -1,1469 +0,0 @@ -# Generated by Powerlevel10k configuration wizard on 2020-02-27 at 13:48 UTC. -# Based on romkatv/powerlevel10k/config/p10k-classic.zsh. -# Wizard options: powerline, classic, darkest, time, angled separators, sharp heads, -# flat tails, 2 lines, solid, full frame, compact, concise, transient_prompt, -# instant_prompt=off. -# Type `p10k configure` to generate another config. -# -# Config for Powerlevel10k with classic powerline prompt style. Type `p10k configure` to generate -# your own config based on it. -# -# Tip: Looking for a nice color? Here's a one-liner to print colormap. -# -# for i in {0..255}; do print -Pn "%K{$i} %k%F{$i}${(l:3::0:)i}%f " ${${(M)$((i%8)):#7}:+$'\n'}; done - -# Temporarily change options. -'builtin' 'local' '-a' 'p10k_config_opts' -[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') -[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') -[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') -'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' - -() { - emulate -L zsh - setopt no_unset extended_glob - - # Unset all configuration options. This allows you to apply configiguration changes without - # restarting zsh. Edit ~/.p10k.zsh and type `source ~/.p10k.zsh`. - unset -m 'POWERLEVEL9K_*' - - autoload -Uz is-at-least && is-at-least 5.1 || return - - zmodload zsh/langinfo - if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then - local LC_ALL=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8} - fi - - # The list of segments shown on the left. Fill it with the most important segments. - typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( - # =========================[ Line #1 ]========================= - # os_icon # os identifier - dir # current directory - vcs # git status - # =========================[ Line #2 ]========================= - newline # \n - # prompt_char # prompt symbol - ) - - # The list of segments shown on the right. Fill it with less important segments. - # Right prompt on the last prompt line (where you are typing your commands) gets - # automatically hidden when the input line reaches it. Right prompt above the - # last prompt line gets hidden if it would overlap with left prompt. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=( - # =========================[ Line #1 ]========================= - status # exit code of the last command - 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) - 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 - # go_version # go version (https://golang.org) - # rust_version # rustc version (https://www.rust-lang.org) - # dotnet_version # .NET version (https://dotnet.microsoft.com) - # php_version # php version (https://www.php.net/) - # laravel_version # laravel php framework version (https://laravel.com/) - 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) - 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) - context # user@hostname - 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) - midnight_commander # midnight commander shell (https://midnight-commander.org/) - nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) - vi_mode # vi mode (you don't need this if you've enabled prompt_char) - # vpn_ip # virtual private network indicator - # load # CPU load - # disk_usage # disk usage - # ram # free RAM - # swap # used swap - todo # todo items (https://github.com/todotxt/todo.txt-cli) - timewarrior # timewarrior tracking status (https://timewarrior.net/) - taskwarrior # taskwarrior task count (https://taskwarrior.org/) - time # current time - # =========================[ Line #2 ]========================= - newline # \n - # ip # ip address and bandwidth usage for a specified network interface - # public_ip # public IP address - # proxy # system-wide http/https/ftp proxy - # battery # internal battery - # wifi # wifi speed - # example # example user-defined segment (see prompt_example function below) - ) - - # To enable default icons for all segments, don't define POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION - # or set it to '${P9K_VISUAL_IDENTIFIER}'. - # - # To remove trailing space from all default icons, set POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION - # to '${P9K_VISUAL_IDENTIFIER% }'. - # - # To enable default icons for one segment (e.g., dir), set - # POWERLEVEL9K_DIR_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}'. - # - # To assign a specific icon to one segment (e.g., dir), set - # POWERLEVEL9K_DIR_VISUAL_IDENTIFIER_EXPANSION='⭐'. - # - # To assign a specific icon to a segment in a given state (e.g., dir in state NOT_WRITABLE), - # set POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='⭐'. - # - # Note: You can use $'\u2B50' instead of '⭐'. It's especially convenient when specifying - # icons that your text editor cannot render. Don't forget to put $ and use single quotes when - # defining icons via Unicode codepoints. - # - # Note: Many default icons cannot be displayed with system fonts. You'll need to install a - # capable font to use them. See POWERLEVEL9K_MODE below. - typeset -g POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION='${P9K_VISUAL_IDENTIFIER}' - - # This option makes a difference only when default icons are enabled for all or some prompt - # segments (see POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION above). LOCK_ICON can be printed as - # $'\uE0A2', $'\uE138' or $'\uF023' depending on POWERLEVEL9K_MODE. The correct value of this - # parameter depends on the provider of the font your terminal is using. - # - # Font Provider | POWERLEVEL9K_MODE - # ---------------------------------+------------------- - # Powerline | powerline - # Font Awesome | awesome-fontconfig - # Adobe Source Code Pro | awesome-fontconfig - # Source Code Pro | awesome-fontconfig - # Awesome-Terminal Fonts (regular) | awesome-fontconfig - # Awesome-Terminal Fonts (patched) | awesome-patched - # Nerd Fonts | nerdfont-complete - # Other | compatible - # - # If this looks overwhelming, either stick with a preinstalled system font and set - # POWERLEVEL9K_MODE=compatible, or install the recommended Powerlevel10k font from - # https://github.com/romkatv/powerlevel10k/#recommended-meslo-nerd-font-patched-for-powerlevel10k - # and set POWERLEVEL9K_MODE=nerdfont-complete. - typeset -g POWERLEVEL9K_MODE=powerline - - # When set to true, icons appear before content on both sides of the prompt. When set - # to false, icons go after content. If empty or not set, icons go before content in the left - # prompt and after content in the right prompt. - # - # You can also override it for a specific segment: - # - # POWERLEVEL9K_STATUS_ICON_BEFORE_CONTENT=false - # - # Or for a specific segment in specific state: - # - # POWERLEVEL9K_DIR_NOT_WRITABLE_ICON_BEFORE_CONTENT=false - typeset -g POWERLEVEL9K_ICON_BEFORE_CONTENT= - - # Add an empty line before each prompt. - typeset -g POWERLEVEL9K_PROMPT_ADD_NEWLINE=false - - # Connect left prompt lines with these symbols. You'll probably want to use the same color - # as POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND below. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX='%238F╭─' - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_PREFIX='%238F├─' - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX='%238F╰─' - # Connect right prompt lines with these symbols. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_SUFFIX='%238F─╮' - typeset -g POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_SUFFIX='%238F─┤' - typeset -g POWERLEVEL9K_MULTILINE_LAST_PROMPT_SUFFIX='%238F─╯' - - # Filler between left and right prompt on the first prompt line. You can set it to ' ', '·' or - # '─'. The last two make it easier to see the alignment between left and right prompt and to - # separate prompt from command output. You might want to set POWERLEVEL9K_PROMPT_ADD_NEWLINE=false - # for more compact prompt if using using this option. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='─' - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_BACKGROUND= - if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then - # The color of the filler. You'll probably want to match the color of POWERLEVEL9K_MULTILINE - # ornaments defined above. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238 - # Start filler from the edge of the screen if there are no left segments on the first line. - typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_FIRST_SEGMENT_END_SYMBOL='%{%}' - # End filler on the edge of the screen if there are no right segments on the first line. - typeset -g POWERLEVEL9K_EMPTY_LINE_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='%{%}' - fi - - # Default background color. - typeset -g POWERLEVEL9K_BACKGROUND=234 - - # Separator between same-color segments on the left. - typeset -g POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR='%242F\uE0B1' - # Separator between same-color segments on the right. - typeset -g POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR='%242F\uE0B3' - # Separator between different-color segments on the left. - typeset -g POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR='\uE0B0' - # Separator between different-color segments on the right. - typeset -g POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR='\uE0B2' - # The right end of left prompt. - typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL='\uE0B0' - # The left end of right prompt. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL='\uE0B2' - # The left end of left prompt. - typeset -g POWERLEVEL9K_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL='' - # The right end of right prompt. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL='' - # Left prompt terminator for lines without any segments. - typeset -g POWERLEVEL9K_EMPTY_LINE_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL= - - #################################[ os_icon: os identifier ]################################## - # OS identifier color. - typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=255 - # Make the icon bold. - typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='%B${P9K_CONTENT}' - - ################################[ prompt_char: prompt symbol ]################################ - # Transparent background. - typeset -g POWERLEVEL9K_PROMPT_CHAR_BACKGROUND= - # Green prompt symbol if the last command succeeded. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=76 - # Red prompt symbol if the last command failed. - typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196 - # Default prompt symbol. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯' - # Prompt symbol in command vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VICMD_CONTENT_EXPANSION='❮' - # Prompt symbol in visual vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIVIS_CONTENT_EXPANSION='Ⅴ' - # Prompt symbol in overwrite vi mode. - typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIOWR_CONTENT_EXPANSION='▶' - typeset -g POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE=true - # No line terminator if prompt_char is the last segment. - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL= - # No line introducer if prompt_char is the first segment. - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= - # No surrounding whitespace. - typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_{LEFT,RIGHT}_WHITESPACE= - - ##################################[ dir: current directory ]################################## - # Default current directory color. - typeset -g POWERLEVEL9K_DIR_FOREGROUND=31 - # If directory is too long, shorten some of its segments to the shortest possible unique - # prefix. The shortened directory can be tab-completed to the original. - typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique - # Replace removed segment suffixes with this symbol. - typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= - # Color of the shortened directory segments. - typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=103 - # Color of the anchor directory segments. Anchor segments are never shortened. The first - # segment is always an anchor. - typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=39 - # Display anchor directory segments in bold. - typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true - # Don't shorten directories that contain any of these files. They are anchors. - local anchor_files=( - .bzr - .citc - .git - .hg - .node-version - .python-version - .go-version - .ruby-version - .lua-version - .java-version - .perl-version - .php-version - .tool-version - .shorten_folder_marker - .svn - .terraform - CVS - Cargo.toml - composer.json - go.mod - package.json - ) - typeset -g POWERLEVEL9K_SHORTEN_FOLDER_MARKER="(${(j:|:)anchor_files})" - # If set to true, remove everything before the last (deepest) subdirectory that contains files - # matching $POWERLEVEL9K_SHORTEN_FOLDER_MARKER. For example, when the current directory is - # /foo/bar/git_repo/baz, prompt will display git_repo/baz. This assumes that /foo/bar/git_repo - # contains a marker (.git) and other directories don't. - typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false - # Don't shorten this many last directory segments. They are anchors. - typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1 - # Shorten directory if it's longer than this even if there is space for it. The value can - # be either absolute (e.g., '80') or a percentage of terminal width (e.g, '50%'). If empty, - # directory will be shortened only when prompt doesn't fit or when other parameters demand it - # (see POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS and POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT below). - # If set to `0`, directory will always be shortened to its minimum length. - typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80 - # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least this - # many columns for typing commands. - typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40 - # When `dir` segment is on the last prompt line, try to shorten it enough to leave at least - # COLUMNS * POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT * 0.01 columns for typing commands. - typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT=50 - # If set to true, embed a hyperlink into the directory. Useful for quickly - # opening a directory in the file manager simply by clicking the link. - # Can also be handy when the directory is shortened, as it allows you to see - # the full directory that was used in previous commands. - typeset -g POWERLEVEL9K_DIR_HYPERLINK=false - - # Enable special styling for non-writable directories. - typeset -g POWERLEVEL9K_DIR_SHOW_WRITABLE=true - # Show this icon when the current directory is not writable. POWERLEVEL9K_DIR_SHOW_WRITABLE - # above must be set to true for this parameter to have effect. - typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_VISUAL_IDENTIFIER_EXPANSION='∅' - - # Custom prefix. - # typeset -g POWERLEVEL9K_DIR_PREFIX='%244Fin ' - - # POWERLEVEL9K_DIR_CLASSES allows you to specify custom icons for different directories. - # It must be an array with 3 * N elements. Each triplet consists of: - # - # 1. A pattern against which the current directory is matched. Matching is done with - # extended_glob option enabled. - # 2. Directory class for the purpose of styling. - # 3. Icon. - # - # Triplets are tried in order. The first triplet whose pattern matches $PWD wins. If there - # are no matches, the directory will have no icon. - # - # Example: - # - # typeset -g POWERLEVEL9K_DIR_CLASSES=( - # '~/work(|/*)' WORK '(╯°□°）╯︵ ┻━┻' - # '~(|/*)' HOME '⌂' - # '*' DEFAULT '') - # - # With these settings, the current directory in the prompt may look like this: - # - # (╯°□°）╯︵ ┻━┻ ~/work/projects/important/urgent - # - # Or like this: - # - # ⌂ ~/best/powerlevel10k - # - # You can also set different colors for directories of different classes. Remember to override - # FOREGROUND, SHORTENED_FOREGROUND and ANCHOR_FOREGROUND for every directory class that you wish - # to have its own color. - # - # typeset -g POWERLEVEL9K_DIR_WORK_FOREGROUND=31 - # typeset -g POWERLEVEL9K_DIR_WORK_SHORTENED_FOREGROUND=103 - # typeset -g POWERLEVEL9K_DIR_WORK_ANCHOR_FOREGROUND=39 - # - typeset -g POWERLEVEL9K_DIR_CLASSES=() - - #####################################[ vcs: git status ]###################################### - # Branch icon. Set this parameter to '\uF126 ' for the popular Powerline branch icon. - typeset -g POWERLEVEL9K_VCS_BRANCH_ICON= - POWERLEVEL9K_VCS_BRANCH_ICON=${(g::)POWERLEVEL9K_VCS_BRANCH_ICON} - - # Untracked files icon. It's really a question mark, your font isn't broken. - # Change the value of this parameter to show a different icon. - typeset -g POWERLEVEL9K_VCS_UNTRACKED_ICON='?' - POWERLEVEL9K_VCS_UNTRACKED_ICON=${(g::)POWERLEVEL9K_VCS_UNTRACKED_ICON} - - # Formatter for Git status. - # - # Example output: master ⇣42⇡42 *42 merge ~42 +42 !42 ?42. - # - # You can edit the function to customize how Git status looks. - # - # VCS_STATUS_* parameters are set by gitstatus plugin. See reference: - # https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh. - function my_git_formatter() { - emulate -L zsh - - if [[ -n $P9K_CONTENT ]]; then - # If P9K_CONTENT is not empty, use it. It's either "loading" or from vcs_info (not from - # gitstatus plugin). VCS_STATUS_* parameters are not available in this case. - typeset -g my_git_format=$P9K_CONTENT - return - fi - - if (( $1 )); then - # Styling for up-to-date Git status. - local meta='%244F' # grey foreground - local clean='%76F' # green foreground - local modified='%178F' # yellow foreground - local untracked='%39F' # blue foreground - local conflicted='%196F' # red foreground - else - # Styling for incomplete and stale Git status. - local meta='%244F' # grey foreground - local clean='%244F' # grey foreground - local modified='%244F' # grey foreground - local untracked='%244F' # grey foreground - local conflicted='%244F' # grey foreground - fi - - local res - local where # branch or tag - if [[ -n $VCS_STATUS_LOCAL_BRANCH ]]; then - res+="${clean}${POWERLEVEL9K_VCS_BRANCH_ICON}" - where=${(V)VCS_STATUS_LOCAL_BRANCH} - elif [[ -n $VCS_STATUS_TAG ]]; then - res+="${meta}#" - where=${(V)VCS_STATUS_TAG} - fi - - # If local branch name or tag is at most 32 characters long, show it in full. - # Otherwise show the first 12 … the last 12. - (( $#where > 32 )) && where[13,-13]="…" - res+="${clean}${where//\%/%%}" # escape % - - # Display the current Git commit if there is no branch or tag. - # Tip: To always display the current Git commit, remove `[[ -z $where ]] &&` from the next line. - [[ -z $where ]] && res+="${meta}@${clean}${VCS_STATUS_COMMIT[1,8]}" - - # Show tracking branch name if it differs from local branch. - if [[ -n ${VCS_STATUS_REMOTE_BRANCH:#$VCS_STATUS_LOCAL_BRANCH} ]]; then - res+="${meta}:${clean}${(V)VCS_STATUS_REMOTE_BRANCH//\%/%%}" # escape % - fi - - # ⇣42 if behind the remote. - (( VCS_STATUS_COMMITS_BEHIND )) && res+=" ${clean}⇣${VCS_STATUS_COMMITS_BEHIND}" - # ⇡42 if ahead of the remote; no leading space if also behind the remote: ⇣42⇡42. - (( VCS_STATUS_COMMITS_AHEAD && !VCS_STATUS_COMMITS_BEHIND )) && res+=" " - (( VCS_STATUS_COMMITS_AHEAD )) && res+="${clean}⇡${VCS_STATUS_COMMITS_AHEAD}" - # ⇠42 if behind the push remote. - (( VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" ${clean}⇠${VCS_STATUS_PUSH_COMMITS_BEHIND}" - (( VCS_STATUS_PUSH_COMMITS_AHEAD && !VCS_STATUS_PUSH_COMMITS_BEHIND )) && res+=" " - # ⇢42 if ahead of the push remote; no leading space if also behind: ⇠42⇢42. - (( VCS_STATUS_PUSH_COMMITS_AHEAD )) && res+="${clean}⇢${VCS_STATUS_PUSH_COMMITS_AHEAD}" - # *42 if have stashes. - (( VCS_STATUS_STASHES )) && res+=" ${clean}*${VCS_STATUS_STASHES}" - # 'merge' if the repo is in an unusual state. - [[ -n $VCS_STATUS_ACTION ]] && res+=" ${conflicted}${VCS_STATUS_ACTION}" - # ~42 if have merge conflicts. - (( VCS_STATUS_NUM_CONFLICTED )) && res+=" ${conflicted}~${VCS_STATUS_NUM_CONFLICTED}" - # +42 if have staged changes. - (( VCS_STATUS_NUM_STAGED )) && res+=" ${modified}+${VCS_STATUS_NUM_STAGED}" - # !42 if have unstaged changes. - (( VCS_STATUS_NUM_UNSTAGED )) && res+=" ${modified}!${VCS_STATUS_NUM_UNSTAGED}" - # ?42 if have untracked files. It's really a question mark, your font isn't broken. - # See POWERLEVEL9K_VCS_UNTRACKED_ICON above if you want to use a different icon. - # Remove the next line if you don't want to see untracked files at all. - (( VCS_STATUS_NUM_UNTRACKED )) && res+=" ${untracked}${POWERLEVEL9K_VCS_UNTRACKED_ICON}${VCS_STATUS_NUM_UNTRACKED}" - # "─" if the number of unstaged files is unknown. This can happen due to - # POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY (see below) being set to a non-negative number lower - # than the number of files in the Git index, or due to bash.showDirtyState being set to false - # in the repository config. The number of staged and untracked files may also be unknown - # in this case. - (( VCS_STATUS_HAS_UNSTAGED == -1 )) && res+=" ${modified}─" - - typeset -g my_git_format=$res - } - functions -M my_git_formatter 2>/dev/null - - # Don't count the number of unstaged, untracked and conflicted files in Git repositories with - # more than this many files in the index. Negative value means infinity. - # - # If you are working in Git repositories with tens of millions of files and seeing performance - # sagging, try setting POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY to a number lower than the output - # of `git ls-files | wc -l`. Alternatively, add `bash.showDirtyState = false` to the repository's - # config: `git config bash.showDirtyState false`. - typeset -g POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY=-1 - - # Don't show Git status in prompt for repositories whose workdir matches this pattern. - # For example, if set to '~', the Git repository at $HOME/.git will be ignored. - # Multiple patterns can be combined with '|': '~|~/some/dir'. - typeset -g POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN='~' - - # Disable the default Git status formatting. - typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true - # Install our own Git status formatter. - typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}' - typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter(0)))+${my_git_format}}' - # Enable counters for staged, unstaged, etc. - typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 - - # Icon color. - typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76 - typeset -g POWERLEVEL9K_VCS_LOADING_VISUAL_IDENTIFIER_COLOR=244 - # Custom icon. - typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION= - # Custom prefix. - # typeset -g POWERLEVEL9K_VCS_PREFIX='%244Fon ' - - # Show status of repositories of these types. You can add svn and/or hg if you are - # using them. If you do, your prompt may become slow even when your current directory - # isn't in an svn or hg reposotiry. - typeset -g POWERLEVEL9K_VCS_BACKENDS=(git) - - # These settings are used for respositories other than Git or when gitstatusd fails and - # Powerlevel10k has to fall back to using vcs_info. - typeset -g POWERLEVEL9K_VCS_CLEAN_FOREGROUND=76 - typeset -g POWERLEVEL9K_VCS_UNTRACKED_FOREGROUND=76 - typeset -g POWERLEVEL9K_VCS_MODIFIED_FOREGROUND=178 - - ##########################[ status: exit code of the last command ]########################### - # Enable OK_PIPE, ERROR_PIPE and ERROR_SIGNAL status states to allow us to enable, disable and - # style them independently from the regular OK and ERROR state. - typeset -g POWERLEVEL9K_STATUS_EXTENDED_STATES=true - - # Status on success. No content, just an icon. No need to show it if prompt_char is enabled as - # it will signify success by turning green. - typeset -g POWERLEVEL9K_STATUS_OK=true - typeset -g POWERLEVEL9K_STATUS_OK_FOREGROUND=70 - typeset -g POWERLEVEL9K_STATUS_OK_VISUAL_IDENTIFIER_EXPANSION='✔' - - # Status when some part of a pipe command fails but the overall exit status is zero. It may look - # like this: 1|0. - typeset -g POWERLEVEL9K_STATUS_OK_PIPE=true - typeset -g POWERLEVEL9K_STATUS_OK_PIPE_FOREGROUND=70 - typeset -g POWERLEVEL9K_STATUS_OK_PIPE_VISUAL_IDENTIFIER_EXPANSION='✔' - - # Status when it's just an error code (e.g., '1'). No need to show it if prompt_char is enabled as - # it will signify error by turning red. - typeset -g POWERLEVEL9K_STATUS_ERROR=true - typeset -g POWERLEVEL9K_STATUS_ERROR_FOREGROUND=160 - typeset -g POWERLEVEL9K_STATUS_ERROR_VISUAL_IDENTIFIER_EXPANSION='✘' - - # Status when the last command was terminated by a signal. - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL=true - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_FOREGROUND=160 - # Use terse signal names: "INT" instead of "SIGINT(2)". - typeset -g POWERLEVEL9K_STATUS_VERBOSE_SIGNAME=false - typeset -g POWERLEVEL9K_STATUS_ERROR_SIGNAL_VISUAL_IDENTIFIER_EXPANSION='✘' - - # Status when some part of a pipe command fails and the overall exit status is also non-zero. - # It may look like this: 1|0. - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE=true - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_FOREGROUND=160 - typeset -g POWERLEVEL9K_STATUS_ERROR_PIPE_VISUAL_IDENTIFIER_EXPANSION='✘' - - ###################[ command_execution_time: duration of the last command ]################### - # Show duration of the last command if takes longer than this many seconds. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=3 - # Show this many fractional digits. Zero means round to seconds. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0 - # Execution time color. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FOREGROUND=248 - # Duration format: 1d 2h 3m 4s. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_FORMAT='d h m s' - # Custom icon. - typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION= - # Custom prefix. - # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%244Ftook ' - - #######################[ background_jobs: presence of background jobs ]####################### - # Don't show the number of background jobs. - typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE=false - # Background jobs color. - typeset -g POWERLEVEL9K_BACKGROUND_JOBS_FOREGROUND=37 - # Custom icon. - typeset -g POWERLEVEL9K_BACKGROUND_JOBS_VISUAL_IDENTIFIER_EXPANSION='≡' - - #######################[ direnv: direnv status (https://direnv.net/) ]######################## - # Direnv color. - typeset -g POWERLEVEL9K_DIRENV_FOREGROUND=178 - # Custom icon. - # typeset -g POWERLEVEL9K_DIRENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###############[ asdf: asdf version manager (https://github.com/asdf-vm/asdf) ]############### - # Default asdf color. Only used to display tools for which there is no color override (see below). - typeset -g POWERLEVEL9K_ASDF_FOREGROUND=66 - - # There are four parameters that can be used to hide asdf tools. Each parameter describes - # conditions under which a tool gets hidden. Parameters can hide tools but not unhide them. If at - # least one parameter decides to hide a tool, that tool gets hidden. If no parameter decides to - # hide a tool, it gets shown. - # - # Special note on the difference between POWERLEVEL9K_ASDF_SOURCES and - # POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW. Consider the effect of the following commands: - # - # asdf local python 3.8.1 - # asdf global python 3.8.1 - # - # After running both commands the current python version is 3.8.1 and its source is "local" as - # it takes precedence over "global". If POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW is set to false, - # it'll hide python version in this case because 3.8.1 is the same as the global version. - # POWERLEVEL9K_ASDF_SOURCES will hide python version only if the value of this parameter doesn't - # contain "local". - - # Hide tool versions that don't come from one of these sources. - # - # Available sources: - # - # - shell `asdf current` says "set by ASDF_${TOOL}_VERSION environment variable" - # - local `asdf current` says "set by /some/not/home/directory/file" - # - global `asdf current` says "set by /home/username/file" - # - # Note: If this parameter is set to (shell local global), it won't hide tools. - # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SOURCES. - typeset -g POWERLEVEL9K_ASDF_SOURCES=(shell local global) - - # If set to false, hide tool versions that are the same as global. - # - # Note: The name of this parameter doesn't reflect its meaning at all. - # Note: If this parameter is set to true, it won't hide tools. - # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_PROMPT_ALWAYS_SHOW. - typeset -g POWERLEVEL9K_ASDF_PROMPT_ALWAYS_SHOW=false - - # If set to false, hide tool versions that are equal to "system". - # - # Note: If this parameter is set to true, it won't hide tools. - # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_SYSTEM. - typeset -g POWERLEVEL9K_ASDF_SHOW_SYSTEM=true - - # If set to non-empty value, hide tools unless there is a file matching the specified file pattern - # in the current directory, or its parent diretory, or its grandparent directory, and so on. - # - # Note: If this parameter is set to empty value, it won't hide tools. - # Note: SHOW_ON_UPGLOB isn't specific to asdf. It works with all prompt segments. - # Tip: Override this parameter for ${TOOL} with POWERLEVEL9K_ASDF_${TOOL}_SHOW_ON_UPGLOB. - # - # Example: Hide nodejs version when there is no package.json and no *.js files in the current - # directory, in `..`, in `../..` and so on. - # - # typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.js|package.json' - typeset -g POWERLEVEL9K_ASDF_SHOW_ON_UPGLOB= - - # Ruby version from asdf. - typeset -g POWERLEVEL9K_ASDF_RUBY_FOREGROUND=168 - # typeset -g POWERLEVEL9K_ASDF_RUBY_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_RUBY_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Python version from asdf. - typeset -g POWERLEVEL9K_ASDF_PYTHON_FOREGROUND=37 - # typeset -g POWERLEVEL9K_ASDF_PYTHON_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_PYTHON_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Go version from asdf. - typeset -g POWERLEVEL9K_ASDF_GO_FOREGROUND=37 - # typeset -g POWERLEVEL9K_ASDF_GO_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_GO_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Node.js version from asdf. - typeset -g POWERLEVEL9K_ASDF_NODEJS_FOREGROUND=70 - # typeset -g POWERLEVEL9K_ASDF_NODEJS_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_NODEJS_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Rust version from asdf. - typeset -g POWERLEVEL9K_ASDF_RUST_FOREGROUND=37 - # typeset -g POWERLEVEL9K_ASDF_RUST_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_RUST_SHOW_ON_UPGLOB='*.foo|*.bar' - - # .NET Core version from asdf. - typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_FOREGROUND=134 - # typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_DOTNET_CORE_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Flutter version from asdf. - typeset -g POWERLEVEL9K_ASDF_FLUTTER_FOREGROUND=38 - # typeset -g POWERLEVEL9K_ASDF_FLUTTER_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_FLUTTER_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Lua version from asdf. - typeset -g POWERLEVEL9K_ASDF_LUA_FOREGROUND=32 - # typeset -g POWERLEVEL9K_ASDF_LUA_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_LUA_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Java version from asdf. - typeset -g POWERLEVEL9K_ASDF_JAVA_FOREGROUND=32 - # typeset -g POWERLEVEL9K_ASDF_JAVA_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_JAVA_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Perl version from asdf. - typeset -g POWERLEVEL9K_ASDF_PERL_FOREGROUND=67 - # typeset -g POWERLEVEL9K_ASDF_PERL_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_PERL_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Erlang version from asdf. - typeset -g POWERLEVEL9K_ASDF_ERLANG_FOREGROUND=125 - # typeset -g POWERLEVEL9K_ASDF_ERLANG_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_ERLANG_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Elixir version from asdf. - typeset -g POWERLEVEL9K_ASDF_ELIXIR_FOREGROUND=129 - # typeset -g POWERLEVEL9K_ASDF_ELIXIR_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_ELIXIR_SHOW_ON_UPGLOB='*.foo|*.bar' - - # Postgres version from asdf. - typeset -g POWERLEVEL9K_ASDF_POSTGRES_FOREGROUND=31 - # typeset -g POWERLEVEL9K_ASDF_POSTGRES_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_POSTGRES_SHOW_ON_UPGLOB='*.foo|*.bar' - - # PHP version from asdf. - typeset -g POWERLEVEL9K_ASDF_PHP_FOREGROUND=99 - # typeset -g POWERLEVEL9K_ASDF_PHP_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_ASDF_PHP_SHOW_ON_UPGLOB='*.foo|*.bar' - - ##########[ nordvpn: nordvpn connection status, linux only (https://nordvpn.com/) ]########### - # NordVPN connection indicator color. - typeset -g POWERLEVEL9K_NORDVPN_FOREGROUND=39 - # Hide NordVPN connection indicator when not connected. - typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_CONTENT_EXPANSION= - typeset -g POWERLEVEL9K_NORDVPN_{DISCONNECTED,CONNECTING,DISCONNECTING}_VISUAL_IDENTIFIER_EXPANSION= - # Custom icon. - # typeset -g POWERLEVEL9K_NORDVPN_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #################[ ranger: ranger shell (https://github.com/ranger/ranger) ]################## - # Ranger shell color. - typeset -g POWERLEVEL9K_RANGER_FOREGROUND=178 - # Custom icon. - typeset -g POWERLEVEL9K_RANGER_VISUAL_IDENTIFIER_EXPANSION='▲' - - ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]####################### - # Nnn shell color. - typeset -g POWERLEVEL9K_NNN_FOREGROUND=72 - # Custom icon. - # typeset -g POWERLEVEL9K_NNN_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###########################[ vim_shell: vim shell indicator (:sh) ]########################### - # Vim shell indicator color. - typeset -g POWERLEVEL9K_VIM_SHELL_FOREGROUND=34 - # Custom icon. - # typeset -g POWERLEVEL9K_VIM_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ######[ midnight_commander: midnight commander shell (https://midnight-commander.org/) ]###### - # Midnight Commander shell color. - typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_FOREGROUND=178 - # Custom icon. - # typeset -g POWERLEVEL9K_MIDNIGHT_COMMANDER_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #[ nix_shell: nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) ]## - # Nix shell color. - typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74 - - # Tip: If you want to see just the icon without "pure" and "impure", uncomment the next line. - # typeset -g POWERLEVEL9K_NIX_SHELL_CONTENT_EXPANSION= - - # Custom icon. - # typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##################################[ disk_usgae: disk usage ]################################## - # Colors for different levels of disk usage. - typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35 - typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_FOREGROUND=220 - typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_FOREGROUND=160 - # Thresholds for different levels of disk usage (percentage points). - typeset -g POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL=90 - typeset -g POWERLEVEL9K_DISK_USAGE_CRITICAL_LEVEL=95 - # If set to true, hide disk usage when below $POWERLEVEL9K_DISK_USAGE_WARNING_LEVEL percent. - typeset -g POWERLEVEL9K_DISK_USAGE_ONLY_WARNING=false - # Custom icon. - # typeset -g POWERLEVEL9K_DISK_USAGE_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###########[ vi_mode: vi mode (you don't need this if you've enabled prompt_char) ]########### - # Text and color for normal (a.k.a. command) vi mode. - typeset -g POWERLEVEL9K_VI_COMMAND_MODE_STRING=NORMAL - typeset -g POWERLEVEL9K_VI_MODE_NORMAL_FOREGROUND=106 - # Text and color for visual vi mode. - typeset -g POWERLEVEL9K_VI_VISUAL_MODE_STRING=VISUAL - typeset -g POWERLEVEL9K_VI_MODE_VISUAL_FOREGROUND=68 - # Text and color for overtype (a.k.a. overwrite and replace) vi mode. - typeset -g POWERLEVEL9K_VI_OVERWRITE_MODE_STRING=OVERTYPE - typeset -g POWERLEVEL9K_VI_MODE_OVERWRITE_FOREGROUND=172 - # Text and color for insert vi mode. - typeset -g POWERLEVEL9K_VI_INSERT_MODE_STRING= - typeset -g POWERLEVEL9K_VI_MODE_INSERT_FOREGROUND=66 - - # Custom icon. - typeset -g POWERLEVEL9K_RANGER_VISUAL_IDENTIFIER_EXPANSION='▲' - - ######################################[ ram: free RAM ]####################################### - # RAM color. - typeset -g POWERLEVEL9K_RAM_FOREGROUND=66 - # Custom icon. - # typeset -g POWERLEVEL9K_RAM_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #####################################[ swap: used swap ]###################################### - # Swap color. - typeset -g POWERLEVEL9K_SWAP_FOREGROUND=96 - # Custom icon. - # typeset -g POWERLEVEL9K_SWAP_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ######################################[ load: CPU load ]###################################### - # Show average CPU load over this many last minutes. Valid values are 1, 5 and 15. - typeset -g POWERLEVEL9K_LOAD_WHICH=5 - # Load color when load is under 50%. - typeset -g POWERLEVEL9K_LOAD_NORMAL_FOREGROUND=66 - # Load color when load is between 50% and 70%. - typeset -g POWERLEVEL9K_LOAD_WARNING_FOREGROUND=178 - # Load color when load is over 70%. - typeset -g POWERLEVEL9K_LOAD_CRITICAL_FOREGROUND=166 - # Custom icon. - # typeset -g POWERLEVEL9K_LOAD_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ################[ todo: todo items (https://github.com/todotxt/todo.txt-cli) ]################ - # Todo color. - typeset -g POWERLEVEL9K_TODO_FOREGROUND=110 - # Hide todo when the total number of tasks is zero. - typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_TOTAL=true - # Hide todo when the number of tasks after filtering is zero. - typeset -g POWERLEVEL9K_TODO_HIDE_ZERO_FILTERED=false - - # Todo format. The following parameters are available within the expansion. - # - # - P9K_TODO_TOTAL_TASK_COUNT The total number of tasks. - # - P9K_TODO_FILTERED_TASK_COUNT The number of tasks after filtering. - # - # These variables correspond to the last line of the output of `todo.sh -p ls`: - # - # TODO: 24 of 42 tasks shown - # - # Here 24 is P9K_TODO_FILTERED_TASK_COUNT and 42 is P9K_TODO_TOTAL_TASK_COUNT. - # - # typeset -g POWERLEVEL9K_TODO_CONTENT_EXPANSION='$P9K_TODO_FILTERED_TASK_COUNT' - - # Custom icon. - # typeset -g POWERLEVEL9K_TODO_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###########[ timewarrior: timewarrior tracking status (https://timewarrior.net/) ]############ - # Timewarrior color. - typeset -g POWERLEVEL9K_TIMEWARRIOR_FOREGROUND=110 - # If the tracked task is longer than 24 characters, truncate and append "…". - # Tip: To always display tasks without truncation, delete the following parameter. - # Tip: To hide task names and display just the icon when time tracking is enabled, set the - # value of the following parameter to "". - typeset -g POWERLEVEL9K_TIMEWARRIOR_CONTENT_EXPANSION='${P9K_CONTENT:0:24}${${P9K_CONTENT:24}:+…}' - - # Custom icon. - # typeset -g POWERLEVEL9K_TIMEWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##############[ taskwarrior: taskwarrior task count (https://taskwarrior.org/) ]############## - # Taskwarrior color. - typeset -g POWERLEVEL9K_TASKWARRIOR_FOREGROUND=74 - - # Taskwarrior segment format. The following parameters are available within the expansion. - # - # - P9K_TASKWARRIOR_PENDING_COUNT The number of pending tasks: `task +PENDING count`. - # - P9K_TASKWARRIOR_OVERDUE_COUNT The number of overdue tasks: `task +OVERDUE count`. - # - # Zero values are represented as empty parameters. - # - # The default format: - # - # '${P9K_TASKWARRIOR_OVERDUE_COUNT:+"!$P9K_TASKWARRIOR_OVERDUE_COUNT/"}$P9K_TASKWARRIOR_PENDING_COUNT' - # - # typeset -g POWERLEVEL9K_TASKWARRIOR_CONTENT_EXPANSION='$P9K_TASKWARRIOR_PENDING_COUNT' - - # Custom icon. - # typeset -g POWERLEVEL9K_TASKWARRIOR_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##################################[ context: user@hostname ]################################## - # Context color when running with privileges. - typeset -g POWERLEVEL9K_CONTEXT_ROOT_FOREGROUND=178 - # Context color in SSH without privileges. - typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_FOREGROUND=180 - # Default context color (no privileges, no SSH). - typeset -g POWERLEVEL9K_CONTEXT_FOREGROUND=180 - - # Context format when running with privileges: bold user@hostname. - typeset -g POWERLEVEL9K_CONTEXT_ROOT_TEMPLATE='%B%n@%m' - # Context format when in SSH without privileges: user@hostname. - typeset -g POWERLEVEL9K_CONTEXT_{REMOTE,REMOTE_SUDO}_TEMPLATE='%n@%m' - # Default context format (no privileges, no SSH): user@hostname. - typeset -g POWERLEVEL9K_CONTEXT_TEMPLATE='%n@%m' - - # Don't show context unless running with privileges or in SSH. - # Tip: Remove the next line to always show context. - typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_{CONTENT,VISUAL_IDENTIFIER}_EXPANSION= - - # Custom icon. - # typeset -g POWERLEVEL9K_CONTEXT_VISUAL_IDENTIFIER_EXPANSION='⭐' - # Custom prefix. - # typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%244Fwith ' - - ###[ virtualenv: python virtual environment (https://docs.python.org/3/library/venv.html) ]### - # Python virtual environment color. - typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=37 - # Don't show Python version next to the virtual environment name. - typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false - # Separate environment name from Python version only with a space. - typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER= - # Custom icon. - # typeset -g POWERLEVEL9K_VIRTUALENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #####################[ anaconda: conda environment (https://conda.io/) ]###################### - # Anaconda environment color. - typeset -g POWERLEVEL9K_ANACONDA_FOREGROUND=37 - # Don't show Python version next to the anaconda environment name. - typeset -g POWERLEVEL9K_ANACONDA_SHOW_PYTHON_VERSION=false - # Separate environment name from Python version only with a space. - typeset -g POWERLEVEL9K_ANACONDA_{LEFT,RIGHT}_DELIMITER= - # Custom icon. - # typeset -g POWERLEVEL9K_ANACONDA_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ################[ pyenv: python environment (https://github.com/pyenv/pyenv) ]################ - # Pyenv color. - typeset -g POWERLEVEL9K_PYENV_FOREGROUND=37 - # Hide python version if it doesn't come from one of these sources. - typeset -g POWERLEVEL9K_PYENV_SOURCES=(shell local global) - # If set to false, hide python version if it's the same as global: - # $(pyenv version-name) == $(pyenv global). - typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ################[ goenv: go environment (https://github.com/syndbg/goenv) ]################ - # Goenv color. - typeset -g POWERLEVEL9K_GOENV_FOREGROUND=37 - # Hide go version if it doesn't come from one of these sources. - typeset -g POWERLEVEL9K_GOENV_SOURCES=(shell local global) - # If set to false, hide go version if it's the same as global: - # $(goenv version-name) == $(goenv global). - typeset -g POWERLEVEL9K_GOENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_GOENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##########[ nodenv: node.js version from nodenv (https://github.com/nodenv/nodenv) ]########## - # Nodenv color. - typeset -g POWERLEVEL9K_NODENV_FOREGROUND=70 - # Don't show node version if it's the same as global: $(nodenv version-name) == $(nodenv global). - typeset -g POWERLEVEL9K_NODENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_NODENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##############[ nvm: node.js version from nvm (https://github.com/nvm-sh/nvm) ]############### - # Nvm color. - typeset -g POWERLEVEL9K_NVM_FOREGROUND=70 - # Custom icon. - # typeset -g POWERLEVEL9K_NVM_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ############[ nodeenv: node.js environment (https://github.com/ekalinin/nodeenv) ]############ - # Nodeenv color. - typeset -g POWERLEVEL9K_NODEENV_FOREGROUND=70 - # Don't show Node version next to the environment name. - typeset -g POWERLEVEL9K_NODEENV_SHOW_NODE_VERSION=false - # Separate environment name from Node version only with a space. - typeset -g POWERLEVEL9K_NODEENV_{LEFT,RIGHT}_DELIMITER= - # Custom icon. - # typeset -g POWERLEVEL9K_NODEENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##############################[ node_version: node.js version ]############################### - # Node version color. - typeset -g POWERLEVEL9K_NODE_VERSION_FOREGROUND=70 - # Show node version only when in a directory tree containing package.json. - typeset -g POWERLEVEL9K_NODE_VERSION_PROJECT_ONLY=true - # Custom icon. - # typeset -g POWERLEVEL9K_NODE_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #######################[ go_version: go version (https://golang.org) ]######################## - # Go version color. - typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=37 - # Show go version only when in a go project subdirectory. - typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true - # Custom icon. - # typeset -g POWERLEVEL9K_GO_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #################[ rust_version: rustc version (https://www.rust-lang.org) ]################## - # Rust version color. - typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=37 - # Show rust version only when in a rust project subdirectory. - typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true - # Custom icon. - # typeset -g POWERLEVEL9K_RUST_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###############[ dotnet_version: .NET version (https://dotnet.microsoft.com) ]################ - # .NET version color. - typeset -g POWERLEVEL9K_DOTNET_VERSION_FOREGROUND=134 - # Show .NET version only when in a .NET project subdirectory. - typeset -g POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY=true - # Custom icon. - # typeset -g POWERLEVEL9K_DOTNET_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #####################[ php_version: php version (https://www.php.net/) ]###################### - # PHP version color. - typeset -g POWERLEVEL9K_PHP_VERSION_FOREGROUND=99 - # Show PHP version only when in a PHP project subdirectory. - typeset -g POWERLEVEL9K_PHP_VERSION_PROJECT_ONLY=true - # Custom icon. - # typeset -g POWERLEVEL9K_PHP_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##########[ laravel_version: laravel php framework version (https://laravel.com/) ]########### - # Laravel version color. - typeset -g POWERLEVEL9K_LARAVEL_VERSION_FOREGROUND=161 - # Custom icon. - # typeset -g POWERLEVEL9K_LARAVEL_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #############[ rbenv: ruby version from rbenv (https://github.com/rbenv/rbenv) ]############## - # Rbenv color. - typeset -g POWERLEVEL9K_RBENV_FOREGROUND=168 - # Hide ruby version if it doesn't come from one of these sources. - typeset -g POWERLEVEL9K_RBENV_SOURCES=(shell local global) - # If set to false, hide ruby version if it's the same as global: - # $(rbenv version-name) == $(rbenv global). - typeset -g POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_RBENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #######################[ rvm: ruby version from rvm (https://rvm.io) ]######################## - # Rvm color. - typeset -g POWERLEVEL9K_RVM_FOREGROUND=168 - # Don't show @gemset at the end. - typeset -g POWERLEVEL9K_RVM_SHOW_GEMSET=false - # Don't show ruby- at the front. - typeset -g POWERLEVEL9K_RVM_SHOW_PREFIX=false - # Custom icon. - # typeset -g POWERLEVEL9K_RVM_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###########[ fvm: flutter version management (https://github.com/leoafarias/fvm) ]############ - # Fvm color. - typeset -g POWERLEVEL9K_FVM_FOREGROUND=38 - # Custom icon. - # typeset -g POWERLEVEL9K_FVM_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ##########[ luaenv: lua version from luaenv (https://github.com/cehoffman/luaenv) ]########### - # Lua color. - typeset -g POWERLEVEL9K_LUAENV_FOREGROUND=32 - # Hide lua version if it doesn't come from one of these sources. - typeset -g POWERLEVEL9K_LUAENV_SOURCES=(shell local global) - # If set to false, hide lua version if it's the same as global: - # $(luaenv version-name) == $(luaenv global). - typeset -g POWERLEVEL9K_LUAENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_LUAENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###############[ jenv: java version from jenv (https://github.com/jenv/jenv) ]################ - # Java color. - typeset -g POWERLEVEL9K_JENV_FOREGROUND=32 - # Hide java version if it doesn't come from one of these sources. - typeset -g POWERLEVEL9K_JENV_SOURCES=(shell local global) - # If set to false, hide java version if it's the same as global: - # $(jenv version-name) == $(jenv global). - typeset -g POWERLEVEL9K_JENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_JENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###########[ plenv: perl version from plenv (https://github.com/tokuhirom/plenv) ]############ - # Perl color. - typeset -g POWERLEVEL9K_PLENV_FOREGROUND=67 - # Hide perl version if it doesn't come from one of these sources. - typeset -g POWERLEVEL9K_PLENV_SOURCES=(shell local global) - # If set to false, hide perl version if it's the same as global: - # $(plenv version-name) == $(plenv global). - typeset -g POWERLEVEL9K_PLENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_PLENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ############[ phpenv: php version from phpenv (https://github.com/phpenv/phpenv) ]############ - # PHP color. - typeset -g POWERLEVEL9K_PHPENV_FOREGROUND=99 - # Hide php version if it doesn't come from one of these sources. - typeset -g POWERLEVEL9K_PHPENV_SOURCES=(shell local global) - # If set to false, hide php version if it's the same as global: - # $(phpenv version-name) == $(phpenv global). - typeset -g POWERLEVEL9K_PHPENV_PROMPT_ALWAYS_SHOW=false - # Custom icon. - # typeset -g POWERLEVEL9K_PHPENV_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ################[ terraform: terraform workspace (https://www.terraform.io) ]################# - # POWERLEVEL9K_TERRAFORM_CLASSES is an array with even number of elements. The first element - # in each pair defines a pattern against which the current terraform workspace gets matched. - # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) - # that gets matched. If you unset all POWERLEVEL9K_TERRAFORM_*CONTENT_EXPANSION parameters, - # you'll see this value in your prompt. The second element of each pair in - # POWERLEVEL9K_TERRAFORM_CLASSES defines the workspace class. Patterns are tried in order. The - # first match wins. - # - # For example, given these settings: - # - # typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( - # '*prod*' PROD - # '*test*' TEST - # '*' DEFAULT) - # - # If your current terraform workspace is "project_test", its class is TEST because "project_test" - # doesn't match the pattern '*prod*' but does match '*test*'. - # - # You can define different colors, icons and content expansions for different classes: - # - # typeset -g POWERLEVEL9K_TERRAFORM_TEST_FOREGROUND=28 - # typeset -g POWERLEVEL9K_TERRAFORM_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_TERRAFORM_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' - typeset -g POWERLEVEL9K_TERRAFORM_CLASSES=( - # '*prod*' PROD # These values are examples that are unlikely - # '*test*' TEST # to match your needs. Customize them as needed. - '*' DEFAULT) - typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_FOREGROUND=38 - # typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]############# - # Show kubecontext only when the the command you are typing invokes one of these tools. - # Tip: Remove the next line to always show kubecontext. - typeset -g POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND='kubectl|helm|kubens|kubectx|oc' - - # Kubernetes context classes for the purpose of using different colors, icons and expansions with - # different contexts. - # - # POWERLEVEL9K_KUBECONTEXT_CLASSES is an array with even number of elements. The first element - # in each pair defines a pattern against which the current kubernetes context gets matched. - # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) - # that gets matched. If you unset all POWERLEVEL9K_KUBECONTEXT_*CONTENT_EXPANSION parameters, - # you'll see this value in your prompt. The second element of each pair in - # POWERLEVEL9K_KUBECONTEXT_CLASSES defines the context class. Patterns are tried in order. The - # first match wins. - # - # For example, given these settings: - # - # typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( - # '*prod*' PROD - # '*test*' TEST - # '*' DEFAULT) - # - # If your current kubernetes context is "deathray-testing/default", its class is TEST - # because "deathray-testing/default" doesn't match the pattern '*prod*' but does match '*test*'. - # - # You can define different colors, icons and content expansions for different classes: - # - # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_FOREGROUND=28 - # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_KUBECONTEXT_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' - typeset -g POWERLEVEL9K_KUBECONTEXT_CLASSES=( - # '*prod*' PROD # These values are examples that are unlikely - # '*test*' TEST # to match your needs. Customize them as needed. - '*' DEFAULT) - typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_FOREGROUND=134 - typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='○' - - # Use POWERLEVEL9K_KUBECONTEXT_CONTENT_EXPANSION to specify the content displayed by kubecontext - # segment. Parameter expansions are very flexible and fast, too. See reference: - # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion. - # - # Within the expansion the following parameters are always available: - # - # - P9K_CONTENT The content that would've been displayed if there was no content - # expansion defined. - # - P9K_KUBECONTEXT_NAME The current context's name. Corresponds to column NAME in the - # output of `kubectl config get-contexts`. - # - P9K_KUBECONTEXT_CLUSTER The current context's cluster. Corresponds to column CLUSTER in the - # output of `kubectl config get-contexts`. - # - P9K_KUBECONTEXT_NAMESPACE The current context's namespace. Corresponds to column NAMESPACE - # in the output of `kubectl config get-contexts`. If there is no - # namespace, the parameter is set to "default". - # - P9K_KUBECONTEXT_USER The current context's user. Corresponds to column AUTHINFO in the - # output of `kubectl config get-contexts`. - # - # If the context points to Google Kubernetes Engine (GKE) or Elastic Kubernetes Service (EKS), - # the following extra parameters are available: - # - # - P9K_KUBECONTEXT_CLOUD_NAME Either "gke" or "eks". - # - P9K_KUBECONTEXT_CLOUD_ACCOUNT Account/project ID. - # - P9K_KUBECONTEXT_CLOUD_ZONE Availability zone. - # - P9K_KUBECONTEXT_CLOUD_CLUSTER Cluster. - # - # P9K_KUBECONTEXT_CLOUD_* parameters are derived from P9K_KUBECONTEXT_CLUSTER. For example, - # if P9K_KUBECONTEXT_CLUSTER is "gke_my-account_us-east1-a_my-cluster-01": - # - # - P9K_KUBECONTEXT_CLOUD_NAME=gke - # - P9K_KUBECONTEXT_CLOUD_ACCOUNT=my-account - # - P9K_KUBECONTEXT_CLOUD_ZONE=us-east1-a - # - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01 - # - # If P9K_KUBECONTEXT_CLUSTER is "arn:aws:eks:us-east-1:123456789012:cluster/my-cluster-01": - # - # - P9K_KUBECONTEXT_CLOUD_NAME=eks - # - P9K_KUBECONTEXT_CLOUD_ACCOUNT=123456789012 - # - P9K_KUBECONTEXT_CLOUD_ZONE=us-east-1 - # - P9K_KUBECONTEXT_CLOUD_CLUSTER=my-cluster-01 - typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION= - # Show P9K_KUBECONTEXT_CLOUD_CLUSTER if it's not empty and fall back to P9K_KUBECONTEXT_NAME. - POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${P9K_KUBECONTEXT_CLOUD_CLUSTER:-${P9K_KUBECONTEXT_NAME}}' - # Append the current context's namespace if it's not "default". - POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}' - - # Custom prefix. - # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%244Fat ' - - #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]# - # Show aws only when the the command you are typing invokes one of these tools. - # Tip: Remove the next line to always show aws. - typeset -g POWERLEVEL9K_AWS_SHOW_ON_COMMAND='aws|awless|terraform|pulumi' - - # POWERLEVEL9K_AWS_CLASSES is an array with even number of elements. The first element - # in each pair defines a pattern against which the current AWS profile gets matched. - # More specifically, it's P9K_CONTENT prior to the application of context expansion (see below) - # that gets matched. If you unset all POWERLEVEL9K_AWS_*CONTENT_EXPANSION parameters, - # you'll see this value in your prompt. The second element of each pair in - # POWERLEVEL9K_AWS_CLASSES defines the profile class. Patterns are tried in order. The - # first match wins. - # - # For example, given these settings: - # - # typeset -g POWERLEVEL9K_AWS_CLASSES=( - # '*prod*' PROD - # '*test*' TEST - # '*' DEFAULT) - # - # If your current AWS profile is "company_test", its class is TEST - # because "company_test" doesn't match the pattern '*prod*' but does match '*test*'. - # - # You can define different colors, icons and content expansions for different classes: - # - # typeset -g POWERLEVEL9K_AWS_TEST_FOREGROUND=28 - # typeset -g POWERLEVEL9K_AWS_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_AWS_TEST_CONTENT_EXPANSION='> ${P9K_CONTENT} <' - typeset -g POWERLEVEL9K_AWS_CLASSES=( - # '*prod*' PROD # These values are examples that are unlikely - # '*test*' TEST # to match your needs. Customize them as needed. - '*' DEFAULT) - typeset -g POWERLEVEL9K_AWS_DEFAULT_FOREGROUND=208 - # typeset -g POWERLEVEL9K_AWS_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #[ aws_eb_env: aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/) ]# - # AWS Elastic Beanstalk environment color. - typeset -g POWERLEVEL9K_AWS_EB_ENV_FOREGROUND=70 - # Custom icon. - typeset -g POWERLEVEL9K_AWS_EB_ENV_VISUAL_IDENTIFIER_EXPANSION='eb' - - ##########[ azure: azure account name (https://docs.microsoft.com/en-us/cli/azure) ]########## - # Show azure only when the the command you are typing invokes one of these tools. - # Tip: Remove the next line to always show azure. - typeset -g POWERLEVEL9K_AZURE_SHOW_ON_COMMAND='az|terraform|pulumi' - # Azure account name color. - typeset -g POWERLEVEL9K_AZURE_FOREGROUND=32 - # Custom icon. - typeset -g POWERLEVEL9K_AZURE_VISUAL_IDENTIFIER_EXPANSION='az' - - ##########[ gcloud: google cloud account and project (https://cloud.google.com/) ]########### - # Show gcloud only when the the command you are typing invokes one of these tools. - # Tip: Remove the next line to always show gcloud. - typeset -g POWERLEVEL9K_GCLOUD_SHOW_ON_COMMAND='gcloud|gcs' - # Google cloud color. - typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=32 - - # Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION if the default - # is too verbose or not informative enough. - # - # P9K_GCLOUD_ACCOUNT: the output of `gcloud config get-value account` - # P9K_GCLOUD_PROJECT: the output of `gcloud config get-value project` - # ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'. - # - typeset -g POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT//\%/%%}' - - # Custom icon. - # typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #[ google_app_cred: google application credentials (https://cloud.google.com/docs/authentication/production) ]# - # Show google_app_cred only when the the command you are typing invokes one of these tools. - # Tip: Remove the next line to always show google_app_cred. - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_SHOW_ON_COMMAND='terraform|pulumi' - - # Google application credentials classes for the purpose of using different colors, icons and - # expansions with different credentials. - # - # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES is an array with even number of elements. The first - # element in each pair defines a pattern against which the current kubernetes context gets - # matched. More specifically, it's P9K_CONTENT prior to the application of context expansion - # (see below) that gets matched. If you unset all POWERLEVEL9K_GOOGLE_APP_CRED_*CONTENT_EXPANSION - # parameters, you'll see this value in your prompt. The second element of each pair in - # POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES defines the context class. Patterns are tried in order. - # The first match wins. - # - # For example, given these settings: - # - # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( - # '*:*prod*:*' PROD - # '*:*test*:*' TEST - # '*' DEFAULT) - # - # If your current Google application credentials is "service_account deathray-testing x@y.com", - # its class is TEST because it doesn't match the pattern '* *prod* *' but does match '* *test* *'. - # - # You can define different colors, icons and content expansions for different classes: - # - # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_FOREGROUND=28 - # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_VISUAL_IDENTIFIER_EXPANSION='⭐' - # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_TEST_CONTENT_EXPANSION='$P9K_GOOGLE_APP_CRED_PROJECT_ID' - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES=( - # '*:*prod*:*' PROD # These values are examples that are unlikely - # '*:*test*:*' TEST # to match your needs. Customize them as needed. - '*' DEFAULT) - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_FOREGROUND=32 - # typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' - - # Use POWERLEVEL9K_GOOGLE_APP_CRED_CONTENT_EXPANSION to specify the content displayed by - # google_app_cred segment. Parameter expansions are very flexible and fast, too. See reference: - # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion. - # - # You can use the following parameters in the expansion. Each of them corresponds to one of the - # fields in the JSON file pointed to by GOOGLE_APPLICATION_CREDENTIALS. - # - # Parameter | JSON key file field - # ---------------------------------+--------------- - # P9K_GOOGLE_APP_CRED_TYPE | type - # P9K_GOOGLE_APP_CRED_PROJECT_ID | project_id - # P9K_GOOGLE_APP_CRED_CLIENT_EMAIL | client_email - # - # Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurences of '%' replaced by '%%'. - typeset -g POWERLEVEL9K_GOOGLE_APP_CRED_DEFAULT_CONTENT_EXPANSION='${P9K_GOOGLE_APP_CRED_PROJECT_ID//\%/%%}' - - ###############################[ public_ip: public IP address ]############################### - # Public IP color. - typeset -g POWERLEVEL9K_PUBLIC_IP_FOREGROUND=94 - # Custom icon. - # typeset -g POWERLEVEL9K_PUBLIC_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ########################[ vpn_ip: virtual private network indicator ]######################### - # VPN IP color. - typeset -g POWERLEVEL9K_VPN_IP_FOREGROUND=81 - # When on VPN, show just an icon without the IP address. - # Tip: To display the private IP address when on VPN, remove the next line. - typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION= - # Regular expression for the VPN network interface. Run `ifconfig` or `ip -4 a show` while on VPN - # to see the name of the interface. - typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(wg|(.*tun))[0-9]*' - # If set to true, show one segment per matching network interface. If set to false, show only - # one segment corresponding to the first matching network interface. - # Tip: If you set it to true, you'll probably want to unset POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION. - typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=false - # Custom icon. - # typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ###########[ ip: ip address and bandwidth usage for a specified network interface ]########### - # IP color. - typeset -g POWERLEVEL9K_IP_FOREGROUND=38 - # The following parameters are accessible within the expansion: - # - # Parameter | Meaning - # ----------------------+--------------- - # P9K_IP_IP | IP address - # P9K_IP_INTERFACE | network interface - # P9K_IP_RX_BYTES | total number of bytes received - # P9K_IP_TX_BYTES | total number of bytes sent - # P9K_IP_RX_RATE | receive rate (since last prompt) - # P9K_IP_TX_RATE | send rate (since last prompt) - typeset -g POWERLEVEL9K_IP_CONTENT_EXPANSION='${P9K_IP_RX_RATE:+%70F⇣$P9K_IP_RX_RATE }${P9K_IP_TX_RATE:+%215F⇡$P9K_IP_TX_RATE }%38F$P9K_IP_IP' - # Show information for the first network interface whose name matches this regular expression. - # Run `ifconfig` or `ip -4 a show` to see the names of all network interfaces. - typeset -g POWERLEVEL9K_IP_INTERFACE='e.*' - # Custom icon. - # typeset -g POWERLEVEL9K_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' - - #########################[ proxy: system-wide http/https/ftp proxy ]########################## - # Proxy color. - typeset -g POWERLEVEL9K_PROXY_FOREGROUND=68 - # Custom icon. - # typeset -g POWERLEVEL9K_PROXY_VISUAL_IDENTIFIER_EXPANSION='⭐' - - ################################[ battery: internal battery ]################################# - # Show battery in red when it's below this level and not connected to power supply. - typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20 - typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160 - # Show battery in green when it's charging or fully charged. - typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=70 - # Show battery in yellow when it's discharging. - typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178 - # Battery pictograms going from low to high level of charge. - typeset -g POWERLEVEL9K_BATTERY_STAGES=('%K{232}▁' '%K{232}▂' '%K{232}▃' '%K{232}▄' '%K{232}▅' '%K{232}▆' '%K{232}▇' '%K{232}█') - # Don't show the remaining time to charge/discharge. - typeset -g POWERLEVEL9K_BATTERY_VERBOSE=false - - #####################################[ wifi: wifi speed ]##################################### - # WiFi color. - typeset -g POWERLEVEL9K_WIFI_FOREGROUND=68 - # Custom icon. - # typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='⭐' - - # Use different colors and icons depending on signal strength ($P9K_WIFI_BARS). - # - # # Wifi colors and icons for different signal strength levels (low to high). - # typeset -g my_wifi_fg=(68 68 68 68 68) # <-- change these values - # typeset -g my_wifi_icon=('WiFi' 'WiFi' 'WiFi' 'WiFi' 'WiFi') # <-- change these values - # - # typeset -g POWERLEVEL9K_WIFI_CONTENT_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}$P9K_WIFI_LAST_TX_RATE Mbps' - # typeset -g POWERLEVEL9K_WIFI_VISUAL_IDENTIFIER_EXPANSION='%F{${my_wifi_fg[P9K_WIFI_BARS+1]}}${my_wifi_icon[P9K_WIFI_BARS+1]}' - # - # The following parameters are accessible within the expansions: - # - # Parameter | Meaning - # ----------------------+--------------- - # P9K_WIFI_SSID | service set identifier, a.k.a. network name - # P9K_WIFI_LINK_AUTH | authentication protocol such as "wpa2-psk" or "none" - # P9K_WIFI_LAST_TX_RATE | wireless transmit rate in megabits per second - # P9K_WIFI_RSSI | signal strength in dBm, from -120 to 0 - # P9K_WIFI_NOISE | noise in dBm, from -120 to 0 - # P9K_WIFI_BARS | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE) - # - # All parameters except P9K_WIFI_BARS are extracted from the output of the following command: - # - # /System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I - - ####################################[ time: current time ]#################################### - # Current time color. - typeset -g POWERLEVEL9K_TIME_FOREGROUND=66 - # Format for the current time: 09:51:02. See `man 3 strftime`. - typeset -g POWERLEVEL9K_TIME_FORMAT='%D{%H:%M:%S}' - # If set to true, time will update when you hit enter. This way prompts for the past - # commands will contain the start times of their commands as opposed to the default - # behavior where they contain the end times of their preceding commands. - typeset -g POWERLEVEL9K_TIME_UPDATE_ON_COMMAND=false - # Custom icon. - typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION= - # Custom prefix. - # typeset -g POWERLEVEL9K_TIME_PREFIX='%244Fat ' - - # Example of a user-defined prompt segment. Function prompt_example will be called on every - # prompt if `example` prompt segment is added to POWERLEVEL9K_LEFT_PROMPT_ELEMENTS or - # POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS. It displays an icon and orange text greeting the user. - # - # Type `p10k help segment` for documentation and a more sophisticated example. - function prompt_example() { - p10k segment -f 208 -i '⭐' -t 'hello, %n' - } - - # User-defined prompt segments may optionally provide an instant_prompt_* function. Its job - # is to generate the prompt segment for display in instant prompt. See - # https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt. - # - # Powerlevel10k will call instant_prompt_* at the same time as the regular prompt_* function - # and will record all `p10k segment` calls it makes. When displaying instant prompt, Powerlevel10k - # will replay these calls without actually calling instant_prompt_*. It is imperative that - # instant_prompt_* always makes the same `p10k segment` calls regardless of environment. If this - # rule is not observed, the content of instant prompt will be incorrect. - # - # Usually, you should either not define instant_prompt_* or simply call prompt_* from it. If - # instant_prompt_* is not defined for a segment, the segment won't be shown in instant prompt. - function instant_prompt_example() { - # Since prompt_example always makes the same `p10k segment` calls, we can call it from - # instant_prompt_example. This will give us the same `example` prompt segment in the instant - # and regular prompts. - prompt_example - } - - # User-defined prompt segments can be customized the same way as built-in segments. - # typeset -g POWERLEVEL9K_EXAMPLE_FOREGROUND=208 - # typeset -g POWERLEVEL9K_EXAMPLE_VISUAL_IDENTIFIER_EXPANSION='⭐' - - # Transient prompt works similarly to the builtin transient_rprompt option. It trims down prompt - # when accepting a command line. Supported values: - # - # - off: Don't change prompt when accepting a command line. - # - always: Trim down prompt when accepting a command line. - # - same-dir: Trim down prompt when accepting a command line unless this is the first command - # typed after changing current working directory. - typeset -g POWERLEVEL9K_TRANSIENT_PROMPT=always - - # Instant prompt mode. - # - # - off: Disable instant prompt. Choose this if you've tried instant prompt and found - # it incompatible with your zsh configuration files. - # - quiet: Enable instant prompt and don't print warnings when detecting console output - # during zsh initialization. Choose this if you've read and understood - # https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt. - # - verbose: Enable instant prompt and print a warning when detecting console output during - # zsh initialization. Choose this if you've never tried instant prompt, haven't - # seen the warning, or if you are unsure what this all means. - typeset -g POWERLEVEL9K_INSTANT_PROMPT=off - - # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. - # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload - # can slow down prompt by 1-2 milliseconds, so it's better to keep it turned off unless you - # really need it. - typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true - - # If p10k is already loaded, reload configuration. - # This works even with POWERLEVEL9K_DISABLE_HOT_RELOAD=true. - (( ! $+functions[p10k] )) || p10k reload -} - -(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} -'builtin' 'unset' 'p10k_config_opts' diff --git a/oldstuff/home/profiles/browsing/default.nix b/oldstuff/home/profiles/browsing/default.nix deleted file mode 100644 index 44f1448d..00000000 --- a/oldstuff/home/profiles/browsing/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.profiles.browsing; - -in -{ - options.profiles.browsing = { - enable = lib.mkEnableOption - "A profile that enables a browser for the GUI and the terminal"; - }; - - config = lib.mkIf cfg.enable { - nixpkgs.config = { google-chrome = { enableWideVine = true; }; }; - home.packages = with pkgs; [ google-chrome lynx ]; - }; -} diff --git a/oldstuff/home/profiles/default.nix b/oldstuff/home/profiles/default.nix deleted file mode 100644 index fffe2b09..00000000 --- a/oldstuff/home/profiles/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, ... }: -let - profileEnabler = - let - reducer = l: r: { "${r}".enable = true; } // l; - in - builtins.foldl' reducer { } config.activeProfiles; -in -{ - imports = [ ./base ./browsing ./development ./home-office ]; - - options.activeProfiles = lib.mkOption { type = lib.types.listOf lib.types.str; }; - - config.profiles = profileEnabler; -} diff --git a/oldstuff/home/profiles/development/default.nix b/oldstuff/home/profiles/development/default.nix deleted file mode 100644 index 90c8aa6e..00000000 --- a/oldstuff/home/profiles/development/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ config, pkgs, lib, ... }: -let cfg = config.profiles.development; - -in -{ - options.profiles.development = { - enable = lib.mkEnableOption - "A profile that enables the system to be used for developing programs"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs = { - extraPackages = ep: [ ep.magit ]; - extraConfig = '' - ;; prepare magit use from shell - (require 'magit) - (global-git-commit-mode) - - ;; let magit autorefresh on file save within emacs - (add-hook 'after-save-hook 'magit-after-save-refresh-status t) - ''; - }; - - programs.gh.enable = true; - programs.git = { - enable = true; - - userName = "Norbert Melzer"; - userEmail = "timmelzer@gmail.com"; - - aliases = { - graph = - "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold cyan)%h%C(reset) - %C(green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"; - co = "checkout"; - br = "branch"; - st = "status"; - ps = "push"; - pl = "pull"; - root = "rev-parse --show-toplevel"; - }; - - extraConfig = { - init.defaultBranch = "main"; - pull.rebase = false; - }; - - ignores = [ - # IntelliJ files and folders - ".idea/" - "*.iml" - # backupfiles and shadow copies done by editors - "*~" - "\\#*\\#" - ".#*" - # Elixir language server - "/.elixir_ls" - # MyPy Cache - ".mypy_cache" - # Visual Studio Code project configuration - "/.vscode" - # Result folder for nix builds - "result" - "result-*" - # direnv caches - ".direnv/" - # emacs/python stuff - "flycheck_*.py" - ]; - - includes = [{ - condition = "gitdir:~/cloudseeds/**"; - contents = { - init.defaultBranch = "master"; - user.email = "norbert.melzer@cloudseeds.de"; - }; - }]; - }; - - home.packages = [ pkgs.ripgrep ]; - }; -} diff --git a/oldstuff/home/profiles/home-office/default.nix b/oldstuff/home/profiles/home-office/default.nix deleted file mode 100644 index 7de750c1..00000000 --- a/oldstuff/home/profiles/home-office/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.profiles.home-office; - -in -{ - options.profiles.home-office = { - enable = lib.mkEnableOption - "A profile that enables remote desktop to the workingplace"; - - user = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = ""; - example = "jon.doe"; - description = '' - The username used to login to the RDP host - ''; - }; - - pass = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = ""; - example = "secret"; - description = '' - The password used to login to the RDP host - ''; - }; - - domain = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = ""; - example = "secret"; - description = '' - The domain used to login to the RDP host - ''; - }; - - host = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = ""; - example = "example.com"; - description = '' - The hostname or IP of the RDP host - ''; - }; - }; - - config = lib.mkIf cfg.enable { - # TODO: add assertions for `user`, `pass`, and `host` beeing set. - - home.packages = [ - (pkgs.writeShellScriptBin "home-office" '' - ${pkgs.freerdp}/bin/xfreerdp '/u:${cfg.user}' '/p:${cfg.pass}' '/d:${cfg.domain}' '/v:${cfg.host}' /dynamic-resolution - '') - - pkgs.teamspeak_client - ]; - }; -} diff --git a/oldstuff/home/packages/advcp/default.nix b/packages/advcp/default.nix similarity index 100% rename from oldstuff/home/packages/advcp/default.nix rename to packages/advcp/default.nix diff --git a/packages/default.nix b/packages/default.nix new file mode 100644 index 00000000..a223e06c --- /dev/null +++ b/packages/default.nix @@ -0,0 +1,12 @@ +{ self, ... }@inputs: + +let + pkgs = inputs.nixpkgs-2105.legacyPackages.x86_64-linux; + upkgs = inputs.unstable.legacyPackages.x86_64-linux; + mpkgs = inputs.master.legacyPackages.x86_64-linux; +in +{ + advcp = pkgs.callPackage ./advcp { }; + gnucash-de = mpkgs.callPackage ./gnucash-de { }; + keyleds = upkgs.callPackage ./keyleds { }; +} diff --git a/oldstuff/home/packages/gnucash-de/default.nix b/packages/gnucash-de/default.nix similarity index 100% rename from oldstuff/home/packages/gnucash-de/default.nix rename to packages/gnucash-de/default.nix diff --git a/oldstuff/home/packages/keyleds/default.nix b/packages/keyleds/default.nix similarity index 100% rename from oldstuff/home/packages/keyleds/default.nix rename to packages/keyleds/default.nix From b1738a214e2d7e01cd5209a322143cebfc67652e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 31 Jul 2021 11:08:09 +0200 Subject: [PATCH 040/303] nmelzer@mimas: seems to build fully now --- home/modules/default.nix | 1 + home/modules/languages/elixir/default.nix | 2 +- home/modules/languages/erlang/default.nix | 2 +- home/modules/misc/awesome/default.nix | 4 ++- .../modules/misc/home/default.nix | 12 +++---- home/modules/profiles/base/default.nix | 4 +-- home/modules/programs/advcp/default.nix | 2 +- home/modules/programs/emacs/default.nix | 5 +-- .../modules/programs/emacs/lib.nix | 2 +- oldstuff/lib/mk_home_config.nix | 34 ------------------- packages/default.nix | 15 +++++--- .../dracula/konsole/default.nix | 0 .../elixir-lsp/default.nix | 0 .../elixir-lsp/fetch-mix-deps.nix | 0 .../elixir-lsp/source.json | 0 .../erlang-ls/default.nix | 0 .../erlang-ls/source.json | 0 .../rofi-unicode/default.nix | 0 .../rofi-unicode/rofi-unicode.json | 0 19 files changed, 28 insertions(+), 55 deletions(-) rename oldstuff/home/home.nix => home/modules/misc/home/default.nix (72%) rename oldstuff/home/nix/myOverlay/lib/default.nix => home/modules/programs/emacs/lib.nix (92%) delete mode 100644 oldstuff/lib/mk_home_config.nix rename oldstuff/home/packages/dracula/konsole.nix => packages/dracula/konsole/default.nix (100%) rename {oldstuff/home/packages => packages}/elixir-lsp/default.nix (100%) rename {oldstuff/home/packages => packages}/elixir-lsp/fetch-mix-deps.nix (100%) rename {oldstuff/home/packages => packages}/elixir-lsp/source.json (100%) rename {oldstuff/home/packages => packages}/erlang-ls/default.nix (100%) rename {oldstuff/home/packages => packages}/erlang-ls/source.json (100%) rename {oldstuff/home/packages => packages}/rofi-unicode/default.nix (100%) rename {oldstuff/home/packages => packages}/rofi-unicode/rofi-unicode.json (100%) diff --git a/home/modules/default.nix b/home/modules/default.nix index 8c40e2fb..842d0a1a 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -26,4 +26,5 @@ "services/keyleds" = import ./services/keyleds; "misc/awesome" = import ./misc/awesome; + "misc/home" = import ./misc/home; } diff --git a/home/modules/languages/elixir/default.nix b/home/modules/languages/elixir/default.nix index a5a0966c..491adb51 100644 --- a/home/modules/languages/elixir/default.nix +++ b/home/modules/languages/elixir/default.nix @@ -2,7 +2,7 @@ let cfg = config.languages.elixir; - inherit (self) elixir-lsp; + inherit (self.packages.x86_64-linux) elixir-lsp; in { options.languages.elixir = { diff --git a/home/modules/languages/erlang/default.nix b/home/modules/languages/erlang/default.nix index 3c5ee44e..f57f602e 100644 --- a/home/modules/languages/erlang/default.nix +++ b/home/modules/languages/erlang/default.nix @@ -2,7 +2,7 @@ let cfg = config.languages.erlang; - inherit (self) erlang-ls; + inherit (self.packages.x86_64-linux) erlang-ls; in { options.languages.erlang = { diff --git a/home/modules/misc/awesome/default.nix b/home/modules/misc/awesome/default.nix index e814be88..95e78e37 100644 --- a/home/modules/misc/awesome/default.nix +++ b/home/modules/misc/awesome/default.nix @@ -6,6 +6,8 @@ let plugins = [ pkgs.rofi-emoji ]; }; + self' = self.packages.x86_64-linux; + autostartScript = let entries = builtins.map (e: "\"${e}\",") cfg.autostart; @@ -60,7 +62,7 @@ in launcher = lib.mkOption { type = lib.types.str; - default = "${rofi}/bin/rofi -modi drun#run#window#ssh#emoji#unicode:${self.rofi-unicode}/bin/rofiunicode.sh -show drun -show-icons"; + default = "${rofi}/bin/rofi -modi drun#run#window#ssh#emoji#unicode:${self'."rofi/unicode"}/bin/rofiunicode.sh -show drun -show-icons"; }; autostart = lib.mkOption { diff --git a/oldstuff/home/home.nix b/home/modules/misc/home/default.nix similarity index 72% rename from oldstuff/home/home.nix rename to home/modules/misc/home/default.nix index 122eb7a9..72ac1287 100644 --- a/oldstuff/home/home.nix +++ b/home/modules/misc/home/default.nix @@ -1,10 +1,6 @@ -{ config, pkgs, lib, nixpkgs-2105, unstable, self, inputs, ... }: +{ config, pkgs, lib, nixpkgs-2105, unstable, self, ... }: let - # nixPath = builtins.concatStringsSep ":" [ - # "nixpkgs=${inputs.unstable}" - # "nixos-config=/etc/nixos/configuration.nix" - # "/nix/var/nix/profiles/per-user/root/channels" - # ]; + self' = self.packages.x86_64-linux; in { profiles.base.enable = true; @@ -22,7 +18,7 @@ in packages = let p = pkgs; - s = self; + s = self'; in [ p.cachix @@ -32,7 +28,7 @@ in p.tmate p.element-desktop p.powershell - s.dracula-konsole + s."dracula/konsole" p.fira-code p.cascadia-code diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index b4d6de98..80cec214 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -1,8 +1,8 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, lib, pkgs, self, ... }: let cfg = config.profiles.base; - inherit (inputs.self.packages.x86_64-linux) emacs; + inherit (self.packages.x86_64-linux) emacs; dag = lib.hm.dag; diff --git a/home/modules/programs/advcp/default.nix b/home/modules/programs/advcp/default.nix index 917c166c..3f41c398 100644 --- a/home/modules/programs/advcp/default.nix +++ b/home/modules/programs/advcp/default.nix @@ -8,7 +8,7 @@ in }; config = lib.mkIf cfg.enable { - home.packages = [ self.advcp ]; + home.packages = [ self.packages.x86_64-linux.advcp ]; programs.zshell.aliases = { cp = "advcp -g"; diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 27b19031..22580ce3 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -12,7 +12,7 @@ let name = "${k}"; value = { ep = v.packageRequires; - src = pkgs.nobbzLib.emacs.generatePackage k v.tag v.comments v.requires + src = config.lib.emacs.generatePackage k v.tag v.comments v.requires v.code; }; }) @@ -43,6 +43,7 @@ in ./lsp.nix ./projectile.nix ./telephoneline.nix + ./lib.nix ./whichkey ]; @@ -167,7 +168,7 @@ in home.file = { ".emacs.d/init.el" = { - text = pkgs.nobbzLib.emacs.generatePackage "init" + text = config.lib.emacs.generatePackage "init" "Initialises emacs configuration" [ ] [ ] cfg.extraConfig; }; diff --git a/oldstuff/home/nix/myOverlay/lib/default.nix b/home/modules/programs/emacs/lib.nix similarity index 92% rename from oldstuff/home/nix/myOverlay/lib/default.nix rename to home/modules/programs/emacs/lib.nix index 4f263037..60c2a0fd 100644 --- a/oldstuff/home/nix/myOverlay/lib/default.nix +++ b/home/modules/programs/emacs/lib.nix @@ -46,7 +46,7 @@ let in { - emacs.generatePackage = name: tagLine: commentLines: requireList: code: + config.lib.emacs.generatePackage = name: tagLine: commentLines: requireList: code: generatePackage { inherit name code tagLine commentLines requireList; }; diff --git a/oldstuff/lib/mk_home_config.nix b/oldstuff/lib/mk_home_config.nix deleted file mode 100644 index b9204925..00000000 --- a/oldstuff/lib/mk_home_config.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ home-manager, ... }@inputs: - -username: entrypoint: -let - system = "x86_64-linux"; - - args = { - stable = inputs.nixpkgs-2105.legacyPackages.${system}; - unstable = inputs.unstable.legacyPackages.${system}; - self = inputs.self.packages.${system}; - inherit inputs; - }; -in -home-manager.lib.homeManagerConfiguration { - inherit username system; - homeDirectory = "/home/${username}"; - configuration = { lib, ... }: { - _module = { inherit args; }; - nixpkgs.overlays = builtins.attrValues inputs.self.overlays; - nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (lib.getName pkg) [ - "insync" - "teamspeak-client" - "google-chrome" - "steam" - "steam-original" - "steam-runtime" - ]); - imports = inputs.self.homeModules.all-modules ++ [ - ../home/profiles - ../home/home.nix - entrypoint - ]; - }; -} diff --git a/packages/default.nix b/packages/default.nix index a223e06c..18c245f4 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,12 +1,19 @@ -{ self, ... }@inputs: +{ self, emacs, ... }@inputs: let pkgs = inputs.nixpkgs-2105.legacyPackages.x86_64-linux; upkgs = inputs.unstable.legacyPackages.x86_64-linux; mpkgs = inputs.master.legacyPackages.x86_64-linux; + + epkgs = import inputs.unstable { system = "x86_64-linux"; overlays = [ emacs.overlay ]; }; in { - advcp = pkgs.callPackage ./advcp { }; - gnucash-de = mpkgs.callPackage ./gnucash-de { }; - keyleds = upkgs.callPackage ./keyleds { }; + "advcp" = pkgs.callPackage ./advcp { }; + "gnucash-de" = mpkgs.callPackage ./gnucash-de { }; + "keyleds" = upkgs.callPackage ./keyleds { }; + "dracula/konsole" = upkgs.callPackage ./dracula/konsole { }; + "emacs" = epkgs.emacsGcc; + "elixir-lsp" = upkgs.beam.packages.erlang.callPackage ./elixir-lsp { }; + "erlang-ls" = upkgs.beam.packages.erlang.callPackage ./erlang-ls { }; + "rofi/unicode" = upkgs.callPackage ./rofi-unicode { }; } diff --git a/oldstuff/home/packages/dracula/konsole.nix b/packages/dracula/konsole/default.nix similarity index 100% rename from oldstuff/home/packages/dracula/konsole.nix rename to packages/dracula/konsole/default.nix diff --git a/oldstuff/home/packages/elixir-lsp/default.nix b/packages/elixir-lsp/default.nix similarity index 100% rename from oldstuff/home/packages/elixir-lsp/default.nix rename to packages/elixir-lsp/default.nix diff --git a/oldstuff/home/packages/elixir-lsp/fetch-mix-deps.nix b/packages/elixir-lsp/fetch-mix-deps.nix similarity index 100% rename from oldstuff/home/packages/elixir-lsp/fetch-mix-deps.nix rename to packages/elixir-lsp/fetch-mix-deps.nix diff --git a/oldstuff/home/packages/elixir-lsp/source.json b/packages/elixir-lsp/source.json similarity index 100% rename from oldstuff/home/packages/elixir-lsp/source.json rename to packages/elixir-lsp/source.json diff --git a/oldstuff/home/packages/erlang-ls/default.nix b/packages/erlang-ls/default.nix similarity index 100% rename from oldstuff/home/packages/erlang-ls/default.nix rename to packages/erlang-ls/default.nix diff --git a/oldstuff/home/packages/erlang-ls/source.json b/packages/erlang-ls/source.json similarity index 100% rename from oldstuff/home/packages/erlang-ls/source.json rename to packages/erlang-ls/source.json diff --git a/oldstuff/home/packages/rofi-unicode/default.nix b/packages/rofi-unicode/default.nix similarity index 100% rename from oldstuff/home/packages/rofi-unicode/default.nix rename to packages/rofi-unicode/default.nix diff --git a/oldstuff/home/packages/rofi-unicode/rofi-unicode.json b/packages/rofi-unicode/rofi-unicode.json similarity index 100% rename from oldstuff/home/packages/rofi-unicode/rofi-unicode.json rename to packages/rofi-unicode/rofi-unicode.json From 6eefa5590c7780d8f8d681fb18f233803ef7a1bf Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 31 Jul 2021 22:25:08 +0200 Subject: [PATCH 041/303] clean emacs module --- home/modules/default.nix | 10 +++++++++- home/modules/programs/emacs/default.nix | 11 ----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/home/modules/default.nix b/home/modules/default.nix index 842d0a1a..4f99dac0 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -18,10 +18,18 @@ "languages/tex" = import ./languages/tex; "programs/advcp" = import ./programs/advcp; - "programs/emacs" = import ./programs/emacs; "programs/openshift" = import ./programs/openshift; "programs/zshell" = import ./programs/zshell; "programs/nixpkgs" = import ./programs/nixpkgs; + "programs/emacs" = import ./programs/emacs; + "programs/emacs/beacon" = import ./programs/emacs/beacon.nix; + "programs/emacs/company" = import ./programs/emacs/company.nix; + "programs/emacs/helm" = import ./programs/emacs/helm.nix; + "programs/emacs/lsp" = import ./programs/emacs/lsp.nix; + "programs/emacs/projectile" = import ./programs/emacs/projectile.nix; + "programs/emacs/telephoneline" = import ./programs/emacs/telephoneline.nix; + "programs/emacs/lib" = import ./programs/emacs/lib.nix; + "programs/emacs/whichkey" = import ./programs/emacs/whichkey; "services/keyleds" = import ./services/keyleds; diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 22580ce3..744605af 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -36,17 +36,6 @@ let in { - imports = [ - ./beacon.nix - ./company.nix - ./helm.nix - ./lsp.nix - ./projectile.nix - ./telephoneline.nix - ./lib.nix - ./whichkey - ]; - options.programs.emacs = { splashScreen = lib.mkOption { type = lib.types.bool; From f869f70f4b6d0f6405a39ab204d12f97208a2e5f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 10:17:25 +0200 Subject: [PATCH 042/303] move cachix over --- .../modules/cachix/caches}/nix-community.nix | 0 .../modules/cachix/caches}/nobbz.nix | 0 .../modules/cachix/caches}/ts-helper.nix | 0 .../modules/cachix/default.nix | 7 ++----- nixos/modules/default.nix | 1 + oldstuff/nixos/hosts/default.nix | 20 ------------------- oldstuff/nixos/modules/cachix/ca-nix.nix | 15 -------------- 7 files changed, 3 insertions(+), 40 deletions(-) rename {oldstuff/nixos/modules/cachix => nixos/modules/cachix/caches}/nix-community.nix (100%) rename {oldstuff/nixos/modules/cachix => nixos/modules/cachix/caches}/nobbz.nix (100%) rename {oldstuff/nixos/modules/cachix => nixos/modules/cachix/caches}/ts-helper.nix (100%) rename oldstuff/nixos/modules/cachix.nix => nixos/modules/cachix/default.nix (64%) delete mode 100644 oldstuff/nixos/hosts/default.nix delete mode 100644 oldstuff/nixos/modules/cachix/ca-nix.nix diff --git a/oldstuff/nixos/modules/cachix/nix-community.nix b/nixos/modules/cachix/caches/nix-community.nix similarity index 100% rename from oldstuff/nixos/modules/cachix/nix-community.nix rename to nixos/modules/cachix/caches/nix-community.nix diff --git a/oldstuff/nixos/modules/cachix/nobbz.nix b/nixos/modules/cachix/caches/nobbz.nix similarity index 100% rename from oldstuff/nixos/modules/cachix/nobbz.nix rename to nixos/modules/cachix/caches/nobbz.nix diff --git a/oldstuff/nixos/modules/cachix/ts-helper.nix b/nixos/modules/cachix/caches/ts-helper.nix similarity index 100% rename from oldstuff/nixos/modules/cachix/ts-helper.nix rename to nixos/modules/cachix/caches/ts-helper.nix diff --git a/oldstuff/nixos/modules/cachix.nix b/nixos/modules/cachix/default.nix similarity index 64% rename from oldstuff/nixos/modules/cachix.nix rename to nixos/modules/cachix/default.nix index 40fc6ea9..38ad5750 100644 --- a/oldstuff/nixos/modules/cachix.nix +++ b/nixos/modules/cachix/default.nix @@ -1,16 +1,13 @@ { config, pkgs, lib, ... }: let - folder = ./cachix; + folder = ./caches; toImport = name: value: folder + ("/" + name); filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key; imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); - - hostname = config.networking.hostName; - caEnabled = __elem hostname [ ]; in { inherit imports; - nix.binaryCaches = lib.mkDefault (lib.optional caEnabled "https://cache.nixos.org/"); + nix.binaryCaches = [ "https://cache.nixos.org/" ]; environment.systemPackages = [ pkgs.cachix ]; } diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 731b86cf..588bbdd2 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,4 +1,5 @@ { flake = import ./flake.nix; nix = import ./nix.nix; + cachix = import ./cachix; } diff --git a/oldstuff/nixos/hosts/default.nix b/oldstuff/nixos/hosts/default.nix deleted file mode 100644 index 7a9671cf..00000000 --- a/oldstuff/nixos/hosts/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ self, ... }@inputs: -let - mkSystem = name: nixpkgs: modules: - nixpkgs.lib.nixosSystem ({ - extraArgs = inputs; - - system = "x86_64-linux"; - - modules = [ - (./. + "/legacy/${name}.nix") - (./. + "/hardware/${name}.nix") - nixpkgs.nixosModules.notDetected - ] ++ modules; - }); -in -{ - delly-nixos = mkSystem "delly-nixos" inputs.unstable (with self.nixosModules; [ cachix flake gc version ]); - tux-nixos = mkSystem "tux-nixos" inputs.nixpkgs-2105 (with self.nixosModules; [ cachix flake intel gc version ]); - nixos = mkSystem "nixos" inputs.unstable (with self.nixosModules; [ cachix flake virtualbox-demo gc version ]); -} diff --git a/oldstuff/nixos/modules/cachix/ca-nix.nix b/oldstuff/nixos/modules/cachix/ca-nix.nix deleted file mode 100644 index b6de359a..00000000 --- a/oldstuff/nixos/modules/cachix/ca-nix.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, ... }: - -{ - nix = { - binaryCaches = - if (config.networking.hostName == "delly-nixos") then - lib.mkForce [ - # "https://cache.ngi0.nixos.org/" - ] - else [ ]; - binaryCachePublicKeys = [ - "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA=" - ]; - }; -} From a1806ecd49c3f3846e8f93d832069cb14e6914a8 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 10:22:32 +0200 Subject: [PATCH 043/303] clean up old modules --- oldstuff/nixos/modules/default.nix | 11 --- oldstuff/nixos/modules/k3s.nix | 23 ------- oldstuff/nixos/modules/kubernetes.nix | 28 -------- oldstuff/nixos/modules/packet-iscsi.nix | 92 ------------------------- 4 files changed, 154 deletions(-) delete mode 100644 oldstuff/nixos/modules/default.nix delete mode 100644 oldstuff/nixos/modules/k3s.nix delete mode 100644 oldstuff/nixos/modules/kubernetes.nix delete mode 100644 oldstuff/nixos/modules/packet-iscsi.nix diff --git a/oldstuff/nixos/modules/default.nix b/oldstuff/nixos/modules/default.nix deleted file mode 100644 index 3e59248c..00000000 --- a/oldstuff/nixos/modules/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - cachix = import ./cachix.nix; - flake = import ./flake.nix; - gc = import ./gc.nix; - intel = import ./intel.nix; - k3s = import ./k3s.nix; - kubernetes = import ./kubernetes.nix; - packet-iscsi = import ./packet-iscsi.nix; - version = import ./version.nix; - virtualbox-demo = import ./virtualbox-demo.nix; -} diff --git a/oldstuff/nixos/modules/k3s.nix b/oldstuff/nixos/modules/k3s.nix deleted file mode 100644 index 6ec18c41..00000000 --- a/oldstuff/nixos/modules/k3s.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, unstable, ... }: - -{ - services.k3s = { - enable = true; - package = unstable.legacyPackages.x86_64-linux.k3s; - role = "server"; - docker = true; - extraFlags = "--write-kubeconfig-mode 644 --disable traefik --default-local-storage-path /opt/local-path-provisioner"; - }; - - systemd.services.k3s.path = [ pkgs.zfs ]; - - # https://github.com/NixOS/nixpkgs/issues/103158 - systemd.services.k3s.after = [ "network-online.service" "firewall.service" ]; - systemd.services.k3s.serviceConfig.KillMode = lib.mkForce "control-group"; - - # https://github.com/NixOS/nixpkgs/issues/98766 - boot.kernelModules = [ "br_netfilter" "ip_conntrack" "ip_vs" "ip_vs_rr" "ip_vs_wrr" "ip_vs_sh" "overlay" ]; - networking.firewall.extraCommands = '' - iptables -A INPUT -i cni+ -j ACCEPT - ''; -} diff --git a/oldstuff/nixos/modules/kubernetes.nix b/oldstuff/nixos/modules/kubernetes.nix deleted file mode 100644 index 406bf21d..00000000 --- a/oldstuff/nixos/modules/kubernetes.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, ... }: -let - hostname = config.networking.hostName; - - # This IP is in the zerotier network, making the kubernetes network - # available within the network only so far. - ip = "192.168.178.76"; # TODO: make an option to configure. -in -{ - services.kubernetes = { - roles = [ "master" "node" ]; - masterAddress = hostname; - kubelet.extraOpts = "--fail-swap-on=false"; - easyCerts = true; - - apiserver = { - enable = true; - insecurePort = 80; - securePort = 8443; - advertiseAddress = ip; - }; - - addonManager.enable = true; - addons = { - dashboard.enable = true; - }; - }; -} diff --git a/oldstuff/nixos/modules/packet-iscsi.nix b/oldstuff/nixos/modules/packet-iscsi.nix deleted file mode 100644 index ed7c881d..00000000 --- a/oldstuff/nixos/modules/packet-iscsi.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ pkgs, config, lib, ... }: -let - packet-block-storage = - pkgs.stdenv.mkDerivation { - name = "packet-block-storage"; - src = pkgs.fetchFromGitHub { - owner = "packethost"; - repo = "packet-block-storage"; - rev = "4be27cbca7a924b4de7af059d5ac30c2aa5c9e6f"; - sha256 = "0h4lpvz7v6xhl14kkwrjp202lbagj6wp2wqgrqdc6cfb4h0mf9fq"; - }; - nativeBuildInputs = [ pkgs.makeWrapper ]; - installPhase = - let - deps = with pkgs; [ - which - jq - curl - gawk - kmod - openiscsi - multipath-tools - ]; - wrapIt = prog: '' - cp ${prog} $out/bin - chmod ugo+rx $out/bin/${prog} - substituteInPlace $out/bin/${prog} --replace /lib/udev/scsi_id ${pkgs.udev}/lib/udev/scsi_id - wrapProgram $out/bin/${prog} --prefix PATH : ${lib.makeBinPath deps} - ''; - in - '' - mkdir -p $out/bin - ${wrapIt "packet-block-storage-attach"} - ${wrapIt "packet-block-storage-detach"} - ''; - }; - -in -{ - environment.systemPackages = [ packet-block-storage pkgs.multipath-tools pkgs.openiscsi ]; - - systemd.sockets.multipathd = { - description = "multipathd control socket"; - before = [ "sockets.target" ]; - - listenStreams = [ "@/org/kernel/linux/storage/multipathd" ]; - }; - - systemd.services.multipathd = { - description = "Device-Mapper Multipath Device Controller"; - before = [ - "iscsi.service" - "iscsid.service" - ]; - after = [ "multipathd.socket" "systemd-udevd.service" ]; - unitConfig = { - DefaultDependencies = false; - }; - wants = [ "multipathd.socket" "blk-availability.service" ]; - conflicts = [ "shutdown.target" ]; - serviceConfig = { - Type = "notify"; - NotifyAccess = "main"; - LimitCORE = "infinity"; - ExecStartPre = "${pkgs.kmod}/bin/modprobe -a dm-multipath"; - ExecStart = "${pkgs.multipath-tools}/bin/multipathd -d -s"; - ExecReload = "${pkgs.multipath-tools}/bin/multipathd reconfigure"; - }; - }; - - systemd.targets.iscsi = { - description = "iSCSI mounts"; - wants = [ "iscsid.service" "attach-block-storage.service" ]; - wantedBy = [ "remote-fs.target" ]; - }; - - systemd.services.iscsid = { - description = "iSCSI daemon"; - path = [ pkgs.openiscsi ]; - script = "iscsid -f"; - }; - - systemd.services.attach-block-storage = { - description = "Attach Packet.net block storage"; - requires = [ "network-online.target" "iscsid.service" "multipathd.service" ]; - after = [ "network-online.target" "iscsid.service" "multipathd.service" ]; - before = [ ]; - script = '' - ${packet-block-storage}/bin/packet-block-storage-attach - ''; - }; -} From c65c15aa2e750de436d64b7e13729d73f1d27d2b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 10:26:19 +0200 Subject: [PATCH 044/303] re-enable exa aliases --- home/modules/default.nix | 1 + {oldstuff/home/modules => home/modules/programs}/exa/default.nix | 0 2 files changed, 1 insertion(+) rename {oldstuff/home/modules => home/modules/programs}/exa/default.nix (100%) diff --git a/home/modules/default.nix b/home/modules/default.nix index 4f99dac0..1c31a064 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -21,6 +21,7 @@ "programs/openshift" = import ./programs/openshift; "programs/zshell" = import ./programs/zshell; "programs/nixpkgs" = import ./programs/nixpkgs; + "programs/exa" = import ./programs/exa; "programs/emacs" = import ./programs/emacs; "programs/emacs/beacon" = import ./programs/emacs/beacon.nix; "programs/emacs/company" = import ./programs/emacs/company.nix; diff --git a/oldstuff/home/modules/exa/default.nix b/home/modules/programs/exa/default.nix similarity index 100% rename from oldstuff/home/modules/exa/default.nix rename to home/modules/programs/exa/default.nix From b9837010ba1d5dd96a2f64b8de06d4afa8431f7a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 10:33:19 +0200 Subject: [PATCH 045/303] nmelzer@enceladeus: transfer --- home/configurations/default.nix | 1 + .../configurations/nmelzer@enceladeus.nix | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename oldstuff/home/hosts/delly-nixos.nix => home/configurations/nmelzer@enceladeus.nix (82%) diff --git a/home/configurations/default.nix b/home/configurations/default.nix index 8b6fe2a9..52b0589a 100644 --- a/home/configurations/default.nix +++ b/home/configurations/default.nix @@ -2,4 +2,5 @@ { "nmelzer@mimas" = self.lib.mkHome "nmelzer" "mimas" "x86_64-linux" inputs.unstable; + "nmelzer@enceladeus" = self.lib.mkHome "nmelzer" "enceladeus" "x86_64-linux" inputs.unstable; } diff --git a/oldstuff/home/hosts/delly-nixos.nix b/home/configurations/nmelzer@enceladeus.nix similarity index 82% rename from oldstuff/home/hosts/delly-nixos.nix rename to home/configurations/nmelzer@enceladeus.nix index 6025c99d..a2bbc2c0 100644 --- a/oldstuff/home/hosts/delly-nixos.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -2,13 +2,12 @@ { config = { + nixpkgs.allowedUnfree = [ "google-chrome" ]; + nixpkgs.config.contentAddressedByDefault = false; activeProfiles = [ "browsing" "development" ]; # "home-office" ]; - # xsession.windowManager.awesome.terminalEmulator = - # "${pkgs.lxterminal}/bin/lxterminal"; - xsession.windowManager.awesome.autostart = [ "${pkgs.blueman}/bin/blueman-applet" "${pkgs.networkmanagerapplet}/bin/nm-applet" From a27ff58d067bc630985b233d235cb5c2b2f269ee Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 10:58:16 +0200 Subject: [PATCH 046/303] demo@thetys: transfer --- home/configurations/default.nix | 1 + .../nixos.nix => home/configurations/demo@thetys.nix | 10 ++++++++-- home/modules/default.nix | 2 ++ .../home => home}/modules/languages/lua/default.nix | 0 .../modules/languages/terraform/default.nix | 0 5 files changed, 11 insertions(+), 2 deletions(-) rename oldstuff/home/hosts/nixos.nix => home/configurations/demo@thetys.nix (82%) rename {oldstuff/home => home}/modules/languages/lua/default.nix (100%) rename {oldstuff/home => home}/modules/languages/terraform/default.nix (100%) diff --git a/home/configurations/default.nix b/home/configurations/default.nix index 52b0589a..05e05b78 100644 --- a/home/configurations/default.nix +++ b/home/configurations/default.nix @@ -3,4 +3,5 @@ { "nmelzer@mimas" = self.lib.mkHome "nmelzer" "mimas" "x86_64-linux" inputs.unstable; "nmelzer@enceladeus" = self.lib.mkHome "nmelzer" "enceladeus" "x86_64-linux" inputs.unstable; + "demo@thetys" = self.lib.mkHome "demo" "thetys" "x86_64-linux" inputs.unstable; } diff --git a/oldstuff/home/hosts/nixos.nix b/home/configurations/demo@thetys.nix similarity index 82% rename from oldstuff/home/hosts/nixos.nix rename to home/configurations/demo@thetys.nix index f4f3fbc1..38a71906 100644 --- a/oldstuff/home/hosts/nixos.nix +++ b/home/configurations/demo@thetys.nix @@ -1,7 +1,13 @@ -{ pkgs, stable, self, ... }: +{ pkgs, nixpkgs-2105, self, ... }: +let + stable = nixpkgs-2105.legacyPackages.x86_64-linux; + self' = self.packages.x86_64-linux; +in { config = { + nixpkgs.allowedUnfree = [ "google-chrome" ]; + activeProfiles = [ "browsing" "development" ]; enabledLanguages = @@ -16,7 +22,7 @@ home.packages = [ stable.mysqlWorkbench - self.gnucash-de + self'.gnucash-de ]; systemd.user.services = { diff --git a/home/modules/default.nix b/home/modules/default.nix index 1c31a064..672e6889 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -16,6 +16,8 @@ "languages/python" = import ./languages/python; "languages/rust" = import ./languages/rust; "languages/tex" = import ./languages/tex; + "languages/lua" = import ./languages/lua; + "languages/terraform" = import ./languages/terraform; "programs/advcp" = import ./programs/advcp; "programs/openshift" = import ./programs/openshift; diff --git a/oldstuff/home/modules/languages/lua/default.nix b/home/modules/languages/lua/default.nix similarity index 100% rename from oldstuff/home/modules/languages/lua/default.nix rename to home/modules/languages/lua/default.nix diff --git a/oldstuff/home/modules/languages/terraform/default.nix b/home/modules/languages/terraform/default.nix similarity index 100% rename from oldstuff/home/modules/languages/terraform/default.nix rename to home/modules/languages/terraform/default.nix From 27ff2766d855793aeccb3ddd96c90d4ec61e6268 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 11:03:19 +0200 Subject: [PATCH 047/303] oldstuff: clean up files not needed anymore --- oldstuff/home/.envrc | 14 -- oldstuff/home/.github/dependabot.yml | 14 -- .../home/.github/workflows/environments.yml | 57 ------- oldstuff/home/.gitignore | 4 - oldstuff/home/.gitlab-ci.yml | 20 --- oldstuff/home/README.adoc | 18 --- oldstuff/home/flake.lock | 141 ------------------ oldstuff/home/flake.nix | 94 ------------ .../home/packages/kmymoney-de/default.nix | 11 -- .../home/scripts/build-config/default.nix | 13 -- .../home/scripts/bump-version/default.nix | 56 ------- .../home/scripts/switch-config/default.nix | 52 ------- .../home/scripts/update-config/default.nix | 14 -- oldstuff/lib/default.nix | 5 - oldstuff/scripts/build-config.nix | 15 -- oldstuff/scripts/default.nix | 9 -- oldstuff/scripts/switch-config.nix | 45 ------ 17 files changed, 582 deletions(-) delete mode 100644 oldstuff/home/.envrc delete mode 100644 oldstuff/home/.github/dependabot.yml delete mode 100644 oldstuff/home/.github/workflows/environments.yml delete mode 100644 oldstuff/home/.gitignore delete mode 100644 oldstuff/home/.gitlab-ci.yml delete mode 100644 oldstuff/home/README.adoc delete mode 100644 oldstuff/home/flake.lock delete mode 100644 oldstuff/home/flake.nix delete mode 100644 oldstuff/home/packages/kmymoney-de/default.nix delete mode 100644 oldstuff/home/scripts/build-config/default.nix delete mode 100644 oldstuff/home/scripts/bump-version/default.nix delete mode 100644 oldstuff/home/scripts/switch-config/default.nix delete mode 100644 oldstuff/home/scripts/update-config/default.nix delete mode 100644 oldstuff/lib/default.nix delete mode 100644 oldstuff/scripts/build-config.nix delete mode 100644 oldstuff/scripts/default.nix delete mode 100644 oldstuff/scripts/switch-config.nix diff --git a/oldstuff/home/.envrc b/oldstuff/home/.envrc deleted file mode 100644 index 181b216b..00000000 --- a/oldstuff/home/.envrc +++ /dev/null @@ -1,14 +0,0 @@ -# -*- mode: shell-script -*- - -use_flake() { - watch_file flake.lock - watch_file {**/,}*.nix - - mkdir -p $(direnv_layout_dir) - - eval "$(nix print-dev-env \ - --profile "$(direnv_layout_dir)/flake-profile" \ - --option builders "")" -} - -use flake diff --git a/oldstuff/home/.github/dependabot.yml b/oldstuff/home/.github/dependabot.yml deleted file mode 100644 index f20780ab..00000000 --- a/oldstuff/home/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -updates: -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - reviewers: - - NobbZ - assignees: - - NobbZ - labels: - - CI diff --git a/oldstuff/home/.github/workflows/environments.yml b/oldstuff/home/.github/workflows/environments.yml deleted file mode 100644 index a4f558b6..00000000 --- a/oldstuff/home/.github/workflows/environments.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: "build" - -on: - push: - branches: - - main - pull_request: - -jobs: - overlays: - name: Build package ${{ matrix.package }} - runs-on: ubuntu-latest - strategy: - matrix: - package: - - advcp - - elixir-lsp - - erlang-ls - - emacsGit - - keyleds - - rofi-unicode - - keepass - steps: - - uses: actions/checkout@v2.3.4 - - uses: cachix/install-nix-action@v13 - with: - install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210207_fd6eaa1/install - extra_nix_config: | - experimental-features = nix-command flakes - - uses: cachix/cachix-action@v10 - with: { name: nobbz, signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' } - - run: nix build -L .#${{ matrix.package }} - - environment: - name: Build for ${{ matrix.hostname }} - needs: overlays - runs-on: ubuntu-latest - strategy: - matrix: - hostname: - - delly-nixos - - nixos - - tux-nixos - - WS0005 - steps: - - uses: actions/checkout@v2.3.4 - with: { fetch-depth: 0 } - - uses: cachix/install-nix-action@v13 - with: - install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210207_fd6eaa1/install - extra_nix_config: experimental-features = nix-command flakes - - uses: cachix/cachix-action@v10 - with: - name: nobbz - signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - skipPush: github.ref != 'refs/heads/main' - - run: nix build -L .#${{ matrix.hostname }} diff --git a/oldstuff/home/.gitignore b/oldstuff/home/.gitignore deleted file mode 100644 index 5f553024..00000000 --- a/oldstuff/home/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/result -/result-* -/hosts/default.nix -/secrets.nix diff --git a/oldstuff/home/.gitlab-ci.yml b/oldstuff/home/.gitlab-ci.yml deleted file mode 100644 index 58472276..00000000 --- a/oldstuff/home/.gitlab-ci.yml +++ /dev/null @@ -1,20 +0,0 @@ -image: nixos/nix:latest - -build: - before_script: - - nix-env -iA nixpkgs.cachix nixpkgs.bash nixpkgs.gnumake - - cachix use nobbz - - cachix use nix-community - - nix path-info --all > /tmp/store-path-pre-build - script: - - | - set -x - for file in hosts/*.nix; do - host=$(basename $file .nix) - make build HOSTNAME=$host - mv result $host.result - ln -s $(pwd)/$host.result /nix/var/nix/gcroots/$host.result - done - nix-collect-garbage --verbose - after_script: - - bash -c "comm -13 <(sort /tmp/store-path-pre-build | grep -v '\.drv$') <(nix path-info --all | grep -v '\.drv$' | sort) | cachix push nobbz" diff --git a/oldstuff/home/README.adoc b/oldstuff/home/README.adoc deleted file mode 100644 index 0c52b750..00000000 --- a/oldstuff/home/README.adoc +++ /dev/null @@ -1,18 +0,0 @@ -= Dotfiles -Norbert Melzer -:toc: macro - -This is just another approach to organize my dotfiles in a repository. - -toc::[] - -== Sources - -There are some old repositories I used to configure stuff. -My actual dotfiles have been private for a long time as they contain secrets. -I will probably never open them. - -Though I configured other programs by other means, as I (re) discover those sources I will add them to the list: - -.Sources for this new dotfile repo -* https://gitlab.com/NobbZ/emacs.d[emacs config] diff --git a/oldstuff/home/flake.lock b/oldstuff/home/flake.lock deleted file mode 100644 index 9d6155e1..00000000 --- a/oldstuff/home/flake.lock +++ /dev/null @@ -1,141 +0,0 @@ -{ - "nodes": { - "cryptomator": { - "locked": { - "lastModified": 1609951575, - "narHash": "sha256-8m3dvQKjpFk/Y0tpqAa7e5eOUrQnsDY1bfvROGILZbY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2eb8804497a506d8c1a0363f99a08ad1d688a24f", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2eb8804497a506d8c1a0363f99a08ad1d688a24f", - "type": "github" - } - }, - "emacs": { - "locked": { - "lastModified": 1618111206, - "narHash": "sha256-JUNV8PKu77CytEUfQgAMml+gECO6CY6ymVuKu7TYkGM=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "75a4d7273b19ac442d246e2d5e109c9dfed58b35", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1618041827, - "narHash": "sha256-17Fzc8rmT6HOarCp+8k9RhmgMorNtzTk/rzew+FqHrA=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f567ea8228e0ce718871d7346e444dd15ad702e5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1618064689, - "narHash": "sha256-MGnHpM3bSd5JClA+1ad+jvcfNr0HrYoGmqCc2s7thkM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ad7604ddbd9b299701fb5e15bc39cff80deffce2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-20.09", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-master": { - "locked": { - "lastModified": 1618128638, - "narHash": "sha256-MijJTAR8TPCOQ8bdGSH3rhoi2pgdzPiwsN+CV1yE38Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0062afc0506491c2989a17eadf7239b5a7b38338", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "cryptomator": "cryptomator", - "emacs": "emacs", - "home-manager": "home-manager", - "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": [ - "system", - "nixpkgs" - ], - "nixpkgs-unstable": [ - "system", - "unstable" - ], - "system": "system" - } - }, - "system": { - "inputs": { - "nixpkgs": "nixpkgs", - "unstable": "unstable" - }, - "locked": { - "lastModified": 1618129712, - "narHash": "sha256-s16tcS0cN/0t0Ih7Bfmmw7Egn5w45kC5OD2wtiyWVv0=", - "owner": "NobbZ", - "repo": "nixos-config", - "rev": "b0e1c4bc7dd23bc6e935567674d54a29e4da9991", - "type": "github" - }, - "original": { - "owner": "NobbZ", - "repo": "nixos-config", - "type": "github" - } - }, - "unstable": { - "locked": { - "lastModified": 1617899217, - "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/oldstuff/home/flake.nix b/oldstuff/home/flake.nix deleted file mode 100644 index d1501027..00000000 --- a/oldstuff/home/flake.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - inputs = { - # Main channels - system.url = "github:NobbZ/nixos-config"; - nixpkgs-stable.follows = "system/nixpkgs"; - nixpkgs-unstable.follows = "system/unstable"; - - nixpkgs-master.url = "github:nixos/nixpkgs/master"; - - cryptomator.url = "github:nixos/nixpkgs/2eb8804497a506d8c1a0363f99a08ad1d688a24f"; - - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - - # Overlays - emacs.url = "github:nix-community/emacs-overlay"; - }; - - outputs = { self, emacs, ... }@inputs: - let - pkgs = import inputs.nixpkgs-unstable { - system = "x86_64-linux"; - overlays = builtins.attrValues self.overlays; - config.permittedInsecurePackages = [ "go-1.14.15" ]; - }; - - pkgs-stable = import inputs.nixpkgs-stable { - system = "x86_64-linux"; - overlays = builtins.attrValues self.overlays; - }; - in - { - overlay = import ./nix/myOverlay; - - overlays = { - inputs = final: prev: { inherit inputs; }; - emacs = emacs.overlay; - self = self.overlay; - }; - - lib = import ./lib inputs; - - homeConfigurations = { - tux-nixos = self.lib.mkHomeConfig "nmelzer" ./hosts/tux-nixos.nix; - delly-nixos = self.lib.mkHomeConfig "nmelzer" ./hosts/delly-nixos.nix; - nixos = self.lib.mkHomeConfig "demo" ./hosts/nixos.nix; - WS0005 = self.lib.mkHomeConfig "nmelzer" ./hosts/WS0005.nix; - }; - - apps.x86_64-linux = { - build = { type = "app"; program = "${self.packages.x86_64-linux.build-config}"; }; - switch = { type = "app"; program = "${self.packages.x86_64-linux.switch-config}"; }; - bump = { type = "app"; program = "${self.packages.x86_64-linux.bump-version}"; }; - }; - - defaultApp.x86_64-linux = self.apps.x86_64-linux.switch; - - packages.x86_64-linux = { - advcp = pkgs.callPackage ./packages/advcp { }; - elixir-lsp = pkgs.beam.packages.erlang.callPackage ./packages/elixir-lsp { - rebar3 = pkgs-stable.beam.packages.erlang.rebar3; - }; - erlang-ls = pkgs.beam.packages.erlang.callPackage ./packages/erlang-ls { }; - keyleds = pkgs.callPackage ./packages/keyleds { - stdenv = pkgs.gcc8Stdenv; - }; - rofi-unicode = pkgs.callPackage ./packages/rofi-unicode { }; - nix-zsh-completions = pkgs.nix-zsh-completions; - keepass = pkgs.keepass; - emacsGit = pkgs.emacsPgtkGcc; - cryptomator = inputs.cryptomator.legacyPackages.x86_64-linux.cryptomator; - dracula-konsole = pkgs.callPackage ./packages/dracula/konsole.nix { }; - gnucash-de = pkgs.callPackage ./packages/gnucash-de { }; - - update-config = pkgs.callPackage ./scripts/update-config { }; - build-config = pkgs.callPackage ./scripts/build-config { }; - switch-config = pkgs.callPackage ./scripts/switch-config { }; - bump-version = pkgs.callPackage ./scripts/bump-version { }; - } // builtins.mapAttrs - (_: config: - config.activationPackage) - self.homeConfigurations; - - checks.x86_64-linux = { - inherit (self.packages.x86_64-linux) advcp elixir-lsp erlang-ls keyleds - rofi-unicode nix-zsh-completions keepass emacsGit cryptomator; - } // builtins.mapAttrs - (_: config: - config.activationPackage) - self.homeConfigurations; - }; -} diff --git a/oldstuff/home/packages/kmymoney-de/default.nix b/oldstuff/home/packages/kmymoney-de/default.nix deleted file mode 100644 index dd754ef5..00000000 --- a/oldstuff/home/packages/kmymoney-de/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ runCommand, makeWrapper, kmymoney }: - -runCommand "kmymoney-de-${kmymoney.version}" -{ - nativeBuildInputs = [ makeWrapper ]; -} '' - mkdir -p $out/{bin,share/applications} - makeWrapper ${kmymoney}/bin/kmymoney $out/bin/kmymoney \ - --set LANG de_DE.UTF-8 - ln -s ${kmymoney}/share/applications/org.kde.kmymoney.desktop $out/share/applications/org.kde.kmymoney.desktop -'' diff --git a/oldstuff/home/scripts/build-config/default.nix b/oldstuff/home/scripts/build-config/default.nix deleted file mode 100644 index 6f5c7128..00000000 --- a/oldstuff/home/scripts/build-config/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ writeShellScript, nettools, ... }: - -writeShellScript "build-config.sh" '' - set -ex - - if [ -z $1 ]; then - name=$(${nettools}/bin/hostname) - else - name=$1 - fi - - nix build -L --out-link "result-$name" ".#$name" -'' diff --git a/oldstuff/home/scripts/bump-version/default.nix b/oldstuff/home/scripts/bump-version/default.nix deleted file mode 100644 index 3ce22e90..00000000 --- a/oldstuff/home/scripts/bump-version/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ writeScript, python3, nix-prefetch-github, nix-prefetch-git, ... }: - -writeScript "bump-version.py" '' - #!${python3}/bin/python - - import json - import re - import subprocess - from sys import argv - - version = { - "elixir-ls": "v0.7.0", - "erlang-ls": "0.13.0", - "emoji": "master", - } - - location = { - "elixir-ls": "packages/elixir-lsp/source.json", - "erlang-ls": "packages/erlang-ls/source.json", - "emoji": "packages/rofi-unicode/rofi-unicode.json", - } - - repo_url = { - "elixir-ls": ("elixir-lsp", "elixir-ls"), - "erlang-ls": ("erlang-ls", "erlang_ls"), - "emoji": "https://git.teknik.io/matf/rofiemoji-rofiunicode.git", - } - - def github(name, rev, file): - bin = "${nix-prefetch-github}/bin/nix-prefetch-github" - owner, repo = repo_url[name] - data = json.loads(subprocess.check_output([bin, "--rev", rev, owner, repo])) - data["version"] = re.sub("^v", "", rev) - with open(file, "w") as f: - json.dump(data, f, indent=2, sort_keys=True) - f.write("\n") - - def git(name, rev, file): - bin = "${nix-prefetch-git}/bin/nix-prefetch-git" - url = repo_url[name] - data = json.loads(subprocess.check_output([bin, url])) - data["version"] = re.sub("^v", "", rev) - with open(file, "w") as f: - json.dump(data, f, indent=2, sort_keys=True) - f.write("\n") - - fetcher = { - "elixir-ls": github, - "erlang-ls": github, - "emoji": git, - } - - name = argv[1] - - fetcher[name](name, version[name], location[name]) -'' diff --git a/oldstuff/home/scripts/switch-config/default.nix b/oldstuff/home/scripts/switch-config/default.nix deleted file mode 100644 index bbffc5b2..00000000 --- a/oldstuff/home/scripts/switch-config/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ writeShellScript, nixUnstable, nettools, ... }: - -writeShellScript "switch-config.sh" '' - set -ex - - name="" - user="$USER" - targetHost="" - - while (( $# > 0 )); do - i=$1; shift 1 - - case "$i" in - --targetHost) - targetHost=$1; shift 1 - ;; - - --name) - name=$1; shift 1 - ;; - - --user) - user=$1; shift 1 - ;; - esac - done - - if [ -z "$name" ]; then - if [ -z "$targetHost" ]; then - name=$(${nettools}/bin/hostname) - else - printf "--name needs to be specified" - exit - fi - fi - - outLink=$(mktemp -d)/result-$name - - ${nixUnstable}/bin/nix build -L \ - --out-link "$outLink" \ - ".#$name" - - if [ -z "$targetHost" ]; then - $outLink/activate - else - storePath=$(readlink "$outLink") - nix copy --to "ssh://root@$targetHost" "$storePath" - ssh "$user@$targetHost" "$storePath/activate" - fi - - rm $outLink -'' diff --git a/oldstuff/home/scripts/update-config/default.nix b/oldstuff/home/scripts/update-config/default.nix deleted file mode 100644 index b93edcae..00000000 --- a/oldstuff/home/scripts/update-config/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ writeShellScript, lib, inputs, nixUnstable, ... }: -let - hostNames = builtins.attrNames inputs.self.homeConfigurations; - hostNamesBash = builtins.map (n: ".#${n}") hostNames; - hostNamesArray = "(${lib.escapeShellArgs hostNamesBash})"; -in -writeShellScript "update-config.sh" '' - set -ex - ${nixUnstable}/bin/nix flake update --recreate-lock-file --commit-lock-file - - hosts=${hostNamesArray} - - ${nixUnstable}/bin/nix build -L "''${hosts[@]}" -'' diff --git a/oldstuff/lib/default.nix b/oldstuff/lib/default.nix deleted file mode 100644 index eb90c332..00000000 --- a/oldstuff/lib/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -inputs: - -{ - mkHomeConfig = import ./mk_home_config.nix inputs; -} diff --git a/oldstuff/scripts/build-config.nix b/oldstuff/scripts/build-config.nix deleted file mode 100644 index fdfcc49c..00000000 --- a/oldstuff/scripts/build-config.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ writeShellScriptBin, nettools, nixUnstable, ... }: - -writeShellScriptBin "build-config.sh" '' - set -ex - - if [ -z $1 ]; then - name=$(${nettools}/bin/hostname) - else - name=$1 - fi - - ${nixUnstable}/bin/nix build -L \ - --out-link "result-$name" \ - .#$name -'' diff --git a/oldstuff/scripts/default.nix b/oldstuff/scripts/default.nix deleted file mode 100644 index d9a2cd2e..00000000 --- a/oldstuff/scripts/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ nixpkgs-2105, ... }@inputs: -let - system = "x86_64-linux"; - pkgs = import nixpkgs-2105 { inherit system; }; -in -{ - build-config = pkgs.callPackage ./build-config.nix { }; - switch-config = pkgs.callPackage ./switch-config.nix { }; -} diff --git a/oldstuff/scripts/switch-config.nix b/oldstuff/scripts/switch-config.nix deleted file mode 100644 index 9cccdbb1..00000000 --- a/oldstuff/scripts/switch-config.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ writeShellScriptBin, nettools, nixUnstable }: - -writeShellScriptBin "switch-config.sh" '' - set -ex - - name="" - targetHost="" - - while (( $# > 0 )); do - i=$1; shift 1 - - case "$i" in - --targetHost) - targetHost=$1; shift 1 - ;; - - --name) - name=$1; shift 1 - ;; - esac - done - - if [ -z "$name" ]; then - if [ -z "$targetHost" ]; then - name=$(${nettools}/bin/hostname) - else - printf "--name needs to be specified" - exit 1 - fi - fi - outLink=$(mktemp -d)/result-$name - - # nixos-rebuild build -L \ - # --out-link "$outLink" \ - # .#$name - - if [ -z "$targetHost" ]; then - echo "Will activate, please enter your password to elevate" - sudo nixos-rebuild switch -L --flake .#$name - else - storePath=$(readlink "$outLink") - nix copy --to "ssh://root@$targetHost" "$storePath" - ssh "root@$targetHost" "$storePath/bin/switch-to-configuration" switch - fi -'' From 776234be9e94f0d88a594880659f6172e7c67adf Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 11:32:43 +0200 Subject: [PATCH 048/303] zx: init at 2.0.0 --- packages/default.nix | 2 + packages/nodePackages/default.nix | 20 + packages/nodePackages/node-env.nix | 572 +++++++++++++++++++++++ packages/nodePackages/node-packages.json | 3 + packages/nodePackages/node-packages.nix | 270 +++++++++++ 5 files changed, 867 insertions(+) create mode 100644 packages/nodePackages/default.nix create mode 100644 packages/nodePackages/node-env.nix create mode 100644 packages/nodePackages/node-packages.json create mode 100644 packages/nodePackages/node-packages.nix diff --git a/packages/default.nix b/packages/default.nix index 18c245f4..23bcc3b9 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -6,6 +6,7 @@ let mpkgs = inputs.master.legacyPackages.x86_64-linux; epkgs = import inputs.unstable { system = "x86_64-linux"; overlays = [ emacs.overlay ]; }; + nodePkgs = upkgs.callPackage ./nodePackages { }; in { "advcp" = pkgs.callPackage ./advcp { }; @@ -16,4 +17,5 @@ in "elixir-lsp" = upkgs.beam.packages.erlang.callPackage ./elixir-lsp { }; "erlang-ls" = upkgs.beam.packages.erlang.callPackage ./erlang-ls { }; "rofi/unicode" = upkgs.callPackage ./rofi-unicode { }; + "zx" = nodePkgs.zx; } diff --git a/packages/nodePackages/default.nix b/packages/nodePackages/default.nix new file mode 100644 index 00000000..23ba53cb --- /dev/null +++ b/packages/nodePackages/default.nix @@ -0,0 +1,20 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{ pkgs ? import { + inherit system; + } +, system ? builtins.currentSystem +, nodejs ? pkgs."nodejs-12_x" +}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/packages/nodePackages/node-env.nix b/packages/nodePackages/node-env.nix new file mode 100644 index 00000000..9bb0331f --- /dev/null +++ b/packages/nodePackages/node-env.nix @@ -0,0 +1,572 @@ +# This file originates from node2nix + +{ lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile }: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" { } '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = { dependencies }: + lib.optionalString (dependencies != [ ]) + (lib.concatMapStrings + (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) + dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [ ], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = { dependencies, production }: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [ ], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" { } '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = { packageName, bypassCache, reconstructLock, npmFlags, production }: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [ ] + , buildInputs ? [ ] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... + }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version + , src + , dependencies ? [ ] + , buildInputs ? [ ] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... + }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [ ] + , buildInputs ? [ ] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... + }@args: + + let + nodeDependencies = buildNodeDependencies args; + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < Date: Sun, 1 Aug 2021 12:04:45 +0200 Subject: [PATCH 049/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/de00abcd9631b104ef2868e1e0a877b1ec6b5633' -> 'github:nix-community/emacs-overlay/87b33a6201526c0edff73ba6496589b9f5647a22' * Updated 'master': 'github:nixos/nixpkgs/e8d67ac8fc5294a32fd257c757548d9cb0f81190' -> 'github:nixos/nixpkgs/bc3416a2dddd3c7a2a3182373c392292ed8e22b6' * Updated 'nix': 'github:nixos/nix/48e35585a6f23b05647cef12bcc85eeab3ae1d59' -> 'github:nixos/nix/2b67cb7b8c8ac7953f7e341d760bdb3c021fe765' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/2262d7863a6af007274a698367484bf4903a3299' -> 'github:nixos/nixpkgs/11c662074e2ae3dddd7e157918b6981de4ce7857' --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 6eb7cca4..c6e2b9c1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1627579950, - "narHash": "sha256-MUbgLOeNjgTUVxzVWZ4Gjek2PlgC4r206PgVkNslrmY=", + "lastModified": 1627808526, + "narHash": "sha256-wiFbTCDq09EWle7ZqoxSnjC0u4vADpDADZN2aMlMnpM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "de00abcd9631b104ef2868e1e0a877b1ec6b5633", + "rev": "87b33a6201526c0edff73ba6496589b9f5647a22", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1627627671, - "narHash": "sha256-h0aJ/9oCKHYrSZFmu2vamAlCaxCWjxlul894JloeAa0=", + "lastModified": 1627810206, + "narHash": "sha256-Os/R1teO0iKtJlVdzGglylDVXdVDQR7BRX4M25dfk2U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8d67ac8fc5294a32fd257c757548d9cb0f81190", + "rev": "bc3416a2dddd3c7a2a3182373c392292ed8e22b6", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1627505905, - "narHash": "sha256-B6fop0p49C+ELrQkdPhClaxIKcVR6JBRY7qPUy+QvxQ=", + "lastModified": 1627654443, + "narHash": "sha256-KnMQRMDqidemayib7HUTSbKuxFaLxHUEf9bGq+ajVzo=", "owner": "nixos", "repo": "nix", - "rev": "48e35585a6f23b05647cef12bcc85eeab3ae1d59", + "rev": "2b67cb7b8c8ac7953f7e341d760bdb3c021fe765", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1627528535, - "narHash": "sha256-+E0LxCLav1GmbQbqwCKP39DRMn6NeEq00drC8udnYIY=", + "lastModified": 1627714638, + "narHash": "sha256-K50HjZJzRaFoxzGkbNwynsrKGQsinmUQE5HNSCNcO6Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2262d7863a6af007274a698367484bf4903a3299", + "rev": "11c662074e2ae3dddd7e157918b6981de4ce7857", "type": "github" }, "original": { From 0941f3df506b5e48f70e7c695f3af2fba05b6fd3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 12:05:31 +0200 Subject: [PATCH 050/303] update: init the app --- apps/update/default.nix | 24 ++++++++++++++++++++++++ apps/update/update.mjs | 3 +++ flake.nix | 4 +++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 apps/update/default.nix create mode 100644 apps/update/update.mjs diff --git a/apps/update/default.nix b/apps/update/default.nix new file mode 100644 index 00000000..99e04401 --- /dev/null +++ b/apps/update/default.nix @@ -0,0 +1,24 @@ +{ self, unstable, ... }: + +let + pkgs = import unstable { system = "x86_64-linux"; }; + type = "app"; + program = "${update}/bin/update.mjs"; + + update = pkgs.stdenv.mkDerivation { + pname = "nobbz-flake-updater"; + version = "0.0.1"; + + buildInputs = [ self.packages.x86_64-linux.zx ]; + + src = ./.; + + installPhase = '' + mkdir -p $out/bin + + install --mode=555 update.mjs $out/bin/update.mjs + ls -l $out/bin + ''; + }; +in +{ inherit type program; } diff --git a/apps/update/update.mjs b/apps/update/update.mjs new file mode 100644 index 00000000..601d063f --- /dev/null +++ b/apps/update/update.mjs @@ -0,0 +1,3 @@ +#!/usr/bin/env zx + +await $`nix flake update --commit-lock-file` \ No newline at end of file diff --git a/flake.nix b/flake.nix index d51bbc4a..2733241f 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,8 @@ checks = { }; - apps = { }; + apps.x86_64-linux = { + update = import ./apps/update inputs; + }; }; } From ec109ae183da9b408ed5a86f6524139727a8ef21 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 19:08:57 +0200 Subject: [PATCH 051/303] gnucash: build from unstable --- packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/default.nix b/packages/default.nix index 23bcc3b9..e8b4e7ae 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -10,7 +10,7 @@ let in { "advcp" = pkgs.callPackage ./advcp { }; - "gnucash-de" = mpkgs.callPackage ./gnucash-de { }; + "gnucash-de" = upkgs.callPackage ./gnucash-de { }; "keyleds" = upkgs.callPackage ./keyleds { }; "dracula/konsole" = upkgs.callPackage ./dracula/konsole { }; "emacs" = epkgs.emacsGcc; From 61ce7d3f91c35d981c7e880b5e5260555380649e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 19:09:09 +0200 Subject: [PATCH 052/303] checks: enable --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 2733241f..ee114227 100644 --- a/flake.nix +++ b/flake.nix @@ -26,9 +26,9 @@ // self.lib.nixosConfigurationsAsPackages.x86_64-linux // self.lib.homeConfigurationsAsPackages.x86_64-linux; - lib = import ./lib inputs; + checks = self.packages; - checks = { }; + lib = import ./lib inputs; apps.x86_64-linux = { update = import ./apps/update inputs; From a6fce6fd25c52e73ec73b8ad75f47eca031455d7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 1 Aug 2021 23:00:21 +0200 Subject: [PATCH 053/303] update readme --- README.org | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/README.org b/README.org index 15a5a3d0..3096a1e8 100644 --- a/README.org +++ b/README.org @@ -2,18 +2,19 @@ #+AUTHOR: Norbert Melzer -* TODO Overhaul [4/34] +* TODO Overhaul [16/35] ** TODO Systemconfiguration [3/3] *** DONE =tux-nixos= -> =mimas= *** DONE =delly-nixos= -> =enceladeus= *** DONE =nixos= -> =thetys= -** TODO Homeconfiguration [0/3] -*** TODO =tux-nixos= -*** TODO =delly-nixos= -*** TODO =nixos= -** TODO Helper functions [1/3] +** TODO Homeconfiguration [3/4] +*** DONE =tux-nixos= -> =nmelzer@mimas= +*** DONE =delly-nixos= -> =nmelzer@enceladeus= +*** DONE =nixos= -> =demo@thetys= +*** TODO =WS0005= +** TODO Helper functions [2/3] *** TODO apply overlays -*** TODO create home config +*** DONE create home config *** DONE create system config ** TODO Overlay [0/11] *** TODO re-expose ~emacs-overlay~ @@ -27,16 +28,16 @@ **** TODO ~gnucash-de~ **** TODO ~kmymoney-de~ **** TODO ~emacs~ -** TODO Packages [0/9] -*** TODO ~advcp~ -*** TODO ~elixir-lsp~ -*** TODO ~erlang-ls~ -*** TODO ~keyleds~ -*** TODO ~rofi-unicode~ -*** TODO ~dracula-console~ -*** TODO ~gnucash-de~ +** TODO Packages [8/9] +*** DONE ~advcp~ +*** DONE ~elixir-lsp~ +*** DONE ~erlang-ls~ +*** DONE ~keyleds~ +*** DONE ~rofi-unicode~ +*** DONE ~dracula-console~ +*** DONE ~gnucash-de~ *** TODO ~kmymoney-de~ -*** TODO ~emacs~ +*** DONE ~emacs~ # Local Variables: From d8587011b967e65ca340c7fd773f275bea49b6ba Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 3 Aug 2021 20:59:42 +0200 Subject: [PATCH 054/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/87b33a6201526c0edff73ba6496589b9f5647a22' -> 'github:nix-community/emacs-overlay/f884e04d8bc411e7a7e0c494050d6c749e084b1a' * Updated 'master': 'github:nixos/nixpkgs/bc3416a2dddd3c7a2a3182373c392292ed8e22b6' -> 'github:nixos/nixpkgs/beb8b3d8ccec1baee7fd0909519753733df669b8' * Updated 'nix': 'github:nixos/nix/2b67cb7b8c8ac7953f7e341d760bdb3c021fe765' -> 'github:nixos/nix/47e96bb533f8cacc171bec9b688b134de31a48a9' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/11c662074e2ae3dddd7e157918b6981de4ce7857' -> 'github:nixos/nixpkgs/d4590d21006387dcb190c516724cb1e41c0f8fdf' * Updated 'unstable': 'github:nixos/nixpkgs/8ecc61c91a596df7d3293603a9c2384190c1b89a' -> 'github:nixos/nixpkgs/aaf9676fbb7fb4570216ca1e189a3dc769d62c45' --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c6e2b9c1..3e6a1c00 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1627808526, - "narHash": "sha256-wiFbTCDq09EWle7ZqoxSnjC0u4vADpDADZN2aMlMnpM=", + "lastModified": 1628009153, + "narHash": "sha256-YXojyQiweQ67CSM/1nKTOfGqQguINfikX+6YYWwpLzM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "87b33a6201526c0edff73ba6496589b9f5647a22", + "rev": "f884e04d8bc411e7a7e0c494050d6c749e084b1a", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1627810206, - "narHash": "sha256-Os/R1teO0iKtJlVdzGglylDVXdVDQR7BRX4M25dfk2U=", + "lastModified": 1628016974, + "narHash": "sha256-9rWs1Cqp+EuoZTX/DtwyLTDvSZxUF1W6zX26wzkfTbQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc3416a2dddd3c7a2a3182373c392292ed8e22b6", + "rev": "beb8b3d8ccec1baee7fd0909519753733df669b8", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1627654443, - "narHash": "sha256-KnMQRMDqidemayib7HUTSbKuxFaLxHUEf9bGq+ajVzo=", + "lastModified": 1627913633, + "narHash": "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg=", "owner": "nixos", "repo": "nix", - "rev": "2b67cb7b8c8ac7953f7e341d760bdb3c021fe765", + "rev": "47e96bb533f8cacc171bec9b688b134de31a48a9", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1627714638, - "narHash": "sha256-K50HjZJzRaFoxzGkbNwynsrKGQsinmUQE5HNSCNcO6Y=", + "lastModified": 1627892869, + "narHash": "sha256-Fg0KPi9oGTZ7Ju7rb8foq0GOZI3++ZaF6wf10ClMA58=", "owner": "nixos", "repo": "nixpkgs", - "rev": "11c662074e2ae3dddd7e157918b6981de4ce7857", + "rev": "d4590d21006387dcb190c516724cb1e41c0f8fdf", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1627391865, - "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=", + "lastModified": 1627857416, + "narHash": "sha256-AV0MsFVzbWI2MZbJ2j0kc8ooFLGSCZHuM9ipaWR9ds4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a", + "rev": "aaf9676fbb7fb4570216ca1e189a3dc769d62c45", "type": "github" }, "original": { From 21e5665f7ec2816befc4e05515403e7fff9ad202 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 3 Aug 2021 22:18:26 +0200 Subject: [PATCH 055/303] enceladeus: move the store --- nixos/configurations/hardware/enceladeus.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/configurations/hardware/enceladeus.nix b/nixos/configurations/hardware/enceladeus.nix index 40646e1e..39fb470c 100644 --- a/nixos/configurations/hardware/enceladeus.nix +++ b/nixos/configurations/hardware/enceladeus.nix @@ -18,6 +18,12 @@ fsType = "ext4"; }; + filesystems."/nix/store" = + { + device = "/dev/disk/by-uuid/1ee9d669-07e1-4f40-93af-71f9ad999f70"; + fsType = "ext4"; + }; + swapDevices = [{ device = "/dev/disk/by-uuid/87c5fea1-6bcb-41d4-af9d-b9342a45c9b3"; }]; From a6ac8dc109f23da4b7083bc8ffc672a1668bfaf6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 3 Aug 2021 22:19:44 +0200 Subject: [PATCH 056/303] enceladeus: fix typo --- nixos/configurations/hardware/enceladeus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/hardware/enceladeus.nix b/nixos/configurations/hardware/enceladeus.nix index 39fb470c..69317655 100644 --- a/nixos/configurations/hardware/enceladeus.nix +++ b/nixos/configurations/hardware/enceladeus.nix @@ -18,7 +18,7 @@ fsType = "ext4"; }; - filesystems."/nix/store" = + fileSystems."/nix/store" = { device = "/dev/disk/by-uuid/1ee9d669-07e1-4f40-93af-71f9ad999f70"; fsType = "ext4"; From 1c53fbed0f8fcbedf9470260a2454cc29e27f330 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 3 Aug 2021 23:16:26 +0200 Subject: [PATCH 057/303] small refactor of update --- apps/update/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/update/default.nix b/apps/update/default.nix index 99e04401..7444c8e8 100644 --- a/apps/update/default.nix +++ b/apps/update/default.nix @@ -3,7 +3,7 @@ let pkgs = import unstable { system = "x86_64-linux"; }; type = "app"; - program = "${update}/bin/update.mjs"; + program = "${update}/bin/update"; update = pkgs.stdenv.mkDerivation { pname = "nobbz-flake-updater"; @@ -14,10 +14,16 @@ let src = ./.; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/{bin,lib} - install --mode=555 update.mjs $out/bin/update.mjs - ls -l $out/bin + cat < $out/bin/update + #!${pkgs.bash}/bin/bash + + exec $out/lib/update.mjs + EOF + chmod ugo=rx $out/bin/update + + install --mode=555 update.mjs $out/lib/update.mjs ''; }; in From 47487ff259961de84b8af4a8eea1f18b0e4d9112 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 5 Aug 2021 07:10:53 +0200 Subject: [PATCH 058/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/f884e04d8bc411e7a7e0c494050d6c749e084b1a' -> 'github:nix-community/emacs-overlay/8bceeeff7c7d00aee965f0ac623db2dba5b048f3' * Updated 'master': 'github:nixos/nixpkgs/beb8b3d8ccec1baee7fd0909519753733df669b8' -> 'github:nixos/nixpkgs/48ad5bae56916e64c6b6284633cb77f2738a3f5c' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/d4590d21006387dcb190c516724cb1e41c0f8fdf' -> 'github:nixos/nixpkgs/465daf79b4a23d6e47d2efddece7120da8800c63' * Updated 'unstable': 'github:nixos/nixpkgs/aaf9676fbb7fb4570216ca1e189a3dc769d62c45' -> 'github:nixos/nixpkgs/c464dc811babfe316ed4ab7bbc12351122e69dd7' --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3e6a1c00..3dd0cadf 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628009153, - "narHash": "sha256-YXojyQiweQ67CSM/1nKTOfGqQguINfikX+6YYWwpLzM=", + "lastModified": 1628128176, + "narHash": "sha256-elL6sSscr6riZ7LbwNeMXaqUJHYamrsedDs/nbq8k7E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f884e04d8bc411e7a7e0c494050d6c749e084b1a", + "rev": "8bceeeff7c7d00aee965f0ac623db2dba5b048f3", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628016974, - "narHash": "sha256-9rWs1Cqp+EuoZTX/DtwyLTDvSZxUF1W6zX26wzkfTbQ=", + "lastModified": 1628136287, + "narHash": "sha256-3lxeNKjPEzqcH1uwCdDO4zHk6tOcGH51iMONcYnlSPE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "beb8b3d8ccec1baee7fd0909519753733df669b8", + "rev": "48ad5bae56916e64c6b6284633cb77f2738a3f5c", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1627892869, - "narHash": "sha256-Fg0KPi9oGTZ7Ju7rb8foq0GOZI3++ZaF6wf10ClMA58=", + "lastModified": 1628077112, + "narHash": "sha256-ehfkGNBdq0GFbezcXZP4OPcik+k4Lm7mF8NUKJlq6Ho=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d4590d21006387dcb190c516724cb1e41c0f8fdf", + "rev": "465daf79b4a23d6e47d2efddece7120da8800c63", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1627857416, - "narHash": "sha256-AV0MsFVzbWI2MZbJ2j0kc8ooFLGSCZHuM9ipaWR9ds4=", + "lastModified": 1627942574, + "narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aaf9676fbb7fb4570216ca1e189a3dc769d62c45", + "rev": "c464dc811babfe316ed4ab7bbc12351122e69dd7", "type": "github" }, "original": { From c179ffac7f78f61bb3c3a239b6da12cb763f756f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 6 Aug 2021 15:06:36 +0200 Subject: [PATCH 059/303] enceladeus: update fileSystems --- nixos/configurations/hardware/enceladeus.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/configurations/hardware/enceladeus.nix b/nixos/configurations/hardware/enceladeus.nix index 69317655..fcbea4e4 100644 --- a/nixos/configurations/hardware/enceladeus.nix +++ b/nixos/configurations/hardware/enceladeus.nix @@ -14,7 +14,7 @@ fileSystems."/" = { - device = "/dev/disk/by-uuid/4a31eb44-990b-4fdd-a19b-6ede2b1ae58b"; + device = "/dev/disk/by-uuid/1be71104-48ad-40c3-bf4c-086cd887969f"; fsType = "ext4"; }; @@ -24,6 +24,18 @@ fsType = "ext4"; }; + fileSystems."/home" = + { + device = "/dev/disk/by-uuid/53a36eeb-9f0e-4cb6-bdd9-53ae5a74c683"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { + device = "/dev/sda1"; + fsType = "ext4"; + }; + swapDevices = [{ device = "/dev/disk/by-uuid/87c5fea1-6bcb-41d4-af9d-b9342a45c9b3"; }]; From 7b95a2a3336bb105bb7f15fc1ee3dd94616e71e6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 6 Aug 2021 17:29:11 +0200 Subject: [PATCH 060/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/8bceeeff7c7d00aee965f0ac623db2dba5b048f3' -> 'github:nix-community/emacs-overlay/2230a3cd6abcbc1be1af27c19db45c926281fe5c' * Updated 'master': 'github:nixos/nixpkgs/48ad5bae56916e64c6b6284633cb77f2738a3f5c' -> 'github:nixos/nixpkgs/87fa42c9378b29112875fa0beb85bb505a911315' * Updated 'nix': 'github:nixos/nix/47e96bb533f8cacc171bec9b688b134de31a48a9' -> 'github:nixos/nix/d64f9671fcce47e792974b372dc72de8c49994b7' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/465daf79b4a23d6e47d2efddece7120da8800c63' -> 'github:nixos/nixpkgs/ff1ea3a36c1dfafdf0490e0d144c5a0ed0891bb9' * Updated 'unstable': 'github:nixos/nixpkgs/c464dc811babfe316ed4ab7bbc12351122e69dd7' -> 'github:nixos/nixpkgs/5a82107589e6ba78a14b9a00c9ba268f1329a13f' --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3dd0cadf..e6d31734 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628128176, - "narHash": "sha256-elL6sSscr6riZ7LbwNeMXaqUJHYamrsedDs/nbq8k7E=", + "lastModified": 1628242158, + "narHash": "sha256-Dp26OowfEuQ8z9Agp5Glt9dsCJFnRM7SHK9ZYdEcnyg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8bceeeff7c7d00aee965f0ac623db2dba5b048f3", + "rev": "2230a3cd6abcbc1be1af27c19db45c926281fe5c", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628136287, - "narHash": "sha256-3lxeNKjPEzqcH1uwCdDO4zHk6tOcGH51iMONcYnlSPE=", + "lastModified": 1628262933, + "narHash": "sha256-Qlx3MSBqCDedgR/xbDwzx4Oo6v8I/0EqNA7egI9ERMU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48ad5bae56916e64c6b6284633cb77f2738a3f5c", + "rev": "87fa42c9378b29112875fa0beb85bb505a911315", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1627913633, - "narHash": "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg=", + "lastModified": 1628169187, + "narHash": "sha256-kkivOa+RCF8F+PVEwKstLyJcCWEmZ//q+SfwCqJOv5s=", "owner": "nixos", "repo": "nix", - "rev": "47e96bb533f8cacc171bec9b688b134de31a48a9", + "rev": "d64f9671fcce47e792974b372dc72de8c49994b7", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628077112, - "narHash": "sha256-ehfkGNBdq0GFbezcXZP4OPcik+k4Lm7mF8NUKJlq6Ho=", + "lastModified": 1628165821, + "narHash": "sha256-I/e2Y1TjUkaM787s3gaeaB8X2OvinP/ueZpYnJjN6G4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "465daf79b4a23d6e47d2efddece7120da8800c63", + "rev": "ff1ea3a36c1dfafdf0490e0d144c5a0ed0891bb9", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1627942574, - "narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=", + "lastModified": 1628121754, + "narHash": "sha256-WQJSvlP/4f1pJCPM9Se+0x606jrUNgDiIUvF7GYxS2Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c464dc811babfe316ed4ab7bbc12351122e69dd7", + "rev": "5a82107589e6ba78a14b9a00c9ba268f1329a13f", "type": "github" }, "original": { From 67aa9684deb5a1ee6d9f31a8020ac6c0bea60ace Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 8 Aug 2021 02:21:43 +0200 Subject: [PATCH 061/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/2230a3cd6abcbc1be1af27c19db45c926281fe5c' -> 'github:nix-community/emacs-overlay/cd04543c0155979dc019213a434e71734455e903' * Updated 'home-manager': 'github:nix-community/home-manager/7f976da06840c268cc291a021bab7532b923713c' -> 'github:nix-community/home-manager/b0d769691cc379c9ab91d3acec5d14e75c02c02b' * Updated 'master': 'github:nixos/nixpkgs/87fa42c9378b29112875fa0beb85bb505a911315' -> 'github:nixos/nixpkgs/c61e6fa01e9d168d9dda87aa055e8b05d1d48ee2' * Updated 'nix': 'github:nixos/nix/d64f9671fcce47e792974b372dc72de8c49994b7' -> 'github:nixos/nix/e277c0c479d58bcd0f55e71ec9ebe43a6161a1d4' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/ff1ea3a36c1dfafdf0490e0d144c5a0ed0891bb9' -> 'github:nixos/nixpkgs/733682c32929293341f113f297b64ea6319e9089' * Updated 'unstable': 'github:nixos/nixpkgs/5a82107589e6ba78a14b9a00c9ba268f1329a13f' -> 'github:nixos/nixpkgs/439b1605227b8adb1357b55ce8529d541abbe9eb' --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e6d31734..5edde84d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628242158, - "narHash": "sha256-Dp26OowfEuQ8z9Agp5Glt9dsCJFnRM7SHK9ZYdEcnyg=", + "lastModified": 1628356768, + "narHash": "sha256-MYnHBDAH1pF3jCvsnxjfECD2PP0t1ODVFH6SnzIc2FQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2230a3cd6abcbc1be1af27c19db45c926281fe5c", + "rev": "cd04543c0155979dc019213a434e71734455e903", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1627592512, - "narHash": "sha256-+bauwACGl+/dTQB047XImRz5P6Lp6vxl5ruiKjtENxo=", + "lastModified": 1628287034, + "narHash": "sha256-pWMEpQQcKxBy0OKskFLXJHEyGYJIiMu/BUQjCWxGF38=", "owner": "nix-community", "repo": "home-manager", - "rev": "7f976da06840c268cc291a021bab7532b923713c", + "rev": "b0d769691cc379c9ab91d3acec5d14e75c02c02b", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628262933, - "narHash": "sha256-Qlx3MSBqCDedgR/xbDwzx4Oo6v8I/0EqNA7egI9ERMU=", + "lastModified": 1628381945, + "narHash": "sha256-dKf0gL7MLRV3GvvWMsuYiV3dF/vxdzPb5vBVThGPhG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "87fa42c9378b29112875fa0beb85bb505a911315", + "rev": "c61e6fa01e9d168d9dda87aa055e8b05d1d48ee2", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1628169187, - "narHash": "sha256-kkivOa+RCF8F+PVEwKstLyJcCWEmZ//q+SfwCqJOv5s=", + "lastModified": 1628264471, + "narHash": "sha256-aZ+IbRRP0jhdHNZ5nRrpFIRgBaF2eDrDcj4MiI1UHes=", "owner": "nixos", "repo": "nix", - "rev": "d64f9671fcce47e792974b372dc72de8c49994b7", + "rev": "e277c0c479d58bcd0f55e71ec9ebe43a6161a1d4", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628165821, - "narHash": "sha256-I/e2Y1TjUkaM787s3gaeaB8X2OvinP/ueZpYnJjN6G4=", + "lastModified": 1628186972, + "narHash": "sha256-wWXlIQdZq/EtlBAGFJ62YHYEnJclxCuUOUGnrQqJ3zg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff1ea3a36c1dfafdf0490e0d144c5a0ed0891bb9", + "rev": "733682c32929293341f113f297b64ea6319e9089", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628121754, - "narHash": "sha256-WQJSvlP/4f1pJCPM9Se+0x606jrUNgDiIUvF7GYxS2Q=", + "lastModified": 1628199198, + "narHash": "sha256-DkMFcm5VdqbausjUjyHWGBlcXNw/EMFiQpiCY5KKtMo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a82107589e6ba78a14b9a00c9ba268f1329a13f", + "rev": "439b1605227b8adb1357b55ce8529d541abbe9eb", "type": "github" }, "original": { From 63bb47004e75032c4ff3706d35b3930532d4f8c5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 8 Aug 2021 23:11:07 +0200 Subject: [PATCH 062/303] fix build problems introduced by nix-community/home-manager#1758 --- home/modules/languages/clojure/default.nix | 2 +- home/modules/languages/erlang/default.nix | 2 +- home/modules/languages/go/default.nix | 2 +- home/modules/languages/nix/default.nix | 2 +- home/modules/languages/rust/default.nix | 2 +- home/modules/languages/tex/default.nix | 2 +- home/modules/profiles/development/default.nix | 2 +- home/modules/programs/emacs/default.nix | 4 ++-- oldstuff/home/modules/languages/c/default.nix | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/home/modules/languages/clojure/default.nix b/home/modules/languages/clojure/default.nix index 4bf20dde..7064e99f 100644 --- a/home/modules/languages/clojure/default.nix +++ b/home/modules/languages/clojure/default.nix @@ -16,7 +16,7 @@ in languages = [ "clojure" ]; }; - extraConfig = '' + extraInit = '' (setenv "PATH" (concat "${pkgs.leiningen}/bin:" (getenv "PATH"))) (setq lsp-clojure-server-command '("${pkgs.bash}/bin/bash" "-c" "${pkgs.clojure-lsp}/bin/clojure-lsp")) diff --git a/home/modules/languages/erlang/default.nix b/home/modules/languages/erlang/default.nix index f57f602e..fc9c636e 100644 --- a/home/modules/languages/erlang/default.nix +++ b/home/modules/languages/erlang/default.nix @@ -21,7 +21,7 @@ in languages = [ "erlang" ]; }; - programs.emacs.extraConfig = '' + programs.emacs.extraInit = '' ;; Configure erlang related stuff (setq lsp-erlang-server-path "${erlang-ls}/bin/erlang_ls") diff --git a/home/modules/languages/go/default.nix b/home/modules/languages/go/default.nix index 60755bc6..e459eeaf 100644 --- a/home/modules/languages/go/default.nix +++ b/home/modules/languages/go/default.nix @@ -17,7 +17,7 @@ in home.packages = [ pkgs.go ]; - programs.emacs.extraConfig = '' + programs.emacs.extraInit = '' (add-to-list 'exec-path "${pkgs.gopls}/bin") (add-hook 'go-mode-hook diff --git a/home/modules/languages/nix/default.nix b/home/modules/languages/nix/default.nix index 442b7755..8f6760a2 100644 --- a/home/modules/languages/nix/default.nix +++ b/home/modules/languages/nix/default.nix @@ -10,7 +10,7 @@ in config = lib.mkIf cfg.enable { programs.emacs.extraPackages = ep: [ ep.lsp-mode ep.nix-mode ep.flycheck ]; - programs.emacs.extraConfig = '' + programs.emacs.extraInit = '' (require 'lsp-mode) ;; make lsp-mode aware of nix diff --git a/home/modules/languages/rust/default.nix b/home/modules/languages/rust/default.nix index 864837e4..6b6d79cc 100644 --- a/home/modules/languages/rust/default.nix +++ b/home/modules/languages/rust/default.nix @@ -15,7 +15,7 @@ in languages = [ "rust" ]; }; - programs.emacs.extraConfig = '' + programs.emacs.extraInit = '' (setq lsp-rust-rls-server-command "rls") (add-hook 'rust-mode-hook diff --git a/home/modules/languages/tex/default.nix b/home/modules/languages/tex/default.nix index 030f480b..aaad18c4 100644 --- a/home/modules/languages/tex/default.nix +++ b/home/modules/languages/tex/default.nix @@ -14,7 +14,7 @@ in enable = true; }; - programs.emacs.extraConfig = '' + programs.emacs.extraInit = '' (add-to-list 'exec-path "${pkgs.texlab}/bin") (add-hook 'tex-mode-hook diff --git a/home/modules/profiles/development/default.nix b/home/modules/profiles/development/default.nix index 90c8aa6e..7e99576f 100644 --- a/home/modules/profiles/development/default.nix +++ b/home/modules/profiles/development/default.nix @@ -11,7 +11,7 @@ in config = lib.mkIf cfg.enable { programs.emacs = { extraPackages = ep: [ ep.magit ]; - extraConfig = '' + extraInit = '' ;; prepare magit use from shell (require 'magit) (global-git-commit-mode) diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 744605af..381c5358 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -61,7 +61,7 @@ in })); }; - extraConfig = lib.mkOption { + extraInit = lib.mkOption { type = lib.types.lines; default = ""; description = '' @@ -76,7 +76,7 @@ in }; config = lib.mkIf emacsEnabled { - programs.emacs.extraConfig = '' + programs.emacs.extraInit = '' ;; adjust the load-path to find further down required files (add-to-list 'load-path (expand-file-name "lisp" user-emacs-directory)) diff --git a/oldstuff/home/modules/languages/c/default.nix b/oldstuff/home/modules/languages/c/default.nix index 3744a7ab..4fdf08ab 100644 --- a/oldstuff/home/modules/languages/c/default.nix +++ b/oldstuff/home/modules/languages/c/default.nix @@ -19,7 +19,7 @@ in languages = [ "c" "c++" ]; }; - programs.emacs.extraConfig = '' + programs.emacs.extraInit = '' (setq lsp-clients-clangd-executable "${pkgs.clang-tools}/bin/clangd") ''; }; From 53fbbb39f326c1f3e53bce698cb0a6c134e0bb95 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 9 Aug 2021 06:37:18 +0200 Subject: [PATCH 063/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/cd04543c0155979dc019213a434e71734455e903' -> 'github:nix-community/emacs-overlay/73538fa26b715cc7b4d265ee7b0c582e6c27fe4c' * Updated 'home-manager': 'github:nix-community/home-manager/b0d769691cc379c9ab91d3acec5d14e75c02c02b' -> 'github:nix-community/home-manager/2c4234cb79684646657f9cfcd4075c3122845670' * Updated 'master': 'github:nixos/nixpkgs/c61e6fa01e9d168d9dda87aa055e8b05d1d48ee2' -> 'github:nixos/nixpkgs/5f746317f10f7206f1dbb8dfcfc2257b04507eee' * Updated 'unstable': 'github:nixos/nixpkgs/439b1605227b8adb1357b55ce8529d541abbe9eb' -> 'github:nixos/nixpkgs/0dde103318090f77ac95ef7fc26fe0cdd00fa0b3' --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5edde84d..7a641202 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628356768, - "narHash": "sha256-MYnHBDAH1pF3jCvsnxjfECD2PP0t1ODVFH6SnzIc2FQ=", + "lastModified": 1628473758, + "narHash": "sha256-EKTy/96QK+krye7RU/nFBxMI5GdBGgxp+Ik6B7fv6mQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cd04543c0155979dc019213a434e71734455e903", + "rev": "73538fa26b715cc7b4d265ee7b0c582e6c27fe4c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628287034, - "narHash": "sha256-pWMEpQQcKxBy0OKskFLXJHEyGYJIiMu/BUQjCWxGF38=", + "lastModified": 1628468976, + "narHash": "sha256-NHgYsXZuLWEePrC+65b8EtKQg714H9NB7cO4BM4V5JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0d769691cc379c9ab91d3acec5d14e75c02c02b", + "rev": "2c4234cb79684646657f9cfcd4075c3122845670", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628381945, - "narHash": "sha256-dKf0gL7MLRV3GvvWMsuYiV3dF/vxdzPb5vBVThGPhG8=", + "lastModified": 1628477318, + "narHash": "sha256-oxfAhBIaKfNOUKHybnY7Ur8we7nNFXb+DUD1VdR5pfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c61e6fa01e9d168d9dda87aa055e8b05d1d48ee2", + "rev": "5f746317f10f7206f1dbb8dfcfc2257b04507eee", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628199198, - "narHash": "sha256-DkMFcm5VdqbausjUjyHWGBlcXNw/EMFiQpiCY5KKtMo=", + "lastModified": 1628287055, + "narHash": "sha256-YwxtAt25pZofJT/e4sxw9cFBaFok+zgIy04HFV0rDd0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "439b1605227b8adb1357b55ce8529d541abbe9eb", + "rev": "0dde103318090f77ac95ef7fc26fe0cdd00fa0b3", "type": "github" }, "original": { From ed32560d1860d51df47b82fb28482d7f7fe1872f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 9 Aug 2021 06:37:57 +0200 Subject: [PATCH 064/303] start the switch script --- apps/switch/default.nix | 38 ++++++++++++++++++++++++++++++++++++++ apps/switch/switch.mjs | 18 ++++++++++++++++++ flake.nix | 1 + 3 files changed, 57 insertions(+) create mode 100644 apps/switch/default.nix create mode 100644 apps/switch/switch.mjs diff --git a/apps/switch/default.nix b/apps/switch/default.nix new file mode 100644 index 00000000..4bf981bf --- /dev/null +++ b/apps/switch/default.nix @@ -0,0 +1,38 @@ +{ self, unstable, ... }: + +let + pkgs = import unstable { system = "x86_64-linux"; }; + type = "app"; + program = "${switch}/bin/switch"; + + nixosConfigs = pkgs.writeText "nixosConfigs" '' + ${__toJSON (__attrNames self.nixosConfigurations)} + ''; + + homeConfigs = pkgs.writeText "homeConfigs" '' + ${__toJSON (__attrNames self.homeConfigurations)} + ''; + + switch = pkgs.stdenv.mkDerivation { + pname = "nobbz-flake-switcher"; + version = "0.0.1"; + + buildInputs = [ self.packages.x86_64-linux.zx ]; + + src = ./.; + + installPhase = '' + mkdir -p $out/{bin,lib} + + cat < $out/bin/switch + #!${pkgs.bash}/bin/bash + + exec $out/lib/switch.mjs --nixos ${nixosConfigs} --home ${homeConfigs} "\$@" + EOF + chmod ugo=rx $out/bin/switch + + install --mode=555 switch.mjs $out/lib/switch.mjs + ''; + }; +in +{ inherit type program; } diff --git a/apps/switch/switch.mjs b/apps/switch/switch.mjs new file mode 100644 index 00000000..c1d43146 --- /dev/null +++ b/apps/switch/switch.mjs @@ -0,0 +1,18 @@ +#!/usr/bin/env zx + +console.log(process.argv.slice(2)) + +console.log(argv) + +console.log("loading nixos names") + +const nixosConfigs = JSON.parse(await fs.readFile(argv.nixos)) + +console.log("loading home manager names") + +const homeConfigs = JSON.parse(await fs.readFile(argv.home)) + +console.log("finished reading inputs") + +nixosConfigs.map(val => console.log(val)) +homeConfigs.map(val => console.log(val)) \ No newline at end of file diff --git a/flake.nix b/flake.nix index ee114227..772d490d 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ apps.x86_64-linux = { update = import ./apps/update inputs; + switch = import ./apps/switch inputs; }; }; } From 8b85eb4e283ac029453d0e0af34d2ceaa4146b41 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 9 Aug 2021 08:03:54 +0200 Subject: [PATCH 065/303] current host and user switch --- apps/switch/switch.mjs | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/apps/switch/switch.mjs b/apps/switch/switch.mjs index c1d43146..e698fc36 100644 --- a/apps/switch/switch.mjs +++ b/apps/switch/switch.mjs @@ -1,18 +1,36 @@ #!/usr/bin/env zx +const info = (line) => console.log(chalk.yellow(line)); + +const trim = (str) => str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, ''); + console.log(process.argv.slice(2)) console.log(argv) -console.log("loading nixos names") +info("loading nixos names") const nixosConfigs = JSON.parse(await fs.readFile(argv.nixos)) -console.log("loading home manager names") +info("loading home manager names") const homeConfigs = JSON.parse(await fs.readFile(argv.home)) -console.log("finished reading inputs") +info("reading hostname"); + +const hostName = (await fs.readFile("/etc/hostname", "utf8")).trim() + +info("reading user"); + +const user = process.env.USER.trim(); + +info("finished reading inputs") + +const targets = [ + `.#nixos/config/${hostName}`, + `.#home/config/${user}@${hostName}`, +] + +await $`nix build --keep-going -L ${targets}` -nixosConfigs.map(val => console.log(val)) -homeConfigs.map(val => console.log(val)) \ No newline at end of file +await $`sudo nixos-rebuild switch --flake .#${hostName}` \ No newline at end of file From 04bd38aca76d91aebbade3f72c9e9a9e8b834b76 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 10 Aug 2021 06:37:22 +0200 Subject: [PATCH 066/303] use correct option to build init.el --- home/modules/programs/emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 381c5358..4003d01c 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -159,7 +159,7 @@ in ".emacs.d/init.el" = { text = config.lib.emacs.generatePackage "init" "Initialises emacs configuration" [ ] [ ] - cfg.extraConfig; + cfg.extraInit; }; }; }; From 49324e5db312d02ccf888a58d032e1425fad71a0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 9 Aug 2021 06:37:18 +0200 Subject: [PATCH 067/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/cd04543c0155979dc019213a434e71734455e903' -> 'github:nix-community/emacs-overlay/73538fa26b715cc7b4d265ee7b0c582e6c27fe4c' * Updated 'home-manager': 'github:nix-community/home-manager/b0d769691cc379c9ab91d3acec5d14e75c02c02b' -> 'github:nix-community/home-manager/2c4234cb79684646657f9cfcd4075c3122845670' * Updated 'master': 'github:nixos/nixpkgs/c61e6fa01e9d168d9dda87aa055e8b05d1d48ee2' -> 'github:nixos/nixpkgs/5f746317f10f7206f1dbb8dfcfc2257b04507eee' * Updated 'unstable': 'github:nixos/nixpkgs/439b1605227b8adb1357b55ce8529d541abbe9eb' -> 'github:nixos/nixpkgs/0dde103318090f77ac95ef7fc26fe0cdd00fa0b3' --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5edde84d..7a641202 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628356768, - "narHash": "sha256-MYnHBDAH1pF3jCvsnxjfECD2PP0t1ODVFH6SnzIc2FQ=", + "lastModified": 1628473758, + "narHash": "sha256-EKTy/96QK+krye7RU/nFBxMI5GdBGgxp+Ik6B7fv6mQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cd04543c0155979dc019213a434e71734455e903", + "rev": "73538fa26b715cc7b4d265ee7b0c582e6c27fe4c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628287034, - "narHash": "sha256-pWMEpQQcKxBy0OKskFLXJHEyGYJIiMu/BUQjCWxGF38=", + "lastModified": 1628468976, + "narHash": "sha256-NHgYsXZuLWEePrC+65b8EtKQg714H9NB7cO4BM4V5JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0d769691cc379c9ab91d3acec5d14e75c02c02b", + "rev": "2c4234cb79684646657f9cfcd4075c3122845670", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628381945, - "narHash": "sha256-dKf0gL7MLRV3GvvWMsuYiV3dF/vxdzPb5vBVThGPhG8=", + "lastModified": 1628477318, + "narHash": "sha256-oxfAhBIaKfNOUKHybnY7Ur8we7nNFXb+DUD1VdR5pfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c61e6fa01e9d168d9dda87aa055e8b05d1d48ee2", + "rev": "5f746317f10f7206f1dbb8dfcfc2257b04507eee", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628199198, - "narHash": "sha256-DkMFcm5VdqbausjUjyHWGBlcXNw/EMFiQpiCY5KKtMo=", + "lastModified": 1628287055, + "narHash": "sha256-YwxtAt25pZofJT/e4sxw9cFBaFok+zgIy04HFV0rDd0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "439b1605227b8adb1357b55ce8529d541abbe9eb", + "rev": "0dde103318090f77ac95ef7fc26fe0cdd00fa0b3", "type": "github" }, "original": { From 4691a85ed7af994b8d3612a47e5dbbdbd221a58e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 10 Aug 2021 06:41:12 +0200 Subject: [PATCH 068/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/73538fa26b715cc7b4d265ee7b0c582e6c27fe4c' -> 'github:nix-community/emacs-overlay/29829efa3367108398a024db927263d95a55bba2' * Updated 'home-manager': 'github:nix-community/home-manager/2c4234cb79684646657f9cfcd4075c3122845670' -> 'github:nix-community/home-manager/5515ec99cc1a8df5b8ca2204f752e1501572fa1b' * Updated 'master': 'github:nixos/nixpkgs/5f746317f10f7206f1dbb8dfcfc2257b04507eee' -> 'github:nixos/nixpkgs/53bd44342d22b53677b245c15de6e8f8a37718d0' * Updated 'nix': 'github:nixos/nix/e277c0c479d58bcd0f55e71ec9ebe43a6161a1d4' -> 'github:nixos/nix/8943e3176d5a94088a2018c3415f2f34fe9309d1' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/733682c32929293341f113f297b64ea6319e9089' -> 'github:nixos/nixpkgs/b09c989b82f7a4f7319802a1dcf8bfe859d65362' * Updated 'unstable': 'github:nixos/nixpkgs/0dde103318090f77ac95ef7fc26fe0cdd00fa0b3' -> 'github:nixos/nixpkgs/6ef4f522d63f22b40004319778761040d3197390' --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 7a641202..af407c3a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628473758, - "narHash": "sha256-EKTy/96QK+krye7RU/nFBxMI5GdBGgxp+Ik6B7fv6mQ=", + "lastModified": 1628560239, + "narHash": "sha256-Tcq9yzD4fFi39skf+jjxmIXh5/d3fSHFqzJA3nTMeu0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "73538fa26b715cc7b4d265ee7b0c582e6c27fe4c", + "rev": "29829efa3367108398a024db927263d95a55bba2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628468976, - "narHash": "sha256-NHgYsXZuLWEePrC+65b8EtKQg714H9NB7cO4BM4V5JQ=", + "lastModified": 1628547133, + "narHash": "sha256-KCOyWv81NxRO2vgqtu09bbndXmy3T/0PkSfrXxnFN+8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c4234cb79684646657f9cfcd4075c3122845670", + "rev": "5515ec99cc1a8df5b8ca2204f752e1501572fa1b", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628477318, - "narHash": "sha256-oxfAhBIaKfNOUKHybnY7Ur8we7nNFXb+DUD1VdR5pfM=", + "lastModified": 1628565534, + "narHash": "sha256-GhiVo8+4kk7SyVM4juXJVvhblVlrXUbVLViB0ZMHrHE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f746317f10f7206f1dbb8dfcfc2257b04507eee", + "rev": "53bd44342d22b53677b245c15de6e8f8a37718d0", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1628264471, - "narHash": "sha256-aZ+IbRRP0jhdHNZ5nRrpFIRgBaF2eDrDcj4MiI1UHes=", + "lastModified": 1628532303, + "narHash": "sha256-vQ+gT1glaAtjlYI5GhLhgeRiGFSd4ImP5kVkZfhHtuk=", "owner": "nixos", "repo": "nix", - "rev": "e277c0c479d58bcd0f55e71ec9ebe43a6161a1d4", + "rev": "8943e3176d5a94088a2018c3415f2f34fe9309d1", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628186972, - "narHash": "sha256-wWXlIQdZq/EtlBAGFJ62YHYEnJclxCuUOUGnrQqJ3zg=", + "lastModified": 1628523294, + "narHash": "sha256-qMkH/JRRmcqb/eOa/pKksrKGOy2YEPQNH/457QyoyFg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "733682c32929293341f113f297b64ea6319e9089", + "rev": "b09c989b82f7a4f7319802a1dcf8bfe859d65362", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628287055, - "narHash": "sha256-YwxtAt25pZofJT/e4sxw9cFBaFok+zgIy04HFV0rDd0=", + "lastModified": 1628465643, + "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0dde103318090f77ac95ef7fc26fe0cdd00fa0b3", + "rev": "6ef4f522d63f22b40004319778761040d3197390", "type": "github" }, "original": { From ca8ba1f2644ebbe3751f23e6e90cb72e47f4f229 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 11 Aug 2021 07:25:37 +0200 Subject: [PATCH 069/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/29829efa3367108398a024db927263d95a55bba2' -> 'github:nix-community/emacs-overlay/3fbe6cf3459cf955e188444b68f085f7a45b6ffa' * Updated 'home-manager': 'github:nix-community/home-manager/5515ec99cc1a8df5b8ca2204f752e1501572fa1b' -> 'github:nix-community/home-manager/a4a83078976025f2dc6aaca35b20880735f7baa3' * Updated 'master': 'github:nixos/nixpkgs/53bd44342d22b53677b245c15de6e8f8a37718d0' -> 'github:nixos/nixpkgs/6b9dc66a14e3e9aaf927d8071388043e98a5aa9e' * Updated 'nix': 'github:nixos/nix/8943e3176d5a94088a2018c3415f2f34fe9309d1' -> 'github:nixos/nix/a6ba313a0aac3b6e2fef434cb42d190a0849238e' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/b09c989b82f7a4f7319802a1dcf8bfe859d65362' -> 'github:nixos/nixpkgs/2d6ab6c6b92f7aaf8bc53baba9754b9bfdce56f2' * Updated 'unstable': 'github:nixos/nixpkgs/6ef4f522d63f22b40004319778761040d3197390' -> 'github:nixos/nixpkgs/fe01052444c1d66ed6ef76df2af798c9769e9e79' --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index af407c3a..ca0d8bb0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628560239, - "narHash": "sha256-Tcq9yzD4fFi39skf+jjxmIXh5/d3fSHFqzJA3nTMeu0=", + "lastModified": 1628646917, + "narHash": "sha256-JZYFV6tTt305iSNr3jEW4VGTsbLAPkcOwBYB2PGkp0I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "29829efa3367108398a024db927263d95a55bba2", + "rev": "3fbe6cf3459cf955e188444b68f085f7a45b6ffa", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628547133, - "narHash": "sha256-KCOyWv81NxRO2vgqtu09bbndXmy3T/0PkSfrXxnFN+8=", + "lastModified": 1628631012, + "narHash": "sha256-/QEIuwoWeELkAZAOx3uqLr1xsVeGdo8KKgnDUhQtcr8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5515ec99cc1a8df5b8ca2204f752e1501572fa1b", + "rev": "a4a83078976025f2dc6aaca35b20880735f7baa3", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628565534, - "narHash": "sha256-GhiVo8+4kk7SyVM4juXJVvhblVlrXUbVLViB0ZMHrHE=", + "lastModified": 1628656692, + "narHash": "sha256-ejh23pGAAapHsoetRqEaID/AvlFQCKJ0qj2a75JH9Ao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53bd44342d22b53677b245c15de6e8f8a37718d0", + "rev": "6b9dc66a14e3e9aaf927d8071388043e98a5aa9e", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1628532303, - "narHash": "sha256-vQ+gT1glaAtjlYI5GhLhgeRiGFSd4ImP5kVkZfhHtuk=", + "lastModified": 1628586117, + "narHash": "sha256-8hS4xy7fq3z9XZIMYm4sQi9SzhcYqEJfdbwgDePoWuc=", "owner": "nixos", "repo": "nix", - "rev": "8943e3176d5a94088a2018c3415f2f34fe9309d1", + "rev": "a6ba313a0aac3b6e2fef434cb42d190a0849238e", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628523294, - "narHash": "sha256-qMkH/JRRmcqb/eOa/pKksrKGOy2YEPQNH/457QyoyFg=", + "lastModified": 1628607662, + "narHash": "sha256-TT7jldaYFtHGdVX/yE6FjdpPdNY01xIygB2zGjzFTqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b09c989b82f7a4f7319802a1dcf8bfe859d65362", + "rev": "2d6ab6c6b92f7aaf8bc53baba9754b9bfdce56f2", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628465643, - "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", + "lastModified": 1628605906, + "narHash": "sha256-XqCCPDIIG4zMPJ/V757FgzGM2zypcRb1BY7u/DqHKX0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ef4f522d63f22b40004319778761040d3197390", + "rev": "fe01052444c1d66ed6ef76df2af798c9769e9e79", "type": "github" }, "original": { From c777599995a9a9aca1bac9125f2343d4f8e3d903 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 11 Aug 2021 10:18:11 +0200 Subject: [PATCH 070/303] mimas: disable IPv6 on docker --- nixos/configurations/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 267aae84..410d37d3 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -144,7 +144,7 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in # storageDriver = "zfs"; # extraOptions = "--storage-opt zfs.fsname=rpool/local/docker"; package = upkgs.docker; - extraOptions = "--ipv6 --dns 1.1.1.1"; + extraOptions = "--dns 1.1.1.1"; }; containers.enable = true; From cd6420838b3b69a1f2aa3edcbedb44a87c7e1401 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 11 Aug 2021 23:01:58 +0200 Subject: [PATCH 071/303] clean nix module a bit --- nixos/modules/nix.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index ef5335bb..04fafac3 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -22,17 +22,13 @@ in }; }; - config.nix.extraOptions = lib.mkIf (config.nix.experimentalFeatures != "") '' - experimental-features = ${config.nix.experimentalFeatures} - ''; - - config.nix.autoOptimiseStore = lib.mkDefault true; - - config.nix.gc.automatic = lib.mkDefault true; - config.nix.gc.options = lib.mkDefault "--delete-older-than 10d"; - - config.nixpkgs.config.allowUnfreePredicate = - if (allowed == [ ]) - then (_: false) - else (pkg: __elem (lib.getName pkg) allowed); + config = lib.mkMerge [ + (lib.mkIf (config.nix.experimentalFeatures != "") { nix.extraOptions = "experimental-features = ${config.nix.experimentalFeatures}"; }) + (lib.mkIf (allowed != [ ]) { nixpkgs.config.allowUnfreePredicate = (pkg: __elem (lib.getName pkg) allowed); }) + { nix.autoOptimiseStore = lib.mkDefault true; } + { + nix.gc.automatic = lib.mkDefault true; + nix.gc.options = lib.mkDefault "--delete-older-than 10d"; + } + ]; } From dfda8563ae403db99ef5dfc941175a7665e60443 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 12 Aug 2021 10:35:58 +0200 Subject: [PATCH 072/303] flake.lock: Update Flake input changes: * Updated 'emacs': 'github:nix-community/emacs-overlay/3fbe6cf3459cf955e188444b68f085f7a45b6ffa' -> 'github:nix-community/emacs-overlay/4947b85a89f10799ef9b8bc1ee924c47f7919363' * Updated 'home-manager': 'github:nix-community/home-manager/a4a83078976025f2dc6aaca35b20880735f7baa3' -> 'github:nix-community/home-manager/604561ba9ac45ee30385670b18f15731c541287b' * Updated 'master': 'github:nixos/nixpkgs/6b9dc66a14e3e9aaf927d8071388043e98a5aa9e' -> 'github:nixos/nixpkgs/3276b62e6639096014652132f4824ac2b4f2a2c4' * Updated 'nix': 'github:nixos/nix/a6ba313a0aac3b6e2fef434cb42d190a0849238e' -> 'github:nixos/nix/43856b0d6da94fe9bafea2f6b3a1720d31967abd' * Updated 'nix/nixpkgs': 'github:NixOS/nixpkgs/f77036342e2b690c61c97202bf48f2ce13acc022' -> 'github:NixOS/nixpkgs/f6551e1efa261568c82b76c3a582b2c2ceb1f53f' * Updated 'nixpkgs-2105': 'github:nixos/nixpkgs/2d6ab6c6b92f7aaf8bc53baba9754b9bfdce56f2' -> 'github:nixos/nixpkgs/927ce1afc1db40869a463a37ea2738c27d425f80' * Updated 'unstable': 'github:nixos/nixpkgs/fe01052444c1d66ed6ef76df2af798c9769e9e79' -> 'github:nixos/nixpkgs/9df2cb074d72ea80ac9fd225b29060c8cf13dd39' --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index ca0d8bb0..9c79d766 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628646917, - "narHash": "sha256-JZYFV6tTt305iSNr3jEW4VGTsbLAPkcOwBYB2PGkp0I=", + "lastModified": 1628733533, + "narHash": "sha256-nBqxmdIEFvNGeitko87cpOoZ36IWE4eNOWBfK5DWVjo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3fbe6cf3459cf955e188444b68f085f7a45b6ffa", + "rev": "4947b85a89f10799ef9b8bc1ee924c47f7919363", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628631012, - "narHash": "sha256-/QEIuwoWeELkAZAOx3uqLr1xsVeGdo8KKgnDUhQtcr8=", + "lastModified": 1628717424, + "narHash": "sha256-s/9mf0dhnM0itctLEIVmQnwNZi0drtqI2WU/NPFEsgY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4a83078976025f2dc6aaca35b20880735f7baa3", + "rev": "604561ba9ac45ee30385670b18f15731c541287b", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628656692, - "narHash": "sha256-ejh23pGAAapHsoetRqEaID/AvlFQCKJ0qj2a75JH9Ao=", + "lastModified": 1628755700, + "narHash": "sha256-MLrsXqsGTqtjNl2vFrp+C/YPUwNGFgtBiTpRtBbMgJk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6b9dc66a14e3e9aaf927d8071388043e98a5aa9e", + "rev": "3276b62e6639096014652132f4824ac2b4f2a2c4", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1628586117, - "narHash": "sha256-8hS4xy7fq3z9XZIMYm4sQi9SzhcYqEJfdbwgDePoWuc=", + "lastModified": 1628716034, + "narHash": "sha256-35GI9uiux/E5t0MF6bFyn/1N/O/m8cOYyuq76SZ5vR0=", "owner": "nixos", "repo": "nix", - "rev": "a6ba313a0aac3b6e2fef434cb42d190a0849238e", + "rev": "43856b0d6da94fe9bafea2f6b3a1720d31967abd", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1624862269, - "narHash": "sha256-JFcsh2+7QtfKdJFoPibLFPLgIW6Ycnv8Bts9a7RYme0=", + "lastModified": 1628689438, + "narHash": "sha256-YMINW6YmubHZVdliGsAJpnnMYXRrvppv59LgwtnyYhs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f77036342e2b690c61c97202bf48f2ce13acc022", + "rev": "f6551e1efa261568c82b76c3a582b2c2ceb1f53f", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628607662, - "narHash": "sha256-TT7jldaYFtHGdVX/yE6FjdpPdNY01xIygB2zGjzFTqk=", + "lastModified": 1628696776, + "narHash": "sha256-K8+/IQNZDZltIu/KSf+Tz01OwNzTGgTch0ktMOWcxLg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d6ab6c6b92f7aaf8bc53baba9754b9bfdce56f2", + "rev": "927ce1afc1db40869a463a37ea2738c27d425f80", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628605906, - "narHash": "sha256-XqCCPDIIG4zMPJ/V757FgzGM2zypcRb1BY7u/DqHKX0=", + "lastModified": 1628693817, + "narHash": "sha256-WtlM8ptjcUUWRvbpkToKJHzLlGCEXZKGh+SfwUYHobA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe01052444c1d66ed6ef76df2af798c9769e9e79", + "rev": "9df2cb074d72ea80ac9fd225b29060c8cf13dd39", "type": "github" }, "original": { From bb014f515096706bd322e5de070e44183882ba08 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 13 Aug 2021 12:50:32 +0200 Subject: [PATCH 073/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/4947b85a89f10799ef9b8bc1ee924c47f7919363' (2021-08-12) → 'github:nix-community/emacs-overlay/a0ca2c855f2f0a21a8b3989e8ceee6f2f823027e' (2021-08-13) • Updated input 'home-manager': 'github:nix-community/home-manager/604561ba9ac45ee30385670b18f15731c541287b' (2021-08-11) → 'github:nix-community/home-manager/a965b097b1e0c3bcf22f39413afd1ec6cc1f5335' (2021-08-13) • Updated input 'master': 'github:nixos/nixpkgs/3276b62e6639096014652132f4824ac2b4f2a2c4' (2021-08-12) → 'github:nixos/nixpkgs/acc802ec9af5736168b54e83d3309d7f92ee6397' (2021-08-13) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/927ce1afc1db40869a463a37ea2738c27d425f80' (2021-08-11) → 'github:nixos/nixpkgs/ad6e733d633802620b5eec9be91e837973eac18a' (2021-08-12) • Updated input 'unstable': 'github:nixos/nixpkgs/9df2cb074d72ea80ac9fd225b29060c8cf13dd39' (2021-08-11) → 'github:nixos/nixpkgs/4138cbd913fad85073e59007710e3f083d0eb7c6' (2021-08-12) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9c79d766..73c64f0a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628733533, - "narHash": "sha256-nBqxmdIEFvNGeitko87cpOoZ36IWE4eNOWBfK5DWVjo=", + "lastModified": 1628846943, + "narHash": "sha256-0jnjXLvNBBcR+tUZnFxdFjEHKgDeFTl7YGnz7qZUqfE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4947b85a89f10799ef9b8bc1ee924c47f7919363", + "rev": "a0ca2c855f2f0a21a8b3989e8ceee6f2f823027e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628717424, - "narHash": "sha256-s/9mf0dhnM0itctLEIVmQnwNZi0drtqI2WU/NPFEsgY=", + "lastModified": 1628837533, + "narHash": "sha256-SQ+3ma51/vkJrk2ISiW1zVqcsQq+dqgUDkus6V5SxrU=", "owner": "nix-community", "repo": "home-manager", - "rev": "604561ba9ac45ee30385670b18f15731c541287b", + "rev": "a965b097b1e0c3bcf22f39413afd1ec6cc1f5335", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628755700, - "narHash": "sha256-MLrsXqsGTqtjNl2vFrp+C/YPUwNGFgtBiTpRtBbMgJk=", + "lastModified": 1628851581, + "narHash": "sha256-eyh3rAHVeJeamkFuBka3KP7jMlRbWSlZcCZPdizCx6g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3276b62e6639096014652132f4824ac2b4f2a2c4", + "rev": "acc802ec9af5736168b54e83d3309d7f92ee6397", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628696776, - "narHash": "sha256-K8+/IQNZDZltIu/KSf+Tz01OwNzTGgTch0ktMOWcxLg=", + "lastModified": 1628776130, + "narHash": "sha256-EyzdilgzoO8YCgck1lkOF1Bp+QVEazJBtuG5GkVY6xg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "927ce1afc1db40869a463a37ea2738c27d425f80", + "rev": "ad6e733d633802620b5eec9be91e837973eac18a", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628693817, - "narHash": "sha256-WtlM8ptjcUUWRvbpkToKJHzLlGCEXZKGh+SfwUYHobA=", + "lastModified": 1628779307, + "narHash": "sha256-ErivbgE5SGvNdFpq+Q50lw1JGGmvxBR/d71aW41S+1A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df2cb074d72ea80ac9fd225b29060c8cf13dd39", + "rev": "4138cbd913fad85073e59007710e3f083d0eb7c6", "type": "github" }, "original": { From 5b84b78f05ea89e21ad2f52fb055ea24ef6ca6b7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 14 Aug 2021 11:19:55 +0200 Subject: [PATCH 074/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/a0ca2c855f2f0a21a8b3989e8ceee6f2f823027e' (2021-08-13) → 'github:nix-community/emacs-overlay/8931da7b6c36bd2f6bce1190302e48d9dec26a80' (2021-08-14) • Updated input 'master': 'github:nixos/nixpkgs/acc802ec9af5736168b54e83d3309d7f92ee6397' (2021-08-13) → 'github:nixos/nixpkgs/c580b69c108d61e6dd95d08f4d636458001cc9f4' (2021-08-14) • Updated input 'nix': 'github:nixos/nix/43856b0d6da94fe9bafea2f6b3a1720d31967abd' (2021-08-11) → 'github:nixos/nix/d581129ef9ef5d7d65e676f6a7bfe36c82f6ea6e' (2021-08-13) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/ad6e733d633802620b5eec9be91e837973eac18a' (2021-08-12) → 'github:nixos/nixpkgs/a445f5829889959d65ad65e5c961d5c67e1cd677' (2021-08-13) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 73c64f0a..32093690 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628846943, - "narHash": "sha256-0jnjXLvNBBcR+tUZnFxdFjEHKgDeFTl7YGnz7qZUqfE=", + "lastModified": 1628932644, + "narHash": "sha256-R1xgH/vADxJ8P3MhPDF6LF6q3+LhfAaaagZhciY2aHo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a0ca2c855f2f0a21a8b3989e8ceee6f2f823027e", + "rev": "8931da7b6c36bd2f6bce1190302e48d9dec26a80", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628851581, - "narHash": "sha256-eyh3rAHVeJeamkFuBka3KP7jMlRbWSlZcCZPdizCx6g=", + "lastModified": 1628928292, + "narHash": "sha256-1t9z0Yej2o6kNTUraxPLuRAj9q0kR05tV7BUt6cWqDo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "acc802ec9af5736168b54e83d3309d7f92ee6397", + "rev": "c580b69c108d61e6dd95d08f4d636458001cc9f4", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1628716034, - "narHash": "sha256-35GI9uiux/E5t0MF6bFyn/1N/O/m8cOYyuq76SZ5vR0=", + "lastModified": 1628852017, + "narHash": "sha256-vcorRcdfMdhhvSav9x2DvYsem/wN2aKdtowPcNh2YKU=", "owner": "nixos", "repo": "nix", - "rev": "43856b0d6da94fe9bafea2f6b3a1720d31967abd", + "rev": "d581129ef9ef5d7d65e676f6a7bfe36c82f6ea6e", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628776130, - "narHash": "sha256-EyzdilgzoO8YCgck1lkOF1Bp+QVEazJBtuG5GkVY6xg=", + "lastModified": 1628865210, + "narHash": "sha256-dB3IA8AYUQDXH+Xy/6nbv4QpIbVl88DphbcxJSUYiX4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad6e733d633802620b5eec9be91e837973eac18a", + "rev": "a445f5829889959d65ad65e5c961d5c67e1cd677", "type": "github" }, "original": { From c0b002f0aa3ddd1e3c1aeb379335b34e18c48699 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 15 Aug 2021 08:32:52 +0200 Subject: [PATCH 075/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/8931da7b6c36bd2f6bce1190302e48d9dec26a80' (2021-08-14) → 'github:nix-community/emacs-overlay/e3179ac580e0401ee1f793f1ec30814fae13f3c7' (2021-08-15) • Updated input 'home-manager': 'github:nix-community/home-manager/a965b097b1e0c3bcf22f39413afd1ec6cc1f5335' (2021-08-13) → 'github:nix-community/home-manager/72f3bc6fa461a2899a06c87c137c7135e410e387' (2021-08-14) • Updated input 'master': 'github:nixos/nixpkgs/c580b69c108d61e6dd95d08f4d636458001cc9f4' (2021-08-14) → 'github:nixos/nixpkgs/52657498f71af8c0247e6d5f861a6c97534ccd87' (2021-08-15) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 32093690..e9ab5a51 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628932644, - "narHash": "sha256-R1xgH/vADxJ8P3MhPDF6LF6q3+LhfAaaagZhciY2aHo=", + "lastModified": 1628992202, + "narHash": "sha256-h2nv/lWPiCqh5gFwqq87QQNZN1ISy/Acyzr3w87S5qk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8931da7b6c36bd2f6bce1190302e48d9dec26a80", + "rev": "e3179ac580e0401ee1f793f1ec30814fae13f3c7", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628837533, - "narHash": "sha256-SQ+3ma51/vkJrk2ISiW1zVqcsQq+dqgUDkus6V5SxrU=", + "lastModified": 1628946811, + "narHash": "sha256-u/A1RzWyP88zbMwVFJ41BAkh9BTLbSLfCigrGAgyZKQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "a965b097b1e0c3bcf22f39413afd1ec6cc1f5335", + "rev": "72f3bc6fa461a2899a06c87c137c7135e410e387", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628928292, - "narHash": "sha256-1t9z0Yej2o6kNTUraxPLuRAj9q0kR05tV7BUt6cWqDo=", + "lastModified": 1629007363, + "narHash": "sha256-irPlPsSj//9ZEgJv6hEY2sQYPKWG6u9AShS53nfErPA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c580b69c108d61e6dd95d08f4d636458001cc9f4", + "rev": "52657498f71af8c0247e6d5f861a6c97534ccd87", "type": "github" }, "original": { From 380160457968049b0a99494c1ab194a414df474f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 15 Aug 2021 09:23:35 +0200 Subject: [PATCH 076/303] elixir-ls: 0.7.0 -> 0.8.0 --- packages/elixir-lsp/default.nix | 2 +- packages/elixir-lsp/source.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/elixir-lsp/default.nix b/packages/elixir-lsp/default.nix index 0cb8b767..ec1fbf47 100644 --- a/packages/elixir-lsp/default.nix +++ b/packages/elixir-lsp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { deps = fetchMixDeps { name = "${name}-${version}"; inherit src; - sha256 = "sha256-1SgqSBMtQb653qKKXXFMmNfYKOqEmXL6mbvjJJi2zLo="; + sha256 = "sha256-uG9Il5jpx4AUWStW4lXCjQvundlC58lSpKR6eB34Gf4="; }; src = fetchFromGitHub rec { diff --git a/packages/elixir-lsp/source.json b/packages/elixir-lsp/source.json index 860bf17d..d612f996 100644 --- a/packages/elixir-lsp/source.json +++ b/packages/elixir-lsp/source.json @@ -2,7 +2,7 @@ "fetchSubmodules": true, "owner": "elixir-lsp", "repo": "elixir-ls", - "rev": "f9ca65e05f13985c0a6270e6b9f4166f18a1357c", - "sha256": "+iwThFqiGQgh5APFlh2OPSclqq1B/I1QvVM6WAbDEDQ=", - "version": "0.7.0" + "rev": "b8e618eee426a83d1b8e54a40ab5d8c55c1f56b2", + "sha256": "pUvONMTYH8atF/p2Ep/K3bwJUDxTzCsxLPbpjP0tQpM=", + "version": "0.8.0" } From 8f3b54083f51672ad619e7715c45ec60703013a6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 15 Aug 2021 09:28:01 +0200 Subject: [PATCH 077/303] erlang-ls: 0.17.0 -> 0.18.0 --- packages/erlang-ls/source.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/erlang-ls/source.json b/packages/erlang-ls/source.json index 283d44b4..712f9a11 100644 --- a/packages/erlang-ls/source.json +++ b/packages/erlang-ls/source.json @@ -2,7 +2,7 @@ "fetchSubmodules": true, "owner": "erlang-ls", "repo": "erlang_ls", - "rev": "0.17.0", - "sha256": "sha256-XCXZ6+dcfgrHXgQx6Qa3NqosXP2NJKgB8puZQTpM72s=", - "version": "0.17.0" + "rev": "0.18.0", + "sha256": "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow=", + "version": "0.18.0" } From a2d727b208b392eccf6d19bcf088e2c90c9c26b5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 16 Aug 2021 07:37:14 +0200 Subject: [PATCH 078/303] mimas: enable gitea --- nixos/configurations/mimas.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 410d37d3..68da1f42 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -138,6 +138,8 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in hardware.opengl.enable = true; hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.beignet ]; + services.gitea.enable = true; + virtualisation = { docker = { enable = true; From a25a5946d19d42a7a59b19a6ae49fd4d7cc49a0d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 16 Aug 2021 07:39:10 +0200 Subject: [PATCH 079/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/e3179ac580e0401ee1f793f1ec30814fae13f3c7' (2021-08-15) → 'github:nix-community/emacs-overlay/c252073b4e9b5f62a9ba6e7bec3551bea2e26a32' (2021-08-16) • Updated input 'master': 'github:nixos/nixpkgs/52657498f71af8c0247e6d5f861a6c97534ccd87' (2021-08-15) → 'github:nixos/nixpkgs/802dd8829c7070025c658113bea229a42bbe9c6b' (2021-08-16) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/a445f5829889959d65ad65e5c961d5c67e1cd677' (2021-08-13) → 'github:nixos/nixpkgs/8ac785da9843aa110caeed6c912875e46a415a11' (2021-08-15) • Updated input 'unstable': 'github:nixos/nixpkgs/4138cbd913fad85073e59007710e3f083d0eb7c6' (2021-08-12) → 'github:nixos/nixpkgs/6fc5211eddddc02c50ca7f98d6cc377726417fa9' (2021-08-13) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e9ab5a51..2aa2ea7e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628992202, - "narHash": "sha256-h2nv/lWPiCqh5gFwqq87QQNZN1ISy/Acyzr3w87S5qk=", + "lastModified": 1629078857, + "narHash": "sha256-41dgUwB2FdFbR9M8gwCES+MWsbcDzGG6YdHlMsXMvGs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e3179ac580e0401ee1f793f1ec30814fae13f3c7", + "rev": "c252073b4e9b5f62a9ba6e7bec3551bea2e26a32", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629007363, - "narHash": "sha256-irPlPsSj//9ZEgJv6hEY2sQYPKWG6u9AShS53nfErPA=", + "lastModified": 1629091044, + "narHash": "sha256-bf6YbUvAeUh4x7LzTLRMGXHUowDu8vWvzkiJchjTK08=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52657498f71af8c0247e6d5f861a6c97534ccd87", + "rev": "802dd8829c7070025c658113bea229a42bbe9c6b", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628865210, - "narHash": "sha256-dB3IA8AYUQDXH+Xy/6nbv4QpIbVl88DphbcxJSUYiX4=", + "lastModified": 1629033443, + "narHash": "sha256-Vo3TvQvR5hsd3incx/xOt6GFgTm651CYVauHS/irOFo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a445f5829889959d65ad65e5c961d5c67e1cd677", + "rev": "8ac785da9843aa110caeed6c912875e46a415a11", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628779307, - "narHash": "sha256-ErivbgE5SGvNdFpq+Q50lw1JGGmvxBR/d71aW41S+1A=", + "lastModified": 1628869426, + "narHash": "sha256-7OetQdzAnml3+0b3pmr+reBKs9jn54IvVxbsncWzBn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4138cbd913fad85073e59007710e3f083d0eb7c6", + "rev": "6fc5211eddddc02c50ca7f98d6cc377726417fa9", "type": "github" }, "original": { From ec15c272d974876a44dd30caa35dc4d56e2ef170 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 18 Aug 2021 06:57:55 +0200 Subject: [PATCH 080/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/c252073b4e9b5f62a9ba6e7bec3551bea2e26a32' (2021-08-16) → 'github:nix-community/emacs-overlay/203f890b687c2d981200130549bda4df65349789' (2021-08-18) • Updated input 'home-manager': 'github:nix-community/home-manager/72f3bc6fa461a2899a06c87c137c7135e410e387' (2021-08-14) → 'github:nix-community/home-manager/a5c609b4b1cd4e1381ac8ea1b7d5b0792ebde0a3' (2021-08-18) • Updated input 'master': 'github:nixos/nixpkgs/802dd8829c7070025c658113bea229a42bbe9c6b' (2021-08-16) → 'github:nixos/nixpkgs/3788c68def67ca7949e0864c27638d484389363d' (2021-08-18) • Updated input 'nix': 'github:nixos/nix/d581129ef9ef5d7d65e676f6a7bfe36c82f6ea6e' (2021-08-13) → 'github:nixos/nix/2cd1a5b8f31627a09ac34afcbb0f76e90606204f' (2021-08-16) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/8ac785da9843aa110caeed6c912875e46a415a11' (2021-08-15) → 'github:nixos/nixpkgs/97c5d0cbe76901da0135b05cdbdfc5b068a7942c' (2021-08-17) • Updated input 'unstable': 'github:nixos/nixpkgs/6fc5211eddddc02c50ca7f98d6cc377726417fa9' (2021-08-13) → 'github:nixos/nixpkgs/23485f23ff8536592b5178a5d244f84da770bc87' (2021-08-16) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2aa2ea7e..dc05cdb2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629078857, - "narHash": "sha256-41dgUwB2FdFbR9M8gwCES+MWsbcDzGG6YdHlMsXMvGs=", + "lastModified": 1629250486, + "narHash": "sha256-L9izjLJUC9wzANrWAEYB1srD7Mf10XXtm3nv2XJHTcM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c252073b4e9b5f62a9ba6e7bec3551bea2e26a32", + "rev": "203f890b687c2d981200130549bda4df65349789", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628946811, - "narHash": "sha256-u/A1RzWyP88zbMwVFJ41BAkh9BTLbSLfCigrGAgyZKQ=", + "lastModified": 1629255483, + "narHash": "sha256-hG6CrmH6ltZbORAWnSLIo+NlRV8ICDN43yhnp03CEWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "72f3bc6fa461a2899a06c87c137c7135e410e387", + "rev": "a5c609b4b1cd4e1381ac8ea1b7d5b0792ebde0a3", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629091044, - "narHash": "sha256-bf6YbUvAeUh4x7LzTLRMGXHUowDu8vWvzkiJchjTK08=", + "lastModified": 1629252929, + "narHash": "sha256-Aj20gmGBs8TG7pyaQqgbsqAQ6cB+TVuL18Pk3DPBxcQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "802dd8829c7070025c658113bea229a42bbe9c6b", + "rev": "3788c68def67ca7949e0864c27638d484389363d", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1628852017, - "narHash": "sha256-vcorRcdfMdhhvSav9x2DvYsem/wN2aKdtowPcNh2YKU=", + "lastModified": 1629107809, + "narHash": "sha256-yxWNSVHYdBN6oD+zN3vv8pTZpjPsf/E7EpnsZNMdxlo=", "owner": "nixos", "repo": "nix", - "rev": "d581129ef9ef5d7d65e676f6a7bfe36c82f6ea6e", + "rev": "2cd1a5b8f31627a09ac34afcbb0f76e90606204f", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1629033443, - "narHash": "sha256-Vo3TvQvR5hsd3incx/xOt6GFgTm651CYVauHS/irOFo=", + "lastModified": 1629225863, + "narHash": "sha256-ewRb0HOyhtP0Z1Aei9MwsGmrfRusJ7tkIRkBjazS8Rc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8ac785da9843aa110caeed6c912875e46a415a11", + "rev": "97c5d0cbe76901da0135b05cdbdfc5b068a7942c", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628869426, - "narHash": "sha256-7OetQdzAnml3+0b3pmr+reBKs9jn54IvVxbsncWzBn0=", + "lastModified": 1629137058, + "narHash": "sha256-rOOLXq8/HcqlKNTJdSiPqB+kbYdcjBaGwqq6pP5IOfQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6fc5211eddddc02c50ca7f98d6cc377726417fa9", + "rev": "23485f23ff8536592b5178a5d244f84da770bc87", "type": "github" }, "original": { From 5ff0dc633bcbbe250b1781b6602fb08b513e37bd Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 18 Aug 2021 07:10:03 +0200 Subject: [PATCH 081/303] mimas: quick fix HTOP --- home/configurations/nmelzer@mimas.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index 41e6747f..8829c8ed 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -50,13 +50,15 @@ in programs.obs-studio.enable = true; programs.htop = { - detailedCpuTime = true; - meters.right = [ - { kind = "Battery"; mode = 1; } - "Tasks" - "LoadAverage" - "Uptime" - ]; + settings = { + detailed_cpu_time = true; + }; + # meters.right = [ + # { kind = "Battery"; mode = 1; } + # "Tasks" + # "LoadAverage" + # "Uptime" + # ]; }; xsession.windowManager.awesome.autostart = [ From 680ea648c770c7ae6aae91f25280cb8608401b63 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 19 Aug 2021 07:00:41 +0200 Subject: [PATCH 082/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/203f890b687c2d981200130549bda4df65349789' (2021-08-18) → 'github:nix-community/emacs-overlay/0b4721c2e99075f7eb879da4d3ace1ca8b7ada5a' (2021-08-19) • Updated input 'flake-utils': 'github:numtide/flake-utils/f7e004a55b120c02ecb6219596820fcd32ca8772' (2021-06-16) → 'github:numtide/flake-utils/c5d161cc0af116a2e17f54316f0bf43f0819785c' (2021-08-18) • Updated input 'home-manager': 'github:nix-community/home-manager/a5c609b4b1cd4e1381ac8ea1b7d5b0792ebde0a3' (2021-08-18) → 'github:nix-community/home-manager/bf6b85136b47ab1a76df4a90ea4850871147494a' (2021-08-19) • Updated input 'master': 'github:nixos/nixpkgs/3788c68def67ca7949e0864c27638d484389363d' (2021-08-18) → 'github:nixos/nixpkgs/6816676a4573410c036500e399f409f57d2e184f' (2021-08-19) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/97c5d0cbe76901da0135b05cdbdfc5b068a7942c' (2021-08-17) → 'github:nixos/nixpkgs/7bbca9877caed472c6b5866ea09302cfcdce3dbf' (2021-08-18) • Updated input 'unstable': 'github:nixos/nixpkgs/23485f23ff8536592b5178a5d244f84da770bc87' (2021-08-16) → 'github:nixos/nixpkgs/253aecf69ed7595aaefabde779aa6449195bebb7' (2021-08-18) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index dc05cdb2..ec6b327d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629250486, - "narHash": "sha256-L9izjLJUC9wzANrWAEYB1srD7Mf10XXtm3nv2XJHTcM=", + "lastModified": 1629336814, + "narHash": "sha256-nfbuttll1zx/u8YYZ9VZypis0CHv8ibkt04lf1gs3G8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "203f890b687c2d981200130549bda4df65349789", + "rev": "0b4721c2e99075f7eb879da4d3ace1ca8b7ada5a", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1629255483, - "narHash": "sha256-hG6CrmH6ltZbORAWnSLIo+NlRV8ICDN43yhnp03CEWE=", + "lastModified": 1629347633, + "narHash": "sha256-FGZJ7lmTAMIkjdrh6dIPck5HuB4KMT2GgDV5ZjiCWoc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a5c609b4b1cd4e1381ac8ea1b7d5b0792ebde0a3", + "rev": "bf6b85136b47ab1a76df4a90ea4850871147494a", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629252929, - "narHash": "sha256-Aj20gmGBs8TG7pyaQqgbsqAQ6cB+TVuL18Pk3DPBxcQ=", + "lastModified": 1629343283, + "narHash": "sha256-66w7+LGocWtSXw86uhZp0BoeyOCmVR7/FjvyaKMWUUA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3788c68def67ca7949e0864c27638d484389363d", + "rev": "6816676a4573410c036500e399f409f57d2e184f", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1629225863, - "narHash": "sha256-ewRb0HOyhtP0Z1Aei9MwsGmrfRusJ7tkIRkBjazS8Rc=", + "lastModified": 1629271619, + "narHash": "sha256-by9D3OkEKk4rOzJIMbC0uP2wP3Bt81auP5xmbmPg2a8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "97c5d0cbe76901da0135b05cdbdfc5b068a7942c", + "rev": "7bbca9877caed472c6b5866ea09302cfcdce3dbf", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1629137058, - "narHash": "sha256-rOOLXq8/HcqlKNTJdSiPqB+kbYdcjBaGwqq6pP5IOfQ=", + "lastModified": 1629292755, + "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23485f23ff8536592b5178a5d244f84da770bc87", + "rev": "253aecf69ed7595aaefabde779aa6449195bebb7", "type": "github" }, "original": { From 8e5dc6675d704a79e23aa2ca5d4fee09747ed40a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 19 Aug 2021 10:18:07 +0200 Subject: [PATCH 083/303] add emacs-pgtk-gcc --- packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/default.nix b/packages/default.nix index e8b4e7ae..8583f252 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -14,6 +14,7 @@ in "keyleds" = upkgs.callPackage ./keyleds { }; "dracula/konsole" = upkgs.callPackage ./dracula/konsole { }; "emacs" = epkgs.emacsGcc; + "emacsPgtkGcc" = epkgs.emacsPgtkGcc; "elixir-lsp" = upkgs.beam.packages.erlang.callPackage ./elixir-lsp { }; "erlang-ls" = upkgs.beam.packages.erlang.callPackage ./erlang-ls { }; "rofi/unicode" = upkgs.callPackage ./rofi-unicode { }; From c701f84e5a0b61b52b450df90f56b423de5d3841 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 20 Aug 2021 06:37:26 +0200 Subject: [PATCH 084/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/0b4721c2e99075f7eb879da4d3ace1ca8b7ada5a' (2021-08-19) → 'github:nix-community/emacs-overlay/3fb39c072d37b91002df4e11c0109ee004654d8c' (2021-08-20) • Updated input 'master': 'github:nixos/nixpkgs/6816676a4573410c036500e399f409f57d2e184f' (2021-08-19) → 'github:nixos/nixpkgs/abeef13d12fbc2eecc75c1138bdcc0b9ad22b32d' (2021-08-20) • Updated input 'nix': 'github:nixos/nix/2cd1a5b8f31627a09ac34afcbb0f76e90606204f' (2021-08-16) → 'github:nixos/nix/ffa629b2c0ea6368deca700afdac53a6e14557aa' (2021-08-19) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ec6b327d..4b5880fd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629336814, - "narHash": "sha256-nfbuttll1zx/u8YYZ9VZypis0CHv8ibkt04lf1gs3G8=", + "lastModified": 1629423968, + "narHash": "sha256-6n3CwyynvUD0weHgP1aAqmh4Dg1GzB9hHdTZpz9vEaU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0b4721c2e99075f7eb879da4d3ace1ca8b7ada5a", + "rev": "3fb39c072d37b91002df4e11c0109ee004654d8c", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629343283, - "narHash": "sha256-66w7+LGocWtSXw86uhZp0BoeyOCmVR7/FjvyaKMWUUA=", + "lastModified": 1629429679, + "narHash": "sha256-zMIDw9zEozrRhem6yS2b3/xOOmqK79eGc0bozqfjtSM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6816676a4573410c036500e399f409f57d2e184f", + "rev": "abeef13d12fbc2eecc75c1138bdcc0b9ad22b32d", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1629107809, - "narHash": "sha256-yxWNSVHYdBN6oD+zN3vv8pTZpjPsf/E7EpnsZNMdxlo=", + "lastModified": 1629360796, + "narHash": "sha256-KAcvr8eEhEqOQweDAsHurO9ECmfdptbU1UT7smcpyBs=", "owner": "nixos", "repo": "nix", - "rev": "2cd1a5b8f31627a09ac34afcbb0f76e90606204f", + "rev": "ffa629b2c0ea6368deca700afdac53a6e14557aa", "type": "github" }, "original": { From fce3737975313efaa549d9072f950c2785ac7da9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 20 Aug 2021 13:23:51 +0200 Subject: [PATCH 085/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/73538fa26b715cc7b4d265ee7b0c582e6c27fe4c' (2021-08-09) → 'github:nix-community/emacs-overlay/539db709fdedeb4d9e470cd62e590c970ff7d627' (2021-08-20) • Updated input 'flake-utils': 'github:numtide/flake-utils/f7e004a55b120c02ecb6219596820fcd32ca8772' (2021-06-16) → 'github:numtide/flake-utils/c5d161cc0af116a2e17f54316f0bf43f0819785c' (2021-08-18) • Updated input 'home-manager': 'github:nix-community/home-manager/2c4234cb79684646657f9cfcd4075c3122845670' (2021-08-09) → 'github:nix-community/home-manager/bf6b85136b47ab1a76df4a90ea4850871147494a' (2021-08-19) • Updated input 'master': 'github:nixos/nixpkgs/5f746317f10f7206f1dbb8dfcfc2257b04507eee' (2021-08-09) → 'github:nixos/nixpkgs/dc1f02f02a6a6fe2f041b3d299ee36f69d3d041b' (2021-08-20) • Updated input 'nix': 'github:nixos/nix/e277c0c479d58bcd0f55e71ec9ebe43a6161a1d4' (2021-08-06) → 'github:nixos/nix/7a54b10a8a29dadea2bb2c639a15cfec25a4d38c' (2021-08-20) • Updated input 'nix/nixpkgs': 'github:NixOS/nixpkgs/f77036342e2b690c61c97202bf48f2ce13acc022' (2021-06-28) → 'github:NixOS/nixpkgs/f6551e1efa261568c82b76c3a582b2c2ceb1f53f' (2021-08-11) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/733682c32929293341f113f297b64ea6319e9089' (2021-08-05) → 'github:nixos/nixpkgs/a1007637cea374bd1bafd754cfd5388894c49129' (2021-08-19) • Updated input 'unstable': 'github:nixos/nixpkgs/0dde103318090f77ac95ef7fc26fe0cdd00fa0b3' (2021-08-06) → 'github:nixos/nixpkgs/253aecf69ed7595aaefabde779aa6449195bebb7' (2021-08-18) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 7a641202..e96d6e55 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1628473758, - "narHash": "sha256-EKTy/96QK+krye7RU/nFBxMI5GdBGgxp+Ik6B7fv6mQ=", + "lastModified": 1629450651, + "narHash": "sha256-rURSzge/ahDDVpgOLYjNdP3oqKgolgisVHp2pEypnDo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "73538fa26b715cc7b4d265ee7b0c582e6c27fe4c", + "rev": "539db709fdedeb4d9e470cd62e590c970ff7d627", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1628468976, - "narHash": "sha256-NHgYsXZuLWEePrC+65b8EtKQg714H9NB7cO4BM4V5JQ=", + "lastModified": 1629347633, + "narHash": "sha256-FGZJ7lmTAMIkjdrh6dIPck5HuB4KMT2GgDV5ZjiCWoc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c4234cb79684646657f9cfcd4075c3122845670", + "rev": "bf6b85136b47ab1a76df4a90ea4850871147494a", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1628477318, - "narHash": "sha256-oxfAhBIaKfNOUKHybnY7Ur8we7nNFXb+DUD1VdR5pfM=", + "lastModified": 1629458213, + "narHash": "sha256-1uDpJFrtNklBHHoo/9Un0CimbJ09wdhCmPO9K2nT5Nc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f746317f10f7206f1dbb8dfcfc2257b04507eee", + "rev": "dc1f02f02a6a6fe2f041b3d299ee36f69d3d041b", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1628264471, - "narHash": "sha256-aZ+IbRRP0jhdHNZ5nRrpFIRgBaF2eDrDcj4MiI1UHes=", + "lastModified": 1629453556, + "narHash": "sha256-nlTEYae1JWor8cfazqLy39dzmtSgAttfjZXl3EajnTE=", "owner": "nixos", "repo": "nix", - "rev": "e277c0c479d58bcd0f55e71ec9ebe43a6161a1d4", + "rev": "7a54b10a8a29dadea2bb2c639a15cfec25a4d38c", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1624862269, - "narHash": "sha256-JFcsh2+7QtfKdJFoPibLFPLgIW6Ycnv8Bts9a7RYme0=", + "lastModified": 1628689438, + "narHash": "sha256-YMINW6YmubHZVdliGsAJpnnMYXRrvppv59LgwtnyYhs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f77036342e2b690c61c97202bf48f2ce13acc022", + "rev": "f6551e1efa261568c82b76c3a582b2c2ceb1f53f", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1628186972, - "narHash": "sha256-wWXlIQdZq/EtlBAGFJ62YHYEnJclxCuUOUGnrQqJ3zg=", + "lastModified": 1629379628, + "narHash": "sha256-dI8wpEo7wIVWoTUk2oyWFUnlVHNKLs+ren1TqITN1mI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "733682c32929293341f113f297b64ea6319e9089", + "rev": "a1007637cea374bd1bafd754cfd5388894c49129", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1628287055, - "narHash": "sha256-YwxtAt25pZofJT/e4sxw9cFBaFok+zgIy04HFV0rDd0=", + "lastModified": 1629292755, + "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0dde103318090f77ac95ef7fc26fe0cdd00fa0b3", + "rev": "253aecf69ed7595aaefabde779aa6449195bebb7", "type": "github" }, "original": { From c0828df5f640f7979bacf1a3df5f550472b669f5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 20 Aug 2021 16:16:18 +0200 Subject: [PATCH 086/303] finish the switch script --- apps/switch/switch.mjs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/switch/switch.mjs b/apps/switch/switch.mjs index e698fc36..b6f73e42 100644 --- a/apps/switch/switch.mjs +++ b/apps/switch/switch.mjs @@ -33,4 +33,15 @@ const targets = [ await $`nix build --keep-going -L ${targets}` +await fs.readdir('.') + .then(dirs => Promise.all(dirs + .filter(name => name.startsWith('result')) + .map(link => { + const activate = `./${link}/bin/home-manager-generation`; + + fs.stat(activate) + .then(() => $`${activate}`) + .catch(() => {}) + }))) + await $`sudo nixos-rebuild switch --flake .#${hostName}` \ No newline at end of file From 27a95e5f7685698d507445be33afe11bbb70da04 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 20 Aug 2021 22:45:36 +0200 Subject: [PATCH 087/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/539db709fdedeb4d9e470cd62e590c970ff7d627' (2021-08-20) → 'github:nix-community/emacs-overlay/31faed68033c6aff73002a57db29c8235ddfd112' (2021-08-20) • Updated input 'flake-utils': 'github:numtide/flake-utils/c5d161cc0af116a2e17f54316f0bf43f0819785c' (2021-08-18) → 'github:numtide/flake-utils/997f7efcb746a9c140ce1f13c72263189225f482' (2021-08-20) • Updated input 'master': 'github:nixos/nixpkgs/dc1f02f02a6a6fe2f041b3d299ee36f69d3d041b' (2021-08-20) → 'github:nixos/nixpkgs/200f2a7c58ed6b40b618377288c071314875fcd3' (2021-08-20) --- flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index e96d6e55..b764ebef 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629450651, - "narHash": "sha256-rURSzge/ahDDVpgOLYjNdP3oqKgolgisVHp2pEypnDo=", + "lastModified": 1629479494, + "narHash": "sha256-WOgUc7JcgpDyzafio+0JzLY4s1Y6vnkVx2VWR0Bvmew=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "539db709fdedeb4d9e470cd62e590c970ff7d627", + "rev": "31faed68033c6aff73002a57db29c8235ddfd112", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1629284811, + "lastModified": 1629481132, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "rev": "997f7efcb746a9c140ce1f13c72263189225f482", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629458213, - "narHash": "sha256-1uDpJFrtNklBHHoo/9Un0CimbJ09wdhCmPO9K2nT5Nc=", + "lastModified": 1629492157, + "narHash": "sha256-p4770cc58YXy9knxzXN/e2WibM3iIqJccX0AR2X5ni8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc1f02f02a6a6fe2f041b3d299ee36f69d3d041b", + "rev": "200f2a7c58ed6b40b618377288c071314875fcd3", "type": "github" }, "original": { From 47057f3f00e7ec8639aff25a8b00af157b65064b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 21 Aug 2021 10:18:32 +0200 Subject: [PATCH 088/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/31faed68033c6aff73002a57db29c8235ddfd112' (2021-08-20) → 'github:nix-community/emacs-overlay/069e2b93522c4b4e09f3a6f21c545125fa3cd79e' (2021-08-21) • Updated input 'home-manager': 'github:nix-community/home-manager/bf6b85136b47ab1a76df4a90ea4850871147494a' (2021-08-19) → 'github:nix-community/home-manager/4367119ca3e295513a71eafe839296410a73dbf0' (2021-08-21) • Updated input 'master': 'github:nixos/nixpkgs/200f2a7c58ed6b40b618377288c071314875fcd3' (2021-08-20) → 'github:nixos/nixpkgs/00125db0e92779dd3e3a4ffaec1a84d0fb8a5654' (2021-08-21) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b764ebef..e08aded0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629479494, - "narHash": "sha256-WOgUc7JcgpDyzafio+0JzLY4s1Y6vnkVx2VWR0Bvmew=", + "lastModified": 1629510754, + "narHash": "sha256-UxskcNMOHOFRQ6x8UQzClg6+SCFitq15rMdPXUNxRFk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "31faed68033c6aff73002a57db29c8235ddfd112", + "rev": "069e2b93522c4b4e09f3a6f21c545125fa3cd79e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1629347633, - "narHash": "sha256-FGZJ7lmTAMIkjdrh6dIPck5HuB4KMT2GgDV5ZjiCWoc=", + "lastModified": 1629524621, + "narHash": "sha256-+KoNE8oqSiumDnpi/MP81PR1P/6sIj8v2DpYfbYT3Aw=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf6b85136b47ab1a76df4a90ea4850871147494a", + "rev": "4367119ca3e295513a71eafe839296410a73dbf0", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629492157, - "narHash": "sha256-p4770cc58YXy9knxzXN/e2WibM3iIqJccX0AR2X5ni8=", + "lastModified": 1629533266, + "narHash": "sha256-l+i6dwI47armdk07bgwd7GxMzmHV5NIh+suLZgWRblo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "200f2a7c58ed6b40b618377288c071314875fcd3", + "rev": "00125db0e92779dd3e3a4ffaec1a84d0fb8a5654", "type": "github" }, "original": { From dd54818bfcff483275a37197f5d0f0b363ece93d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 23 Aug 2021 07:49:56 +0200 Subject: [PATCH 089/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/069e2b93522c4b4e09f3a6f21c545125fa3cd79e' (2021-08-21) → 'github:nix-community/emacs-overlay/a033b05f5dfaef2fcc0af32e63d9c69d8a3b410e' (2021-08-23) • Updated input 'home-manager': 'github:nix-community/home-manager/4367119ca3e295513a71eafe839296410a73dbf0' (2021-08-21) → 'github:nix-community/home-manager/f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa' (2021-08-22) • Updated input 'master': 'github:nixos/nixpkgs/00125db0e92779dd3e3a4ffaec1a84d0fb8a5654' (2021-08-21) → 'github:nixos/nixpkgs/da1d0c8056856b456d823ae472989b40ba3d9e92' (2021-08-23) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e08aded0..9d874d59 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629510754, - "narHash": "sha256-UxskcNMOHOFRQ6x8UQzClg6+SCFitq15rMdPXUNxRFk=", + "lastModified": 1629683097, + "narHash": "sha256-IUe/2jluwJpSD7SRq5PvaDPmnnxrAtsAC/fXp0/hoDw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "069e2b93522c4b4e09f3a6f21c545125fa3cd79e", + "rev": "a033b05f5dfaef2fcc0af32e63d9c69d8a3b410e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1629524621, - "narHash": "sha256-+KoNE8oqSiumDnpi/MP81PR1P/6sIj8v2DpYfbYT3Aw=", + "lastModified": 1629598480, + "narHash": "sha256-d07nc5Kf2MMKKVe47iIrBT+14/65g2nhEn+Z4PKjFmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4367119ca3e295513a71eafe839296410a73dbf0", + "rev": "f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629533266, - "narHash": "sha256-l+i6dwI47armdk07bgwd7GxMzmHV5NIh+suLZgWRblo=", + "lastModified": 1629696992, + "narHash": "sha256-EoM+UxcD4U8zuhR0Mna+LUqf7wBeS33aYN/QjsfuKTc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00125db0e92779dd3e3a4ffaec1a84d0fb8a5654", + "rev": "da1d0c8056856b456d823ae472989b40ba3d9e92", "type": "github" }, "original": { From 625e165ae0dd1e2d09b0d0da2067346c251c9c2a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 23 Aug 2021 07:50:27 +0200 Subject: [PATCH 090/303] bump zx --- packages/nodePackages/node-packages.json | 4 +- packages/nodePackages/node-packages.nix | 266 +++++++++++++++++++++-- 2 files changed, 255 insertions(+), 15 deletions(-) diff --git a/packages/nodePackages/node-packages.json b/packages/nodePackages/node-packages.json index 634160c5..5fe8fdea 100644 --- a/packages/nodePackages/node-packages.json +++ b/packages/nodePackages/node-packages.json @@ -1,3 +1,3 @@ [ - "zx" -] \ No newline at end of file + "zx" +] diff --git a/packages/nodePackages/node-packages.nix b/packages/nodePackages/node-packages.nix index d58722a8..aa64ac84 100644 --- a/packages/nodePackages/node-packages.nix +++ b/packages/nodePackages/node-packages.nix @@ -4,6 +4,33 @@ let sources = { + "@nodelib/fs.scandir-2.1.5" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; + }; + }; + "@nodelib/fs.stat-2.0.5" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; + }; + }; + "@nodelib/fs.walk-1.2.8" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; + }; + }; "@types/fs-extra-9.0.12" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; @@ -22,13 +49,13 @@ let sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/node-16.4.9" = { + "@types/node-16.7.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.9"; + version = "16.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.9.tgz"; - sha512 = "HXhRf581nCItzn8yevv4LYt+bJ5cBbDBAJExbDPMeU/2n5/j0ZemGpayahFBP4xL7RseaCLASLD9i9AYyDe7Nw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.7.1.tgz"; + sha512 = "ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A=="; }; }; "@types/node-fetch-2.5.12" = { @@ -49,6 +76,15 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; + "array-union-3.0.1" = { + name = "array-union"; + packageName = "array-union"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz"; + sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -58,6 +94,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -103,6 +148,42 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; + "fast-glob-3.2.7" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + }; + }; + "fastq-1.12.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz"; + sha512 = "VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg=="; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; @@ -121,13 +202,31 @@ let sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; }; - "graceful-fs-4.2.6" = { + "glob-parent-5.1.2" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + }; + "globby-12.0.1" = { + name = "globby"; + packageName = "globby"; + version = "12.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-12.0.1.tgz"; + sha512 = "AofdCGi+crQ1uN9+nMbTnvC4XGNPJN9hRiPf+A76lUZIZoWoj4Z9iyUQGge7xCGKgR/7ejB36qoIlLoDBc7fYw=="; + }; + }; + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "has-flag-4.0.0" = { @@ -139,6 +238,42 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "ignore-5.1.8" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -157,6 +292,24 @@ let sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; + "micromatch-4.0.4" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + }; + }; "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; @@ -193,6 +346,60 @@ let sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "picomatch-2.3.0" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + }; + }; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "run-parallel-1.2.0" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + }; + }; + "slash-4.0.0" = { + name = "slash"; + packageName = "slash"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; + sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + }; + }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -202,6 +409,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; "universalify-2.0.0" = { name = "universalify"; packageName = "universalify"; @@ -226,34 +442,58 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-2.0.0.tgz"; - sha512 = "OF8YvqseMMmtDaASqO+8+0/tJZvykLK0hX9YBAaRO9l7Hc+YjNKjpgJTjrmncgEURoyDr9Ln4r/qBtEuDNZstg=="; + url = "https://registry.npmjs.org/zx/-/zx-3.1.0.tgz"; + sha512 = "Dwm75vWiWPsZhZXRUmneeZQlMbRXJBDLMy+QGDyKDID2+Dkp6LCzlXTrW7VOmU66K1/w8dEcJ5r3zFCDW0kx1Q=="; }; dependencies = [ + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.9" + sources."@types/node-16.7.1" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" + sources."array-union-3.0.1" sources."asynckit-0.4.0" + sources."braces-3.0.2" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."delayed-stream-1.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.7" + sources."fastq-1.12.0" + sources."fill-range-7.0.1" sources."form-data-3.0.1" sources."fs-extra-10.0.0" - sources."graceful-fs-4.2.6" + sources."glob-parent-5.1.2" + sources."globby-12.0.1" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" + sources."ignore-5.1.8" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" sources."isexe-2.0.0" sources."jsonfile-6.1.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."minimist-1.2.5" sources."node-fetch-2.6.1" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" + sources."slash-4.0.0" sources."supports-color-7.2.0" + sources."to-regex-range-5.0.1" sources."universalify-2.0.0" sources."which-2.0.2" ]; From 2424e532c88dd17aa81498344d3cb947c65ab5af Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 24 Aug 2021 15:33:43 +0200 Subject: [PATCH 091/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/a033b05f5dfaef2fcc0af32e63d9c69d8a3b410e' (2021-08-23) → 'github:nix-community/emacs-overlay/b57f95c78042800bbd2b6b3c6c1f9fb85221507e' (2021-08-24) • Updated input 'home-manager': 'github:nix-community/home-manager/f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa' (2021-08-22) → 'github:nix-community/home-manager/9029fd2b9de2147480efab55f351343f4fed73b9' (2021-08-23) • Updated input 'master': 'github:nixos/nixpkgs/da1d0c8056856b456d823ae472989b40ba3d9e92' (2021-08-23) → 'github:nixos/nixpkgs/823ff946b85508ffc6ad70cc0984abc741def879' (2021-08-24) • Updated input 'nix': 'github:nixos/nix/7a54b10a8a29dadea2bb2c639a15cfec25a4d38c' (2021-08-20) → 'github:nixos/nix/af94b54db3a2be100731a215cb5e95f306471731' (2021-08-23) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/a1007637cea374bd1bafd754cfd5388894c49129' (2021-08-19) → 'github:nixos/nixpkgs/871e8c4d585ff2a9eb200dcbd96e3856775807b9' (2021-08-22) • Updated input 'unstable': 'github:nixos/nixpkgs/253aecf69ed7595aaefabde779aa6449195bebb7' (2021-08-18) → 'github:nixos/nixpkgs/870959c7fb3a42af1863bed9e1756086a74eb649' (2021-08-22) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9d874d59..65a4a50c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629683097, - "narHash": "sha256-IUe/2jluwJpSD7SRq5PvaDPmnnxrAtsAC/fXp0/hoDw=", + "lastModified": 1629797053, + "narHash": "sha256-wWZsxPmB/pmtfuXdn20vPAAz+QVi4gWN/2Ck0gdLu58=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a033b05f5dfaef2fcc0af32e63d9c69d8a3b410e", + "rev": "b57f95c78042800bbd2b6b3c6c1f9fb85221507e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1629598480, - "narHash": "sha256-d07nc5Kf2MMKKVe47iIrBT+14/65g2nhEn+Z4PKjFmk=", + "lastModified": 1629729582, + "narHash": "sha256-P8bSE0v/alIafhsDVPwIZyBMz4YfHc2H0mOabnsf1so=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa", + "rev": "9029fd2b9de2147480efab55f351343f4fed73b9", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629696992, - "narHash": "sha256-EoM+UxcD4U8zuhR0Mna+LUqf7wBeS33aYN/QjsfuKTc=", + "lastModified": 1629811710, + "narHash": "sha256-cg9AHZ+ZafA9ZhO8Y/H+Z+ySsEPwNNri6ht5p+KA2GA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da1d0c8056856b456d823ae472989b40ba3d9e92", + "rev": "823ff946b85508ffc6ad70cc0984abc741def879", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1629453556, - "narHash": "sha256-nlTEYae1JWor8cfazqLy39dzmtSgAttfjZXl3EajnTE=", + "lastModified": 1629716742, + "narHash": "sha256-H+ISQ6m7YJFNbS1RnW14WAuKNRReEqL6y95UIJPAxAM=", "owner": "nixos", "repo": "nix", - "rev": "7a54b10a8a29dadea2bb2c639a15cfec25a4d38c", + "rev": "af94b54db3a2be100731a215cb5e95f306471731", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1629379628, - "narHash": "sha256-dI8wpEo7wIVWoTUk2oyWFUnlVHNKLs+ren1TqITN1mI=", + "lastModified": 1629673050, + "narHash": "sha256-8xn5q1RJQ7jd7uBnKBMte9CVRzJOTbW2NjPXb3WBICI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1007637cea374bd1bafd754cfd5388894c49129", + "rev": "871e8c4d585ff2a9eb200dcbd96e3856775807b9", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1629292755, - "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=", + "lastModified": 1629618782, + "narHash": "sha256-2K8SSXu3alo/URI3MClGdDSns6Gb4ZaW4LET53UWyKk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "253aecf69ed7595aaefabde779aa6449195bebb7", + "rev": "870959c7fb3a42af1863bed9e1756086a74eb649", "type": "github" }, "original": { From 42e1c8d14825ced7966d5b472052c9562a2bb031 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 26 Aug 2021 13:03:47 +0200 Subject: [PATCH 092/303] enable nix-direnv --- home/modules/profiles/base/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index 80cec214..de362486 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -54,6 +54,8 @@ in advancedCopy.enable = true; bat.enable = true; direnv.enable = true; + direnv.nix-direnv.enable = true; + direnv.nix-direnv.enableFlakes = true; exa.enable = true; home-manager.enable = true; htop.enable = true; From 0f4b28a5bbcdf58a8e5cbb03e4a21951792d3b42 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 26 Aug 2021 13:06:31 +0200 Subject: [PATCH 093/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/b57f95c78042800bbd2b6b3c6c1f9fb85221507e' (2021-08-24) → 'github:nix-community/emacs-overlay/daf338bd83887489341c85e4f20f26034cc24bd2' (2021-08-26) • Updated input 'home-manager': 'github:nix-community/home-manager/9029fd2b9de2147480efab55f351343f4fed73b9' (2021-08-23) → 'github:nix-community/home-manager/f637e145d758ab183d3dba096c9312eae8bc0c7c' (2021-08-26) • Updated input 'master': 'github:nixos/nixpkgs/823ff946b85508ffc6ad70cc0984abc741def879' (2021-08-24) → 'github:nixos/nixpkgs/eafa8276d592eedb29887c8c726e396e74613ef0' (2021-08-26) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/871e8c4d585ff2a9eb200dcbd96e3856775807b9' (2021-08-22) → 'github:nixos/nixpkgs/bc1a0f56812a26018d19aa6501a8eb1aa3edb6ed' (2021-08-25) • Updated input 'unstable': 'github:nixos/nixpkgs/870959c7fb3a42af1863bed9e1756086a74eb649' (2021-08-22) → 'github:nixos/nixpkgs/5bc8b980b9178ef9a4bb622320cf34e59ea2ea10' (2021-08-23) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 65a4a50c..f2c7c5db 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629797053, - "narHash": "sha256-wWZsxPmB/pmtfuXdn20vPAAz+QVi4gWN/2Ck0gdLu58=", + "lastModified": 1629969371, + "narHash": "sha256-8BwSUWo9xeXPNw2JtvGSa3r8p520DZUDKy8kxyy5Y+A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b57f95c78042800bbd2b6b3c6c1f9fb85221507e", + "rev": "daf338bd83887489341c85e4f20f26034cc24bd2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1629729582, - "narHash": "sha256-P8bSE0v/alIafhsDVPwIZyBMz4YfHc2H0mOabnsf1so=", + "lastModified": 1629961460, + "narHash": "sha256-t0UEf5bIJg4TKrqN3dF2rS65iyKCUTT0RfW2f5lWMQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9029fd2b9de2147480efab55f351343f4fed73b9", + "rev": "f637e145d758ab183d3dba096c9312eae8bc0c7c", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629811710, - "narHash": "sha256-cg9AHZ+ZafA9ZhO8Y/H+Z+ySsEPwNNri6ht5p+KA2GA=", + "lastModified": 1629974903, + "narHash": "sha256-xFeAeV7KXffY8TXzYowx0tZceD4hus6VZvcUTa0s+mg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "823ff946b85508ffc6ad70cc0984abc741def879", + "rev": "eafa8276d592eedb29887c8c726e396e74613ef0", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1629673050, - "narHash": "sha256-8xn5q1RJQ7jd7uBnKBMte9CVRzJOTbW2NjPXb3WBICI=", + "lastModified": 1629880082, + "narHash": "sha256-RlQUhZ89btTIINW7xJ4GgX9QE83HhySkliaguz5xUus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "871e8c4d585ff2a9eb200dcbd96e3856775807b9", + "rev": "bc1a0f56812a26018d19aa6501a8eb1aa3edb6ed", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1629618782, - "narHash": "sha256-2K8SSXu3alo/URI3MClGdDSns6Gb4ZaW4LET53UWyKk=", + "lastModified": 1629705759, + "narHash": "sha256-M5sHgjA1OZn/c21pk64qd5kjbkBpbZuYwgaDEl9kiP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "870959c7fb3a42af1863bed9e1756086a74eb649", + "rev": "5bc8b980b9178ef9a4bb622320cf34e59ea2ea10", "type": "github" }, "original": { From 458207ea2c589d4490e5bc7630abf1595d22b147 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 29 Aug 2021 12:39:33 +0200 Subject: [PATCH 094/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/a033b05f5dfaef2fcc0af32e63d9c69d8a3b410e' (2021-08-23) → 'github:nix-community/emacs-overlay/0f2e92d0624f5a6887c8a07e1a5ae6ab298e194b' (2021-08-29) • Updated input 'home-manager': 'github:nix-community/home-manager/f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa' (2021-08-22) → 'github:nix-community/home-manager/33db7cc6a66d1c1cb77c23ae8e18cefd0425a0c8' (2021-08-27) • Updated input 'master': 'github:nixos/nixpkgs/da1d0c8056856b456d823ae472989b40ba3d9e92' (2021-08-23) → 'github:nixos/nixpkgs/9e8fcb0184170a97b4d0a933783bd7c83aff2ab2' (2021-08-29) • Updated input 'nix': 'github:nixos/nix/7a54b10a8a29dadea2bb2c639a15cfec25a4d38c' (2021-08-20) → 'github:nixos/nix/af94b54db3a2be100731a215cb5e95f306471731' (2021-08-23) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/a1007637cea374bd1bafd754cfd5388894c49129' (2021-08-19) → 'github:nixos/nixpkgs/74d017edb6717ad76d38edc02ad3210d4ad66b96' (2021-08-27) • Updated input 'unstable': 'github:nixos/nixpkgs/253aecf69ed7595aaefabde779aa6449195bebb7' (2021-08-18) → 'github:nixos/nixpkgs/21c937f8cb1e6adcfeb36dfd6c90d9d9bfab1d28' (2021-08-27) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9d874d59..d8172c31 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1629683097, - "narHash": "sha256-IUe/2jluwJpSD7SRq5PvaDPmnnxrAtsAC/fXp0/hoDw=", + "lastModified": 1630228697, + "narHash": "sha256-LhwbUdVSha/OdQCTCsuagYCZHeB4aBD47Z/NB4OHShQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a033b05f5dfaef2fcc0af32e63d9c69d8a3b410e", + "rev": "0f2e92d0624f5a6887c8a07e1a5ae6ab298e194b", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1629598480, - "narHash": "sha256-d07nc5Kf2MMKKVe47iIrBT+14/65g2nhEn+Z4PKjFmk=", + "lastModified": 1630030114, + "narHash": "sha256-t5lptbv7rtNSawdwoA2JUAiqXgLYAO+dGqp8KRtOaDA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa", + "rev": "33db7cc6a66d1c1cb77c23ae8e18cefd0425a0c8", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1629696992, - "narHash": "sha256-EoM+UxcD4U8zuhR0Mna+LUqf7wBeS33aYN/QjsfuKTc=", + "lastModified": 1630227793, + "narHash": "sha256-Cr93/YpvWquBXKhr7H+D8hfStn9cyO6KJ50XEoWHb4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da1d0c8056856b456d823ae472989b40ba3d9e92", + "rev": "9e8fcb0184170a97b4d0a933783bd7c83aff2ab2", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1629453556, - "narHash": "sha256-nlTEYae1JWor8cfazqLy39dzmtSgAttfjZXl3EajnTE=", + "lastModified": 1629716742, + "narHash": "sha256-H+ISQ6m7YJFNbS1RnW14WAuKNRReEqL6y95UIJPAxAM=", "owner": "nixos", "repo": "nix", - "rev": "7a54b10a8a29dadea2bb2c639a15cfec25a4d38c", + "rev": "af94b54db3a2be100731a215cb5e95f306471731", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1629379628, - "narHash": "sha256-dI8wpEo7wIVWoTUk2oyWFUnlVHNKLs+ren1TqITN1mI=", + "lastModified": 1630076329, + "narHash": "sha256-mkxPL5pXZv8cfHgjSW0oWfZRGSSlGwXy/7KR+2Mgf3M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1007637cea374bd1bafd754cfd5388894c49129", + "rev": "74d017edb6717ad76d38edc02ad3210d4ad66b96", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1629292755, - "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=", + "lastModified": 1630074300, + "narHash": "sha256-BFM7OiXRs0RvSUZd6NCGAKWVPn3VodgYQ4TUQXxbMBU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "253aecf69ed7595aaefabde779aa6449195bebb7", + "rev": "21c937f8cb1e6adcfeb36dfd6c90d9d9bfab1d28", "type": "github" }, "original": { From 052e90d73df4a401f0d7cf0fefc951d3739a8f52 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 30 Aug 2021 06:33:33 +0200 Subject: [PATCH 095/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/0f2e92d0624f5a6887c8a07e1a5ae6ab298e194b' (2021-08-29) → 'github:nix-community/emacs-overlay/8ed671dab09f08e8079e24f9fc7800b7ce260fa2' (2021-08-30) • Updated input 'home-manager': 'github:nix-community/home-manager/33db7cc6a66d1c1cb77c23ae8e18cefd0425a0c8' (2021-08-27) → 'github:nix-community/home-manager/61ca2fc1c00a275b8bd61582b23195d60fe0fa40' (2021-08-30) • Updated input 'master': 'github:nixos/nixpkgs/9e8fcb0184170a97b4d0a933783bd7c83aff2ab2' (2021-08-29) → 'github:nixos/nixpkgs/f082ab00bd29de3bea7faa1a9654fc45151f86a2' (2021-08-30) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d8172c31..41b06406 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1630228697, - "narHash": "sha256-LhwbUdVSha/OdQCTCsuagYCZHeB4aBD47Z/NB4OHShQ=", + "lastModified": 1630288376, + "narHash": "sha256-RwVCR6bUQy95gJAGo0GmMBDA3YkdRkULSBuq2CextIc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0f2e92d0624f5a6887c8a07e1a5ae6ab298e194b", + "rev": "8ed671dab09f08e8079e24f9fc7800b7ce260fa2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1630030114, - "narHash": "sha256-t5lptbv7rtNSawdwoA2JUAiqXgLYAO+dGqp8KRtOaDA=", + "lastModified": 1630294974, + "narHash": "sha256-9e3AKxbCoexrsWFXxQ4QUETNxQlXaffnntEnPOO19oI=", "owner": "nix-community", "repo": "home-manager", - "rev": "33db7cc6a66d1c1cb77c23ae8e18cefd0425a0c8", + "rev": "61ca2fc1c00a275b8bd61582b23195d60fe0fa40", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1630227793, - "narHash": "sha256-Cr93/YpvWquBXKhr7H+D8hfStn9cyO6KJ50XEoWHb4g=", + "lastModified": 1630285496, + "narHash": "sha256-Inv3piOAkmdjK6fUSW8XUH03nDeEpm9z1F0ZTa48oH4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e8fcb0184170a97b4d0a933783bd7c83aff2ab2", + "rev": "f082ab00bd29de3bea7faa1a9654fc45151f86a2", "type": "github" }, "original": { From 3fba31952bbbabebe5f5bf3cdd702b47870540a5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Sep 2021 10:35:48 +0200 Subject: [PATCH 096/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/8ed671dab09f08e8079e24f9fc7800b7ce260fa2' (2021-08-30) → 'github:nix-community/emacs-overlay/3475b81d1c14509c9ebfae1e53366b28acaa2b6b' (2021-09-02) • Updated input 'home-manager': 'github:nix-community/home-manager/61ca2fc1c00a275b8bd61582b23195d60fe0fa40' (2021-08-30) → 'github:nix-community/home-manager/21a2ff449620a9cb91802f9d1a9157b2ae8c6b39' (2021-08-31) • Updated input 'master': 'github:nixos/nixpkgs/39067594f5d668caa701fc3e014a8b4bf73a9ac0' (2021-08-30) → 'github:nixos/nixpkgs/052009bf2b6768c4cf171d94de4d75aee2b81492' (2021-09-02) • Updated input 'nix': 'github:nixos/nix/af94b54db3a2be100731a215cb5e95f306471731' (2021-08-23) → 'github:nixos/nix/c397184749f7a273f1311b098fa9152af550e394' (2021-09-02) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/74d017edb6717ad76d38edc02ad3210d4ad66b96' (2021-08-27) → 'github:nixos/nixpkgs/110a2c9ebbf5d4a94486854f18a37a938cfacbbb' (2021-09-01) • Updated input 'unstable': 'github:nixos/nixpkgs/21c937f8cb1e6adcfeb36dfd6c90d9d9bfab1d28' (2021-08-27) → 'github:nixos/nixpkgs/8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512' (2021-08-29) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 7e2f9df6..83dc9f4e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1630288376, - "narHash": "sha256-RwVCR6bUQy95gJAGo0GmMBDA3YkdRkULSBuq2CextIc=", + "lastModified": 1630547375, + "narHash": "sha256-bwwx2Z+4rQZdOweZYUYD1svIvD5LfcHRWtegybvVsyo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8ed671dab09f08e8079e24f9fc7800b7ce260fa2", + "rev": "3475b81d1c14509c9ebfae1e53366b28acaa2b6b", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1630294974, - "narHash": "sha256-9e3AKxbCoexrsWFXxQ4QUETNxQlXaffnntEnPOO19oI=", + "lastModified": 1630428740, + "narHash": "sha256-394yJxkFjvg47vB0jK5WHCitLDilyGjO3HpuZkAM2GA=", "owner": "nix-community", "repo": "home-manager", - "rev": "61ca2fc1c00a275b8bd61582b23195d60fe0fa40", + "rev": "21a2ff449620a9cb91802f9d1a9157b2ae8c6b39", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1630301915, - "narHash": "sha256-yFa6zKFTYLe2UYN0f4mnZVj8NzRamRsP7iMd6oGFjS0=", + "lastModified": 1630568224, + "narHash": "sha256-S+8LcU/hyBZQOXgClFZpI3zkHpTX6mLbcLS+UrAVFdk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "39067594f5d668caa701fc3e014a8b4bf73a9ac0", + "rev": "052009bf2b6768c4cf171d94de4d75aee2b81492", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1629716742, - "narHash": "sha256-H+ISQ6m7YJFNbS1RnW14WAuKNRReEqL6y95UIJPAxAM=", + "lastModified": 1630562172, + "narHash": "sha256-VC3llpR8AuaUKZvKcFiZ59Pb3/ErHgiXkFW0kzP6xHY=", "owner": "nixos", "repo": "nix", - "rev": "af94b54db3a2be100731a215cb5e95f306471731", + "rev": "c397184749f7a273f1311b098fa9152af550e394", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1630076329, - "narHash": "sha256-mkxPL5pXZv8cfHgjSW0oWfZRGSSlGwXy/7KR+2Mgf3M=", + "lastModified": 1630481079, + "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "74d017edb6717ad76d38edc02ad3210d4ad66b96", + "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1630074300, - "narHash": "sha256-BFM7OiXRs0RvSUZd6NCGAKWVPn3VodgYQ4TUQXxbMBU=", + "lastModified": 1630248577, + "narHash": "sha256-9d/yq96TTrnF7qjA6wPYk+rYjWAXwfUmwk3qewezSeg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21c937f8cb1e6adcfeb36dfd6c90d9d9bfab1d28", + "rev": "8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512", "type": "github" }, "original": { From cd0cf22a7bf0da438419de0b36d1c3ec1748cbe2 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 6 Sep 2021 08:17:20 +0200 Subject: [PATCH 097/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/3475b81d1c14509c9ebfae1e53366b28acaa2b6b' (2021-09-02) → 'github:nix-community/emacs-overlay/08398463502a50dab640e64c5cfb39ef29545c3c' (2021-09-06) • Updated input 'home-manager': 'github:nix-community/home-manager/21a2ff449620a9cb91802f9d1a9157b2ae8c6b39' (2021-08-31) → 'github:nix-community/home-manager/5e46262cb1fa888f6f46a675cc2806a23ba9625c' (2021-09-06) • Updated input 'master': 'github:nixos/nixpkgs/e4a8bc9b944a3f4370143ee282b6dd6568b60f23' (2021-09-02) → 'github:nixos/nixpkgs/9fcf2a8a2cb0f5b78edc8ec7ca877240e7fe3009' (2021-09-06) • Updated input 'nix': 'github:nixos/nix/c397184749f7a273f1311b098fa9152af550e394' (2021-09-02) → 'github:nixos/nix/90b2dd570cbd8313a8cf45b3cf66ddef2bb06e07' (2021-09-02) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/110a2c9ebbf5d4a94486854f18a37a938cfacbbb' (2021-09-01) → 'github:nixos/nixpkgs/1e5c35dfbc8e0ad8c35aa1a6446f442ca1ec5234' (2021-09-05) • Updated input 'unstable': 'github:nixos/nixpkgs/8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512' (2021-08-29) → 'github:nixos/nixpkgs/23d5823337f4502dfa17e192d8c53a47cabcb6b4' (2021-09-05) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 819efeb4..f10f07cb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1630547375, - "narHash": "sha256-bwwx2Z+4rQZdOweZYUYD1svIvD5LfcHRWtegybvVsyo=", + "lastModified": 1630893136, + "narHash": "sha256-TwySlmIjvgHEHx2xllpDeY4Xrg7sEPi076t6y+kXfu8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3475b81d1c14509c9ebfae1e53366b28acaa2b6b", + "rev": "08398463502a50dab640e64c5cfb39ef29545c3c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1630428740, - "narHash": "sha256-394yJxkFjvg47vB0jK5WHCitLDilyGjO3HpuZkAM2GA=", + "lastModified": 1630890028, + "narHash": "sha256-Q2ZuK0QQiSdgei68a6wV1FDPmBkR6M0apFjQrWsv8FY=", "owner": "nix-community", "repo": "home-manager", - "rev": "21a2ff449620a9cb91802f9d1a9157b2ae8c6b39", + "rev": "5e46262cb1fa888f6f46a675cc2806a23ba9625c", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1630571681, - "narHash": "sha256-3VbYZjs/dBG0aDFU5BrReMf/ogMfPshwPVpOrgxqQko=", + "lastModified": 1630899757, + "narHash": "sha256-G68Y1bRbIx8y7h+GGd6m/UW8xl9vx8WS1ZUEHo0BAsk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4a8bc9b944a3f4370143ee282b6dd6568b60f23", + "rev": "9fcf2a8a2cb0f5b78edc8ec7ca877240e7fe3009", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1630562172, - "narHash": "sha256-VC3llpR8AuaUKZvKcFiZ59Pb3/ErHgiXkFW0kzP6xHY=", + "lastModified": 1630587652, + "narHash": "sha256-2RmRhN7F750/bEwCQVIC8mnOiJjRI57AKAVo83p1vcI=", "owner": "nixos", "repo": "nix", - "rev": "c397184749f7a273f1311b098fa9152af550e394", + "rev": "90b2dd570cbd8313a8cf45b3cf66ddef2bb06e07", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1630481079, - "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", + "lastModified": 1630845541, + "narHash": "sha256-DKj/0V+NNJe3sgRAZFb4yYFZFH0gXD1qNU8xiI87+GA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", + "rev": "1e5c35dfbc8e0ad8c35aa1a6446f442ca1ec5234", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1630248577, - "narHash": "sha256-9d/yq96TTrnF7qjA6wPYk+rYjWAXwfUmwk3qewezSeg=", + "lastModified": 1630850248, + "narHash": "sha256-OzJi6Olf7mSVhGt3W7qOMVP5Qk1lH60zlHeCcITzfv0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512", + "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4", "type": "github" }, "original": { From a58b3d596a1b6a4b1309fd3480e42bc6293b3f72 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 6 Sep 2021 17:54:32 +0200 Subject: [PATCH 098/303] thetys: expose mysql for co workers --- nixos/configurations/thetys.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index bb00daa0..fa40a31b 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -70,6 +70,7 @@ networking.firewall.allowedTCPPorts = [ # ports often used for development, that I want to expose for easier access from the host 3000 + 3306 8080 8081 ]; From 8048701b678be1db28cf2cc235588fa751b10779 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 7 Sep 2021 07:13:33 +0200 Subject: [PATCH 099/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/08398463502a50dab640e64c5cfb39ef29545c3c' (2021-09-06) → 'github:nix-community/emacs-overlay/ff588e63db43e6bb9d9f6e876ed94c976d031ac8' (2021-09-07) • Updated input 'master': 'github:nixos/nixpkgs/9fcf2a8a2cb0f5b78edc8ec7ca877240e7fe3009' (2021-09-06) → 'github:nixos/nixpkgs/2be182ab81d7cac34e01ad8858658b571bbb7e16' (2021-09-07) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/1e5c35dfbc8e0ad8c35aa1a6446f442ca1ec5234' (2021-09-05) → 'github:nixos/nixpkgs/fd6dba47199a7c249e64c1aa1fef01ee78e58481' (2021-09-06) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f10f07cb..9137acdd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1630893136, - "narHash": "sha256-TwySlmIjvgHEHx2xllpDeY4Xrg7sEPi076t6y+kXfu8=", + "lastModified": 1630976301, + "narHash": "sha256-SRDp+8b8ZZN3XTpExgXFipH/fGiKeuICgUT8SCekFyc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "08398463502a50dab640e64c5cfb39ef29545c3c", + "rev": "ff588e63db43e6bb9d9f6e876ed94c976d031ac8", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1630899757, - "narHash": "sha256-G68Y1bRbIx8y7h+GGd6m/UW8xl9vx8WS1ZUEHo0BAsk=", + "lastModified": 1630990524, + "narHash": "sha256-C3qes3BUPxGKjHpWq+1l7Qmy+tPpMbQh3m7prwupP5s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9fcf2a8a2cb0f5b78edc8ec7ca877240e7fe3009", + "rev": "2be182ab81d7cac34e01ad8858658b571bbb7e16", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1630845541, - "narHash": "sha256-DKj/0V+NNJe3sgRAZFb4yYFZFH0gXD1qNU8xiI87+GA=", + "lastModified": 1630927478, + "narHash": "sha256-y2z+/r1QhRRkPr0Dzl0O7qXdZ0jfr32w7OlfXr2XNik=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e5c35dfbc8e0ad8c35aa1a6446f442ca1ec5234", + "rev": "fd6dba47199a7c249e64c1aa1fef01ee78e58481", "type": "github" }, "original": { From 292e852f09c2aa8a4465bb54844ab16803ba0d09 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 7 Sep 2021 07:32:32 +0200 Subject: [PATCH 100/303] disable powershell --- home/modules/misc/home/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/misc/home/default.nix b/home/modules/misc/home/default.nix index 72ac1287..190e29b3 100644 --- a/home/modules/misc/home/default.nix +++ b/home/modules/misc/home/default.nix @@ -27,7 +27,7 @@ in p.exercism p.tmate p.element-desktop - p.powershell + # p.powershell s."dracula/konsole" p.fira-code From b6c40d30b03a0941b3634dbee352030aaf12faa4 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 10 Sep 2021 20:21:51 +0200 Subject: [PATCH 101/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/ff588e63db43e6bb9d9f6e876ed94c976d031ac8' (2021-09-07) → 'github:nix-community/emacs-overlay/8320c615b706f0d459544d7d37a59c5a5ff5e7e0' (2021-09-10) • Updated input 'home-manager': 'github:nix-community/home-manager/5e46262cb1fa888f6f46a675cc2806a23ba9625c' (2021-09-06) → 'github:nix-community/home-manager/039f786e609fdb3cfd9c5520ff3791750c3eaebf' (2021-09-08) • Updated input 'master': 'github:nixos/nixpkgs/2be182ab81d7cac34e01ad8858658b571bbb7e16' (2021-09-07) → 'github:nixos/nixpkgs/a6fbb0b67ddf15f495c3fff0a05beb7885759863' (2021-09-10) • Updated input 'nix': 'github:nixos/nix/90b2dd570cbd8313a8cf45b3cf66ddef2bb06e07' (2021-09-02) → 'github:nixos/nix/25b6b741759b1b1c57bde1e69eca57627358605d' (2021-09-09) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/fd6dba47199a7c249e64c1aa1fef01ee78e58481' (2021-09-06) → 'github:nixos/nixpkgs/276671abd104e83ba7cb0b26f44848489eb0306b' (2021-09-08) • Updated input 'unstable': 'github:nixos/nixpkgs/23d5823337f4502dfa17e192d8c53a47cabcb6b4' (2021-09-05) → 'github:nixos/nixpkgs/4f6d8095fd51954120a1d08ea5896fe42dc3923b' (2021-09-09) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9137acdd..68e8e168 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1630976301, - "narHash": "sha256-SRDp+8b8ZZN3XTpExgXFipH/fGiKeuICgUT8SCekFyc=", + "lastModified": 1631294328, + "narHash": "sha256-PYuZn7hloVUxvFWyhvt23cUGPxCQSkw7RvF7YIn1Ut0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ff588e63db43e6bb9d9f6e876ed94c976d031ac8", + "rev": "8320c615b706f0d459544d7d37a59c5a5ff5e7e0", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1630890028, - "narHash": "sha256-Q2ZuK0QQiSdgei68a6wV1FDPmBkR6M0apFjQrWsv8FY=", + "lastModified": 1631134124, + "narHash": "sha256-C17wJ2HyuFZllJ/PbpFuuDjkzWvg8np9UIAdSrpuwS0=", "owner": "nix-community", "repo": "home-manager", - "rev": "5e46262cb1fa888f6f46a675cc2806a23ba9625c", + "rev": "039f786e609fdb3cfd9c5520ff3791750c3eaebf", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1630990524, - "narHash": "sha256-C3qes3BUPxGKjHpWq+1l7Qmy+tPpMbQh3m7prwupP5s=", + "lastModified": 1631297722, + "narHash": "sha256-xQw1d39tM/ViMvnNT9N6HQKevvwdPnMdbkmqi2EXeuE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2be182ab81d7cac34e01ad8858658b571bbb7e16", + "rev": "a6fbb0b67ddf15f495c3fff0a05beb7885759863", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1630587652, - "narHash": "sha256-2RmRhN7F750/bEwCQVIC8mnOiJjRI57AKAVo83p1vcI=", + "lastModified": 1631192496, + "narHash": "sha256-MlIDXTWPjAYktVzV5N4G8o65F3IhqOpMK2pTULB3wJY=", "owner": "nixos", "repo": "nix", - "rev": "90b2dd570cbd8313a8cf45b3cf66ddef2bb06e07", + "rev": "25b6b741759b1b1c57bde1e69eca57627358605d", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1630927478, - "narHash": "sha256-y2z+/r1QhRRkPr0Dzl0O7qXdZ0jfr32w7OlfXr2XNik=", + "lastModified": 1631135738, + "narHash": "sha256-igtPHjRUaP5+6C7GuQ05J8ZT6RQ9CKmXMUzHl5tXwdM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd6dba47199a7c249e64c1aa1fef01ee78e58481", + "rev": "276671abd104e83ba7cb0b26f44848489eb0306b", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1630850248, - "narHash": "sha256-OzJi6Olf7mSVhGt3W7qOMVP5Qk1lH60zlHeCcITzfv0=", + "lastModified": 1631206977, + "narHash": "sha256-o3Dct9aJ5ht5UaTUBzXrRcK1RZt2eG5/xSlWJuUCVZM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4", + "rev": "4f6d8095fd51954120a1d08ea5896fe42dc3923b", "type": "github" }, "original": { From 915e39f0832709d5bf5bfd0be794179710fa2874 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 11 Sep 2021 10:13:56 +0200 Subject: [PATCH 102/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/8320c615b706f0d459544d7d37a59c5a5ff5e7e0' (2021-09-10) → 'github:nix-community/emacs-overlay/c5bae2fa6a90382bbddb2eacd259c9870414f0c1' (2021-09-11) • Updated input 'master': 'github:nixos/nixpkgs/a6fbb0b67ddf15f495c3fff0a05beb7885759863' (2021-09-10) → 'github:nixos/nixpkgs/3927df8f84ca7463781f65b15521048f57c978bb' (2021-09-11) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/276671abd104e83ba7cb0b26f44848489eb0306b' (2021-09-08) → 'github:nixos/nixpkgs/8b0b81dab17753ab344a44c04be90a61dc55badf' (2021-09-10) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 68e8e168..0a9a29bb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1631294328, - "narHash": "sha256-PYuZn7hloVUxvFWyhvt23cUGPxCQSkw7RvF7YIn1Ut0=", + "lastModified": 1631325107, + "narHash": "sha256-/OcUVmfpJR0eMtD11cVnhynkzYY8pLlJ7sBus1H+yAc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8320c615b706f0d459544d7d37a59c5a5ff5e7e0", + "rev": "c5bae2fa6a90382bbddb2eacd259c9870414f0c1", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1631297722, - "narHash": "sha256-xQw1d39tM/ViMvnNT9N6HQKevvwdPnMdbkmqi2EXeuE=", + "lastModified": 1631345378, + "narHash": "sha256-1zoyHR6trdJwOSGUd3bsres1yOtY2bwOJ/RQtP9Ln7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a6fbb0b67ddf15f495c3fff0a05beb7885759863", + "rev": "3927df8f84ca7463781f65b15521048f57c978bb", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1631135738, - "narHash": "sha256-igtPHjRUaP5+6C7GuQ05J8ZT6RQ9CKmXMUzHl5tXwdM=", + "lastModified": 1631275245, + "narHash": "sha256-vROU1OFI2zvKSBjbMpbpl9R08Or3eUwaW5HJLq88QWY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "276671abd104e83ba7cb0b26f44848489eb0306b", + "rev": "8b0b81dab17753ab344a44c04be90a61dc55badf", "type": "github" }, "original": { From 10d918ed4178a3e09984a03ad9528c8527b2c91f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 13 Sep 2021 14:25:37 +0200 Subject: [PATCH 103/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/c5bae2fa6a90382bbddb2eacd259c9870414f0c1' (2021-09-11) → 'github:nix-community/emacs-overlay/f1b4d7133e698565bdb73d57286da52cc48d78b6' (2021-09-13) • Updated input 'home-manager': 'github:nix-community/home-manager/039f786e609fdb3cfd9c5520ff3791750c3eaebf' (2021-09-08) → 'github:nix-community/home-manager/208e310e9409d0d54ae5e19cb52f8d0f3c7f4771' (2021-09-12) • Updated input 'master': 'github:nixos/nixpkgs/3927df8f84ca7463781f65b15521048f57c978bb' (2021-09-11) → 'github:nixos/nixpkgs/7a3646885315f79ea1efaa0d396414d92d4acac1' (2021-09-13) • Updated input 'nix': 'github:nixos/nix/25b6b741759b1b1c57bde1e69eca57627358605d' (2021-09-09) → 'github:nixos/nix/eadb45c4db1286267923827cc5c6d839c4d0f79b' (2021-09-13) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/8b0b81dab17753ab344a44c04be90a61dc55badf' (2021-09-10) → 'github:nixos/nixpkgs/e85f0175e3effe9ba191d66c09e8f1b7d6362d5e' (2021-09-12) • Updated input 'unstable': 'github:nixos/nixpkgs/4f6d8095fd51954120a1d08ea5896fe42dc3923b' (2021-09-09) → 'github:nixos/nixpkgs/364b5555ee04bf61ee0075a3adab4c9351a8d38c' (2021-09-12) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 0a9a29bb..77807dd6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1631325107, - "narHash": "sha256-/OcUVmfpJR0eMtD11cVnhynkzYY8pLlJ7sBus1H+yAc=", + "lastModified": 1631525154, + "narHash": "sha256-5xq/Pd/2ExxI5krGkv+RZpMzxlDVQ0fuL5mWApQzwHo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c5bae2fa6a90382bbddb2eacd259c9870414f0c1", + "rev": "f1b4d7133e698565bdb73d57286da52cc48d78b6", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1631134124, - "narHash": "sha256-C17wJ2HyuFZllJ/PbpFuuDjkzWvg8np9UIAdSrpuwS0=", + "lastModified": 1631485157, + "narHash": "sha256-U2qv2tjrWpTWe1KPUPXEcByOdnTBlJWX/Bhk7Ax5mgA=", "owner": "nix-community", "repo": "home-manager", - "rev": "039f786e609fdb3cfd9c5520ff3791750c3eaebf", + "rev": "208e310e9409d0d54ae5e19cb52f8d0f3c7f4771", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1631345378, - "narHash": "sha256-1zoyHR6trdJwOSGUd3bsres1yOtY2bwOJ/RQtP9Ln7o=", + "lastModified": 1631533971, + "narHash": "sha256-1fUQoIiRMf/JfstYohUGgrakLt8NS3PRmHrg8lUTjdk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3927df8f84ca7463781f65b15521048f57c978bb", + "rev": "7a3646885315f79ea1efaa0d396414d92d4acac1", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1631192496, - "narHash": "sha256-MlIDXTWPjAYktVzV5N4G8o65F3IhqOpMK2pTULB3wJY=", + "lastModified": 1631534004, + "narHash": "sha256-LiEga9nKY2AhlrT+b/iGaRd4PvE5vr8wCg6M3iRAgww=", "owner": "nixos", "repo": "nix", - "rev": "25b6b741759b1b1c57bde1e69eca57627358605d", + "rev": "eadb45c4db1286267923827cc5c6d839c4d0f79b", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1631275245, - "narHash": "sha256-vROU1OFI2zvKSBjbMpbpl9R08Or3eUwaW5HJLq88QWY=", + "lastModified": 1631452463, + "narHash": "sha256-/BMbXjACbkemEB0cULa4/DFNAHusavOzRJL/VX2FIuM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8b0b81dab17753ab344a44c04be90a61dc55badf", + "rev": "e85f0175e3effe9ba191d66c09e8f1b7d6362d5e", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1631206977, - "narHash": "sha256-o3Dct9aJ5ht5UaTUBzXrRcK1RZt2eG5/xSlWJuUCVZM=", + "lastModified": 1631470189, + "narHash": "sha256-hkUPYlpNOY9nbG1ByRin9NzPAYnPtwq/nGxO/DoeZd0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f6d8095fd51954120a1d08ea5896fe42dc3923b", + "rev": "364b5555ee04bf61ee0075a3adab4c9351a8d38c", "type": "github" }, "original": { From a9e7423042f76d82f1ffd0d6eda3e8c3c0bc2671 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 14 Sep 2021 08:06:31 +0200 Subject: [PATCH 104/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/f1b4d7133e698565bdb73d57286da52cc48d78b6' (2021-09-13) → 'github:nix-community/emacs-overlay/bdc2b79671bf70cf73efa3ee2320bd414087315a' (2021-09-14) • Updated input 'flake-utils': 'github:numtide/flake-utils/997f7efcb746a9c140ce1f13c72263189225f482' (2021-08-20) → 'github:numtide/flake-utils/7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19' (2021-09-13) • Updated input 'home-manager': 'github:nix-community/home-manager/208e310e9409d0d54ae5e19cb52f8d0f3c7f4771' (2021-09-12) → 'github:nix-community/home-manager/5199bc841aa9ebafc567a1f5c498682650f68973' (2021-09-13) • Updated input 'master': 'github:nixos/nixpkgs/7a3646885315f79ea1efaa0d396414d92d4acac1' (2021-09-13) → 'github:nixos/nixpkgs/6f5e9a6f7bc5b83bcfd09f4a2d32e3a35d62fb16' (2021-09-14) • Updated input 'nix': 'github:nixos/nix/eadb45c4db1286267923827cc5c6d839c4d0f79b' (2021-09-13) → 'github:nixos/nix/4ed66735b67b785efad7e23599a1777343c264b5' (2021-09-13) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 77807dd6..f836847c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1631525154, - "narHash": "sha256-5xq/Pd/2ExxI5krGkv+RZpMzxlDVQ0fuL5mWApQzwHo=", + "lastModified": 1631584417, + "narHash": "sha256-FM90TRRdF8tqG0ZBpk5EROgOSQ4yY1Bv2ry1lgSfeQc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f1b4d7133e698565bdb73d57286da52cc48d78b6", + "rev": "bdc2b79671bf70cf73efa3ee2320bd414087315a", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1631485157, - "narHash": "sha256-U2qv2tjrWpTWe1KPUPXEcByOdnTBlJWX/Bhk7Ax5mgA=", + "lastModified": 1631495560, + "narHash": "sha256-fps7iZrSWuWHEiBPDogPQlL19zOSjlCSvCQps534oQ4=", "owner": "nix-community", "repo": "home-manager", - "rev": "208e310e9409d0d54ae5e19cb52f8d0f3c7f4771", + "rev": "5199bc841aa9ebafc567a1f5c498682650f68973", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1631533971, - "narHash": "sha256-1fUQoIiRMf/JfstYohUGgrakLt8NS3PRmHrg8lUTjdk=", + "lastModified": 1631596344, + "narHash": "sha256-Wn61o5G6egxhqyYyZxDw6z1EhpdwM6TCUrP+8roHM6E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a3646885315f79ea1efaa0d396414d92d4acac1", + "rev": "6f5e9a6f7bc5b83bcfd09f4a2d32e3a35d62fb16", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1631534004, - "narHash": "sha256-LiEga9nKY2AhlrT+b/iGaRd4PvE5vr8wCg6M3iRAgww=", + "lastModified": 1631568664, + "narHash": "sha256-D4jCw2ZpoxD5M5kZ5P3FlqotmbYejjrzlp63P3gEsI4=", "owner": "nixos", "repo": "nix", - "rev": "eadb45c4db1286267923827cc5c6d839c4d0f79b", + "rev": "4ed66735b67b785efad7e23599a1777343c264b5", "type": "github" }, "original": { From 970d2bf555c656b79912b3d02ff79e5015bcfeea Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 14 Sep 2021 23:36:49 +0200 Subject: [PATCH 105/303] erlang-ls: 0.18.0 -> 0.19.0 --- packages/erlang-ls/source.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/erlang-ls/source.json b/packages/erlang-ls/source.json index 712f9a11..eab3945e 100644 --- a/packages/erlang-ls/source.json +++ b/packages/erlang-ls/source.json @@ -1,8 +1,8 @@ { - "fetchSubmodules": true, - "owner": "erlang-ls", - "repo": "erlang_ls", - "rev": "0.18.0", - "sha256": "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow=", - "version": "0.18.0" + "version": "0.19.0", + "owner": "erlang-ls", + "repo": "erlang_ls", + "rev": "3ccf5139823e9a3f0e23476b1de6ebb2d70b5201", + "sha256": "WesGgLoVR435lNXnsCFYcUoKXDMuL7hWImDluori+dc=", + "fetchSubmodules": true } From 6167be904a2488e2f692b02ec2bc82f4bd06468a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 15 Sep 2021 22:12:24 +0200 Subject: [PATCH 106/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/bdc2b79671bf70cf73efa3ee2320bd414087315a' (2021-09-14) → 'github:nix-community/emacs-overlay/89334d9994e9ad0cfaa0ec502f5fa95a43974ef8' (2021-09-15) • Updated input 'home-manager': 'github:nix-community/home-manager/5199bc841aa9ebafc567a1f5c498682650f68973' (2021-09-13) → 'github:nix-community/home-manager/562449b50354ac224adc4265803cba40b931ae7b' (2021-09-14) • Updated input 'master': 'github:nixos/nixpkgs/6f5e9a6f7bc5b83bcfd09f4a2d32e3a35d62fb16' (2021-09-14) → 'github:nixos/nixpkgs/ca831be54c1588b44d3452f79a4cfa540a341856' (2021-09-15) • Updated input 'nix': 'github:nixos/nix/4ed66735b67b785efad7e23599a1777343c264b5' (2021-09-13) → 'github:nixos/nix/1ec4efa6c82fb6d90887c21aa7c7c6f3c644dd65' (2021-09-15) • Updated input 'nix/lowdown-src': 'github:kristapsdz/lowdown/148f9b2f586c41b7e36e73009db43ea68c7a1a4d' (2021-04-03) → 'github:kristapsdz/lowdown/b4483d0ef85990f54b864158ab786b4a5b3904fa' (2021-08-06) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/e85f0175e3effe9ba191d66c09e8f1b7d6362d5e' (2021-09-12) → 'github:nixos/nixpkgs/a59d9b39f1dd0338cdaa0a5c5bdc3f4b69801881' (2021-09-14) • Updated input 'unstable': 'github:nixos/nixpkgs/364b5555ee04bf61ee0075a3adab4c9351a8d38c' (2021-09-12) → 'github:nixos/nixpkgs/bcd607489d76795508c48261e1ad05f5d4b7672f' (2021-09-14) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index f836847c..554c489f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1631584417, - "narHash": "sha256-FM90TRRdF8tqG0ZBpk5EROgOSQ4yY1Bv2ry1lgSfeQc=", + "lastModified": 1631725895, + "narHash": "sha256-S/e3+sAIinNLqEh1ODZT52jaxIl10ejwzaofhK9yf5M=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bdc2b79671bf70cf73efa3ee2320bd414087315a", + "rev": "89334d9994e9ad0cfaa0ec502f5fa95a43974ef8", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1631495560, - "narHash": "sha256-fps7iZrSWuWHEiBPDogPQlL19zOSjlCSvCQps534oQ4=", + "lastModified": 1631658300, + "narHash": "sha256-LsKiOWHtfOgatuIOSfuznj1vKfz7TYSzYPx3RzU9Ibo=", "owner": "nix-community", "repo": "home-manager", - "rev": "5199bc841aa9ebafc567a1f5c498682650f68973", + "rev": "562449b50354ac224adc4265803cba40b931ae7b", "type": "github" }, "original": { @@ -53,27 +53,27 @@ "lowdown-src": { "flake": false, "locked": { - "lastModified": 1617481909, - "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=", + "lastModified": 1628247802, + "narHash": "sha256-4XSXGYvKqogR7bubyqYNwBHYCtrIn6XRGXj6+u+BXNs=", "owner": "kristapsdz", "repo": "lowdown", - "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d", + "rev": "b4483d0ef85990f54b864158ab786b4a5b3904fa", "type": "github" }, "original": { "owner": "kristapsdz", - "ref": "VERSION_0_8_4", + "ref": "VERSION_0_8_6", "repo": "lowdown", "type": "github" } }, "master": { "locked": { - "lastModified": 1631596344, - "narHash": "sha256-Wn61o5G6egxhqyYyZxDw6z1EhpdwM6TCUrP+8roHM6E=", + "lastModified": 1631736520, + "narHash": "sha256-WO7Qv2G74UcUtfvV5UVwwHAUtEymy6NHzyUiN7sisno=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f5e9a6f7bc5b83bcfd09f4a2d32e3a35d62fb16", + "rev": "ca831be54c1588b44d3452f79a4cfa540a341856", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1631568664, - "narHash": "sha256-D4jCw2ZpoxD5M5kZ5P3FlqotmbYejjrzlp63P3gEsI4=", + "lastModified": 1631729903, + "narHash": "sha256-ulQg4JnnOMrRA3llwaHUByzRz2qtJ+8fe3A22iy9PZ4=", "owner": "nixos", "repo": "nix", - "rev": "4ed66735b67b785efad7e23599a1777343c264b5", + "rev": "1ec4efa6c82fb6d90887c21aa7c7c6f3c644dd65", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1631452463, - "narHash": "sha256-/BMbXjACbkemEB0cULa4/DFNAHusavOzRJL/VX2FIuM=", + "lastModified": 1631653811, + "narHash": "sha256-7Gp82o1g/kTUybopdktDMmZQ947Zm6vtoG4LJC9LTb0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e85f0175e3effe9ba191d66c09e8f1b7d6362d5e", + "rev": "a59d9b39f1dd0338cdaa0a5c5bdc3f4b69801881", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "unstable": { "locked": { - "lastModified": 1631470189, - "narHash": "sha256-hkUPYlpNOY9nbG1ByRin9NzPAYnPtwq/nGxO/DoeZd0=", + "lastModified": 1631663639, + "narHash": "sha256-5oMEq+P2krgBbqogWx1k1JrsTCG0pUVYS9DvDzNNV3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "364b5555ee04bf61ee0075a3adab4c9351a8d38c", + "rev": "bcd607489d76795508c48261e1ad05f5d4b7672f", "type": "github" }, "original": { From 387ddb2972e11dd33519314f2e37e504b3a47d72 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 15 Sep 2021 23:03:27 +0200 Subject: [PATCH 107/303] rnix-lsp: use master --- flake.lock | 74 ++++++++++++++++++++++++++ flake.nix | 1 + home/modules/languages/nix/default.nix | 8 +-- 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 554c489f..9e430125 100644 --- a/flake.lock +++ b/flake.lock @@ -83,6 +83,27 @@ "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1629707199, + "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=", + "owner": "nmattia", + "repo": "naersk", + "rev": "df71f5e4babda41cd919a8684b72218e2e809fa9", + "type": "github" + }, + "original": { + "owner": "nmattia", + "repo": "naersk", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -150,6 +171,43 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1630481079, + "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "rnix-lsp": { + "inputs": { + "naersk": "naersk", + "nixpkgs": "nixpkgs_2", + "utils": "utils" + }, + "locked": { + "lastModified": 1631531304, + "narHash": "sha256-hlJ0FYaxUGpFqAuhB+Fde7ydxJQXV3NIwKQ8rW85gc8=", + "owner": "nix-community", + "repo": "rnix-lsp", + "rev": "ab9c26a903846fc6712b811bdb32a2539ed3a42d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "rnix-lsp", + "type": "github" + } + }, "root": { "inputs": { "emacs": "emacs", @@ -159,6 +217,7 @@ "nix": "nix", "nixpkgs-2009": "nixpkgs-2009", "nixpkgs-2105": "nixpkgs-2105", + "rnix-lsp": "rnix-lsp", "unstable": "unstable" } }, @@ -177,6 +236,21 @@ "repo": "nixpkgs", "type": "github" } + }, + "utils": { + "locked": { + "lastModified": 1629481132, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 772d490d..88618c69 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ inputs.master.url = "github:nixos/nixpkgs/master"; inputs.nix.url = "github:nixos/nix/master"; + inputs.rnix-lsp.url = "github:nix-community/rnix-lsp/master"; inputs.home-manager.url = "github:nix-community/home-manager"; inputs.home-manager.inputs.nixpkgs.follows = "unstable"; diff --git a/home/modules/languages/nix/default.nix b/home/modules/languages/nix/default.nix index 8f6760a2..2a1e93b7 100644 --- a/home/modules/languages/nix/default.nix +++ b/home/modules/languages/nix/default.nix @@ -1,6 +1,8 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.nix; +{ config, lib, pkgs, rnix-lsp, ... }: +let + cfg = config.languages.nix; + rnixLsp = rnix-lsp.defaultPackage.x86_64-linux; in { options.languages.nix = { @@ -16,7 +18,7 @@ in ;; make lsp-mode aware of nix (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix")) (lsp-register-client - (make-lsp-client :new-connection (lsp-stdio-connection '("${pkgs.rnix-lsp}/bin/rnix-lsp")) + (make-lsp-client :new-connection (lsp-stdio-connection '("${rnixLsp}/bin/rnix-lsp")) :major-modes '(nix-mode) :server-id 'nix)) From 2274ce40d70ad7544a954b08e08d13d8b9a13ac8 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 15 Sep 2021 23:03:56 +0200 Subject: [PATCH 108/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'master': 'github:nixos/nixpkgs/ca831be54c1588b44d3452f79a4cfa540a341856' (2021-09-15) → 'github:nixos/nixpkgs/0d1656e6312ebf2fed4597585df408fdb39a23bf' (2021-09-15) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9e430125..2819f068 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1631736520, - "narHash": "sha256-WO7Qv2G74UcUtfvV5UVwwHAUtEymy6NHzyUiN7sisno=", + "lastModified": 1631739613, + "narHash": "sha256-V70C2qfshKl6TMF+zw6DlF6Pz7g9+BAvtWvOON00O60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca831be54c1588b44d3452f79a4cfa540a341856", + "rev": "0d1656e6312ebf2fed4597585df408fdb39a23bf", "type": "github" }, "original": { From 10afa1b0adcab6bdc9408d5b1e2252d4b891a5b2 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 17 Sep 2021 07:49:42 +0200 Subject: [PATCH 109/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/89334d9994e9ad0cfaa0ec502f5fa95a43974ef8' (2021-09-15) → 'github:nix-community/emacs-overlay/830dd351b336617e58efe7ee7878959fe78e1927' (2021-09-17) • Updated input 'home-manager': 'github:nix-community/home-manager/562449b50354ac224adc4265803cba40b931ae7b' (2021-09-14) → 'github:nix-community/home-manager/371576cdc2580ba93a38e28da8ece2129f558815' (2021-09-15) • Updated input 'master': 'github:nixos/nixpkgs/0d1656e6312ebf2fed4597585df408fdb39a23bf' (2021-09-15) → 'github:nixos/nixpkgs/644e1ca5c55aa308716a2869f288803ae5d05383' (2021-09-17) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/a59d9b39f1dd0338cdaa0a5c5bdc3f4b69801881' (2021-09-14) → 'github:nixos/nixpkgs/8dd8bd8be74879f9f7919b16a4cb5ab2a75f18e5' (2021-09-15) • Updated input 'unstable': 'github:nixos/nixpkgs/bcd607489d76795508c48261e1ad05f5d4b7672f' (2021-09-14) → 'github:nixos/nixpkgs/79c444b5bdeaba142d128afddee14c89ecf2a968' (2021-09-16) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2819f068..7b03e84d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1631725895, - "narHash": "sha256-S/e3+sAIinNLqEh1ODZT52jaxIl10ejwzaofhK9yf5M=", + "lastModified": 1631843322, + "narHash": "sha256-7rWo0xaND/FpXZQ4XLidaOCwqdjz7/x21Qa7Eb9mE3A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "89334d9994e9ad0cfaa0ec502f5fa95a43974ef8", + "rev": "830dd351b336617e58efe7ee7878959fe78e1927", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1631658300, - "narHash": "sha256-LsKiOWHtfOgatuIOSfuznj1vKfz7TYSzYPx3RzU9Ibo=", + "lastModified": 1631740142, + "narHash": "sha256-FnwtaJ+fZw2QzsCqGJW4kJd9hXiPxPgfi+9dwratk28=", "owner": "nix-community", "repo": "home-manager", - "rev": "562449b50354ac224adc4265803cba40b931ae7b", + "rev": "371576cdc2580ba93a38e28da8ece2129f558815", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1631739613, - "narHash": "sha256-V70C2qfshKl6TMF+zw6DlF6Pz7g9+BAvtWvOON00O60=", + "lastModified": 1631853943, + "narHash": "sha256-87MU0hYs6TXih6hw13MzJNWJmeQ+gphXbJ+hO/9hTaI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0d1656e6312ebf2fed4597585df408fdb39a23bf", + "rev": "644e1ca5c55aa308716a2869f288803ae5d05383", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1631653811, - "narHash": "sha256-7Gp82o1g/kTUybopdktDMmZQ947Zm6vtoG4LJC9LTb0=", + "lastModified": 1631706269, + "narHash": "sha256-KVaS+GC3gz/G5qL09ZUnq4gpQR38C+AWuXJ1ftirgK0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a59d9b39f1dd0338cdaa0a5c5bdc3f4b69801881", + "rev": "8dd8bd8be74879f9f7919b16a4cb5ab2a75f18e5", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "unstable": { "locked": { - "lastModified": 1631663639, - "narHash": "sha256-5oMEq+P2krgBbqogWx1k1JrsTCG0pUVYS9DvDzNNV3o=", + "lastModified": 1631785487, + "narHash": "sha256-VSKEvOtaY/roDxEHFxXh6GguOqqWCJZ3E06fBdKu8+I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcd607489d76795508c48261e1ad05f5d4b7672f", + "rev": "79c444b5bdeaba142d128afddee14c89ecf2a968", "type": "github" }, "original": { From 99023736af97fb0390982d228af575d023c91d97 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 17 Sep 2021 11:38:11 +0200 Subject: [PATCH 110/303] nix: patch nix to avoid isMacho error --- nixos/modules/flake.nix | 2 +- nixos/modules/unset-is-macho.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/unset-is-macho.patch diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index 960bda33..4c504586 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -5,7 +5,7 @@ config = lib.mkIf config.nix.flakes.enable { nix = { - package = lib.mkDefault nix.packages.x86_64-linux.nix; # pkgs.nixUnstable; + package = lib.mkDefault (nix.packages.x86_64-linux.nix.overrideAttrs (_: { patches = [ ./unset-is-macho.patch ]; })); # pkgs.nixUnstable; experimentalFeatures = "nix-command flakes"; registry.nixpkgs.flake = nixpkgs-2105; diff --git a/nixos/modules/unset-is-macho.patch b/nixos/modules/unset-is-macho.patch new file mode 100644 index 00000000..75ca9feb --- /dev/null +++ b/nixos/modules/unset-is-macho.patch @@ -0,0 +1,13 @@ +diff --git a/src/nix/get-env.sh b/src/nix/get-env.sh +index 42c806450..a8563c772 100644 +--- a/src/nix/get-env.sh ++++ b/src/nix/get-env.sh +@@ -8,6 +8,8 @@ if [[ -n $stdenv ]]; then + source $stdenv/setup + fi + ++unset -f isMachO ++ + # Better to use compgen, but stdenv bash doesn't have it. + __vars="$(declare -p)" + __functions="$(declare -F)" \ No newline at end of file From 7bc3da0e8cbb80bc00550774b71c121f5fe325f1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 20 Sep 2021 06:38:56 +0200 Subject: [PATCH 111/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/830dd351b336617e58efe7ee7878959fe78e1927' (2021-09-17) → 'github:nix-community/emacs-overlay/0ee5cdf83c885b36ac5045e7747bcde670f1c7af' (2021-09-20) • Updated input 'master': 'github:nixos/nixpkgs/644e1ca5c55aa308716a2869f288803ae5d05383' (2021-09-17) → 'github:nixos/nixpkgs/24ecb306d8bcb2dc56922aee724af7c8bf512485' (2021-09-20) • Updated input 'nix': 'github:nixos/nix/1ec4efa6c82fb6d90887c21aa7c7c6f3c644dd65' (2021-09-15) → 'github:nixos/nix/37cc50f2c88b50086a1a8ed20631d1427d445b7e' (2021-09-17) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/8dd8bd8be74879f9f7919b16a4cb5ab2a75f18e5' (2021-09-15) → 'github:nixos/nixpkgs/6120ac5cd201f6cb593d1b80e861be0342495be9' (2021-09-18) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7b03e84d..217af501 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1631843322, - "narHash": "sha256-7rWo0xaND/FpXZQ4XLidaOCwqdjz7/x21Qa7Eb9mE3A=", + "lastModified": 1632101904, + "narHash": "sha256-Pk2sn57qZxc3e5Rz5gFaMby+1zS0J9BqaM2iEDTDvWk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "830dd351b336617e58efe7ee7878959fe78e1927", + "rev": "0ee5cdf83c885b36ac5045e7747bcde670f1c7af", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1631853943, - "narHash": "sha256-87MU0hYs6TXih6hw13MzJNWJmeQ+gphXbJ+hO/9hTaI=", + "lastModified": 1632111884, + "narHash": "sha256-XZi3/6jD2f3bfSGlnG7pJa5yiZ5p4VOoJOGo7F4pqqQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "644e1ca5c55aa308716a2869f288803ae5d05383", + "rev": "24ecb306d8bcb2dc56922aee724af7c8bf512485", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1631729903, - "narHash": "sha256-ulQg4JnnOMrRA3llwaHUByzRz2qtJ+8fe3A22iy9PZ4=", + "lastModified": 1631859047, + "narHash": "sha256-IC0GWKnLUqhNI77V2wMdkHBSgQ7bvFGlaJV9XND7me4=", "owner": "nixos", "repo": "nix", - "rev": "1ec4efa6c82fb6d90887c21aa7c7c6f3c644dd65", + "rev": "37cc50f2c88b50086a1a8ed20631d1427d445b7e", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1631706269, - "narHash": "sha256-KVaS+GC3gz/G5qL09ZUnq4gpQR38C+AWuXJ1ftirgK0=", + "lastModified": 1631993469, + "narHash": "sha256-McX1mqzbXtfyf8w9cA5gJHD2mDjen+4ze6xpHHKXuRI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8dd8bd8be74879f9f7919b16a4cb5ab2a75f18e5", + "rev": "6120ac5cd201f6cb593d1b80e861be0342495be9", "type": "github" }, "original": { From 9b287fd65b58a64285d43f804ecdf149a81651c9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 20 Sep 2021 14:29:13 +0200 Subject: [PATCH 112/303] thetys: disable IPFS --- nixos/configurations/thetys.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index fa40a31b..d8843071 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -58,7 +58,7 @@ services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; services.zerotierone.package = (import nixpkgs-2105 { config.allowUnfree = true; system = pkgs.system; }).zerotierone; - services.ipfs.enable = true; + # services.ipfs.enable = true; services.openssh.enable = true; From cacb9699e7625c0370794a02fbb10cb286366bc5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 21 Sep 2021 19:26:28 +0200 Subject: [PATCH 113/303] angular/cli: add package --- packages/default.nix | 3 +- packages/nodePackages/default.nix | 2 +- packages/nodePackages/node-packages.json | 3 +- packages/nodePackages/node-packages.nix | 3014 ++++++++++++++++++++-- packages/nodePackages/override.nix | 16 + 5 files changed, 2818 insertions(+), 220 deletions(-) create mode 100644 packages/nodePackages/override.nix diff --git a/packages/default.nix b/packages/default.nix index 8583f252..aa21b505 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -6,7 +6,7 @@ let mpkgs = inputs.master.legacyPackages.x86_64-linux; epkgs = import inputs.unstable { system = "x86_64-linux"; overlays = [ emacs.overlay ]; }; - nodePkgs = upkgs.callPackage ./nodePackages { }; + nodePkgs = upkgs.callPackage ./nodePackages/override.nix { }; in { "advcp" = pkgs.callPackage ./advcp { }; @@ -19,4 +19,5 @@ in "erlang-ls" = upkgs.beam.packages.erlang.callPackage ./erlang-ls { }; "rofi/unicode" = upkgs.callPackage ./rofi-unicode { }; "zx" = nodePkgs.zx; + "angular" = nodePkgs."@angular/cli"; } diff --git a/packages/nodePackages/default.nix b/packages/nodePackages/default.nix index 23ba53cb..ba9d50d7 100644 --- a/packages/nodePackages/default.nix +++ b/packages/nodePackages/default.nix @@ -4,7 +4,7 @@ inherit system; } , system ? builtins.currentSystem -, nodejs ? pkgs."nodejs-12_x" +, nodejs ? pkgs."nodejs-14_x" }: let diff --git a/packages/nodePackages/node-packages.json b/packages/nodePackages/node-packages.json index 5fe8fdea..171ab173 100644 --- a/packages/nodePackages/node-packages.json +++ b/packages/nodePackages/node-packages.json @@ -1,3 +1,4 @@ [ - "zx" + "zx", + "@angular/cli" ] diff --git a/packages/nodePackages/node-packages.nix b/packages/nodePackages/node-packages.nix index aa64ac84..ccf061aa 100644 --- a/packages/nodePackages/node-packages.nix +++ b/packages/nodePackages/node-packages.nix @@ -4,6 +4,42 @@ let sources = { + "@angular-devkit/architect-0.1202.6" = { + name = "_at_angular-devkit_slash_architect"; + packageName = "@angular-devkit/architect"; + version = "0.1202.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.6.tgz"; + sha512 = "DQHK5VGfPof1TuSmRmt2Usw2BuNVLzxKSSy7+tEJbYzqf8N/wQO+1M67ye8qf8gAU88xGo378dD9++DFc/PJZA=="; + }; + }; + "@angular-devkit/core-12.2.6" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "12.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.6.tgz"; + sha512 = "E+OhY34Vmwyy1/PaX/nzao40XM70wOr7Urh00sAtV8sPLXMLeW0gHk4DUchCKohxQkrIL0AxYt1aeUVgIc7bSA=="; + }; + }; + "@angular-devkit/schematics-12.2.6" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "12.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.6.tgz"; + sha512 = "CmDNOdJg08p5QrV8dNdg3O5ErYM1hJT06PLnVZzTWkShAL0y/3zxXAP/Wwdg0vAvt9Kh38jvMtC3YTCOThR/hA=="; + }; + }; + "@gar/promisify-1.1.2" = { + name = "_at_gar_slash_promisify"; + packageName = "@gar/promisify"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz"; + sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; + }; + }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -31,6 +67,123 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; + "@npmcli/fs-1.0.0" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz"; + sha512 = "8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ=="; + }; + }; + "@npmcli/git-2.1.0" = { + name = "_at_npmcli_slash_git"; + packageName = "@npmcli/git"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz"; + sha512 = "/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw=="; + }; + }; + "@npmcli/installed-package-contents-1.0.7" = { + name = "_at_npmcli_slash_installed-package-contents"; + packageName = "@npmcli/installed-package-contents"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz"; + sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; + }; + }; + "@npmcli/move-file-1.1.2" = { + name = "_at_npmcli_slash_move-file"; + packageName = "@npmcli/move-file"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + }; + }; + "@npmcli/node-gyp-1.0.2" = { + name = "_at_npmcli_slash_node-gyp"; + packageName = "@npmcli/node-gyp"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz"; + sha512 = "yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="; + }; + }; + "@npmcli/promise-spawn-1.3.2" = { + name = "_at_npmcli_slash_promise-spawn"; + packageName = "@npmcli/promise-spawn"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz"; + sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; + }; + }; + "@npmcli/run-script-1.8.6" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "1.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz"; + sha512 = "e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g=="; + }; + }; + "@rollup/plugin-commonjs-20.0.0" = { + name = "_at_rollup_slash_plugin-commonjs"; + packageName = "@rollup/plugin-commonjs"; + version = "20.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz"; + sha512 = "5K0g5W2Ol8hAcTHqcTBHiA7M58tfmYi1o9KxeJuuRNpGaTa5iLjcyemBitCBcKXaHamOBBEH2dGom6v6Unmqjg=="; + }; + }; + "@rollup/plugin-node-resolve-13.0.4" = { + name = "_at_rollup_slash_plugin-node-resolve"; + packageName = "@rollup/plugin-node-resolve"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz"; + sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w=="; + }; + }; + "@rollup/pluginutils-3.1.0" = { + name = "_at_rollup_slash_pluginutils"; + packageName = "@rollup/pluginutils"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; + sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; + }; + }; + "@schematics/angular-12.2.6" = { + name = "_at_schematics_slash_angular"; + packageName = "@schematics/angular"; + version = "12.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.6.tgz"; + sha512 = "53yVIB43jPpqitJXT5IxPm9Kq1P8AyRgzrCIKAl4mESsPsOIFR6ZCpuNRlaumEinHnbMpgzZ2M+RlialzAOS6w=="; + }; + }; + "@tootallnate/once-1.1.2" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + }; + }; + "@types/estree-0.0.39" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; + sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + }; + }; "@types/fs-extra-9.0.12" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; @@ -49,13 +202,13 @@ let sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/node-16.7.1" = { + "@types/node-16.9.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.7.1"; + version = "16.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.7.1.tgz"; - sha512 = "ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.4.tgz"; + sha512 = "KDazLNYAGIuJugdbULwFZULF9qQ13yNWEBFnfVpqlpgAAo6H/qnM9RjBgh0A0kmHf3XxAKLdN5mTIng9iUvVLA=="; }; }; "@types/node-fetch-2.5.12" = { @@ -67,6 +220,132 @@ let sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; }; }; + "@types/resolve-1.17.1" = { + name = "_at_types_slash_resolve"; + packageName = "@types/resolve"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"; + sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; + }; + }; + "@yarnpkg/lockfile-1.1.0" = { + name = "_at_yarnpkg_slash_lockfile"; + packageName = "@yarnpkg/lockfile"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz"; + sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; + "agentkeepalive-4.1.4" = { + name = "agentkeepalive"; + packageName = "agentkeepalive"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; + sha512 = "+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ=="; + }; + }; + "aggregate-error-3.1.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ajv-8.6.2" = { + name = "ajv"; + packageName = "ajv"; + version = "8.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz"; + sha512 = "9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w=="; + }; + }; + "ajv-formats-2.1.0" = { + name = "ajv-formats"; + packageName = "ajv-formats"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz"; + sha512 = "USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q=="; + }; + }; + "ansi-colors-4.1.1" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + }; + }; + "ansi-escapes-4.3.2" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-regex-5.0.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; + }; + }; "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -76,6 +355,24 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.7" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + }; + }; "array-union-3.0.1" = { name = "array-union"; packageName = "array-union"; @@ -85,6 +382,24 @@ let sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; }; }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -94,6 +409,69 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.11.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + }; + }; + "balanced-match-1.0.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; "braces-3.0.2" = { name = "braces"; packageName = "braces"; @@ -103,6 +481,51 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; + "builtin-modules-3.2.0" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz"; + sha512 = "lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="; + }; + }; + "builtins-1.0.3" = { + name = "builtins"; + packageName = "builtins"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + }; + "cacache-15.3.0" = { + name = "cacache"; + packageName = "cacache"; + version = "15.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"; + sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -112,319 +535,2119 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; + "cli-spinners-2.6.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"; + sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; + }; + }; + "cli-width-3.0.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; + sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; + }; + }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; "color-convert-2.0.1" = { name = "color-convert"; packageName = "color-convert"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + }; + }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "define-lazy-prop-2.0.0" = { + name = "define-lazy-prop"; + packageName = "define-lazy-prop"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; + sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; + "duplexer-0.1.2" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; + "env-paths-2.2.1" = { + name = "env-paths"; + packageName = "env-paths"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; + }; + }; + "err-code-2.0.3" = { + name = "err-code"; + packageName = "err-code"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "estree-walker-1.0.1" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; + sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; + }; + }; + "estree-walker-2.0.2" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"; + sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; + }; + }; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-glob-3.2.7" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fastq-1.13.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; + }; + }; + "figures-3.2.0" = { + name = "figures"; + packageName = "figures"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; + sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "form-data-3.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; + sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + }; + }; + "from-0.1.7" = { + name = "from"; + packageName = "from"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + }; + }; + "fs-extra-10.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz"; + sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fsevents-2.3.2" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.7" = { + name = "glob"; + packageName = "glob"; + version = "7.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + }; + }; + "glob-parent-5.1.2" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + }; + "globby-12.0.2" = { + name = "globby"; + packageName = "globby"; + version = "12.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz"; + sha512 = "lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ=="; + }; + }; + "graceful-fs-4.2.8" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.5" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "hosted-git-info-4.0.2" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg=="; + }; + }; + "http-cache-semantics-4.1.0" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + }; + }; + "http-proxy-agent-4.0.1" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "https-proxy-agent-5.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + }; + }; + "humanize-ms-1.2.1" = { + name = "humanize-ms"; + packageName = "humanize-ms"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "iconv-lite-0.6.3" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; + "ignore-5.1.8" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + }; + "ignore-walk-3.0.4" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-2.0.0" = { + name = "ini"; + packageName = "ini"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; + }; + }; + "inquirer-8.1.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz"; + sha512 = "DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q=="; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; + "is-core-module-2.6.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; + sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; + }; + }; + "is-docker-2.2.1" = { + name = "is-docker"; + packageName = "is-docker"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-interactive-1.0.0" = { + name = "is-interactive"; + packageName = "is-interactive"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"; + sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; + }; + }; + "is-lambda-1.0.1" = { + name = "is-lambda"; + packageName = "is-lambda"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; + sha1 = "3d9877899e6a53efc0160504cde15f82e6f061d5"; + }; + }; + "is-module-1.0.0" = { + name = "is-module"; + packageName = "is-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"; + sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-reference-1.2.1" = { + name = "is-reference"; + packageName = "is-reference"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; + sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; + "is-wsl-2.2.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-parse-even-better-errors-2.3.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-schema-traverse-1.0.0" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsonc-parser-3.0.0" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz"; + sha512 = "fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="; + }; + }; + "jsonfile-6.1.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "log-symbols-4.1.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "magic-string-0.25.7" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.25.7"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"; + sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; + }; + }; + "make-fetch-happen-9.1.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; + "micromatch-4.0.4" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + }; + }; + "mime-db-1.49.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.49.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; + }; + }; + "mime-types-2.1.32" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.32"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "minipass-3.1.5" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + }; + }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-fetch-1.4.1" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; + sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-json-stream-1.0.1" = { + name = "minipass-json-stream"; + packageName = "minipass-json-stream"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz"; + sha512 = "ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg=="; + }; + }; + "minipass-pipeline-1.2.4" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + }; + "minipass-sized-1.0.3" = { + name = "minipass-sized"; + packageName = "minipass-sized"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "node-fetch-2.6.4" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.4.tgz"; + sha512 = "aD1fO+xtLiSCc9vuD+sYMxpIuQyhHscGSkBEo2o5LTV/3bTEAYvdUii29n8LlO5uLCmWdGP7uVUVXFo5SRdkLA=="; + }; + }; + "node-gyp-7.1.2" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"; + sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; + }; + }; + "nopt-5.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; + }; + }; + "npm-bundled-1.1.2" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"; + sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; + }; + }; + "npm-install-checks-4.0.0" = { + name = "npm-install-checks"; + packageName = "npm-install-checks"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz"; + sha512 = "09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w=="; + }; + }; + "npm-normalize-package-bin-1.0.1" = { + name = "npm-normalize-package-bin"; + packageName = "npm-normalize-package-bin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; + }; + }; + "npm-package-arg-8.1.5" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "8.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz"; + sha512 = "LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="; + }; + }; + "npm-packlist-2.2.2" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz"; + sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="; + }; + }; + "npm-pick-manifest-6.1.1" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz"; + sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="; + }; + }; + "npm-registry-fetch-11.0.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz"; + sha512 = "jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-5.1.2" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + }; + "open-8.2.1" = { + name = "open"; + packageName = "open"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.2.1.tgz"; + sha512 = "rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ=="; + }; + }; + "ora-5.4.1" = { + name = "ora"; + packageName = "ora"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; + "pacote-11.3.5" = { + name = "pacote"; + packageName = "pacote"; + version = "11.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz"; + sha512 = "fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-parse-1.0.7" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; + }; + }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "picomatch-2.3.0" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; + "promise-retry-2.0.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + }; + "ps-tree-1.2.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz"; + sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; + }; + }; + "psl-1.8.0" = { + name = "psl"; + packageName = "psl"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + }; + "read-package-json-fast-2.0.3" = { + name = "read-package-json-fast"; + packageName = "read-package-json-fast"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz"; + sha512 = "W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; + "require-from-string-2.0.2" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + }; + "resolve-1.20.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "rollup-2.56.3" = { + name = "rollup"; + packageName = "rollup"; + version = "2.56.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"; + sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg=="; + }; + }; + "run-async-2.4.1" = { + name = "run-async"; + packageName = "run-async"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; + }; + }; + "run-parallel-1.2.0" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + }; + }; + "rxjs-6.6.7" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; + }; + }; + "rxjs-7.3.0" = { + name = "rxjs"; + packageName = "rxjs"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz"; + sha512 = "p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "semver-7.3.5" = { + name = "semver"; + packageName = "semver"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "signal-exit-3.0.4" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"; + sha512 = "rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="; + }; + }; + "slash-4.0.0" = { + name = "slash"; + packageName = "slash"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; + sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + }; + }; + "smart-buffer-4.2.0" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; + }; + }; + "socks-2.6.1" = { + name = "socks"; + packageName = "socks"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz"; + sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; + }; + }; + "socks-proxy-agent-6.1.0" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"; + sha512 = "57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; + "sourcemap-codec-1.4.8" = { + name = "sourcemap-codec"; + packageName = "sourcemap-codec"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; + sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; + }; + }; + "split-0.3.3" = { + name = "split"; + packageName = "split"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; + "ssri-8.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; + sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; }; }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; }; }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; }; }; - "dir-glob-3.0.1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "3.0.1"; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "fast-glob-3.2.7" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.7"; + "string-width-4.2.2" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; - sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; + sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; }; }; - "fastq-1.12.0" = { - name = "fastq"; - packageName = "fastq"; - version = "1.12.0"; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz"; - sha512 = "VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg=="; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; + "string_decoder-1.3.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; - "form-data-3.0.1" = { - name = "form-data"; - packageName = "form-data"; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; - sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; - "fs-extra-10.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.0.0"; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz"; - sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "glob-parent-5.1.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.2"; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; - "globby-12.0.1" = { - name = "globby"; - packageName = "globby"; - version = "12.0.1"; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.0.1.tgz"; - sha512 = "AofdCGi+crQ1uN9+nMbTnvC4XGNPJN9hRiPf+A76lUZIZoWoj4Z9iyUQGge7xCGKgR/7ejB36qoIlLoDBc7fYw=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "graceful-fs-4.2.8" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.8"; + "symbol-observable-4.0.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz"; + sha512 = "b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ=="; }; }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; + "tar-6.1.11" = { + name = "tar"; + packageName = "tar"; + version = "6.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; - "ignore-5.1.8" = { - name = "ignore"; - packageName = "ignore"; - version = "5.1.8"; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; - sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; - "is-glob-4.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.1"; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; }; }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; + "tslib-1.14.1" = { + name = "tslib"; + packageName = "tslib"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; + "tslib-2.1.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; + sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; }; }; - "micromatch-4.0.4" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.4"; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; - "mime-db-1.49.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.49.0"; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; - sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "mime-types-2.1.32" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.32"; + "type-fest-0.21.3" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; - sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; }; - "minimist-1.2.5" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.5"; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; - "node-fetch-2.6.1" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.1"; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; - sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; + "universalify-2.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; }; - "picomatch-2.3.0" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.3.0"; + "uri-js-4.4.1" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; - sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "queue-microtask-1.2.3" = { - name = "queue-microtask"; - packageName = "queue-microtask"; - version = "1.2.3"; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "run-parallel-1.2.0" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.2.0"; + "uuid-8.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "slash-4.0.0" = { - name = "slash"; - packageName = "slash"; - version = "4.0.0"; + "validate-npm-package-name-3.0.0" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; - sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + }; + }; + "whatwg-url-5.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; }; }; "which-2.0.2" = { @@ -436,66 +2659,140 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; }; in { zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "3.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-3.1.0.tgz"; - sha512 = "Dwm75vWiWPsZhZXRUmneeZQlMbRXJBDLMy+QGDyKDID2+Dkp6LCzlXTrW7VOmU66K1/w8dEcJ5r3zFCDW0kx1Q=="; + url = "https://registry.npmjs.org/zx/-/zx-4.2.0.tgz"; + sha512 = "/4f7FaJecA9I655KXKXIHO3CFNYjAz2uSmTz6v2eNlKdrQKyz4VyF3RjqFuP6nQG+Hd3+NjOvrVNBkv8Ne9d4Q=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@rollup/plugin-commonjs-20.0.0" + sources."@rollup/plugin-node-resolve-13.0.4" + (sources."@rollup/pluginutils-3.1.0" // { + dependencies = [ + sources."estree-walker-1.0.1" + ]; + }) + sources."@types/estree-0.0.39" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.1" + sources."@types/node-16.9.4" sources."@types/node-fetch-2.5.12" + sources."@types/resolve-1.17.1" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" sources."asynckit-0.4.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."builtin-modules-3.2.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" + sources."duplexer-0.1.2" + sources."estree-walker-2.0.2" + sources."event-stream-3.3.4" sources."fast-glob-3.2.7" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."form-data-3.0.1" + sources."from-0.1.7" sources."fs-extra-10.0.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."globby-12.0.1" + sources."globby-12.0.2" sources."graceful-fs-4.2.8" + sources."has-1.0.3" sources."has-flag-4.0.0" sources."ignore-5.1.8" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" + sources."is-module-1.0.0" sources."is-number-7.0.0" + sources."is-reference-1.2.1" sources."isexe-2.0.0" sources."jsonfile-6.1.0" + sources."magic-string-0.25.7" + sources."map-stream-0.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" + sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" sources."path-type-4.0.0" + sources."pause-stream-0.0.11" sources."picomatch-2.3.0" + sources."ps-tree-1.2.0" sources."queue-microtask-1.2.3" + sources."resolve-1.20.0" sources."reusify-1.0.4" + sources."rollup-2.56.3" sources."run-parallel-1.2.0" sources."slash-4.0.0" + sources."sourcemap-codec-1.4.8" + sources."split-0.3.3" + sources."stream-combiner-0.0.4" sources."supports-color-7.2.0" + sources."through-2.3.8" sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" sources."universalify-2.0.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -503,7 +2800,290 @@ in homepage = "https://github.com/google/zx#readme"; license = "Apache-2.0"; }; - production = true; + production = false; + bypassCache = true; + reconstructLock = true; + }; + "@angular/cli" = nodeEnv.buildNodePackage { + name = "_at_angular_slash_cli"; + packageName = "@angular/cli"; + version = "12.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.6.tgz"; + sha512 = "nBCynOi5OVVAXA4ktsVhWP+UyWjjR/7+TlEjNgEfcbtlwkE+HIki+oHETAtXKdn5nPvNum3OXPLZPLX2B8MiRA=="; + }; + dependencies = [ + sources."@angular-devkit/architect-0.1202.6" + sources."@angular-devkit/core-12.2.6" + sources."@angular-devkit/schematics-12.2.6" + sources."@gar/promisify-1.1.2" + sources."@npmcli/fs-1.0.0" + sources."@npmcli/git-2.1.0" + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/move-file-1.1.2" + sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/promise-spawn-1.3.2" + sources."@npmcli/run-script-1.8.6" + sources."@schematics/angular-12.2.6" + sources."@tootallnate/once-1.1.2" + sources."@yarnpkg/lockfile-1.1.0" + sources."abbrev-1.1.1" + sources."agent-base-6.0.2" + sources."agentkeepalive-4.1.4" + sources."aggregate-error-3.1.0" + sources."ajv-8.6.2" + sources."ajv-formats-2.1.0" + sources."ansi-colors-4.1.1" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bl-4.1.0" + sources."brace-expansion-1.1.11" + sources."buffer-5.7.1" + sources."builtins-1.0.3" + sources."cacache-15.3.0" + sources."caseless-0.12.0" + sources."chalk-4.1.2" + sources."chardet-0.7.0" + sources."chownr-2.0.0" + sources."clean-stack-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-width-3.0.0" + sources."clone-1.0.4" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.3" + sources."dashdash-1.14.1" + sources."debug-4.3.2" + sources."defaults-1.0.3" + sources."define-lazy-prop-2.0.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + sources."env-paths-2.2.1" + sources."err-code-2.0.3" + sources."escape-string-regexp-1.0.5" + sources."extend-3.0.2" + sources."external-editor-3.1.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."figures-3.2.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-minipass-2.1.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."getpass-0.1.7" + sources."glob-7.1.7" + sources."graceful-fs-4.2.8" + sources."har-schema-2.0.0" + (sources."har-validator-5.1.5" // { + dependencies = [ + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" + ]; + }) + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" + sources."hosted-git-info-4.0.2" + sources."http-cache-semantics-4.1.0" + sources."http-proxy-agent-4.0.1" + sources."http-signature-1.2.0" + sources."https-proxy-agent-5.0.0" + sources."humanize-ms-1.2.1" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."ignore-walk-3.0.4" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-2.0.0" + (sources."inquirer-8.1.2" // { + dependencies = [ + sources."rxjs-7.3.0" + sources."tslib-2.1.0" + ]; + }) + sources."ip-1.1.5" + sources."is-core-module-2.6.0" + sources."is-docker-2.2.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-interactive-1.0.0" + sources."is-lambda-1.0.1" + sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" + sources."is-wsl-2.2.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-1.0.0" + sources."json-stringify-safe-5.0.1" + sources."jsonc-parser-3.0.0" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" + sources."lodash-4.17.21" + sources."log-symbols-4.1.0" + sources."lru-cache-6.0.0" + sources."magic-string-0.25.7" + sources."make-fetch-happen-9.1.0" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minipass-3.1.5" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.4.1" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."negotiator-0.6.2" + sources."node-gyp-7.1.2" + sources."nopt-5.0.0" + sources."npm-bundled-1.1.2" + sources."npm-install-checks-4.0.0" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-package-arg-8.1.5" + sources."npm-packlist-2.2.2" + sources."npm-pick-manifest-6.1.1" + sources."npm-registry-fetch-11.0.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."open-8.2.1" + sources."ora-5.4.1" + sources."os-tmpdir-1.0.2" + sources."p-map-4.0.0" + sources."pacote-11.3.5" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."read-package-json-fast-2.0.3" + sources."readable-stream-3.6.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + sources."require-from-string-2.0.2" + sources."resolve-1.20.0" + sources."restore-cursor-3.1.0" + sources."retry-0.12.0" + sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."semver-7.3.5" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.4" + sources."smart-buffer-4.2.0" + sources."socks-2.6.1" + sources."socks-proxy-agent-6.1.0" + sources."source-map-0.7.3" + sources."sourcemap-codec-1.4.8" + sources."sshpk-1.16.1" + sources."ssri-8.0.1" + sources."string-width-4.2.2" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."symbol-observable-4.0.0" + sources."tar-6.1.11" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."tough-cookie-2.5.0" + sources."tslib-1.14.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-fest-0.21.3" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."uri-js-4.4.1" + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" + sources."validate-npm-package-name-3.0.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) + sources."wcwidth-1.0.1" + sources."which-2.0.2" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."yallist-4.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI tool for Angular"; + homepage = "https://github.com/angular/angular-cli"; + license = "MIT"; + }; + production = false; bypassCache = true; reconstructLock = true; }; diff --git a/packages/nodePackages/override.nix b/packages/nodePackages/override.nix new file mode 100644 index 00000000..97d42f3c --- /dev/null +++ b/packages/nodePackages/override.nix @@ -0,0 +1,16 @@ +{ pkgs ? import { + inherit system; + } +, system ? builtins.currentSystem +}: + +let + nodePackages = import ./default.nix { + inherit pkgs system; + }; +in +nodePackages // { + "@angular/cli" = nodePackages."@angular/cli".overrideAttrs (_: { + NG_CLI_ANALYTICS = false; + }); +} From e76d475539d7866f0a046d472abeed620a8c30f1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 24 Sep 2021 06:41:03 +0200 Subject: [PATCH 114/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/0ee5cdf83c885b36ac5045e7747bcde670f1c7af' (2021-09-20) → 'github:nix-community/emacs-overlay/f2f6b76c2eb17ac3d790ebd2f4eaee74a102350a' (2021-09-24) • Updated input 'home-manager': 'github:nix-community/home-manager/371576cdc2580ba93a38e28da8ece2129f558815' (2021-09-15) → 'github:nix-community/home-manager/b0651cc2173427857b172604f85da6afe69e1d41' (2021-09-23) • Updated input 'master': 'github:nixos/nixpkgs/24ecb306d8bcb2dc56922aee724af7c8bf512485' (2021-09-20) → 'github:nixos/nixpkgs/86dedbe7601047727520740edf54efd8ac353cfd' (2021-09-24) • Updated input 'nix': 'github:nixos/nix/37cc50f2c88b50086a1a8ed20631d1427d445b7e' (2021-09-17) → 'github:nixos/nix/87de086e1aa2bf2fb1a953c0a7935f45f558c758' (2021-09-23) • Updated input 'nixpkgs-2009': 'github:nixos/nixpkgs/068984c00e0d4e54b6684d98f6ac47c92dcb642e' (2021-07-10) → 'github:nixos/nixpkgs/751ad2b52f505cfd6dae257bfaac4d3a2bd25160' (2021-09-23) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/6120ac5cd201f6cb593d1b80e861be0342495be9' (2021-09-18) → 'github:nixos/nixpkgs/83413f47809790e4ca012e314e7782adeae36cf2' (2021-09-22) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/ab9c26a903846fc6712b811bdb32a2539ed3a42d' (2021-09-13) → 'github:nix-community/rnix-lsp/b3f2a6dbcd1115bd449b8cf1299d828c9ebeb485' (2021-09-23) • Updated input 'unstable': 'github:nixos/nixpkgs/79c444b5bdeaba142d128afddee14c89ecf2a968' (2021-09-16) → 'github:nixos/nixpkgs/a930f7da84786807bb105df40e76b541604c3e72' (2021-09-22) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 217af501..0cfd9551 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1632101904, - "narHash": "sha256-Pk2sn57qZxc3e5Rz5gFaMby+1zS0J9BqaM2iEDTDvWk=", + "lastModified": 1632444435, + "narHash": "sha256-7sjjUv53L0Jx3ChoJH0UcKgiCpTlCtVghbWvK5ml/M8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0ee5cdf83c885b36ac5045e7747bcde670f1c7af", + "rev": "f2f6b76c2eb17ac3d790ebd2f4eaee74a102350a", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1631740142, - "narHash": "sha256-FnwtaJ+fZw2QzsCqGJW4kJd9hXiPxPgfi+9dwratk28=", + "lastModified": 1632431340, + "narHash": "sha256-9xUnx5aeDp8Irg2/rWBKn3AjiiQTtsjTX0UshzMXy94=", "owner": "nix-community", "repo": "home-manager", - "rev": "371576cdc2580ba93a38e28da8ece2129f558815", + "rev": "b0651cc2173427857b172604f85da6afe69e1d41", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1632111884, - "narHash": "sha256-XZi3/6jD2f3bfSGlnG7pJa5yiZ5p4VOoJOGo7F4pqqQ=", + "lastModified": 1632455993, + "narHash": "sha256-vSPCK+DyHw8xkx6et5vuC76BvdEJHLDiSB7OBrMIfeg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "24ecb306d8bcb2dc56922aee724af7c8bf512485", + "rev": "86dedbe7601047727520740edf54efd8ac353cfd", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1631859047, - "narHash": "sha256-IC0GWKnLUqhNI77V2wMdkHBSgQ7bvFGlaJV9XND7me4=", + "lastModified": 1632431670, + "narHash": "sha256-UJ4wiNSTqTLQPML6YNA8l3srkFsxCSNmjySVXFjnOU4=", "owner": "nixos", "repo": "nix", - "rev": "37cc50f2c88b50086a1a8ed20631d1427d445b7e", + "rev": "87de086e1aa2bf2fb1a953c0a7935f45f558c758", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs-2009": { "locked": { - "lastModified": 1625876282, - "narHash": "sha256-z/Gv+11Uzdv3HcQCY+xGi1+iuc3rmCaPzxxDSMnuRAI=", + "lastModified": 1632361382, + "narHash": "sha256-Ms1JPm64V3/O4TKoYDpi5HJVNorJG16b0/CKTjwncjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "068984c00e0d4e54b6684d98f6ac47c92dcb642e", + "rev": "751ad2b52f505cfd6dae257bfaac4d3a2bd25160", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1631993469, - "narHash": "sha256-McX1mqzbXtfyf8w9cA5gJHD2mDjen+4ze6xpHHKXuRI=", + "lastModified": 1632291606, + "narHash": "sha256-oEN24XJYAFK9tsD13TzLEizpgQigEfgC6i9x1b/1pVU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6120ac5cd201f6cb593d1b80e861be0342495be9", + "rev": "83413f47809790e4ca012e314e7782adeae36cf2", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1631531304, - "narHash": "sha256-hlJ0FYaxUGpFqAuhB+Fde7ydxJQXV3NIwKQ8rW85gc8=", + "lastModified": 1632399591, + "narHash": "sha256-54dtLkGAbQ4Sln/bs/sI0GaCbXyK8+vDD8QBgxaiCXg=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "ab9c26a903846fc6712b811bdb32a2539ed3a42d", + "rev": "b3f2a6dbcd1115bd449b8cf1299d828c9ebeb485", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "unstable": { "locked": { - "lastModified": 1631785487, - "narHash": "sha256-VSKEvOtaY/roDxEHFxXh6GguOqqWCJZ3E06fBdKu8+I=", + "lastModified": 1632325095, + "narHash": "sha256-KHVVIxhVHq4Wwj4oQPem8/eVkukVKhSPqFKI1o5NrTw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "79c444b5bdeaba142d128afddee14c89ecf2a968", + "rev": "a930f7da84786807bb105df40e76b541604c3e72", "type": "github" }, "original": { From 47c1a5f3993af148c0dc2eef57f2f09aadcebad3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 27 Sep 2021 08:16:03 +0200 Subject: [PATCH 115/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/f2f6b76c2eb17ac3d790ebd2f4eaee74a102350a' (2021-09-24) → 'github:nix-community/emacs-overlay/9e413d8ce53b287d72dc4a6acb20d8ded68514bf' (2021-09-27) • Updated input 'master': 'github:nixos/nixpkgs/86dedbe7601047727520740edf54efd8ac353cfd' (2021-09-24) → 'github:nixos/nixpkgs/5655e71eeeb7c47908ac92b3ff2f6c5073a30d76' (2021-09-27) • Updated input 'nix': 'github:nixos/nix/87de086e1aa2bf2fb1a953c0a7935f45f558c758' (2021-09-23) → 'github:nixos/nix/a0bb5c4130268edbd368a4a07d4a30f1064e9c86' (2021-09-24) • Updated input 'nixpkgs-2009': 'github:nixos/nixpkgs/751ad2b52f505cfd6dae257bfaac4d3a2bd25160' (2021-09-23) → 'github:nixos/nixpkgs/a13824fe5e38187fbc75cd598b5c06bdcc13501f' (2021-09-23) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/83413f47809790e4ca012e314e7782adeae36cf2' (2021-09-22) → 'github:nixos/nixpkgs/fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44' (2021-09-26) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/b3f2a6dbcd1115bd449b8cf1299d828c9ebeb485' (2021-09-23) → 'github:nix-community/rnix-lsp/cc8d7a30eacfc0dd996339942bc024f5c8d7ec5d' (2021-09-26) • Updated input 'unstable': 'github:nixos/nixpkgs/a930f7da84786807bb105df40e76b541604c3e72' (2021-09-22) → 'github:nixos/nixpkgs/51bcdc4cdaac48535dabf0ad4642a66774c609ed' (2021-09-23) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 0cfd9551..81e36dd1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1632444435, - "narHash": "sha256-7sjjUv53L0Jx3ChoJH0UcKgiCpTlCtVghbWvK5ml/M8=", + "lastModified": 1632706853, + "narHash": "sha256-ssgnd5grFcM57rk0FcqKkHAQ7Nu4P9fI+BWhWXP8H0s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f2f6b76c2eb17ac3d790ebd2f4eaee74a102350a", + "rev": "9e413d8ce53b287d72dc4a6acb20d8ded68514bf", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1632455993, - "narHash": "sha256-vSPCK+DyHw8xkx6et5vuC76BvdEJHLDiSB7OBrMIfeg=", + "lastModified": 1632720807, + "narHash": "sha256-uvOR1Bqg6niJ/PXAMhOH5DpPJvv9glCf1/+aBIFwSeE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "86dedbe7601047727520740edf54efd8ac353cfd", + "rev": "5655e71eeeb7c47908ac92b3ff2f6c5073a30d76", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1632431670, - "narHash": "sha256-UJ4wiNSTqTLQPML6YNA8l3srkFsxCSNmjySVXFjnOU4=", + "lastModified": 1632496624, + "narHash": "sha256-jd3MRDYlVRkgdCjohD5wFf/2lF+/z3jhoPRW5nPwqCg=", "owner": "nixos", "repo": "nix", - "rev": "87de086e1aa2bf2fb1a953c0a7935f45f558c758", + "rev": "a0bb5c4130268edbd368a4a07d4a30f1064e9c86", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs-2009": { "locked": { - "lastModified": 1632361382, - "narHash": "sha256-Ms1JPm64V3/O4TKoYDpi5HJVNorJG16b0/CKTjwncjU=", + "lastModified": 1632408697, + "narHash": "sha256-JqTfu361AwFmV0WszXLAjfukqGxBbHRopRgdp9A2w8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "751ad2b52f505cfd6dae257bfaac4d3a2bd25160", + "rev": "a13824fe5e38187fbc75cd598b5c06bdcc13501f", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1632291606, - "narHash": "sha256-oEN24XJYAFK9tsD13TzLEizpgQigEfgC6i9x1b/1pVU=", + "lastModified": 1632639184, + "narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "83413f47809790e4ca012e314e7782adeae36cf2", + "rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1632399591, - "narHash": "sha256-54dtLkGAbQ4Sln/bs/sI0GaCbXyK8+vDD8QBgxaiCXg=", + "lastModified": 1632643075, + "narHash": "sha256-I2MPLO3HPM2hMVNDwMV0c9mmZUggWuxtKsVtZG9gm5w=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "b3f2a6dbcd1115bd449b8cf1299d828c9ebeb485", + "rev": "cc8d7a30eacfc0dd996339942bc024f5c8d7ec5d", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "unstable": { "locked": { - "lastModified": 1632325095, - "narHash": "sha256-KHVVIxhVHq4Wwj4oQPem8/eVkukVKhSPqFKI1o5NrTw=", + "lastModified": 1632411313, + "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a930f7da84786807bb105df40e76b541604c3e72", + "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed", "type": "github" }, "original": { From 67cbb1e75cd812362032dc8d511bd9d1c001c360 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 4 Oct 2021 10:13:25 +0200 Subject: [PATCH 116/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/9e413d8ce53b287d72dc4a6acb20d8ded68514bf' (2021-09-27) → 'github:nix-community/emacs-overlay/5fa26165cf34adbe693b159093ea15f24f7f7ea4' (2021-09-30) • Updated input 'home-manager': 'github:nix-community/home-manager/b0651cc2173427857b172604f85da6afe69e1d41' (2021-09-23) → 'github:nix-community/home-manager/099cbcf13e8219f07b493980a66fe64df0e32d09' (2021-10-03) • Updated input 'master': 'github:nixos/nixpkgs/5655e71eeeb7c47908ac92b3ff2f6c5073a30d76' (2021-09-27) → 'github:nixos/nixpkgs/5a58649f4f6b7d3137ebd88a24cf2834a880a38e' (2021-10-04) • Updated input 'nix': 'github:nixos/nix/a0bb5c4130268edbd368a4a07d4a30f1064e9c86' (2021-09-24) → 'github:nixos/nix/6fadb5df05845e4d7ed18c17c5e68008a97d9044' (2021-10-03) • Updated input 'nix/lowdown-src': 'github:kristapsdz/lowdown/b4483d0ef85990f54b864158ab786b4a5b3904fa' (2021-08-06) → 'github:kristapsdz/lowdown/6bd668af3fd098bdd07a1bedd399564141e275da' (2021-09-24) • Updated input 'nix/nixpkgs': 'github:NixOS/nixpkgs/f6551e1efa261568c82b76c3a582b2c2ceb1f53f' (2021-08-11) → 'github:NixOS/nixpkgs/82891b5e2c2359d7e58d08849e4c89511ab94234' (2021-09-28) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44' (2021-09-26) → 'github:nixos/nixpkgs/92609f3d9bc3acffbdbe54fa1c591a885612aa73' (2021-10-01) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/cc8d7a30eacfc0dd996339942bc024f5c8d7ec5d' (2021-09-26) → 'github:nix-community/rnix-lsp/ba47b015800a41118b203befc1b249a481429fdf' (2021-10-03) • Updated input 'unstable': 'github:nixos/nixpkgs/51bcdc4cdaac48535dabf0ad4642a66774c609ed' (2021-09-23) → 'github:nixos/nixpkgs/82155ff501c7622cb2336646bb62f7624261f6d7' (2021-10-01) --- flake.lock | 55 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 81e36dd1..3ee36ff9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1632706853, - "narHash": "sha256-ssgnd5grFcM57rk0FcqKkHAQ7Nu4P9fI+BWhWXP8H0s=", + "lastModified": 1632992735, + "narHash": "sha256-EuqMxgREM2lNk7JLyHfl5732gjW6pZJurgmKWWUo6ow=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9e413d8ce53b287d72dc4a6acb20d8ded68514bf", + "rev": "5fa26165cf34adbe693b159093ea15f24f7f7ea4", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1632431340, - "narHash": "sha256-9xUnx5aeDp8Irg2/rWBKn3AjiiQTtsjTX0UshzMXy94=", + "lastModified": 1633296444, + "narHash": "sha256-DnC7yVyoYFSsvFze16AWDa5iSHgtT1MbDGgp8rSC3H4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0651cc2173427857b172604f85da6afe69e1d41", + "rev": "099cbcf13e8219f07b493980a66fe64df0e32d09", "type": "github" }, "original": { @@ -53,27 +53,26 @@ "lowdown-src": { "flake": false, "locked": { - "lastModified": 1628247802, - "narHash": "sha256-4XSXGYvKqogR7bubyqYNwBHYCtrIn6XRGXj6+u+BXNs=", + "lastModified": 1632468475, + "narHash": "sha256-NNOm9CbdA8cuwbvaBHslGbPTiU6bh1Ao+MpEPx4rSGo=", "owner": "kristapsdz", "repo": "lowdown", - "rev": "b4483d0ef85990f54b864158ab786b4a5b3904fa", + "rev": "6bd668af3fd098bdd07a1bedd399564141e275da", "type": "github" }, "original": { "owner": "kristapsdz", - "ref": "VERSION_0_8_6", "repo": "lowdown", "type": "github" } }, "master": { "locked": { - "lastModified": 1632720807, - "narHash": "sha256-uvOR1Bqg6niJ/PXAMhOH5DpPJvv9glCf1/+aBIFwSeE=", + "lastModified": 1633334374, + "narHash": "sha256-fmMJXcp4CooH3cp16v+Os1c9aMO+noxirVB/bcfo3aA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5655e71eeeb7c47908ac92b3ff2f6c5073a30d76", + "rev": "5a58649f4f6b7d3137ebd88a24cf2834a880a38e", "type": "github" }, "original": { @@ -110,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1632496624, - "narHash": "sha256-jd3MRDYlVRkgdCjohD5wFf/2lF+/z3jhoPRW5nPwqCg=", + "lastModified": 1633283586, + "narHash": "sha256-5bPZQhwuGcWn8Las3pVVvfumyB9t+FGwxq1N55tolFc=", "owner": "nixos", "repo": "nix", - "rev": "a0bb5c4130268edbd368a4a07d4a30f1064e9c86", + "rev": "6fadb5df05845e4d7ed18c17c5e68008a97d9044", "type": "github" }, "original": { @@ -126,11 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1628689438, - "narHash": "sha256-YMINW6YmubHZVdliGsAJpnnMYXRrvppv59LgwtnyYhs=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6551e1efa261568c82b76c3a582b2c2ceb1f53f", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { @@ -157,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1632639184, - "narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=", + "lastModified": 1633083543, + "narHash": "sha256-thXKms0SvDirYb8/Hw0zqAE1TsuSFWd0y51mSzkPGLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44", + "rev": "92609f3d9bc3acffbdbe54fa1c591a885612aa73", "type": "github" }, "original": { @@ -194,11 +193,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1632643075, - "narHash": "sha256-I2MPLO3HPM2hMVNDwMV0c9mmZUggWuxtKsVtZG9gm5w=", + "lastModified": 1633237382, + "narHash": "sha256-TvtykkGJPoMq5/ynsawuoN81VDnSl+UnHWmBiLqJb/Y=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "cc8d7a30eacfc0dd996339942bc024f5c8d7ec5d", + "rev": "ba47b015800a41118b203befc1b249a481429fdf", "type": "github" }, "original": { @@ -223,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1632411313, - "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=", + "lastModified": 1633080050, + "narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed", + "rev": "82155ff501c7622cb2336646bb62f7624261f6d7", "type": "github" }, "original": { From 946e412416fa5176226e1b5e9a7a4052505a520c Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 6 Oct 2021 15:35:45 +0200 Subject: [PATCH 117/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/5fa26165cf34adbe693b159093ea15f24f7f7ea4' (2021-09-30) → 'github:nix-community/emacs-overlay/8a47765478628f684b09d7f7aa5960e697309c74' (2021-10-06) • Updated input 'home-manager': 'github:nix-community/home-manager/099cbcf13e8219f07b493980a66fe64df0e32d09' (2021-10-03) → 'github:nix-community/home-manager/8bbade4b01c316119e6b163fa9af6ee246cc989a' (2021-10-06) • Updated input 'master': 'github:nixos/nixpkgs/5a58649f4f6b7d3137ebd88a24cf2834a880a38e' (2021-10-04) → 'github:nixos/nixpkgs/2b0082a68f810743c46a65289816313e87057d49' (2021-10-06) • Updated input 'nix': 'github:nixos/nix/6fadb5df05845e4d7ed18c17c5e68008a97d9044' (2021-10-03) → 'github:nixos/nix/d0cc6a192af34f57b0892c49e09c2896c1f5a9dc' (2021-10-06) • Updated input 'nix/lowdown-src': 'github:kristapsdz/lowdown/6bd668af3fd098bdd07a1bedd399564141e275da' (2021-09-24) → 'github:kristapsdz/lowdown/d2c2b44ff6c27b936ec27358a2653caaef8f73b8' (2021-10-06) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/92609f3d9bc3acffbdbe54fa1c591a885612aa73' (2021-10-01) → 'github:nixos/nixpkgs/aff647e2704fa1223994604887bb78276dc57083' (2021-10-05) • Updated input 'unstable': 'github:nixos/nixpkgs/82155ff501c7622cb2336646bb62f7624261f6d7' (2021-10-01) → 'github:nixos/nixpkgs/14aef06d9b3ad1d07626bdbb16083b83f92dc6c1' (2021-10-04) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 3ee36ff9..3f4ef527 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1632992735, - "narHash": "sha256-EuqMxgREM2lNk7JLyHfl5732gjW6pZJurgmKWWUo6ow=", + "lastModified": 1633515705, + "narHash": "sha256-VLCg/A4yuvvc/wiC8CBtwZ6bo6u7QD0rsm06r20x4Ms=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5fa26165cf34adbe693b159093ea15f24f7f7ea4", + "rev": "8a47765478628f684b09d7f7aa5960e697309c74", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1633296444, - "narHash": "sha256-DnC7yVyoYFSsvFze16AWDa5iSHgtT1MbDGgp8rSC3H4=", + "lastModified": 1633525354, + "narHash": "sha256-Ox6ZGo1wrw8XNvWqrP4WMf52YZduRmEufOPU4iFAXI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "099cbcf13e8219f07b493980a66fe64df0e32d09", + "rev": "8bbade4b01c316119e6b163fa9af6ee246cc989a", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "lowdown-src": { "flake": false, "locked": { - "lastModified": 1632468475, - "narHash": "sha256-NNOm9CbdA8cuwbvaBHslGbPTiU6bh1Ao+MpEPx4rSGo=", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", "owner": "kristapsdz", "repo": "lowdown", - "rev": "6bd668af3fd098bdd07a1bedd399564141e275da", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1633334374, - "narHash": "sha256-fmMJXcp4CooH3cp16v+Os1c9aMO+noxirVB/bcfo3aA=", + "lastModified": 1633526845, + "narHash": "sha256-KxjUVpyc8sPgXS0q5T1Bld2zRtGURklVteNmq/CajLQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a58649f4f6b7d3137ebd88a24cf2834a880a38e", + "rev": "2b0082a68f810743c46a65289816313e87057d49", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1633283586, - "narHash": "sha256-5bPZQhwuGcWn8Las3pVVvfumyB9t+FGwxq1N55tolFc=", + "lastModified": 1633525853, + "narHash": "sha256-O+YPTpU3VMdBuwYDw5ZNyAo+dp7wbij8EkP93EF2mHg=", "owner": "nixos", "repo": "nix", - "rev": "6fadb5df05845e4d7ed18c17c5e68008a97d9044", + "rev": "d0cc6a192af34f57b0892c49e09c2896c1f5a9dc", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1633083543, - "narHash": "sha256-thXKms0SvDirYb8/Hw0zqAE1TsuSFWd0y51mSzkPGLU=", + "lastModified": 1633422542, + "narHash": "sha256-JYz2PmVogNRO8DhcvXzL/QhZzboTspJz2YSRlnAj8aM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "92609f3d9bc3acffbdbe54fa1c591a885612aa73", + "rev": "aff647e2704fa1223994604887bb78276dc57083", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1633080050, - "narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=", + "lastModified": 1633351077, + "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "82155ff501c7622cb2336646bb62f7624261f6d7", + "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1", "type": "github" }, "original": { From 02e8215b9db2c6c94ed9a7a7fab311dc9acbb8d1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 7 Oct 2021 08:31:04 +0200 Subject: [PATCH 118/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/8a47765478628f684b09d7f7aa5960e697309c74' (2021-10-06) → 'github:nix-community/emacs-overlay/b27a5d8e8958cec786b3dc8a064b3cf143beb541' (2021-10-07) • Updated input 'home-manager': 'github:nix-community/home-manager/8bbade4b01c316119e6b163fa9af6ee246cc989a' (2021-10-06) → 'github:nix-community/home-manager/d9fe208f3ccd7047a29eb31fd0cd3191c4445323' (2021-10-06) • Updated input 'master': 'github:nixos/nixpkgs/2b0082a68f810743c46a65289816313e87057d49' (2021-10-06) → 'github:nixos/nixpkgs/ea4524e6cc7761c3cc271233fa97b5e7473f760a' (2021-10-07) • Updated input 'nix': 'github:nixos/nix/d0cc6a192af34f57b0892c49e09c2896c1f5a9dc' (2021-10-06) → 'github:nixos/nix/53e479428958b39a126ce15de85d7397fdcfe2e1' (2021-10-06) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3f4ef527..62553c75 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1633515705, - "narHash": "sha256-VLCg/A4yuvvc/wiC8CBtwZ6bo6u7QD0rsm06r20x4Ms=", + "lastModified": 1633574989, + "narHash": "sha256-rn70qpinjttWGkiWi4X11DVzJr8elKicaaM81uiNK1Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8a47765478628f684b09d7f7aa5960e697309c74", + "rev": "b27a5d8e8958cec786b3dc8a064b3cf143beb541", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1633525354, - "narHash": "sha256-Ox6ZGo1wrw8XNvWqrP4WMf52YZduRmEufOPU4iFAXI4=", + "lastModified": 1633531796, + "narHash": "sha256-fm1tcPf9yB+4ySxKETQk6hVpmbYZPVb27fEJFuIz6fA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bbade4b01c316119e6b163fa9af6ee246cc989a", + "rev": "d9fe208f3ccd7047a29eb31fd0cd3191c4445323", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1633526845, - "narHash": "sha256-KxjUVpyc8sPgXS0q5T1Bld2zRtGURklVteNmq/CajLQ=", + "lastModified": 1633573942, + "narHash": "sha256-kmcYNDXiqNGJzi6gy55+aObl5wjFGp908zBMCklExqo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2b0082a68f810743c46a65289816313e87057d49", + "rev": "ea4524e6cc7761c3cc271233fa97b5e7473f760a", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1633525853, - "narHash": "sha256-O+YPTpU3VMdBuwYDw5ZNyAo+dp7wbij8EkP93EF2mHg=", + "lastModified": 1633546959, + "narHash": "sha256-Z/koQdjlyMZzdieb2rjktLzJuL3cKLiK1JWYZIEbtaI=", "owner": "nixos", "repo": "nix", - "rev": "d0cc6a192af34f57b0892c49e09c2896c1f5a9dc", + "rev": "53e479428958b39a126ce15de85d7397fdcfe2e1", "type": "github" }, "original": { From c624df3ce467ea6a4f3e788ced03a026edbda8da Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 7 Oct 2021 09:10:08 +0200 Subject: [PATCH 119/303] erlang-ls: 0.19.0 -> 0.20.0 --- packages/erlang-ls/source.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/erlang-ls/source.json b/packages/erlang-ls/source.json index eab3945e..c18a943f 100644 --- a/packages/erlang-ls/source.json +++ b/packages/erlang-ls/source.json @@ -1,8 +1,8 @@ { - "version": "0.19.0", + "version": "0.20.0", "owner": "erlang-ls", "repo": "erlang_ls", - "rev": "3ccf5139823e9a3f0e23476b1de6ebb2d70b5201", - "sha256": "WesGgLoVR435lNXnsCFYcUoKXDMuL7hWImDluori+dc=", + "rev": "0.20.0", + "sha256": "sha256-XBCauvPalIPjVOYlMfWC+5mKku28b/qqKhp9NgSkoyA=", "fetchSubmodules": true } From 3aa30fa7f13e179685f34823f3feffa430de5243 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 7 Oct 2021 12:23:04 +0200 Subject: [PATCH 120/303] elixir-ls: 0.8.0 -> 0.8.1 --- packages/elixir-lsp/default.nix | 2 +- packages/elixir-lsp/source.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/elixir-lsp/default.nix b/packages/elixir-lsp/default.nix index ec1fbf47..723502fd 100644 --- a/packages/elixir-lsp/default.nix +++ b/packages/elixir-lsp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { deps = fetchMixDeps { name = "${name}-${version}"; inherit src; - sha256 = "sha256-uG9Il5jpx4AUWStW4lXCjQvundlC58lSpKR6eB34Gf4="; + sha256 = "sha256-8MOV2a/C5uO5Q1S97XY8VP0bJI4ByFRIIHNwRtG94cs="; }; src = fetchFromGitHub rec { diff --git a/packages/elixir-lsp/source.json b/packages/elixir-lsp/source.json index d612f996..b5fca972 100644 --- a/packages/elixir-lsp/source.json +++ b/packages/elixir-lsp/source.json @@ -2,7 +2,7 @@ "fetchSubmodules": true, "owner": "elixir-lsp", "repo": "elixir-ls", - "rev": "b8e618eee426a83d1b8e54a40ab5d8c55c1f56b2", - "sha256": "pUvONMTYH8atF/p2Ep/K3bwJUDxTzCsxLPbpjP0tQpM=", - "version": "0.8.0" + "rev": "v0.8.1", + "sha256": "sha256-KlZq12RCor9GrwA8QMP3R+jUQ/xFHRjkLwwkvthiMU0=", + "version": "0.8.1" } From 77a083129e15f780b148711f5fc351424492e2c6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 7 Oct 2021 12:23:38 +0200 Subject: [PATCH 121/303] add a gaming user --- nixos/configurations/mimas.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 68da1f42..545423b9 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -175,6 +175,14 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in ]; }; + gamer = { + isNormalUser = true; + extraGroups = [ + "audio" + "networkmanager" + ]; + }; + aroemer = { isNormalUser = true; extraGroups = [ ]; From 636a279ce4b39882132a47ac43d8894091014004 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 8 Oct 2021 09:57:41 +0200 Subject: [PATCH 122/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/b27a5d8e8958cec786b3dc8a064b3cf143beb541' (2021-10-07) → 'github:nix-community/emacs-overlay/2b6024ce357be986616916c053469efb532b714e' (2021-10-08) • Updated input 'master': 'github:nixos/nixpkgs/ea4524e6cc7761c3cc271233fa97b5e7473f760a' (2021-10-07) → 'github:nixos/nixpkgs/9f449eaf24c8e7f0f68fdab528d67c484d57db89' (2021-10-08) • Updated input 'nix': 'github:nixos/nix/53e479428958b39a126ce15de85d7397fdcfe2e1' (2021-10-06) → 'github:nixos/nix/6bd74a6beaabcf8fe73d2d48894f9870648e0eb1' (2021-10-08) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/aff647e2704fa1223994604887bb78276dc57083' (2021-10-05) → 'github:nixos/nixpkgs/781b1f8e3a2194e1e233cd62b4f2193e129a07f7' (2021-10-07) • Updated input 'unstable': 'github:nixos/nixpkgs/14aef06d9b3ad1d07626bdbb16083b83f92dc6c1' (2021-10-04) → 'github:nixos/nixpkgs/5e2018f7b383aeca6824a30c0cd1978c9532a46a' (2021-10-06) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 62553c75..79c87e39 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1633574989, - "narHash": "sha256-rn70qpinjttWGkiWi4X11DVzJr8elKicaaM81uiNK1Y=", + "lastModified": 1633657931, + "narHash": "sha256-TpSXgQLIuH43OEQumAGScverSXaarojQBprVk3AoyNY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b27a5d8e8958cec786b3dc8a064b3cf143beb541", + "rev": "2b6024ce357be986616916c053469efb532b714e", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1633573942, - "narHash": "sha256-kmcYNDXiqNGJzi6gy55+aObl5wjFGp908zBMCklExqo=", + "lastModified": 1633679771, + "narHash": "sha256-sp7u8kEBiZCT5AGm0GbS6OBVav9oGn+Mk2RYOvOzFPI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4524e6cc7761c3cc271233fa97b5e7473f760a", + "rev": "9f449eaf24c8e7f0f68fdab528d67c484d57db89", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1633546959, - "narHash": "sha256-Z/koQdjlyMZzdieb2rjktLzJuL3cKLiK1JWYZIEbtaI=", + "lastModified": 1633675287, + "narHash": "sha256-4DH0KG9Q/Y9+51zyvmrV2BGk7319NB4jns4Xg3jGnnw=", "owner": "nixos", "repo": "nix", - "rev": "53e479428958b39a126ce15de85d7397fdcfe2e1", + "rev": "6bd74a6beaabcf8fe73d2d48894f9870648e0eb1", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1633422542, - "narHash": "sha256-JYz2PmVogNRO8DhcvXzL/QhZzboTspJz2YSRlnAj8aM=", + "lastModified": 1633625029, + "narHash": "sha256-Ia3kwnN9DhcskAIElLSKb4u/OK7nZU/P0TkaikAX790=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aff647e2704fa1223994604887bb78276dc57083", + "rev": "781b1f8e3a2194e1e233cd62b4f2193e129a07f7", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1633351077, - "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=", + "lastModified": 1633528625, + "narHash": "sha256-AGj5q58eHACAe0RQGxObrGwMUsjMozTsiznhsLCYisQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1", + "rev": "5e2018f7b383aeca6824a30c0cd1978c9532a46a", "type": "github" }, "original": { From 5156f34fe63a31fddb3def7158d05a4a4d26ed0e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 13 Oct 2021 16:25:50 +0200 Subject: [PATCH 123/303] enable proper docs for all hosts --- lib/mk_system.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/mk_system.nix b/lib/mk_system.nix index 2c08778e..ec25f721 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -13,6 +13,7 @@ nixpkgs.lib.nixosSystem ({ networking.hostName = name; nix.flakes.enable = true; system.configurationRevision = self.rev or "dirty"; + documentation.man = { enable = true; generateCaches = true; }; } (./. + "/../nixos/configurations/${name}.nix") (./. + "/../nixos/configurations/hardware/${name}.nix") From 290309fdcecefa6d3d8107189ea4e026c00daf54 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 13 Oct 2021 16:29:16 +0200 Subject: [PATCH 124/303] thetys: add host-alias --- nixos/configurations/thetys.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index d8843071..93e05e6b 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -67,6 +67,7 @@ size = 2048 * 4; }]; + networking.hosts."127.0.0.1" = [ "ax69_mysql" ]; networking.firewall.allowedTCPPorts = [ # ports often used for development, that I want to expose for easier access from the host 3000 From b4dca96457b387af2ad548018f5f46dfcd06d140 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 16 Oct 2021 10:27:40 +0200 Subject: [PATCH 125/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/2b6024ce357be986616916c053469efb532b714e' (2021-10-08) → 'github:nix-community/emacs-overlay/a7442f550bfedfccb1822fd8ceaf6e44955f43db' (2021-10-16) • Updated input 'home-manager': 'github:nix-community/home-manager/d9fe208f3ccd7047a29eb31fd0cd3191c4445323' (2021-10-06) → 'github:nix-community/home-manager/309808afbc2a07e340067f66029a4202b4c4b959' (2021-10-14) • Updated input 'master': 'github:nixos/nixpkgs/9f449eaf24c8e7f0f68fdab528d67c484d57db89' (2021-10-08) → 'github:nixos/nixpkgs/879fcc5676bc88c248eba6fa8555edf576990530' (2021-10-16) • Updated input 'nix': 'github:nixos/nix/6bd74a6beaabcf8fe73d2d48894f9870648e0eb1' (2021-10-08) → 'github:nixos/nix/130284b8508dad3c70e8160b15f3d62042fc730a' (2021-10-15) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/781b1f8e3a2194e1e233cd62b4f2193e129a07f7' (2021-10-07) → 'github:nixos/nixpkgs/83667ff60a88e22b76ef4b0bdf5334670b39c2b6' (2021-10-15) • Updated input 'unstable': 'github:nixos/nixpkgs/5e2018f7b383aeca6824a30c0cd1978c9532a46a' (2021-10-06) → 'github:nixos/nixpkgs/2cf9db0e3d45b9d00f16f2836cb1297bcadc475e' (2021-10-14) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 79c87e39..6d523ecb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1633657931, - "narHash": "sha256-TpSXgQLIuH43OEQumAGScverSXaarojQBprVk3AoyNY=", + "lastModified": 1634349588, + "narHash": "sha256-XUWjr6REnzPnpPtdf+QsLHwBI5R+qhvCWRAzOVDmyto=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2b6024ce357be986616916c053469efb532b714e", + "rev": "a7442f550bfedfccb1822fd8ceaf6e44955f43db", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1633531796, - "narHash": "sha256-fm1tcPf9yB+4ySxKETQk6hVpmbYZPVb27fEJFuIz6fA=", + "lastModified": 1634230035, + "narHash": "sha256-tS0dyWxVgb79Jk8elMthWv/oycj/Q4HHDoNL5V43kz8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9fe208f3ccd7047a29eb31fd0cd3191c4445323", + "rev": "309808afbc2a07e340067f66029a4202b4c4b959", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1633679771, - "narHash": "sha256-sp7u8kEBiZCT5AGm0GbS6OBVav9oGn+Mk2RYOvOzFPI=", + "lastModified": 1634371750, + "narHash": "sha256-w3GazzeJpcvuanx6cyMCqAP6/hddcPerMgcRbjlfx5M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f449eaf24c8e7f0f68fdab528d67c484d57db89", + "rev": "879fcc5676bc88c248eba6fa8555edf576990530", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1633675287, - "narHash": "sha256-4DH0KG9Q/Y9+51zyvmrV2BGk7319NB4jns4Xg3jGnnw=", + "lastModified": 1634305820, + "narHash": "sha256-IEDfqsWNI7ZbU8xmFg4B+nthpcCIE7mr9WYJ2oyYJhA=", "owner": "nixos", "repo": "nix", - "rev": "6bd74a6beaabcf8fe73d2d48894f9870648e0eb1", + "rev": "130284b8508dad3c70e8160b15f3d62042fc730a", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1633625029, - "narHash": "sha256-Ia3kwnN9DhcskAIElLSKb4u/OK7nZU/P0TkaikAX790=", + "lastModified": 1634327140, + "narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "781b1f8e3a2194e1e233cd62b4f2193e129a07f7", + "rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1633528625, - "narHash": "sha256-AGj5q58eHACAe0RQGxObrGwMUsjMozTsiznhsLCYisQ=", + "lastModified": 1634172192, + "narHash": "sha256-FBF4U/T+bMg4sEyT/zkgasvVquGzgdAf4y8uCosKMmo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2018f7b383aeca6824a30c0cd1978c9532a46a", + "rev": "2cf9db0e3d45b9d00f16f2836cb1297bcadc475e", "type": "github" }, "original": { From 24ac76f75d94366d8b4711142a0553649ca60869 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 16 Oct 2021 12:04:04 +0200 Subject: [PATCH 126/303] Revert "flake.lock: Update" This reverts commit b4dca96457b387af2ad548018f5f46dfcd06d140. --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 6d523ecb..79c87e39 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1634349588, - "narHash": "sha256-XUWjr6REnzPnpPtdf+QsLHwBI5R+qhvCWRAzOVDmyto=", + "lastModified": 1633657931, + "narHash": "sha256-TpSXgQLIuH43OEQumAGScverSXaarojQBprVk3AoyNY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a7442f550bfedfccb1822fd8ceaf6e44955f43db", + "rev": "2b6024ce357be986616916c053469efb532b714e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1634230035, - "narHash": "sha256-tS0dyWxVgb79Jk8elMthWv/oycj/Q4HHDoNL5V43kz8=", + "lastModified": 1633531796, + "narHash": "sha256-fm1tcPf9yB+4ySxKETQk6hVpmbYZPVb27fEJFuIz6fA=", "owner": "nix-community", "repo": "home-manager", - "rev": "309808afbc2a07e340067f66029a4202b4c4b959", + "rev": "d9fe208f3ccd7047a29eb31fd0cd3191c4445323", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1634371750, - "narHash": "sha256-w3GazzeJpcvuanx6cyMCqAP6/hddcPerMgcRbjlfx5M=", + "lastModified": 1633679771, + "narHash": "sha256-sp7u8kEBiZCT5AGm0GbS6OBVav9oGn+Mk2RYOvOzFPI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "879fcc5676bc88c248eba6fa8555edf576990530", + "rev": "9f449eaf24c8e7f0f68fdab528d67c484d57db89", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1634305820, - "narHash": "sha256-IEDfqsWNI7ZbU8xmFg4B+nthpcCIE7mr9WYJ2oyYJhA=", + "lastModified": 1633675287, + "narHash": "sha256-4DH0KG9Q/Y9+51zyvmrV2BGk7319NB4jns4Xg3jGnnw=", "owner": "nixos", "repo": "nix", - "rev": "130284b8508dad3c70e8160b15f3d62042fc730a", + "rev": "6bd74a6beaabcf8fe73d2d48894f9870648e0eb1", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1634327140, - "narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=", + "lastModified": 1633625029, + "narHash": "sha256-Ia3kwnN9DhcskAIElLSKb4u/OK7nZU/P0TkaikAX790=", "owner": "nixos", "repo": "nixpkgs", - "rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6", + "rev": "781b1f8e3a2194e1e233cd62b4f2193e129a07f7", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1634172192, - "narHash": "sha256-FBF4U/T+bMg4sEyT/zkgasvVquGzgdAf4y8uCosKMmo=", + "lastModified": 1633528625, + "narHash": "sha256-AGj5q58eHACAe0RQGxObrGwMUsjMozTsiznhsLCYisQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2cf9db0e3d45b9d00f16f2836cb1297bcadc475e", + "rev": "5e2018f7b383aeca6824a30c0cd1978c9532a46a", "type": "github" }, "original": { From 50f9131c850124940842b290e51e9f7b576df86e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 17 Oct 2021 15:40:18 +0200 Subject: [PATCH 127/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/2b6024ce357be986616916c053469efb532b714e' (2021-10-08) → 'github:nix-community/emacs-overlay/76c0ca6786e5c7e12d1608f502641c1b5307330e' (2021-10-17) • Updated input 'home-manager': 'github:nix-community/home-manager/d9fe208f3ccd7047a29eb31fd0cd3191c4445323' (2021-10-06) → 'github:nix-community/home-manager/309808afbc2a07e340067f66029a4202b4c4b959' (2021-10-14) • Updated input 'master': 'github:nixos/nixpkgs/9f449eaf24c8e7f0f68fdab528d67c484d57db89' (2021-10-08) → 'github:nixos/nixpkgs/6605999f19d2d130bc59159d45db006f84639c31' (2021-10-17) • Updated input 'nix': 'github:nixos/nix/6bd74a6beaabcf8fe73d2d48894f9870648e0eb1' (2021-10-08) → 'github:nixos/nix/130284b8508dad3c70e8160b15f3d62042fc730a' (2021-10-15) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/781b1f8e3a2194e1e233cd62b4f2193e129a07f7' (2021-10-07) → 'github:nixos/nixpkgs/83667ff60a88e22b76ef4b0bdf5334670b39c2b6' (2021-10-15) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/ba47b015800a41118b203befc1b249a481429fdf' (2021-10-03) → 'github:nix-community/rnix-lsp/a2d06d2d2910cbe35b4f323a54ef484f51d71e20' (2021-10-17) • Updated input 'unstable': 'github:nixos/nixpkgs/5e2018f7b383aeca6824a30c0cd1978c9532a46a' (2021-10-06) → 'github:nixos/nixpkgs/9aeeb7574fb784eaf6395f4400705b5f619e6cc3' (2021-10-17) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 79c87e39..e8fcf36b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1633657931, - "narHash": "sha256-TpSXgQLIuH43OEQumAGScverSXaarojQBprVk3AoyNY=", + "lastModified": 1634434790, + "narHash": "sha256-vXGxQuuh+Kd7rmTyNyODXPZWI2/bq5oBQ6fVSxbJLCw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2b6024ce357be986616916c053469efb532b714e", + "rev": "76c0ca6786e5c7e12d1608f502641c1b5307330e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1633531796, - "narHash": "sha256-fm1tcPf9yB+4ySxKETQk6hVpmbYZPVb27fEJFuIz6fA=", + "lastModified": 1634230035, + "narHash": "sha256-tS0dyWxVgb79Jk8elMthWv/oycj/Q4HHDoNL5V43kz8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9fe208f3ccd7047a29eb31fd0cd3191c4445323", + "rev": "309808afbc2a07e340067f66029a4202b4c4b959", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1633679771, - "narHash": "sha256-sp7u8kEBiZCT5AGm0GbS6OBVav9oGn+Mk2RYOvOzFPI=", + "lastModified": 1634476226, + "narHash": "sha256-+654XEBXl0QzrM0fkUi2CzrOCuxailGkpSGcjmNdCXk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f449eaf24c8e7f0f68fdab528d67c484d57db89", + "rev": "6605999f19d2d130bc59159d45db006f84639c31", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1633675287, - "narHash": "sha256-4DH0KG9Q/Y9+51zyvmrV2BGk7319NB4jns4Xg3jGnnw=", + "lastModified": 1634305820, + "narHash": "sha256-IEDfqsWNI7ZbU8xmFg4B+nthpcCIE7mr9WYJ2oyYJhA=", "owner": "nixos", "repo": "nix", - "rev": "6bd74a6beaabcf8fe73d2d48894f9870648e0eb1", + "rev": "130284b8508dad3c70e8160b15f3d62042fc730a", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1633625029, - "narHash": "sha256-Ia3kwnN9DhcskAIElLSKb4u/OK7nZU/P0TkaikAX790=", + "lastModified": 1634327140, + "narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "781b1f8e3a2194e1e233cd62b4f2193e129a07f7", + "rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1633237382, - "narHash": "sha256-TvtykkGJPoMq5/ynsawuoN81VDnSl+UnHWmBiLqJb/Y=", + "lastModified": 1634449716, + "narHash": "sha256-JuRCU4KCIA3/pp8BjHqqF9dj1d2xtpkxKKAtSuOzTIY=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "ba47b015800a41118b203befc1b249a481429fdf", + "rev": "a2d06d2d2910cbe35b4f323a54ef484f51d71e20", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1633528625, - "narHash": "sha256-AGj5q58eHACAe0RQGxObrGwMUsjMozTsiznhsLCYisQ=", + "lastModified": 1634436779, + "narHash": "sha256-D/nrXTWpe1bPIjFy85sgiLHYqu+AeaC6v5/+KlA9PRg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2018f7b383aeca6824a30c0cd1978c9532a46a", + "rev": "9aeeb7574fb784eaf6395f4400705b5f619e6cc3", "type": "github" }, "original": { From 6d51c2c86eeb7df695af4edc5007e65a25f110ac Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 19 Oct 2021 11:00:12 +0200 Subject: [PATCH 128/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/76c0ca6786e5c7e12d1608f502641c1b5307330e' (2021-10-17) → 'github:nix-community/emacs-overlay/de982af2c9fb85001b5bea94efe64d8545ba5e55' (2021-10-19) • Updated input 'home-manager': 'github:nix-community/home-manager/309808afbc2a07e340067f66029a4202b4c4b959' (2021-10-14) → 'github:nix-community/home-manager/b5d738b5a3f8c3738433e0aa6482afb4ac635380' (2021-10-18) • Updated input 'master': 'github:nixos/nixpkgs/6605999f19d2d130bc59159d45db006f84639c31' (2021-10-17) → 'github:nixos/nixpkgs/d4c2aaab6f116a876e89c88b2bd024da0a5a6763' (2021-10-19) • Updated input 'nix': 'github:nixos/nix/130284b8508dad3c70e8160b15f3d62042fc730a' (2021-10-15) → 'github:nixos/nix/623514bf9ee1c50921c22b486f9c7b2304fe768e' (2021-10-18) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/83667ff60a88e22b76ef4b0bdf5334670b39c2b6' (2021-10-15) → 'github:nixos/nixpkgs/f001876680c0e32a89bced8d02d2c61250684e17' (2021-10-18) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e8fcf36b..e3358ae7 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1634434790, - "narHash": "sha256-vXGxQuuh+Kd7rmTyNyODXPZWI2/bq5oBQ6fVSxbJLCw=", + "lastModified": 1634608415, + "narHash": "sha256-PTOXRszdUOExzoTQWj77rXV9xr8BIam4yQ0gpTN4vJ0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "76c0ca6786e5c7e12d1608f502641c1b5307330e", + "rev": "de982af2c9fb85001b5bea94efe64d8545ba5e55", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1634230035, - "narHash": "sha256-tS0dyWxVgb79Jk8elMthWv/oycj/Q4HHDoNL5V43kz8=", + "lastModified": 1634543124, + "narHash": "sha256-sPjP5GjZ0DgTgY8KljhGeix4L5ey7A3L1nm6lDffTh0=", "owner": "nix-community", "repo": "home-manager", - "rev": "309808afbc2a07e340067f66029a4202b4c4b959", + "rev": "b5d738b5a3f8c3738433e0aa6482afb4ac635380", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1634476226, - "narHash": "sha256-+654XEBXl0QzrM0fkUi2CzrOCuxailGkpSGcjmNdCXk=", + "lastModified": 1634633157, + "narHash": "sha256-wzvVdoaWhG5jBFpSOOdc8jTB0XWNQS4p8yJtjdNIvRY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6605999f19d2d130bc59159d45db006f84639c31", + "rev": "d4c2aaab6f116a876e89c88b2bd024da0a5a6763", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1634305820, - "narHash": "sha256-IEDfqsWNI7ZbU8xmFg4B+nthpcCIE7mr9WYJ2oyYJhA=", + "lastModified": 1634522136, + "narHash": "sha256-Yfu9z+2c5MsbdVNRziJP9LUdGifvAU8ainFPcuHL6AA=", "owner": "nixos", "repo": "nix", - "rev": "130284b8508dad3c70e8160b15f3d62042fc730a", + "rev": "623514bf9ee1c50921c22b486f9c7b2304fe768e", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1634327140, - "narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=", + "lastModified": 1634551044, + "narHash": "sha256-HOHemrQt3wA7eS5YT8n+X0OdB9+X4O08YUPTrFMBG60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6", + "rev": "f001876680c0e32a89bced8d02d2c61250684e17", "type": "github" }, "original": { From 292e41d3af8f90303307d17c87a1d280725d0da6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 20 Oct 2021 06:58:02 +0200 Subject: [PATCH 129/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/de982af2c9fb85001b5bea94efe64d8545ba5e55' (2021-10-19) → 'github:nix-community/emacs-overlay/cca06d8aeb18c2d9c57cbffb48d2c94537ab9b27' (2021-10-20) • Updated input 'master': 'github:nixos/nixpkgs/d4c2aaab6f116a876e89c88b2bd024da0a5a6763' (2021-10-19) → 'github:nixos/nixpkgs/79f5a81cb3855d7d2e8fe642c78d43da0d6fd9b8' (2021-10-20) • Updated input 'nix': 'github:nixos/nix/623514bf9ee1c50921c22b486f9c7b2304fe768e' (2021-10-18) → 'github:nixos/nix/4a2b7cc68c7d11ec126bc412ffea838e629345af' (2021-10-19) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/f001876680c0e32a89bced8d02d2c61250684e17' (2021-10-18) → 'github:nixos/nixpkgs/8fe3b97ef4527ac88d03ea33e0789f3512e01adc' (2021-10-19) • Updated input 'unstable': 'github:nixos/nixpkgs/9aeeb7574fb784eaf6395f4400705b5f619e6cc3' (2021-10-17) → 'github:nixos/nixpkgs/5f0194220f2402b06f7f79bba6351895facb5acb' (2021-10-18) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e3358ae7..acef816d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1634608415, - "narHash": "sha256-PTOXRszdUOExzoTQWj77rXV9xr8BIam4yQ0gpTN4vJ0=", + "lastModified": 1634694590, + "narHash": "sha256-Yc5dfNAgEMnlYZReXQeqFSTut2WyEwPWmVaKtEM5/zw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "de982af2c9fb85001b5bea94efe64d8545ba5e55", + "rev": "cca06d8aeb18c2d9c57cbffb48d2c94537ab9b27", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1634633157, - "narHash": "sha256-wzvVdoaWhG5jBFpSOOdc8jTB0XWNQS4p8yJtjdNIvRY=", + "lastModified": 1634703432, + "narHash": "sha256-2fkre3qxpOKV/IrIqFcf34DCx2he/42BjlqKKi3H/+w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d4c2aaab6f116a876e89c88b2bd024da0a5a6763", + "rev": "79f5a81cb3855d7d2e8fe642c78d43da0d6fd9b8", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1634522136, - "narHash": "sha256-Yfu9z+2c5MsbdVNRziJP9LUdGifvAU8ainFPcuHL6AA=", + "lastModified": 1634663590, + "narHash": "sha256-TW3z00SiskhsZdo7ci8MpNPv+rrgsZcHloZGhDYI+UI=", "owner": "nixos", "repo": "nix", - "rev": "623514bf9ee1c50921c22b486f9c7b2304fe768e", + "rev": "4a2b7cc68c7d11ec126bc412ffea838e629345af", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1634551044, - "narHash": "sha256-HOHemrQt3wA7eS5YT8n+X0OdB9+X4O08YUPTrFMBG60=", + "lastModified": 1634661806, + "narHash": "sha256-fBuR7EZ67UOdNt3gEwhoyWJ6zJtXh4kuupIALRcx/7I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f001876680c0e32a89bced8d02d2c61250684e17", + "rev": "8fe3b97ef4527ac88d03ea33e0789f3512e01adc", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1634436779, - "narHash": "sha256-D/nrXTWpe1bPIjFy85sgiLHYqu+AeaC6v5/+KlA9PRg=", + "lastModified": 1634515797, + "narHash": "sha256-elgCUC2khtBkOSpE4gDymNvthTZAI4hGI2iNu3YEUkA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9aeeb7574fb784eaf6395f4400705b5f619e6cc3", + "rev": "5f0194220f2402b06f7f79bba6351895facb5acb", "type": "github" }, "original": { From cf366a9c0fdaaa316a84dc791fcb0c8046dd887b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 20 Oct 2021 12:55:38 +0200 Subject: [PATCH 130/303] add com01 host --- home/modules/profiles/base/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index de362486..03459618 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -135,6 +135,11 @@ in identityFile = "~/.ssh/actum-gitlab"; }; + "192.168.123.22" = { + user = "root"; + identitfyFile = "~/.ssh/cloudseeds"; + }; + "*.cloudseeds.de" = { user = "norbert.melzer"; identityFile = "~/.ssh/cloudseeds"; From 75cc08b7066bb8ba91a54539d61e11d385c97c7f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 21 Oct 2021 09:34:53 +0200 Subject: [PATCH 131/303] slightly rework mkSystem --- lib/mk_system.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/mk_system.nix b/lib/mk_system.nix index ec25f721..ea14158c 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -1,8 +1,5 @@ -{ self, ... }@inputs: +{ self, ... }@args: -let - args = inputs; -in name: nixpkgs: nixpkgs.lib.nixosSystem ({ system = "x86_64-linux"; From c4935372c2991bde74758134950f6b21ea953eaa Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 21 Oct 2021 09:39:07 +0200 Subject: [PATCH 132/303] fix typo --- home/modules/profiles/base/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index 03459618..061a4fb4 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -137,7 +137,7 @@ in "192.168.123.22" = { user = "root"; - identitfyFile = "~/.ssh/cloudseeds"; + identityFile = "~/.ssh/cloudseeds"; }; "*.cloudseeds.de" = { From d6eb095c5f0bf173279f9195c19999d42a118ee0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 21 Oct 2021 09:41:15 +0200 Subject: [PATCH 133/303] rewrite straight IP to virtual hostname --- home/modules/profiles/base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index 061a4fb4..a5c51609 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -135,9 +135,9 @@ in identityFile = "~/.ssh/actum-gitlab"; }; - "192.168.123.22" = { + "com01.internal.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + hostname = "192.168.123.22"; user = "root"; - identityFile = "~/.ssh/cloudseeds"; }; "*.cloudseeds.de" = { From 9d75c7fc30f56148f7fc0ced548ae15b411a1f59 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 22 Oct 2021 00:00:29 +0200 Subject: [PATCH 134/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/cca06d8aeb18c2d9c57cbffb48d2c94537ab9b27' (2021-10-20) → 'github:nix-community/emacs-overlay/ae1c1eeeb6168c9e1a13dd47c44781c0eb9ed8ed' (2021-10-21) • Updated input 'flake-utils': 'github:numtide/flake-utils/7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19' (2021-09-13) → 'github:numtide/flake-utils/c91f3de5adaf1de973b797ef7485e441a65b8935' (2021-10-21) • Updated input 'home-manager': 'github:nix-community/home-manager/b5d738b5a3f8c3738433e0aa6482afb4ac635380' (2021-10-18) → 'github:nix-community/home-manager/cfe82d9f444a1b77f135070f1c1ee63fa061f2fd' (2021-10-21) • Updated input 'master': 'github:nixos/nixpkgs/79f5a81cb3855d7d2e8fe642c78d43da0d6fd9b8' (2021-10-20) → 'github:nixos/nixpkgs/be04d53db2536d4e13ebb37023bc405a724ad447' (2021-10-21) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/8fe3b97ef4527ac88d03ea33e0789f3512e01adc' (2021-10-19) → 'github:nixos/nixpkgs/70904d4a9927a4d6e05c72c4aaac4370e05107f3' (2021-10-20) • Updated input 'unstable': 'github:nixos/nixpkgs/5f0194220f2402b06f7f79bba6351895facb5acb' (2021-10-18) → 'github:nixos/nixpkgs/34ad3ffe08adfca17fcb4e4a47bb5f3b113687be' (2021-10-21) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index acef816d..72e031f0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1634694590, - "narHash": "sha256-Yc5dfNAgEMnlYZReXQeqFSTut2WyEwPWmVaKtEM5/zw=", + "lastModified": 1634835049, + "narHash": "sha256-RriAuz0YbjIIjtf94vVMlWxQw5RmEvJtdr+cfT61x+8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cca06d8aeb18c2d9c57cbffb48d2c94537ab9b27", + "rev": "ae1c1eeeb6168c9e1a13dd47c44781c0eb9ed8ed", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1634543124, - "narHash": "sha256-sPjP5GjZ0DgTgY8KljhGeix4L5ey7A3L1nm6lDffTh0=", + "lastModified": 1634851225, + "narHash": "sha256-fwtGHHl7fTELucIRBKO5JORD8QP9Lo9PwY9nrJuEybE=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5d738b5a3f8c3738433e0aa6482afb4ac635380", + "rev": "cfe82d9f444a1b77f135070f1c1ee63fa061f2fd", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1634703432, - "narHash": "sha256-2fkre3qxpOKV/IrIqFcf34DCx2he/42BjlqKKi3H/+w=", + "lastModified": 1634853398, + "narHash": "sha256-clbd9dwAUNBxkiA3YnsU8r8b1hDl8SlmN2/wTtg5/yo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "79f5a81cb3855d7d2e8fe642c78d43da0d6fd9b8", + "rev": "be04d53db2536d4e13ebb37023bc405a724ad447", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1634661806, - "narHash": "sha256-fBuR7EZ67UOdNt3gEwhoyWJ6zJtXh4kuupIALRcx/7I=", + "lastModified": 1634758644, + "narHash": "sha256-H3UW/msC6wadg28lcgZv2Ge/P7dWxesL6i37a0GOeyM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8fe3b97ef4527ac88d03ea33e0789f3512e01adc", + "rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1634515797, - "narHash": "sha256-elgCUC2khtBkOSpE4gDymNvthTZAI4hGI2iNu3YEUkA=", + "lastModified": 1634782485, + "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f0194220f2402b06f7f79bba6351895facb5acb", + "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", "type": "github" }, "original": { From a9dea30f6f8d8f9dfbcf006848bc4fd2d9281379 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 23 Oct 2021 11:52:16 +0200 Subject: [PATCH 135/303] mimas: move steam to system --- home/configurations/nmelzer@mimas.nix | 4 +--- nixos/configurations/default.nix | 2 +- nixos/configurations/mimas.nix | 26 +++++++++++++++++--------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index 8829c8ed..c627dac1 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -5,7 +5,7 @@ let in { config = { - nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" "insync" "steam" "steam-original" "steam-runtime" ]; + nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" "insync" ]; activeProfiles = [ "browsing" "development" "home-office" ]; @@ -39,8 +39,6 @@ in p.handbrake p.keybase-gui p.minikube - p.lutris - p.steam p.gnome3.gnome-tweaks s.gnucash-de diff --git a/nixos/configurations/default.nix b/nixos/configurations/default.nix index d3fcd9ef..60c0d64b 100644 --- a/nixos/configurations/default.nix +++ b/nixos/configurations/default.nix @@ -1,7 +1,7 @@ { self, ... }@inputs: { - mimas = self.lib.mkSystem "mimas" inputs.nixpkgs-2105; + mimas = self.lib.mkSystem "mimas" inputs.unstable; # nixpkgs-2105; enceladeus = self.lib.mkSystem "enceladeus" inputs.unstable; thetys = self.lib.mkSystem "thetys" inputs.unstable; } diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 545423b9..bef256a3 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -3,11 +3,14 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, lib, unstable, ... }: -let upkgs = import unstable { system = "x86_64-linux"; }; in +let + upkgs = import unstable { system = "x86_64-linux"; }; + steamParts = [ "steam" "steam-original" "steam-runtime" ]; +in { imports = [ ]; - nix.allowedUnfree = [ "hplip" "zerotierone" ]; + nix.allowedUnfree = [ "hplip" "zerotierone" ] ++ steamParts; security.chromiumSuidSandbox.enable = true; @@ -68,6 +71,11 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in # Enable the OpenSSH daemon. services.openssh.enable = true; + # Add to XDG_DATA_DIRS: + # * /var/lib/flatpak/exports/share + # * $HOME/.local/share/flatpak/exports/share + services.flatpak.enable = true; + services.zerotierone.enable = true; services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; @@ -127,7 +135,7 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in systemd.services.transmission.after = [ "var-lib-transmission.mount" ]; programs = { - # steam.enable = true; + steam.enable = true; zsh.enable = true; zsh.enableCompletion = false; }; @@ -201,12 +209,12 @@ let upkgs = import unstable { system = "x86_64-linux"; }; in } ]; - services.wakeonlan.interfaces = [ - { - interface = "enp5s0f2"; - method = "magicpacket"; - } - ]; + # services.wakeonlan.interfaces = [ + # { + # interface = "enp5s0f2"; + # method = "magicpacket"; + # } + # ]; # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database From ca6e8ccb5d5e9e3a5fa88ed34ba9348424a5e817 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 23 Oct 2021 12:06:25 +0200 Subject: [PATCH 136/303] mimas: add freerdp to home config --- home/configurations/nmelzer@mimas.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index c627dac1..bbc8e479 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -40,6 +40,7 @@ in p.keybase-gui p.minikube p.gnome3.gnome-tweaks + p.freerdp s.gnucash-de From 370dceb3337a8848a02684cc250ee9c7e501b444 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 24 Oct 2021 09:23:40 +0200 Subject: [PATCH 137/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/ae1c1eeeb6168c9e1a13dd47c44781c0eb9ed8ed' (2021-10-21) → 'github:nix-community/emacs-overlay/54ffb3131da098fa8de183a09c35773c83282137' (2021-10-24) • Updated input 'home-manager': 'github:nix-community/home-manager/cfe82d9f444a1b77f135070f1c1ee63fa061f2fd' (2021-10-21) → 'github:nix-community/home-manager/406eeec0b98903561767ce7aca311034d298d53e' (2021-10-23) • Updated input 'master': 'github:nixos/nixpkgs/be04d53db2536d4e13ebb37023bc405a724ad447' (2021-10-21) → 'github:nixos/nixpkgs/910e1eab7161b60f8e18e2df984e115c0b28fa33' (2021-10-24) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/70904d4a9927a4d6e05c72c4aaac4370e05107f3' (2021-10-20) → 'github:nixos/nixpkgs/95eed9b64eee24975b880308065654fd059f22c3' (2021-10-23) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 72e031f0..650231ac 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1634835049, - "narHash": "sha256-RriAuz0YbjIIjtf94vVMlWxQw5RmEvJtdr+cfT61x+8=", + "lastModified": 1635039860, + "narHash": "sha256-1WcniOsFlLmyMbDu+TdmN0fuxto72EP/3XUoO+gy16g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ae1c1eeeb6168c9e1a13dd47c44781c0eb9ed8ed", + "rev": "54ffb3131da098fa8de183a09c35773c83282137", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1634851225, - "narHash": "sha256-fwtGHHl7fTELucIRBKO5JORD8QP9Lo9PwY9nrJuEybE=", + "lastModified": 1635017514, + "narHash": "sha256-tdV/y8nJZqKDoqFVE8ORB0drdGdSze2xeWfhWz9M3oo=", "owner": "nix-community", "repo": "home-manager", - "rev": "cfe82d9f444a1b77f135070f1c1ee63fa061f2fd", + "rev": "406eeec0b98903561767ce7aca311034d298d53e", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1634853398, - "narHash": "sha256-clbd9dwAUNBxkiA3YnsU8r8b1hDl8SlmN2/wTtg5/yo=", + "lastModified": 1635058007, + "narHash": "sha256-RdR5W/Ml5k4IXx/fJdC8O6c1IWSORBoPS6Ebg/QNCUI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "be04d53db2536d4e13ebb37023bc405a724ad447", + "rev": "910e1eab7161b60f8e18e2df984e115c0b28fa33", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1634758644, - "narHash": "sha256-H3UW/msC6wadg28lcgZv2Ge/P7dWxesL6i37a0GOeyM=", + "lastModified": 1635024461, + "narHash": "sha256-yUU86lOsqqe/qI2pItEJGxx87cHeJiEJhDZvAXvrqfQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3", + "rev": "95eed9b64eee24975b880308065654fd059f22c3", "type": "github" }, "original": { From 848d72e4fe08aead77dbd381eb7d23cedbd47849 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 24 Oct 2021 11:24:24 +0200 Subject: [PATCH 138/303] HM: add insync service --- home/configurations/nmelzer@mimas.nix | 4 +-- home/modules/default.nix | 1 + home/modules/services/insync/default.nix | 44 ++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 home/modules/services/insync/default.nix diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index bbc8e479..67c28d3e 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -5,7 +5,7 @@ let in { config = { - nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" "insync" ]; + nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" ]; activeProfiles = [ "browsing" "development" "home-office" ]; @@ -35,7 +35,6 @@ in s = self.packages.x86_64-linux; in [ - p.insync p.handbrake p.keybase-gui p.minikube @@ -69,6 +68,7 @@ in keyleds.enable = true; keybase.enable = true; kbfs.enable = true; + insync.enable = true; }; systemd.user.services = { diff --git a/home/modules/default.nix b/home/modules/default.nix index 672e6889..1dc04bd0 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -35,6 +35,7 @@ "programs/emacs/whichkey" = import ./programs/emacs/whichkey; "services/keyleds" = import ./services/keyleds; + "services/insync" = import ./services/insync; "misc/awesome" = import ./misc/awesome; "misc/home" = import ./misc/home; diff --git a/home/modules/services/insync/default.nix b/home/modules/services/insync/default.nix new file mode 100644 index 00000000..7f3b9bb1 --- /dev/null +++ b/home/modules/services/insync/default.nix @@ -0,0 +1,44 @@ +{ config, lib, pkgs, self, ... }: + +let + cfg = config.services.insync; +in +{ + options.services.insync = { + enable = lib.mkEnableOption "Insync cloud sync tool"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.insync; + description = '' + The insync package to use. + + It will get automatically added to 'allowedUnfree'. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + nixpkgs.allowedUnfree = [ "insync" ]; + + home.packages = [ cfg.package ]; + + systemd.user.services.insync = { + Unit = { + Description = "Insync - Google Drive, OneDrive, and Dropbox Syncing on Linux, Windows & Mac"; + After = [ "graphical-session-pre.target" ]; + PartOf = [ "graphical-session.target" ]; + }; + + Install = { WantedBy = [ "graphical-session.target" ]; }; + + Service = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/insync start --no-daemon"; + ExecStop = "${cfg.package}/bin/insync stop"; + Restart = "always"; + RestartSec = "5"; + }; + }; + }; +} From ccc1f737a8f7afa1dea3235e9575705b12704349 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 24 Oct 2021 23:59:51 +0200 Subject: [PATCH 139/303] add earthfile mode to emacs --- home/modules/programs/emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 4003d01c..4d222a5a 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -140,7 +140,7 @@ in ep.adoc-mode ep.hledger-mode ep.typescript-mode - + ep.earthfile-mode ep.ledger-mode # ep.bazel-mode From 37de284e935b9a3bda2bd5ad8ccfd58e8874b373 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 25 Oct 2021 07:58:17 +0200 Subject: [PATCH 140/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/54ffb3131da098fa8de183a09c35773c83282137' (2021-10-24) → 'github:nix-community/emacs-overlay/781b562f31cf1408cd2c46efe2aaf2516f074944' (2021-10-25) • Updated input 'home-manager': 'github:nix-community/home-manager/406eeec0b98903561767ce7aca311034d298d53e' (2021-10-23) → 'github:nix-community/home-manager/da8a78eec9f7adb57f9e961d1da64805efacff37' (2021-10-25) • Updated input 'master': 'github:nixos/nixpkgs/910e1eab7161b60f8e18e2df984e115c0b28fa33' (2021-10-24) → 'github:nixos/nixpkgs/ccb59f86d85dbca072c64cd5e065b7334fbbed5f' (2021-10-25) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/95eed9b64eee24975b880308065654fd059f22c3' (2021-10-23) → 'github:nixos/nixpkgs/3b1789322fcbcb5cf51228d732752714f1bf77da' (2021-10-24) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 650231ac..fff58398 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635039860, - "narHash": "sha256-1WcniOsFlLmyMbDu+TdmN0fuxto72EP/3XUoO+gy16g=", + "lastModified": 1635130196, + "narHash": "sha256-WzNBLpUOyr1L1i/CbZ7mZezxbH03ghjiP68lavLMewA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "54ffb3131da098fa8de183a09c35773c83282137", + "rev": "781b562f31cf1408cd2c46efe2aaf2516f074944", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1635017514, - "narHash": "sha256-tdV/y8nJZqKDoqFVE8ORB0drdGdSze2xeWfhWz9M3oo=", + "lastModified": 1635123562, + "narHash": "sha256-kYuwQqHXDYxy5ijpm8SvCoPNx0br1TpoWeTIOEwOYvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "406eeec0b98903561767ce7aca311034d298d53e", + "rev": "da8a78eec9f7adb57f9e961d1da64805efacff37", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1635058007, - "narHash": "sha256-RdR5W/Ml5k4IXx/fJdC8O6c1IWSORBoPS6Ebg/QNCUI=", + "lastModified": 1635136326, + "narHash": "sha256-gG28zQS4JUUbXgmtuU7z41s/zia4EtHje8R9htRwUEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910e1eab7161b60f8e18e2df984e115c0b28fa33", + "rev": "ccb59f86d85dbca072c64cd5e065b7334fbbed5f", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1635024461, - "narHash": "sha256-yUU86lOsqqe/qI2pItEJGxx87cHeJiEJhDZvAXvrqfQ=", + "lastModified": 1635070614, + "narHash": "sha256-eRup9WsvSIhsRrSlNugPcQ7gfGOsbk3d4izufwVlz1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "95eed9b64eee24975b880308065654fd059f22c3", + "rev": "3b1789322fcbcb5cf51228d732752714f1bf77da", "type": "github" }, "original": { From fb30bc736c5280115609928729e79a929fab0d83 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 25 Oct 2021 08:19:17 +0200 Subject: [PATCH 141/303] restic: add module --- home/configurations/nmelzer@mimas.nix | 6 +++ home/modules/default.nix | 1 + home/modules/services/restic/default.nix | 62 ++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 home/modules/services/restic/default.nix diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index 67c28d3e..ea88c47b 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -69,6 +69,12 @@ in keybase.enable = true; kbfs.enable = true; insync.enable = true; + + restic = { + enable = true; + exclude = (map (e: "%h/${e}") [ ".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg" ]) ++ [ "_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv" ]; + oneFileSystem = true; + }; }; systemd.user.services = { diff --git a/home/modules/default.nix b/home/modules/default.nix index 1dc04bd0..603b4401 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -36,6 +36,7 @@ "services/keyleds" = import ./services/keyleds; "services/insync" = import ./services/insync; + "services/restic" = import ./services/restic; "misc/awesome" = import ./misc/awesome; "misc/home" = import ./misc/home; diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix new file mode 100644 index 00000000..c23c0035 --- /dev/null +++ b/home/modules/services/restic/default.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, self, ... }: + +let + cfg = config.services.restic; + + bin = "${cfg.package}/bin/restic"; + excludes = __concatStringsSep " " (builtins.map (e: "--exclude=${e}") cfg.exclude); + xFlags = lib.optionalString cfg.oneFileSystem "-x"; + flags = "${xFlags} ${excludes}"; + + command = "${bin} -vv backup ${flags} %h"; +in +{ + options.services.restic = { + enable = lib.mkEnableOption "Restic Backup Tool"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.restic; + description = "Restic derivation to use"; + }; + + exclude = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Corresponds to `--exclude`. Use `%h` instead of `~`"; + }; + + oneFileSystem = lib.mkOption { + type = lib.types.bool; + default = false; + description = "If true, exclude other file systems, don't cross filesystem boundaries and subvolumes"; + }; + + # TODO: Add options for inlcude, password file, etc + }; + + config = lib.mkIf cfg.enable { + home.packages = [ cfg.package ]; + + systemd.user.services.restic-backup = { + Unit.Description = "Restic Backup Tool"; + + Service = { + Environment = [ + "RESTIC_PASSWORD_FILE=%h/.config/restic/password" + "RESTIC_REPOSITORY=/run/media/nmelzer/data/restic/repo" + ]; + ExecStart = command; + }; + }; + + systemd.user.timers.restic-backup = { + Unit.Description = "Restic periodic backup"; + Timer = { + Unit = "restic-backup.service"; + OnCalendar = "*:0/15"; + }; + Install.WantedBy = [ "timers.target" ]; + }; + }; +} From 40a21177a14655a7e644caf8d4beb6a5ba5df8ab Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 25 Oct 2021 13:07:12 +0200 Subject: [PATCH 142/303] restic: make service a bit better configurable --- home/configurations/demo@thetys.nix | 44 +++++++++++++++++++++++- home/configurations/nmelzer@mimas.nix | 1 + home/modules/services/restic/default.nix | 9 ++++- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/home/configurations/demo@thetys.nix b/home/configurations/demo@thetys.nix index 38a71906..75462b8c 100644 --- a/home/configurations/demo@thetys.nix +++ b/home/configurations/demo@thetys.nix @@ -18,7 +18,49 @@ in programs.emacs.splashScreen = false; programs.emacs.extraPackages = ep: [ ep.robot-mode ]; - services.gnome-keyring.enable = true; + services = { + gnome-keyring.enable = true; + + restic = { + enable = true; + exclude = (map + (e: "%h/${e}") + [ + ".cache" + ".cabal" + ".cargo" + ".emacs.d/eln-cache" + ".emacs.d/.cache" + ".gem" + ".gradle" + ".hex" + ".kube" + ".local" + ".m2" + ".minikube" + ".minishift" + ".mix" + ".mozilla" + ".npm" + ".opam" + ".rancher" + ".vscode-oss" + "go/pkg" + "Videos" + "Downloads" + "VirtualBox VMs" + ]) ++ [ + "_build" + "deps" + "result" + "target" + ".elixir_ls" + "ccls-cache" + ".direnv" + ]; + repo = "sftp:tux-nixos.adoring_suess.zerotier:/var/run/media/nmelzer/data/restic/repo"; + }; + }; home.packages = [ stable.mysqlWorkbench diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index ea88c47b..d8b202a5 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -74,6 +74,7 @@ in enable = true; exclude = (map (e: "%h/${e}") [ ".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg" ]) ++ [ "_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv" ]; oneFileSystem = true; + repo = "/run/media/nmelzer/data/restic/repo"; }; }; diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index c23c0035..a69689c3 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -32,6 +32,11 @@ in description = "If true, exclude other file systems, don't cross filesystem boundaries and subvolumes"; }; + repo = lib.mkOption { + type = lib.types.str; + description = "Location of the repository"; + }; + # TODO: Add options for inlcude, password file, etc }; @@ -43,9 +48,11 @@ in Service = { Environment = [ + "PATH=${lib.makeBinPath [ pkgs.openssh ]}" "RESTIC_PASSWORD_FILE=%h/.config/restic/password" - "RESTIC_REPOSITORY=/run/media/nmelzer/data/restic/repo" + "RESTIC_REPOSITORY=${cfg.repo}" ]; + Type = "oneshot"; ExecStart = command; }; }; From 6204d01206e242f05d01068f8331c5473808235a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 25 Oct 2021 16:53:50 +0200 Subject: [PATCH 143/303] restic: adjust frequency to allow for a window that will be used for purging --- home/modules/services/restic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index a69689c3..a5a172ac 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -61,7 +61,7 @@ in Unit.Description = "Restic periodic backup"; Timer = { Unit = "restic-backup.service"; - OnCalendar = "*:0/15"; + OnCalendar = "1,3..23:0/15"; }; Install.WantedBy = [ "timers.target" ]; }; From 10e2b56bc98656f21fe460766299333ac4f1a8ac Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 26 Oct 2021 11:57:52 +0200 Subject: [PATCH 144/303] add another internal server --- home/modules/profiles/base/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index a5c51609..7602fb75 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -140,6 +140,11 @@ in user = "root"; }; + "ironic.internal.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + hostname = "192.168.123.31"; + user = "root"; + }; + "*.cloudseeds.de" = { user = "norbert.melzer"; identityFile = "~/.ssh/cloudseeds"; From 648dd478dc56a996343ea2138b122af7ae2686f7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 27 Oct 2021 00:00:13 +0200 Subject: [PATCH 145/303] mimas: install samsung printer drivers --- nixos/configurations/mimas.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index bef256a3..db3a14f1 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -5,12 +5,13 @@ { config, pkgs, lib, unstable, ... }: let upkgs = import unstable { system = "x86_64-linux"; }; - steamParts = [ "steam" "steam-original" "steam-runtime" ]; + steamPackages = [ "steam" "steam-original" "steam-runtime" ]; + printerPackages = [ "hplip" "samsung-UnifiedLinuxDriver" ]; in { imports = [ ]; - nix.allowedUnfree = [ "hplip" "zerotierone" ] ++ steamParts; + nix.allowedUnfree = [ "zerotierone" ] ++ printerPackages ++ steamPackages; security.chromiumSuidSandbox.enable = true; @@ -89,7 +90,7 @@ in # Enable CUPS to print documents. services.printing.enable = true; - services.printing.drivers = [ pkgs.hplipWithPlugin ]; + services.printing.drivers = [ pkgs.hplipWithPlugin pkgs.samsungUnifiedLinuxDriver ]; services.ratbagd.enable = true; From dbeb9ca41d4921e0ede583dc94d34b3d39f72b04 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 27 Oct 2021 00:01:47 +0200 Subject: [PATCH 146/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/781b562f31cf1408cd2c46efe2aaf2516f074944' (2021-10-25) → 'github:nix-community/emacs-overlay/a20606a8d924d8ba5e9833669576d3c9bb363047' (2021-10-26) • Updated input 'master': 'github:nixos/nixpkgs/ccb59f86d85dbca072c64cd5e065b7334fbbed5f' (2021-10-25) → 'github:nixos/nixpkgs/113fcf34abdccf21811d3cb3eca793408de7e531' (2021-10-26) • Updated input 'nix': 'github:nixos/nix/4a2b7cc68c7d11ec126bc412ffea838e629345af' (2021-10-19) → 'github:nixos/nix/5667822edc24598788a1f90b923b6b41b733cb8b' (2021-10-26) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index fff58398..c5638ed9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635130196, - "narHash": "sha256-WzNBLpUOyr1L1i/CbZ7mZezxbH03ghjiP68lavLMewA=", + "lastModified": 1635274108, + "narHash": "sha256-VddqKcLlfapgG7KkWnKUAtC7lSqf/wzNIiS/KSITOfU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "781b562f31cf1408cd2c46efe2aaf2516f074944", + "rev": "a20606a8d924d8ba5e9833669576d3c9bb363047", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1635136326, - "narHash": "sha256-gG28zQS4JUUbXgmtuU7z41s/zia4EtHje8R9htRwUEI=", + "lastModified": 1635285216, + "narHash": "sha256-WWJWuwMWNkcsQJ3M2zm4u81cnZnc/cs0XAaT8avf1eU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ccb59f86d85dbca072c64cd5e065b7334fbbed5f", + "rev": "113fcf34abdccf21811d3cb3eca793408de7e531", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1634663590, - "narHash": "sha256-TW3z00SiskhsZdo7ci8MpNPv+rrgsZcHloZGhDYI+UI=", + "lastModified": 1635252330, + "narHash": "sha256-6oJ5Hzxph/bO2/7aWgTUxFtckjtrfxYjNL99GFXNG8o=", "owner": "nixos", "repo": "nix", - "rev": "4a2b7cc68c7d11ec126bc412ffea838e629345af", + "rev": "5667822edc24598788a1f90b923b6b41b733cb8b", "type": "github" }, "original": { From 2dec4d2467d47e19b7eda0ecbb761806ba8784ce Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 27 Oct 2021 07:03:33 +0200 Subject: [PATCH 147/303] restic: retry on failure --- home/modules/services/restic/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index a5a172ac..f062a1cd 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -44,7 +44,11 @@ in home.packages = [ cfg.package ]; systemd.user.services.restic-backup = { - Unit.Description = "Restic Backup Tool"; + Unit = { + Description = "Restic Backup Tool"; + StartLimitIntervalSec = "25m"; + StartLimitBurst = "4"; + }; Service = { Environment = [ @@ -54,6 +58,8 @@ in ]; Type = "oneshot"; ExecStart = command; + Restart = "on-failure"; + RestartSec = "2m"; }; }; @@ -61,7 +67,7 @@ in Unit.Description = "Restic periodic backup"; Timer = { Unit = "restic-backup.service"; - OnCalendar = "1,3..23:0/15"; + OnCalendar = "*:0/15"; }; Install.WantedBy = [ "timers.target" ]; }; From e7b2d484bf858a17fd49ad2cc06c32c765292258 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 27 Oct 2021 07:05:53 +0200 Subject: [PATCH 148/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/a20606a8d924d8ba5e9833669576d3c9bb363047' (2021-10-26) → 'github:nix-community/emacs-overlay/c0f8d5f9d851d87cb37e2a0de883f4bee6c8b411' (2021-10-27) • Updated input 'home-manager': 'github:nix-community/home-manager/da8a78eec9f7adb57f9e961d1da64805efacff37' (2021-10-25) → 'github:nix-community/home-manager/46a69810cb95d2e7286089830dc535d6719eaa6f' (2021-10-26) • Updated input 'master': 'github:nixos/nixpkgs/113fcf34abdccf21811d3cb3eca793408de7e531' (2021-10-26) → 'github:nixos/nixpkgs/22a500a3f87bbce73bd8d777ef920b43a636f018' (2021-10-27) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/3b1789322fcbcb5cf51228d732752714f1bf77da' (2021-10-24) → 'github:nixos/nixpkgs/5ebb1dca9bb056649cbd023f953c0c4e7970bb72' (2021-10-26) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c5638ed9..3d538892 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635274108, - "narHash": "sha256-VddqKcLlfapgG7KkWnKUAtC7lSqf/wzNIiS/KSITOfU=", + "lastModified": 1635303073, + "narHash": "sha256-teBg+mOuj5NEburUcOlydHU79uc/I/JTeQCEHH6YY+Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a20606a8d924d8ba5e9833669576d3c9bb363047", + "rev": "c0f8d5f9d851d87cb37e2a0de883f4bee6c8b411", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1635123562, - "narHash": "sha256-kYuwQqHXDYxy5ijpm8SvCoPNx0br1TpoWeTIOEwOYvA=", + "lastModified": 1635285717, + "narHash": "sha256-CGsOBSkdjIHmKEbUkik1JKQhiKCJ64Hj7dROx7yEDCo=", "owner": "nix-community", "repo": "home-manager", - "rev": "da8a78eec9f7adb57f9e961d1da64805efacff37", + "rev": "46a69810cb95d2e7286089830dc535d6719eaa6f", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1635285216, - "narHash": "sha256-WWJWuwMWNkcsQJ3M2zm4u81cnZnc/cs0XAaT8avf1eU=", + "lastModified": 1635295995, + "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "113fcf34abdccf21811d3cb3eca793408de7e531", + "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1635070614, - "narHash": "sha256-eRup9WsvSIhsRrSlNugPcQ7gfGOsbk3d4izufwVlz1Q=", + "lastModified": 1635280654, + "narHash": "sha256-n0DKD1rG4gLZx6vDnalrQ5obZA9Y7uaOShTDSaOWGhM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3b1789322fcbcb5cf51228d732752714f1bf77da", + "rev": "5ebb1dca9bb056649cbd023f953c0c4e7970bb72", "type": "github" }, "original": { From b2cdd86de3019e56e7cba3f7e671166594a7330f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 29 Oct 2021 13:07:38 +0200 Subject: [PATCH 149/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/c0f8d5f9d851d87cb37e2a0de883f4bee6c8b411' (2021-10-27) → 'github:nix-community/emacs-overlay/ee905a167bdb6475dd27ffb0a70243949914436a' (2021-10-29) • Updated input 'home-manager': 'github:nix-community/home-manager/46a69810cb95d2e7286089830dc535d6719eaa6f' (2021-10-26) → 'github:nix-community/home-manager/cf4866d2187399117d3aed47a58e6f8ef58e5afd' (2021-10-29) • Updated input 'master': 'github:nixos/nixpkgs/22a500a3f87bbce73bd8d777ef920b43a636f018' (2021-10-27) → 'github:nixos/nixpkgs/85850ea4fccb0223d34695a428f0104de1cf7110' (2021-10-29) • Updated input 'nix': 'github:nixos/nix/5667822edc24598788a1f90b923b6b41b733cb8b' (2021-10-26) → 'github:nixos/nix/0d00dd6262bfd77aaac516410f35970f9dccbcb9' (2021-10-28) • Updated input 'nixpkgs-2009': 'github:nixos/nixpkgs/a13824fe5e38187fbc75cd598b5c06bdcc13501f' (2021-09-23) → 'github:nixos/nixpkgs/1c1f5649bb9c1b0d98637c8c365228f57126f361' (2021-10-27) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/5ebb1dca9bb056649cbd023f953c0c4e7970bb72' (2021-10-26) → 'github:nixos/nixpkgs/66d6ec6ed2ddc77d08cf677cc8230db39f051793' (2021-10-28) • Updated input 'unstable': 'github:nixos/nixpkgs/34ad3ffe08adfca17fcb4e4a47bb5f3b113687be' (2021-10-21) → 'github:nixos/nixpkgs/2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61' (2021-10-28) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 3d538892..e5d9ea87 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635303073, - "narHash": "sha256-teBg+mOuj5NEburUcOlydHU79uc/I/JTeQCEHH6YY+Y=", + "lastModified": 1635496269, + "narHash": "sha256-c0yE7xQRm1isu1yoxtp5b9nLFVfHIQdFl7WzBONI6FA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c0f8d5f9d851d87cb37e2a0de883f4bee6c8b411", + "rev": "ee905a167bdb6475dd27ffb0a70243949914436a", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1635285717, - "narHash": "sha256-CGsOBSkdjIHmKEbUkik1JKQhiKCJ64Hj7dROx7yEDCo=", + "lastModified": 1635473360, + "narHash": "sha256-sxb4xuP/9f6z29y4Sxzk0g6gzFKUX9r3vNzga/pCROw=", "owner": "nix-community", "repo": "home-manager", - "rev": "46a69810cb95d2e7286089830dc535d6719eaa6f", + "rev": "cf4866d2187399117d3aed47a58e6f8ef58e5afd", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1635295995, - "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=", + "lastModified": 1635505262, + "narHash": "sha256-y96ki9pyf3uroFPd81C/F13vb0Xwz+jVTo4OqHB2joI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018", + "rev": "85850ea4fccb0223d34695a428f0104de1cf7110", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1635252330, - "narHash": "sha256-6oJ5Hzxph/bO2/7aWgTUxFtckjtrfxYjNL99GFXNG8o=", + "lastModified": 1635458116, + "narHash": "sha256-UALB4YUwUppH7kmqInKsCsry0JyG2PYOmssFF+zctzE=", "owner": "nixos", "repo": "nix", - "rev": "5667822edc24598788a1f90b923b6b41b733cb8b", + "rev": "0d00dd6262bfd77aaac516410f35970f9dccbcb9", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs-2009": { "locked": { - "lastModified": 1632408697, - "narHash": "sha256-JqTfu361AwFmV0WszXLAjfukqGxBbHRopRgdp9A2w8s=", + "lastModified": 1635350005, + "narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a13824fe5e38187fbc75cd598b5c06bdcc13501f", + "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1635280654, - "narHash": "sha256-n0DKD1rG4gLZx6vDnalrQ5obZA9Y7uaOShTDSaOWGhM=", + "lastModified": 1635456205, + "narHash": "sha256-CLZxFvwec8BhFlB5tkIq08UBDNNrijOY780UF6ubJXc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ebb1dca9bb056649cbd023f953c0c4e7970bb72", + "rev": "66d6ec6ed2ddc77d08cf677cc8230db39f051793", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1634782485, - "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", + "lastModified": 1635403963, + "narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61", "type": "github" }, "original": { From d1ff5d4c71892ad373556165c4cb3f8c305224f0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 30 Oct 2021 12:04:28 +0200 Subject: [PATCH 150/303] nmelzer@enceladeus: restic backups --- home/configurations/nmelzer@enceladeus.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index a2bbc2c0..1accf678 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -19,6 +19,13 @@ programs.emacs.splashScreen = false; + services.restic = { + enable = true; + exclude = (map (e: "%h/${e}") [ ".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg" ]) ++ [ "_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv" ]; + oneFileSystem = true; + repo = "sftp:nmelzer@tux-nixos.adoring_suess.zerotier:/run/media/nmelzer/data/restic/repo"; + }; + home.packages = [ ]; }; } From f72d6ca9a68464d9632a1fbb597208d5938e92dc Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 30 Oct 2021 16:58:29 +0200 Subject: [PATCH 151/303] log stderr as well --- home/modules/services/restic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index f062a1cd..a79b6161 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -48,6 +48,8 @@ in Description = "Restic Backup Tool"; StartLimitIntervalSec = "25m"; StartLimitBurst = "4"; + StandardOutput = "journal"; + StandardError = "journal"; }; Service = { From 58fc2365b9e93674313ff144276a28fe1e70d2cd Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 30 Oct 2021 17:06:57 +0200 Subject: [PATCH 152/303] remove again, as it does not have any effect --- home/modules/services/restic/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index a79b6161..f062a1cd 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -48,8 +48,6 @@ in Description = "Restic Backup Tool"; StartLimitIntervalSec = "25m"; StartLimitBurst = "4"; - StandardOutput = "journal"; - StandardError = "journal"; }; Service = { From 88d923bf31911abd33b996d63f3e43d5a0a64b44 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 1 Nov 2021 08:14:32 +0100 Subject: [PATCH 153/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/ee905a167bdb6475dd27ffb0a70243949914436a' (2021-10-29) → 'github:nix-community/emacs-overlay/68de106e6f1fc319bf0a879aed93bd693bd94dd6' (2021-11-01) • Updated input 'home-manager': 'github:nix-community/home-manager/cf4866d2187399117d3aed47a58e6f8ef58e5afd' (2021-10-29) → 'github:nix-community/home-manager/275f955db979e069fbe7a1fd7cfcb5ec030a2096' (2021-10-31) • Updated input 'master': 'github:nixos/nixpkgs/85850ea4fccb0223d34695a428f0104de1cf7110' (2021-10-29) → 'github:nixos/nixpkgs/509d236edf0056d05547c776140fe7cfcf2305bd' (2021-11-01) • Updated input 'nix': 'github:nixos/nix/0d00dd6262bfd77aaac516410f35970f9dccbcb9' (2021-10-28) → 'github:nixos/nix/888771b4b2f153bfbf203e07d768d577ab2343e8' (2021-10-29) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/66d6ec6ed2ddc77d08cf677cc8230db39f051793' (2021-10-28) → 'github:nixos/nixpkgs/f0869b1a2c0b150aac26e10bb5c2364ffb2e804f' (2021-10-31) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e5d9ea87..2d607250 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635496269, - "narHash": "sha256-c0yE7xQRm1isu1yoxtp5b9nLFVfHIQdFl7WzBONI6FA=", + "lastModified": 1635731733, + "narHash": "sha256-Khdr+uik4N+zMe3dDqla3TPCscqhjV4JF5go/fgiH9o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ee905a167bdb6475dd27ffb0a70243949914436a", + "rev": "68de106e6f1fc319bf0a879aed93bd693bd94dd6", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1635473360, - "narHash": "sha256-sxb4xuP/9f6z29y4Sxzk0g6gzFKUX9r3vNzga/pCROw=", + "lastModified": 1635672778, + "narHash": "sha256-WW1Gew3tL0ScjTre5hSWlpKy27c1huLCLweS63u9Wv4=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf4866d2187399117d3aed47a58e6f8ef58e5afd", + "rev": "275f955db979e069fbe7a1fd7cfcb5ec030a2096", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1635505262, - "narHash": "sha256-y96ki9pyf3uroFPd81C/F13vb0Xwz+jVTo4OqHB2joI=", + "lastModified": 1635735275, + "narHash": "sha256-C0WrxH70xFJMl+oznZrSPS3VwqWCyj1MVSTvpkb7ryQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85850ea4fccb0223d34695a428f0104de1cf7110", + "rev": "509d236edf0056d05547c776140fe7cfcf2305bd", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1635458116, - "narHash": "sha256-UALB4YUwUppH7kmqInKsCsry0JyG2PYOmssFF+zctzE=", + "lastModified": 1635514710, + "narHash": "sha256-k9GaS2JIWRph+oJKH1qNSqX6Xt/lpnpNeQCiD1H44GM=", "owner": "nixos", "repo": "nix", - "rev": "0d00dd6262bfd77aaac516410f35970f9dccbcb9", + "rev": "888771b4b2f153bfbf203e07d768d577ab2343e8", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1635456205, - "narHash": "sha256-CLZxFvwec8BhFlB5tkIq08UBDNNrijOY780UF6ubJXc=", + "lastModified": 1635719588, + "narHash": "sha256-pWjdy0NheM97NsPE6+jUnr5LYyeA0sBGTdw4mfXMGZQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66d6ec6ed2ddc77d08cf677cc8230db39f051793", + "rev": "f0869b1a2c0b150aac26e10bb5c2364ffb2e804f", "type": "github" }, "original": { From 270327ca2a1ba5ba5cbe21383b28cf150fbb34eb Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 2 Nov 2021 18:02:09 +0100 Subject: [PATCH 154/303] inital nim-configuration --- home/configurations/demo@thetys.nix | 2 +- home/configurations/nmelzer@mimas.nix | 1 + home/modules/default.nix | 1 + home/modules/languages/nim/default.nix | 31 ++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 home/modules/languages/nim/default.nix diff --git a/home/configurations/demo@thetys.nix b/home/configurations/demo@thetys.nix index 75462b8c..9ea512ad 100644 --- a/home/configurations/demo@thetys.nix +++ b/home/configurations/demo@thetys.nix @@ -11,7 +11,7 @@ in activeProfiles = [ "browsing" "development" ]; enabledLanguages = - [ "elixir" "go" "lua" "nix" "python" "terraform" ]; + [ "elixir" "go" "lua" "nix" "python" "terraform" "nim" ]; languages.python.useMS = true; diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index d8b202a5..381d1adb 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -18,6 +18,7 @@ in "elixir" "erlang" "go" + "nim" "nix" # "ocaml" "python" diff --git a/home/modules/default.nix b/home/modules/default.nix index 603b4401..abb4336d 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -12,6 +12,7 @@ "languages/elixir" = import ./languages/elixir; "languages/erlang" = import ./languages/erlang; "languages/go" = import ./languages/go; + "languages/nim" = import ./languages/nim; "languages/nix" = import ./languages/nix; "languages/python" = import ./languages/python; "languages/rust" = import ./languages/rust; diff --git a/home/modules/languages/nim/default.nix b/home/modules/languages/nim/default.nix new file mode 100644 index 00000000..e9d8c595 --- /dev/null +++ b/home/modules/languages/nim/default.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, unstable, ... }: + +let + cfg = config.languages.nim; + + inherit (unstable.legacyPackage.x86_64-linux) nim; +in +{ + options.languages.nim = { + enable = lib.mkEnableOption "Nim-lang"; + }; + + config = lib.mkIf cfg.enable { + programs.emacs = { + localPackages."init-nim" = { + tag = "Setup Nim Mode"; + requires = [ "company" "flycheck" ]; + packageRequires = ep: [ ep.nim-mode ep.lsp-mode ep.company ep.flycheck ]; + comments = [ ]; + code = '' + (add-hook 'nim-mode-hook + (lambda () + (subword-mode) + (company-mode) + (flycheck-mode) + (lsp-lens-mode))) + ''; + }; + }; + }; +} From 281f017b3f3b37a88d04be93e4bf8d6e9988d994 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 2 Nov 2021 20:35:08 +0100 Subject: [PATCH 155/303] vscode --- home/configurations/nmelzer@mimas.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index d8b202a5..261ed7b1 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -5,7 +5,7 @@ let in { config = { - nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" ]; + nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" "vscode" ]; activeProfiles = [ "browsing" "development" "home-office" ]; @@ -40,6 +40,7 @@ in p.minikube p.gnome3.gnome-tweaks p.freerdp + p.vscode s.gnucash-de From e69e994da2fce8c578be212bde8bfa21260810e3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 3 Nov 2021 11:40:17 +0100 Subject: [PATCH 156/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/68de106e6f1fc319bf0a879aed93bd693bd94dd6' (2021-11-01) → 'github:nix-community/emacs-overlay/14162c1d4f1882a4fe2069cea9cd6f0c42c7bef3' (2021-11-03) • Updated input 'home-manager': 'github:nix-community/home-manager/275f955db979e069fbe7a1fd7cfcb5ec030a2096' (2021-10-31) → 'github:nix-community/home-manager/288faaa5a65e72e37e6027024829b15c8bb69286' (2021-11-02) • Updated input 'master': 'github:nixos/nixpkgs/509d236edf0056d05547c776140fe7cfcf2305bd' (2021-11-01) → 'github:nixos/nixpkgs/b2497e1e0cecf6f6dc47e0dba1e8e4cd5f5b3b7e' (2021-11-03) • Updated input 'nix': 'github:nixos/nix/888771b4b2f153bfbf203e07d768d577ab2343e8' (2021-10-29) → 'github:nixos/nix/133905b309992b2ab0dbec2d2bdc4bcc9672c6b9' (2021-11-03) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/f0869b1a2c0b150aac26e10bb5c2364ffb2e804f' (2021-10-31) → 'github:nixos/nixpkgs/372e59d2af704bffd133cbe029f1d5efe73ba6fb' (2021-11-01) • Updated input 'unstable': 'github:nixos/nixpkgs/2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61' (2021-10-28) → 'github:nixos/nixpkgs/b67e752c29f18a0ca5534a07661366d6a2c2e649' (2021-11-02) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2d607250..49aa8948 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635731733, - "narHash": "sha256-Khdr+uik4N+zMe3dDqla3TPCscqhjV4JF5go/fgiH9o=", + "lastModified": 1635932289, + "narHash": "sha256-kiSSWjOwH6G/cQF93HgnbYDXzt7GH25ID1W+kf/7/s4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "68de106e6f1fc319bf0a879aed93bd693bd94dd6", + "rev": "14162c1d4f1882a4fe2069cea9cd6f0c42c7bef3", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1635672778, - "narHash": "sha256-WW1Gew3tL0ScjTre5hSWlpKy27c1huLCLweS63u9Wv4=", + "lastModified": 1635839387, + "narHash": "sha256-2B6DqfTiwY5w2TljC4+AxEUuVYMTP5Fo2h5iGNIONvk=", "owner": "nix-community", "repo": "home-manager", - "rev": "275f955db979e069fbe7a1fd7cfcb5ec030a2096", + "rev": "288faaa5a65e72e37e6027024829b15c8bb69286", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1635735275, - "narHash": "sha256-C0WrxH70xFJMl+oznZrSPS3VwqWCyj1MVSTvpkb7ryQ=", + "lastModified": 1635935752, + "narHash": "sha256-WayYp/cu/BBTVWW2+eyBFku25pxBzrzQ6wueifVV8B0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "509d236edf0056d05547c776140fe7cfcf2305bd", + "rev": "b2497e1e0cecf6f6dc47e0dba1e8e4cd5f5b3b7e", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1635514710, - "narHash": "sha256-k9GaS2JIWRph+oJKH1qNSqX6Xt/lpnpNeQCiD1H44GM=", + "lastModified": 1635934513, + "narHash": "sha256-DVT86OBbHUQxci/b7DpsPdVIgPCXjynYaj6omfThvYU=", "owner": "nixos", "repo": "nix", - "rev": "888771b4b2f153bfbf203e07d768d577ab2343e8", + "rev": "133905b309992b2ab0dbec2d2bdc4bcc9672c6b9", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1635719588, - "narHash": "sha256-pWjdy0NheM97NsPE6+jUnr5LYyeA0sBGTdw4mfXMGZQ=", + "lastModified": 1635806954, + "narHash": "sha256-yX/zjbIL/HdXh8a92hWJ+31gsLLv7byA1XRuPARaLro=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f0869b1a2c0b150aac26e10bb5c2364ffb2e804f", + "rev": "372e59d2af704bffd133cbe029f1d5efe73ba6fb", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1635403963, - "narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=", + "lastModified": 1635844945, + "narHash": "sha256-tZcL307dj28jgEU1Wdn+zwG9neyW0H2+ZjdVhvJxh9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61", + "rev": "b67e752c29f18a0ca5534a07661366d6a2c2e649", "type": "github" }, "original": { From afd01c05fd8cc81b62d55635cd5aa5fbebae0ae0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 4 Nov 2021 12:00:54 +0100 Subject: [PATCH 157/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/14162c1d4f1882a4fe2069cea9cd6f0c42c7bef3' (2021-11-03) → 'github:nix-community/emacs-overlay/c5ae3158cdffe7263f00dcdaca73c7551b7d1825' (2021-11-04) • Updated input 'master': 'github:nixos/nixpkgs/b2497e1e0cecf6f6dc47e0dba1e8e4cd5f5b3b7e' (2021-11-03) → 'github:nixos/nixpkgs/d2b31aa88f44b21c5f4cce383905017de4c9679f' (2021-11-04) • Updated input 'nix': 'github:nixos/nix/133905b309992b2ab0dbec2d2bdc4bcc9672c6b9' (2021-11-03) → 'github:nixos/nix/c5fd0b46ae56447d9d0a2028d464a5bbf753bf55' (2021-11-04) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/372e59d2af704bffd133cbe029f1d5efe73ba6fb' (2021-11-01) → 'github:nixos/nixpkgs/2fd5c69fa6057870687a6589a8c95da955188f91' (2021-11-03) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 49aa8948..5ae03052 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635932289, - "narHash": "sha256-kiSSWjOwH6G/cQF93HgnbYDXzt7GH25ID1W+kf/7/s4=", + "lastModified": 1635990756, + "narHash": "sha256-419bNWS/9yc7ylNPpAC821zgr/xWZfQ2K0oW46Epqs0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "14162c1d4f1882a4fe2069cea9cd6f0c42c7bef3", + "rev": "c5ae3158cdffe7263f00dcdaca73c7551b7d1825", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1635935752, - "narHash": "sha256-WayYp/cu/BBTVWW2+eyBFku25pxBzrzQ6wueifVV8B0=", + "lastModified": 1636022932, + "narHash": "sha256-U/UkGbjHD4VoqTWdmiZ7pcrZVk3EyIT14iUtZdaZiEU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b2497e1e0cecf6f6dc47e0dba1e8e4cd5f5b3b7e", + "rev": "d2b31aa88f44b21c5f4cce383905017de4c9679f", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1635934513, - "narHash": "sha256-DVT86OBbHUQxci/b7DpsPdVIgPCXjynYaj6omfThvYU=", + "lastModified": 1636019073, + "narHash": "sha256-CX7cZ66CnY/1GT2vP+OMvCbNYiQnycbVDEwHZFAgpv8=", "owner": "nixos", "repo": "nix", - "rev": "133905b309992b2ab0dbec2d2bdc4bcc9672c6b9", + "rev": "c5fd0b46ae56447d9d0a2028d464a5bbf753bf55", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1635806954, - "narHash": "sha256-yX/zjbIL/HdXh8a92hWJ+31gsLLv7byA1XRuPARaLro=", + "lastModified": 1635933255, + "narHash": "sha256-cR4jRaog5/o5U0No0wNVgokfJma9vuiZhtcu3CUcb1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "372e59d2af704bffd133cbe029f1d5efe73ba6fb", + "rev": "2fd5c69fa6057870687a6589a8c95da955188f91", "type": "github" }, "original": { From ba6e024ac5d962ab105da331d28b7e2fdee07317 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 8 Nov 2021 16:56:44 +0100 Subject: [PATCH 158/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/c5ae3158cdffe7263f00dcdaca73c7551b7d1825' (2021-11-04) → 'github:nix-community/emacs-overlay/086344663fbd821023dd4cce8cb5eecc502c2769' (2021-11-08) • Updated input 'home-manager': 'github:nix-community/home-manager/288faaa5a65e72e37e6027024829b15c8bb69286' (2021-11-02) → 'github:nix-community/home-manager/2917ef23b398a22ee33fb34b5766b28728228ab1' (2021-11-07) • Updated input 'master': 'github:nixos/nixpkgs/d2b31aa88f44b21c5f4cce383905017de4c9679f' (2021-11-04) → 'github:nixos/nixpkgs/09c9e88a3f3825274c430e627fafe85355fe6287' (2021-11-08) • Updated input 'nix': 'github:nixos/nix/c5fd0b46ae56447d9d0a2028d464a5bbf753bf55' (2021-11-04) → 'github:nixos/nix/6c2af1f201a925c2aa632737765685c72b642847' (2021-11-08) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/2fd5c69fa6057870687a6589a8c95da955188f91' (2021-11-03) → 'github:nixos/nixpkgs/e74894146a42ba552ebafa19ab2d1df7ccbc1738' (2021-11-08) • Updated input 'unstable': 'github:nixos/nixpkgs/b67e752c29f18a0ca5534a07661366d6a2c2e649' (2021-11-02) → 'github:nixos/nixpkgs/c935f5e0add2cf0ae650d072c8357533e21b0c35' (2021-11-07) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 5ae03052..445a1677 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1635990756, - "narHash": "sha256-419bNWS/9yc7ylNPpAC821zgr/xWZfQ2K0oW46Epqs0=", + "lastModified": 1636363962, + "narHash": "sha256-DyF+NBIPF7f8IZ6zI0NKbTjnfAq7tTSr74k2zVolQsw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c5ae3158cdffe7263f00dcdaca73c7551b7d1825", + "rev": "086344663fbd821023dd4cce8cb5eecc502c2769", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1635839387, - "narHash": "sha256-2B6DqfTiwY5w2TljC4+AxEUuVYMTP5Fo2h5iGNIONvk=", + "lastModified": 1636274622, + "narHash": "sha256-tZYuGhqcfH7piCsrUrIYM0P3oPJcoBxGkuxeFNVxkCc=", "owner": "nix-community", "repo": "home-manager", - "rev": "288faaa5a65e72e37e6027024829b15c8bb69286", + "rev": "2917ef23b398a22ee33fb34b5766b28728228ab1", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1636022932, - "narHash": "sha256-U/UkGbjHD4VoqTWdmiZ7pcrZVk3EyIT14iUtZdaZiEU=", + "lastModified": 1636386043, + "narHash": "sha256-IbrZAH3CxkbLxCNHTbQe6lVy/4+GmFV/JnpV3aU2X9Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2b31aa88f44b21c5f4cce383905017de4c9679f", + "rev": "09c9e88a3f3825274c430e627fafe85355fe6287", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1636019073, - "narHash": "sha256-CX7cZ66CnY/1GT2vP+OMvCbNYiQnycbVDEwHZFAgpv8=", + "lastModified": 1636377222, + "narHash": "sha256-+aGA4gbM+wGqsIfGkNAxXWsUCxUTYTSxW/5LV6IYfa4=", "owner": "nixos", "repo": "nix", - "rev": "c5fd0b46ae56447d9d0a2028d464a5bbf753bf55", + "rev": "6c2af1f201a925c2aa632737765685c72b642847", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1635933255, - "narHash": "sha256-cR4jRaog5/o5U0No0wNVgokfJma9vuiZhtcu3CUcb1M=", + "lastModified": 1636333654, + "narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fd5c69fa6057870687a6589a8c95da955188f91", + "rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1635844945, - "narHash": "sha256-tZcL307dj28jgEU1Wdn+zwG9neyW0H2+ZjdVhvJxh9g=", + "lastModified": 1636267212, + "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b67e752c29f18a0ca5534a07661366d6a2c2e649", + "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", "type": "github" }, "original": { From 8bf79ad316fcbfda2916203dcce82093a5289eca Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 8 Nov 2021 17:44:55 +0100 Subject: [PATCH 159/303] enable rust --- home/configurations/demo@thetys.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/configurations/demo@thetys.nix b/home/configurations/demo@thetys.nix index 9ea512ad..4bf70367 100644 --- a/home/configurations/demo@thetys.nix +++ b/home/configurations/demo@thetys.nix @@ -11,7 +11,7 @@ in activeProfiles = [ "browsing" "development" ]; enabledLanguages = - [ "elixir" "go" "lua" "nix" "python" "terraform" "nim" ]; + [ "elixir" "go" "lua" "nix" "python" "terraform" "nim" "rust" ]; languages.python.useMS = true; From afbaa712fa019f28239951f38224cbdd04e388c6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 12 Nov 2021 06:37:25 +0100 Subject: [PATCH 160/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/086344663fbd821023dd4cce8cb5eecc502c2769' (2021-11-08) → 'github:nix-community/emacs-overlay/209234286d219ca9990707a1f2377e731048bbd2' (2021-11-12) • Updated input 'home-manager': 'github:nix-community/home-manager/2917ef23b398a22ee33fb34b5766b28728228ab1' (2021-11-07) → 'github:nix-community/home-manager/1e5c8e9bff00d0844bc3d25d1a98eab5633e600b' (2021-11-10) • Updated input 'master': 'github:nixos/nixpkgs/09c9e88a3f3825274c430e627fafe85355fe6287' (2021-11-08) → 'github:nixos/nixpkgs/a1b8eb4a30e32553f47ddfb185816f587ba08bbc' (2021-11-12) • Updated input 'nix': 'github:nixos/nix/6c2af1f201a925c2aa632737765685c72b642847' (2021-11-08) → 'github:nixos/nix/52a3b2ee6367306a3f17fe9a2d0e2e4096852e05' (2021-11-10) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/e74894146a42ba552ebafa19ab2d1df7ccbc1738' (2021-11-08) → 'github:nixos/nixpkgs/9e86f5f7a19db6da2445f07bafa6694b556f9c6d' (2021-11-10) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/a2d06d2d2910cbe35b4f323a54ef484f51d71e20' (2021-10-17) → 'github:nix-community/rnix-lsp/c69593fbad279135110ef05bd1364334d6b7f318' (2021-11-11) • Updated input 'unstable': 'github:nixos/nixpkgs/c935f5e0add2cf0ae650d072c8357533e21b0c35' (2021-11-07) → 'github:nixos/nixpkgs/9e70e9f732fbb15872cb4ea11bd43c14328a0b69' (2021-11-09) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 445a1677..93cd0352 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1636363962, - "narHash": "sha256-DyF+NBIPF7f8IZ6zI0NKbTjnfAq7tTSr74k2zVolQsw=", + "lastModified": 1636681505, + "narHash": "sha256-yzNMND5Gf1jZHGTbI8xYC8l0FXAQIlafg9dYrrE6bGc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "086344663fbd821023dd4cce8cb5eecc502c2769", + "rev": "209234286d219ca9990707a1f2377e731048bbd2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1636274622, - "narHash": "sha256-tZYuGhqcfH7piCsrUrIYM0P3oPJcoBxGkuxeFNVxkCc=", + "lastModified": 1636520380, + "narHash": "sha256-gBiQ8+AQG6Dia34rqJDuqs6VFe/J1SjIhOZBeTXCKQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2917ef23b398a22ee33fb34b5766b28728228ab1", + "rev": "1e5c8e9bff00d0844bc3d25d1a98eab5633e600b", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1636386043, - "narHash": "sha256-IbrZAH3CxkbLxCNHTbQe6lVy/4+GmFV/JnpV3aU2X9Q=", + "lastModified": 1636692106, + "narHash": "sha256-wznNEMpwxGIg+UowwvoBDLyKhE5pnzR9DWxBeGP0F4c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "09c9e88a3f3825274c430e627fafe85355fe6287", + "rev": "a1b8eb4a30e32553f47ddfb185816f587ba08bbc", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1636377222, - "narHash": "sha256-+aGA4gbM+wGqsIfGkNAxXWsUCxUTYTSxW/5LV6IYfa4=", + "lastModified": 1636573809, + "narHash": "sha256-fZqSolh+RfJnqK9zR9TFEMFII+ayo4V9DA21xuI9nhA=", "owner": "nixos", "repo": "nix", - "rev": "6c2af1f201a925c2aa632737765685c72b642847", + "rev": "52a3b2ee6367306a3f17fe9a2d0e2e4096852e05", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1636333654, - "narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=", + "lastModified": 1636552551, + "narHash": "sha256-k7Hq/bvUnRlAfFjPGuw3FsSqqspQdRHsCHpgadw6UkQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738", + "rev": "9e86f5f7a19db6da2445f07bafa6694b556f9c6d", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1634449716, - "narHash": "sha256-JuRCU4KCIA3/pp8BjHqqF9dj1d2xtpkxKKAtSuOzTIY=", + "lastModified": 1636669740, + "narHash": "sha256-1RP1PRwpd5xuIrmcXQK6zmOIg0cSJQRGE/Oc3DAZm78=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "a2d06d2d2910cbe35b4f323a54ef484f51d71e20", + "rev": "c69593fbad279135110ef05bd1364334d6b7f318", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1636267212, - "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", + "lastModified": 1636443933, + "narHash": "sha256-ABJmNQdzFWWxaqkb0C0kd9f/MmUtmnQrxm9sZPhgm/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", + "rev": "9e70e9f732fbb15872cb4ea11bd43c14328a0b69", "type": "github" }, "original": { From d483c107eee0f210ca9039b73b053c426b4444a7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 12 Nov 2021 06:40:22 +0100 Subject: [PATCH 161/303] remove ineffective and deprecated option --- home/modules/profiles/base/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index 7602fb75..5028df5c 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -55,7 +55,6 @@ in bat.enable = true; direnv.enable = true; direnv.nix-direnv.enable = true; - direnv.nix-direnv.enableFlakes = true; exa.enable = true; home-manager.enable = true; htop.enable = true; From 407c153a7e484b76ff44887698f815ed89e2551a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 14 Nov 2021 13:59:20 +0100 Subject: [PATCH 162/303] first iteration --- lib/mk_system.nix | 35 ++++++++++++++++++------------- nixos/configurations/mimas.nix | 38 ++++++++++++++++++++++++++++++++++ nixos/modules/grafana.nix | 5 +++++ nixos/modules/zerotier.nix | 8 +++++++ 4 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 nixos/modules/grafana.nix create mode 100644 nixos/modules/zerotier.nix diff --git a/lib/mk_system.nix b/lib/mk_system.nix index ea14158c..06711a85 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -1,18 +1,25 @@ { self, ... }@args: name: nixpkgs: -nixpkgs.lib.nixosSystem ({ - system = "x86_64-linux"; +nixpkgs.lib.nixosSystem ( + let + configFolder = "${self}/nixos/configurations"; + entryPoint = "${configFolder}/${name}.nix"; + hardware = "${configFolder}/hardware/${name}.nix"; + in + { + system = "x86_64-linux"; - modules = [ - { - _module.args = args; - networking.hostName = name; - nix.flakes.enable = true; - system.configurationRevision = self.rev or "dirty"; - documentation.man = { enable = true; generateCaches = true; }; - } - (./. + "/../nixos/configurations/${name}.nix") - (./. + "/../nixos/configurations/hardware/${name}.nix") - ] ++ __attrValues self.nixosModules; -}) + modules = [ + { + _module.args = args; + networking.hostName = name; + nix.flakes.enable = true; + system.configurationRevision = self.rev or "dirty"; + documentation.man = { enable = true; generateCaches = true; }; + } + entryPoint + hardware + ] ++ __attrValues self.nixosModules; + } +) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index db3a14f1..2971bebd 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -217,6 +217,44 @@ in # } # ]; + # grafana configuration + services.grafana = { + enable = true; + domain = "grafana.nobbz.lan"; + port = 2342; + addr = "127.0.0.1"; + }; + + # nginx reverse proxy + services.nginx.virtualHosts.${config.services.grafana.domain} = { + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; + proxyWebsockets = true; + }; + }; + + services.prometheus = { + enable = true; + port = 9001; + + exporters = { + node = { + enable = true; + enabledCollectors = [ "systemd" ]; + port = 9002; + }; + }; + + scrapeConfigs = [ + { + job_name = "mimas"; + static_configs = [{ + targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; + }]; + } + ]; + }; + # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you diff --git a/nixos/modules/grafana.nix b/nixos/modules/grafana.nix new file mode 100644 index 00000000..eae7f139 --- /dev/null +++ b/nixos/modules/grafana.nix @@ -0,0 +1,5 @@ +{ config, pkgs, lib, ... }: +{ + config = lib.mkMerge [ + + } diff --git a/nixos/modules/zerotier.nix b/nixos/modules/zerotier.nix new file mode 100644 index 00000000..a6c9b28f --- /dev/null +++ b/nixos/modules/zerotier.nix @@ -0,0 +1,8 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.zerotier; +in +{ + config = lib.mkIf cfg.enable { }; +} From 526d5e4bfc566b0448e4887c2c3746f774b67f02 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 14 Nov 2021 15:22:21 +0100 Subject: [PATCH 163/303] enable for enceladeus --- nixos/configurations/enceladeus.nix | 10 ++++++++++ nixos/configurations/mimas.nix | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 47f3b4e0..356e0a2b 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -143,6 +143,16 @@ }; }; + services.prometheus = { + exporters = { + node = { + enable = true; + enabledCollectors = [ "systemd" ]; + port = 9002; + }; + }; + }; + # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 2971bebd..aeda9337 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -249,7 +249,10 @@ in { job_name = "mimas"; static_configs = [{ - targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; + targets = [ + "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" + "172.24.199.101:9002" + ]; }]; } ]; From dff230fca264274d1e5f6dca485c0ebcb681db78 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 15 Nov 2021 06:54:43 +0100 Subject: [PATCH 164/303] enceladeus: firewall for prometheus --- nixos/configurations/enceladeus.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 356e0a2b..bd8c65d0 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -89,10 +89,13 @@ services.openssh.enable = true; # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; + networking.firewall.allowedTCPPorts = [ 9002 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; + networking.firewall.trustedInterfaces = [ + "ztrta4jrxj" + ]; # Enable CUPS to print documents. # services.printing.enable = true; From dc92d3aaf88c4f0458b411528a34c924bd15315e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 15 Nov 2021 06:56:07 +0100 Subject: [PATCH 165/303] thetys: enable prometheus --- nixos/configurations/thetys.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 93e05e6b..d1a93ab0 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -74,6 +74,7 @@ 3306 8080 8081 + 9002 ]; nix.distributedBuilds = false; @@ -100,5 +101,15 @@ } ]; + services.prometheus = { + exporters = { + node = { + enable = true; + enabledCollectors = [ "systemd" ]; + port = 9002; + }; + }; + }; + system.stateVersion = "19.09"; } From f7012c73c2fb5a64415d8687b447d4cc567893a0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 15 Nov 2021 06:57:44 +0100 Subject: [PATCH 166/303] mimas: tweak grafana/prometheus settings --- nixos/configurations/mimas.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index aeda9337..d13fdc95 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -81,12 +81,12 @@ in services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; + networking.firewall.allowedTCPPorts = [ 9002 2342 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; - services.fwupd.enable = true; + # services.fwupd.enable = true; # Enable CUPS to print documents. services.printing.enable = true; @@ -247,11 +247,12 @@ in scrapeConfigs = [ { - job_name = "mimas"; + job_name = "node_import"; static_configs = [{ targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" "172.24.199.101:9002" + "172.24.231.199:9002" ]; }]; } From 9b0dc52d4609e13ebceceb8590d7de0441de82da Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 15 Nov 2021 06:59:50 +0100 Subject: [PATCH 167/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/209234286d219ca9990707a1f2377e731048bbd2' (2021-11-12) → 'github:nix-community/emacs-overlay/9349d166936bc89a72f2f7ab113b0fb8f27a9948' (2021-11-15) • Updated input 'home-manager': 'github:nix-community/home-manager/1e5c8e9bff00d0844bc3d25d1a98eab5633e600b' (2021-11-10) → 'github:nix-community/home-manager/3f12ce5f7df69dfb8e12b02e88979b9d7770c663' (2021-11-15) • Updated input 'master': 'github:nixos/nixpkgs/a1b8eb4a30e32553f47ddfb185816f587ba08bbc' (2021-11-12) → 'github:nixos/nixpkgs/9c542ec266ba2d6a9e5bdffcd955d9addd4b3032' (2021-11-15) • Updated input 'nix': 'github:nixos/nix/52a3b2ee6367306a3f17fe9a2d0e2e4096852e05' (2021-11-10) → 'github:nixos/nix/bceda304982a34c65d5a1dab449cb5bc59f63b83' (2021-11-12) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/9e86f5f7a19db6da2445f07bafa6694b556f9c6d' (2021-11-10) → 'github:nixos/nixpkgs/195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2' (2021-11-14) • Updated input 'unstable': 'github:nixos/nixpkgs/9e70e9f732fbb15872cb4ea11bd43c14328a0b69' (2021-11-09) → 'github:nixos/nixpkgs/2fa862644fc15ecb525eb8cd0a60276f1c340c7c' (2021-11-13) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 93cd0352..462a9961 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1636681505, - "narHash": "sha256-yzNMND5Gf1jZHGTbI8xYC8l0FXAQIlafg9dYrrE6bGc=", + "lastModified": 1636940690, + "narHash": "sha256-9ehSzNnHVW9HhGzRUEYQPbX/qcIutRjMQdGcIC60Qv0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "209234286d219ca9990707a1f2377e731048bbd2", + "rev": "9349d166936bc89a72f2f7ab113b0fb8f27a9948", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1636520380, - "narHash": "sha256-gBiQ8+AQG6Dia34rqJDuqs6VFe/J1SjIhOZBeTXCKQI=", + "lastModified": 1636948826, + "narHash": "sha256-7N6gVs0mu8HWpt5DDREAG59fU/kseio1Ji2Mn9C9aFg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e5c8e9bff00d0844bc3d25d1a98eab5633e600b", + "rev": "3f12ce5f7df69dfb8e12b02e88979b9d7770c663", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1636692106, - "narHash": "sha256-wznNEMpwxGIg+UowwvoBDLyKhE5pnzR9DWxBeGP0F4c=", + "lastModified": 1636953063, + "narHash": "sha256-oE3AS7WCX9+YUv4N0rqrefp9QG2GqNcu54ma03yxj1Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1b8eb4a30e32553f47ddfb185816f587ba08bbc", + "rev": "9c542ec266ba2d6a9e5bdffcd955d9addd4b3032", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1636573809, - "narHash": "sha256-fZqSolh+RfJnqK9zR9TFEMFII+ayo4V9DA21xuI9nhA=", + "lastModified": 1636720875, + "narHash": "sha256-HAYF3wLo3in2ITfc4X6H2S//KRVn7aEuEeqBT4WN16w=", "owner": "nixos", "repo": "nix", - "rev": "52a3b2ee6367306a3f17fe9a2d0e2e4096852e05", + "rev": "bceda304982a34c65d5a1dab449cb5bc59f63b83", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1636552551, - "narHash": "sha256-k7Hq/bvUnRlAfFjPGuw3FsSqqspQdRHsCHpgadw6UkQ=", + "lastModified": 1636855248, + "narHash": "sha256-ISyGm3p9uNvSqsgguK6+Pr0IDJ3pik14wTHZXfF3e/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e86f5f7a19db6da2445f07bafa6694b556f9c6d", + "rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1636443933, - "narHash": "sha256-ABJmNQdzFWWxaqkb0C0kd9f/MmUtmnQrxm9sZPhgm/s=", + "lastModified": 1636800699, + "narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e70e9f732fbb15872cb4ea11bd43c14328a0b69", + "rev": "2fa862644fc15ecb525eb8cd0a60276f1c340c7c", "type": "github" }, "original": { From f40470565210b16c76c83f5bd45c90454724e2fe Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 15 Nov 2021 13:35:25 +0100 Subject: [PATCH 168/303] mimas: grafana bind :: --- nixos/configurations/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index d13fdc95..e5b09777 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -222,7 +222,7 @@ in enable = true; domain = "grafana.nobbz.lan"; port = 2342; - addr = "127.0.0.1"; + addr = "0.0.0.0"; }; # nginx reverse proxy From 3a82d1a20fb476cb82a8e98ddd8218302980217c Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 15 Nov 2021 22:59:14 +0100 Subject: [PATCH 169/303] mimas: prometheus rule added --- nixos/configurations/mimas.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index e5b09777..240162be 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -237,6 +237,16 @@ in enable = true; port = 9001; + rules = [ + '' + groups: + - name: test + rules: + - record: nobbz:code_cpu_percent + expr: avg without (cpu) (irate(node_cpu_seconds_total[5m])) + '' + ]; + exporters = { node = { enable = true; From 69cb301d90dd4298e47f212f6385e8381b20b767 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 15 Nov 2021 23:40:35 +0100 Subject: [PATCH 170/303] mimas: thin volumes for prometheus and grafana --- nixos/configurations/hardware/mimas.nix | 10 ++++++++++ nixos/configurations/mimas.nix | 2 ++ 2 files changed, 12 insertions(+) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index e5ed05fb..09ce787a 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -38,6 +38,16 @@ fsType = "ext4"; }; + fileSystems."/var/lib/grafana" = { + device = "/dev/disk/by-uuid/c6294dc0-f2cb-432b-a993-02d21855732c"; + fsType = "ext4"; + }; + + fileSystems."/var/lib/prometheus" = { + device = "/dev/disk/by-uuid/3ec5c5b2-d7cd-4b59-bb6b-d1fc40100662"; + fsType = "ext4"; + }; + fileSystems."/boot" = { device = "/dev/disk/by-uuid/7000-3A85"; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 240162be..33b960b9 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -21,6 +21,8 @@ in boot.supportedFilesystems = [ "ntfs" "exfat" "avfs" ]; boot.cleanTmpDir = true; + services.lvm.boot.thin.enable = true; + hardware.enableRedistributableFirmware = true; # networking.enableRalinkFirmware = true; From 80e1a09b0ac893c8d54a9ff1d6d2b03c415bad16 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 16 Nov 2021 06:44:17 +0100 Subject: [PATCH 171/303] mimas: fix mountpoint --- nixos/configurations/hardware/mimas.nix | 2 +- nixos/configurations/mimas.nix | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index 09ce787a..2b7cf982 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -43,7 +43,7 @@ fsType = "ext4"; }; - fileSystems."/var/lib/prometheus" = { + fileSystems."/var/lib/prometheus2" = { device = "/dev/disk/by-uuid/3ec5c5b2-d7cd-4b59-bb6b-d1fc40100662"; fsType = "ext4"; }; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 33b960b9..1cd9bca2 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -258,6 +258,14 @@ in }; scrapeConfigs = [ + { + job_name = "grafana"; + static_configs = [{ targets = [ "127.0.0.1:2342" ]; }]; + } + { + job_name = "prometheus"; + static_configs = [{ targets = [ "127.0.0.1:9001" ]; }]; + } { job_name = "node_import"; static_configs = [{ From 6fb6546ee371f39b28423c734f4564f614bf42ee Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 16 Nov 2021 07:23:17 +0100 Subject: [PATCH 172/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/9349d166936bc89a72f2f7ab113b0fb8f27a9948' (2021-11-15) → 'github:nix-community/emacs-overlay/f01c9352ea15574602234feea5b4dc25df26a77a' (2021-11-16) • Updated input 'flake-utils': 'github:numtide/flake-utils/c91f3de5adaf1de973b797ef7485e441a65b8935' (2021-10-21) → 'github:numtide/flake-utils/bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4' (2021-11-15) • Updated input 'home-manager': 'github:nix-community/home-manager/3f12ce5f7df69dfb8e12b02e88979b9d7770c663' (2021-11-15) → 'github:nix-community/home-manager/a7c5b00d44f65efd1e8ace2c02243f179e72283a' (2021-11-15) • Updated input 'master': 'github:nixos/nixpkgs/9c542ec266ba2d6a9e5bdffcd955d9addd4b3032' (2021-11-15) → 'github:nixos/nixpkgs/e2c7d2b885a3be8392f385eb5d31170b0cfdce9f' (2021-11-16) • Updated input 'nix': 'github:nixos/nix/bceda304982a34c65d5a1dab449cb5bc59f63b83' (2021-11-12) → 'github:nixos/nix/9fe0343bfd627a6ca0809bbefc80d43a50991347' (2021-11-15) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2' (2021-11-14) → 'github:nixos/nixpkgs/46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/c69593fbad279135110ef05bd1364334d6b7f318' (2021-11-11) → 'github:nix-community/rnix-lsp/9462b0d20325a06f7e43b5a0469ec2c92e60f5fe' (2021-11-15) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 462a9961..2a2bf62d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1636940690, - "narHash": "sha256-9ehSzNnHVW9HhGzRUEYQPbX/qcIutRjMQdGcIC60Qv0=", + "lastModified": 1637027238, + "narHash": "sha256-Ob3nKcvMdBALeBkZXaDtLIfGloJ1srH4pY5lrGQCIWE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9349d166936bc89a72f2f7ab113b0fb8f27a9948", + "rev": "f01c9352ea15574602234feea5b4dc25df26a77a", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1636948826, - "narHash": "sha256-7N6gVs0mu8HWpt5DDREAG59fU/kseio1Ji2Mn9C9aFg=", + "lastModified": 1637010045, + "narHash": "sha256-EzA+Iu2c8N1i3K8jouZSuyMOOeR1glFZSW9ZgqmPH54=", "owner": "nix-community", "repo": "home-manager", - "rev": "3f12ce5f7df69dfb8e12b02e88979b9d7770c663", + "rev": "a7c5b00d44f65efd1e8ace2c02243f179e72283a", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1636953063, - "narHash": "sha256-oE3AS7WCX9+YUv4N0rqrefp9QG2GqNcu54ma03yxj1Y=", + "lastModified": 1637041413, + "narHash": "sha256-rTs9x93S/jU2nVkOVy2bBq7IwmdcmwiLdHhbsfOqNAE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9c542ec266ba2d6a9e5bdffcd955d9addd4b3032", + "rev": "e2c7d2b885a3be8392f385eb5d31170b0cfdce9f", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1636720875, - "narHash": "sha256-HAYF3wLo3in2ITfc4X6H2S//KRVn7aEuEeqBT4WN16w=", + "lastModified": 1636998320, + "narHash": "sha256-Vzqb9W4wHxIAICU3+RMW13+KnXfy3aHT/w4FPUi2rOc=", "owner": "nixos", "repo": "nix", - "rev": "bceda304982a34c65d5a1dab449cb5bc59f63b83", + "rev": "9fe0343bfd627a6ca0809bbefc80d43a50991347", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1636855248, - "narHash": "sha256-ISyGm3p9uNvSqsgguK6+Pr0IDJ3pik14wTHZXfF3e/s=", + "lastModified": 1636944046, + "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2", + "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1636669740, - "narHash": "sha256-1RP1PRwpd5xuIrmcXQK6zmOIg0cSJQRGE/Oc3DAZm78=", + "lastModified": 1636977689, + "narHash": "sha256-pQmAxKBoEhC851iRsowMErz9CYiJxGpARjhPeSapH1Y=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "c69593fbad279135110ef05bd1364334d6b7f318", + "rev": "9462b0d20325a06f7e43b5a0469ec2c92e60f5fe", "type": "github" }, "original": { From b27ba5f7d4a83c6cfdde8bc9632a49eeb3eae8df Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 17 Nov 2021 06:37:16 +0100 Subject: [PATCH 173/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/f01c9352ea15574602234feea5b4dc25df26a77a' (2021-11-16) → 'github:nix-community/emacs-overlay/4a9220bf1477ff8356f7cd503a61d89e869ffa42' (2021-11-17) • Updated input 'home-manager': 'github:nix-community/home-manager/a7c5b00d44f65efd1e8ace2c02243f179e72283a' (2021-11-15) → 'github:nix-community/home-manager/5559ef002306dde0093f3d329725259cada9ed41' (2021-11-16) • Updated input 'master': 'github:nixos/nixpkgs/e2c7d2b885a3be8392f385eb5d31170b0cfdce9f' (2021-11-16) → 'github:nixos/nixpkgs/fc4ff32d2027c1b9c884c5a91531981dd21abc02' (2021-11-17) • Updated input 'nix': 'github:nixos/nix/9fe0343bfd627a6ca0809bbefc80d43a50991347' (2021-11-15) → 'github:nixos/nix/b191213b8b4cb0628ed3a84c5f5cc4d289fe8d88' (2021-11-16) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source?lastModified=1636944046&narHash=sha256-74KLDsiWSBsYXKj%2fql9EGbw1TbIJRE7clFkhl30HV%2fc=&rev=46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/2fa862644fc15ecb525eb8cd0a60276f1c340c7c' (2021-11-13) → 'github:nixos/nixpkgs/931ab058daa7e4cd539533963f95e2bb0dbd41e6' (2021-11-15) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2a2bf62d..2e650c42 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1637027238, - "narHash": "sha256-Ob3nKcvMdBALeBkZXaDtLIfGloJ1srH4pY5lrGQCIWE=", + "lastModified": 1637114509, + "narHash": "sha256-RghTr73r4rMBIG26qIgv90oCdoXP24JpSGQZd+LZ2Ik=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f01c9352ea15574602234feea5b4dc25df26a77a", + "rev": "4a9220bf1477ff8356f7cd503a61d89e869ffa42", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1637010045, - "narHash": "sha256-EzA+Iu2c8N1i3K8jouZSuyMOOeR1glFZSW9ZgqmPH54=", + "lastModified": 1637088670, + "narHash": "sha256-d49wUICXl1iItqvk0lbMwjpUbro86mBrV6876C+SLcA=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7c5b00d44f65efd1e8ace2c02243f179e72283a", + "rev": "5559ef002306dde0093f3d329725259cada9ed41", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1637041413, - "narHash": "sha256-rTs9x93S/jU2nVkOVy2bBq7IwmdcmwiLdHhbsfOqNAE=", + "lastModified": 1637126900, + "narHash": "sha256-sYLnpZuIcI8B1y3krtkAnUVtA2YS52Pe6d5hc5u6ix4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2c7d2b885a3be8392f385eb5d31170b0cfdce9f", + "rev": "fc4ff32d2027c1b9c884c5a91531981dd21abc02", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1636998320, - "narHash": "sha256-Vzqb9W4wHxIAICU3+RMW13+KnXfy3aHT/w4FPUi2rOc=", + "lastModified": 1637102352, + "narHash": "sha256-+S69GLsFytfaAuZlg4KjzUjd5DVnB8bc4f5Sq4iMhys=", "owner": "nixos", "repo": "nix", - "rev": "9fe0343bfd627a6ca0809bbefc80d43a50991347", + "rev": "b191213b8b4cb0628ed3a84c5f5cc4d289fe8d88", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "unstable": { "locked": { - "lastModified": 1636800699, - "narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=", + "lastModified": 1636976544, + "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fa862644fc15ecb525eb8cd0a60276f1c340c7c", + "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", "type": "github" }, "original": { From 669433b0e4fe421a5b478de11b329a838a076567 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 17 Nov 2021 06:57:00 +0100 Subject: [PATCH 174/303] fix flaky follows --- flake.lock | 26 +++++++++++--------------- flake.nix | 1 + 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2e650c42..e6695c20 100644 --- a/flake.lock +++ b/flake.lock @@ -84,10 +84,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "rnix-lsp", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1629707199, @@ -172,24 +169,23 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1630481079, - "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", - "type": "github" + "lastModified": 1636944046, + "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", + "path": "/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source", + "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", + "type": "path" }, "original": { - "owner": "nixos", - "ref": "nixos-21.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "unstable" + ], "utils": "utils" }, "locked": { diff --git a/flake.nix b/flake.nix index 88618c69..537c7bcc 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ inputs.nix.url = "github:nixos/nix/master"; inputs.rnix-lsp.url = "github:nix-community/rnix-lsp/master"; + inputs.rnix-lsp.inputs.nixpkgs.follows = "unstable"; inputs.home-manager.url = "github:nix-community/home-manager"; inputs.home-manager.inputs.nixpkgs.follows = "unstable"; From c83385b7d6e42c4f827d6c13fbec6e400c527206 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 17 Nov 2021 06:57:47 +0100 Subject: [PATCH 175/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source?lastModified=1636944046&narHash=sha256-74KLDsiWSBsYXKj%2fql9EGbw1TbIJRE7clFkhl30HV%2fc=&rev=46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → follows 'rnix-lsp/nixpkgs' --- flake.lock | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index e6695c20..58c0fabd 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,10 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] }, "locked": { "lastModified": 1629707199, @@ -167,19 +170,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1636944046, - "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", - "path": "/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source", - "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "rnix-lsp": { "inputs": { "naersk": "naersk", From 2f370c19cb63ecfb76632eebafe5a5ed4c6ce166 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 18 Nov 2021 06:55:48 +0100 Subject: [PATCH 176/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/4a9220bf1477ff8356f7cd503a61d89e869ffa42' (2021-11-17) → 'github:nix-community/emacs-overlay/88c62860a48ce89a4631520e4a32037702cc285e' (2021-11-18) • Updated input 'home-manager': 'github:nix-community/home-manager/5559ef002306dde0093f3d329725259cada9ed41' (2021-11-16) → 'github:nix-community/home-manager/d85bf67c48f5c64ca39d3d48375e742e16933f4f' (2021-11-17) • Updated input 'master': 'github:nixos/nixpkgs/fc4ff32d2027c1b9c884c5a91531981dd21abc02' (2021-11-17) → 'github:nixos/nixpkgs/42d32516400c1d821d275a5460900bbaef3d3bf1' (2021-11-18) • Updated input 'nix': 'github:nixos/nix/b191213b8b4cb0628ed3a84c5f5cc4d289fe8d88' (2021-11-16) → 'github:nixos/nix/480c883f363912df611c545b05ae0f6f1b9a6c61' (2021-11-17) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source?lastModified=1636944046&narHash=sha256-74KLDsiWSBsYXKj%2fql9EGbw1TbIJRE7clFkhl30HV%2fc=&rev=46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → follows 'rnix-lsp/nixpkgs' • Updated input 'rnix-lsp/nixpkgs': 'github:nixos/nixpkgs/46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → 'github:nixos/nixpkgs/110a2c9ebbf5d4a94486854f18a37a938cfacbbb' (2021-09-01) --- flake.lock | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 58c0fabd..dfe041ce 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1637114509, - "narHash": "sha256-RghTr73r4rMBIG26qIgv90oCdoXP24JpSGQZd+LZ2Ik=", + "lastModified": 1637200214, + "narHash": "sha256-z6HFS4HyaaGd2ZNVwICnALZbQ9DeruNVdbQClaWU3e8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4a9220bf1477ff8356f7cd503a61d89e869ffa42", + "rev": "88c62860a48ce89a4631520e4a32037702cc285e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1637088670, - "narHash": "sha256-d49wUICXl1iItqvk0lbMwjpUbro86mBrV6876C+SLcA=", + "lastModified": 1637188941, + "narHash": "sha256-4aA5iNVhSDbKjsPeG4n0SvfPQ3sd9ve23b05bVztSq4=", "owner": "nix-community", "repo": "home-manager", - "rev": "5559ef002306dde0093f3d329725259cada9ed41", + "rev": "d85bf67c48f5c64ca39d3d48375e742e16933f4f", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1637126900, - "narHash": "sha256-sYLnpZuIcI8B1y3krtkAnUVtA2YS52Pe6d5hc5u6ix4=", + "lastModified": 1637209424, + "narHash": "sha256-oXw75hkCOVtoB+CEElWiTmkC1gNdL3jf0tG2GInytHA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc4ff32d2027c1b9c884c5a91531981dd21abc02", + "rev": "42d32516400c1d821d275a5460900bbaef3d3bf1", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1637102352, - "narHash": "sha256-+S69GLsFytfaAuZlg4KjzUjd5DVnB8bc4f5Sq4iMhys=", + "lastModified": 1637139905, + "narHash": "sha256-9SVNpNRb5FWevmsez2McSy7sv+KAyYaiCAlpFVaZLk8=", "owner": "nixos", "repo": "nix", - "rev": "b191213b8b4cb0628ed3a84c5f5cc4d289fe8d88", + "rev": "480c883f363912df611c545b05ae0f6f1b9a6c61", "type": "github" }, "original": { @@ -170,12 +170,26 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1630481079, + "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": [ - "unstable" - ], + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { From 07b1d18b6a8abe29bdb5707e903ac089b3c7694a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 15:23:46 +0100 Subject: [PATCH 177/303] new restic URL --- home/configurations/demo@thetys.nix | 2 +- home/configurations/nmelzer@enceladeus.nix | 2 +- home/configurations/nmelzer@mimas.nix | 2 +- home/modules/profiles/base/default.nix | 3 +-- home/modules/programs/emacs/polymode/default.nix | 5 +++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/home/configurations/demo@thetys.nix b/home/configurations/demo@thetys.nix index 4bf70367..4c00d740 100644 --- a/home/configurations/demo@thetys.nix +++ b/home/configurations/demo@thetys.nix @@ -58,7 +58,7 @@ in "ccls-cache" ".direnv" ]; - repo = "sftp:tux-nixos.adoring_suess.zerotier:/var/run/media/nmelzer/data/restic/repo"; + repo = "rest:http://172.24.152.168:9999/nobbz"; }; }; diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index 1accf678..82bcba70 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -23,7 +23,7 @@ enable = true; exclude = (map (e: "%h/${e}") [ ".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg" ]) ++ [ "_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv" ]; oneFileSystem = true; - repo = "sftp:nmelzer@tux-nixos.adoring_suess.zerotier:/run/media/nmelzer/data/restic/repo"; + repo = "rest:http://172.24.152.168:9999/nobbz"; }; home.packages = [ ]; diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index f58aff6b..140078fc 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -76,7 +76,7 @@ in enable = true; exclude = (map (e: "%h/${e}") [ ".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg" ]) ++ [ "_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv" ]; oneFileSystem = true; - repo = "/run/media/nmelzer/data/restic/repo"; + repo = "rest:http://172.24.152.168:9999/nobbz"; }; }; diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index 5028df5c..e2f46180 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -3,8 +3,7 @@ let cfg = config.profiles.base; inherit (self.packages.x86_64-linux) emacs; - - dag = lib.hm.dag; + inherit (lib.hm) dag; # TODO: make these a bit more nice, so that repeating the hosts and individual config isn't necessary. zerotierHosts = [ "delly-nixos.adoring_suess.zerotier" "tux-nixos.adoring_suess.zerotier" "nixos.adoring_suess.zerotier" ]; diff --git a/home/modules/programs/emacs/polymode/default.nix b/home/modules/programs/emacs/polymode/default.nix index e76d99c3..c41735d5 100644 --- a/home/modules/programs/emacs/polymode/default.nix +++ b/home/modules/programs/emacs/polymode/default.nix @@ -1,7 +1,8 @@ { config, lib, ... }: -with lib; -let emacs = config.programs.emacs; +with lib; # TODO: long term remove this `with` +let + inherit (config.programs) emacs; in { config = lib.mkIf emacs.enable { From 781679a0ee84c47a6b921d538274afdecf9a03a7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 15:24:42 +0100 Subject: [PATCH 178/303] restic-rest-server --- nixos/configurations/hardware/mimas.nix | 5 +++++ nixos/configurations/mimas.nix | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index 2b7cf982..b988e3b5 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -48,6 +48,11 @@ fsType = "ext4"; }; + fileSystems."/var/lib/restic" = { + device = "/dev/disk/by-uuid/3eb6492a-b126-4ad5-b9df-4eb47df1135c"; + fsType = "ext4"; + }; + fileSystems."/boot" = { device = "/dev/disk/by-uuid/7000-3A85"; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 1cd9bca2..9055cc2f 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -37,7 +37,7 @@ in networking.hostId = "21025bb1"; networking.networkmanager.enable = true; networking.networkmanager.unmanaged = [ - "mac:80:fa:5b:09:15:6e" + # "mac:80:fa:5b:09:15:6e" ]; networking.extraHosts = '' # 127.0.0.1 versions.teamspeak.com files.teamspeak-services.com @@ -120,6 +120,12 @@ in services.xserver.layout = "de"; # services.xserver.xkbOptions = "eurosign:e"; + services.restic.server.enable = true; + services.restic.server.prometheus = true; + services.restic.server.extraFlags = [ "--no-auth" ]; + services.restic.server.listenAddress = "172.24.152.168:9999"; + systemd.services.restic-rest-server.after = [ "var-lib-restic.mount" ]; + # Enable touchpad support. # services.xserver.libinput.enable = true; From a7d78a88cce323cce1935666e299c62d014ad52b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 15:25:24 +0100 Subject: [PATCH 179/303] statix --- packages/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/erlang-ls/default.nix b/packages/erlang-ls/default.nix index 4c468309..08af0add 100644 --- a/packages/erlang-ls/default.nix +++ b/packages/erlang-ls/default.nix @@ -5,7 +5,7 @@ let fetchRebar3Deps = { name, version, sha256, src, meta ? { } }: - stdenv.mkDerivation ({ + stdenv.mkDerivation { name = "rebar-deps-${name}-${version}"; buildInputs = [ git cacert ]; @@ -32,7 +32,7 @@ let # impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit meta; - }); + }; in rebar3Relx rec { pname = "erlang-ls"; From a4018be66337a45a1c40e134700db3b40b2e80a3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 17:01:31 +0100 Subject: [PATCH 180/303] allow port 9999 --- nixos/configurations/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 9055cc2f..11313d4b 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -83,7 +83,7 @@ in services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 9002 2342 ]; + networking.firewall.allowedTCPPorts = [ 9002 2342 9999 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; From abe8c9c52916819df0399ce1020934c744d5659e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 17:39:30 +0100 Subject: [PATCH 181/303] statix (but probably useless) --- oldstuff/home/overlays.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/oldstuff/home/overlays.nix b/oldstuff/home/overlays.nix index 45a04a8b..2e3b19e4 100644 --- a/oldstuff/home/overlays.nix +++ b/oldstuff/home/overlays.nix @@ -3,8 +3,7 @@ let self = (compat { src = ./.; }).defaultNix; - overlay = self.overlay; - overlays = self.overlays; + inherit (self) overlay overlays; in [ overlay From 8442ea3e133864a0d573357ebd66f8869c2e58aa Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 17:40:46 +0100 Subject: [PATCH 182/303] adjust gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 82e0cdf0..d6944e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/result \ No newline at end of file +/result* From 884eb1c1b982ea94d3fc2b12de312d9741282c32 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 17:41:06 +0100 Subject: [PATCH 183/303] whatever happened here --- flake.lock | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index dfe041ce..dd16d058 100644 --- a/flake.lock +++ b/flake.lock @@ -84,10 +84,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "rnix-lsp", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1629707199, @@ -171,6 +168,19 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1636944046, + "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", + "path": "/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source", + "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1630481079, "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", @@ -189,7 +199,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { From 2a3bdbbbba006bfa673d37faaddd7cc6048d2595 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 19 Nov 2021 17:42:14 +0100 Subject: [PATCH 184/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/88c62860a48ce89a4631520e4a32037702cc285e' (2021-11-18) → 'github:nix-community/emacs-overlay/cc2cdfc1212057526f1f8f48b91cf58f49a1c3ae' (2021-11-19) • Updated input 'home-manager': 'github:nix-community/home-manager/d85bf67c48f5c64ca39d3d48375e742e16933f4f' (2021-11-17) → 'github:nix-community/home-manager/2452979efe92128b03e3c27567267066c2825fab' (2021-11-18) • Updated input 'master': 'github:nixos/nixpkgs/42d32516400c1d821d275a5460900bbaef3d3bf1' (2021-11-18) → 'github:nixos/nixpkgs/c0068424f7818d8f284cbf0ea7302417cc76e261' (2021-11-19) • Updated input 'nix': 'github:nixos/nix/480c883f363912df611c545b05ae0f6f1b9a6c61' (2021-11-17) → 'github:nixos/nix/9cd8cffefc65fe425c6aa07aa3bc67a8eec46087' (2021-11-19) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source?lastModified=1636944046&narHash=sha256-74KLDsiWSBsYXKj%2fql9EGbw1TbIJRE7clFkhl30HV%2fc=&rev=46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/931ab058daa7e4cd539533963f95e2bb0dbd41e6' (2021-11-15) → 'github:nixos/nixpkgs/715f63411952c86c8f57ab9e3e3cb866a015b5f2' (2021-11-17) --- flake.lock | 68 ++++++++++++++++++------------------------------------ 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index dd16d058..7083c97f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1637200214, - "narHash": "sha256-z6HFS4HyaaGd2ZNVwICnALZbQ9DeruNVdbQClaWU3e8=", + "lastModified": 1637314118, + "narHash": "sha256-npGYpjp2Zc53p3adMQouTq+F+YI/X1aJiDL0DozzWOs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "88c62860a48ce89a4631520e4a32037702cc285e", + "rev": "cc2cdfc1212057526f1f8f48b91cf58f49a1c3ae", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1637188941, - "narHash": "sha256-4aA5iNVhSDbKjsPeG4n0SvfPQ3sd9ve23b05bVztSq4=", + "lastModified": 1637249535, + "narHash": "sha256-RCatEYQ+uqsZOZpN4ZOtSoO7CJTiQpHNdPjUA0jtejw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d85bf67c48f5c64ca39d3d48375e742e16933f4f", + "rev": "2452979efe92128b03e3c27567267066c2825fab", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1637209424, - "narHash": "sha256-oXw75hkCOVtoB+CEElWiTmkC1gNdL3jf0tG2GInytHA=", + "lastModified": 1637339315, + "narHash": "sha256-qo7R9EzZveIpgqIpRwrIgkohg4NSi+9+v8h8j+qjmuU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "42d32516400c1d821d275a5460900bbaef3d3bf1", + "rev": "c0068424f7818d8f284cbf0ea7302417cc76e261", "type": "github" }, "original": { @@ -84,7 +84,10 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] }, "locked": { "lastModified": 1629707199, @@ -106,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1637139905, - "narHash": "sha256-9SVNpNRb5FWevmsez2McSy7sv+KAyYaiCAlpFVaZLk8=", + "lastModified": 1637331232, + "narHash": "sha256-uJhnSkxUXNytAOFmDAgLhgW7JhkvOkYs5ezg73qwJPo=", "owner": "nixos", "repo": "nix", - "rev": "480c883f363912df611c545b05ae0f6f1b9a6c61", + "rev": "9cd8cffefc65fe425c6aa07aa3bc67a8eec46087", "type": "github" }, "original": { @@ -167,39 +170,12 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1636944046, - "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", - "path": "/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source", - "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1630481079, - "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.05", - "repo": "nixpkgs", - "type": "github" - } - }, "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "unstable" + ], "utils": "utils" }, "locked": { @@ -232,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1636976544, - "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", + "lastModified": 1637155076, + "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", + "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2", "type": "github" }, "original": { From 36d5d15a90fb8cafb1236b5657147ea771b0f114 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 21 Nov 2021 10:07:24 +0100 Subject: [PATCH 185/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/cc2cdfc1212057526f1f8f48b91cf58f49a1c3ae' (2021-11-19) → 'github:nix-community/emacs-overlay/89c94427256d2f9960d3437e96ef93def024b215' (2021-11-21) • Updated input 'home-manager': 'github:nix-community/home-manager/2452979efe92128b03e3c27567267066c2825fab' (2021-11-18) → 'github:nix-community/home-manager/c82bc787b8990c89f2f7d57df652ce2424129b92' (2021-11-20) • Updated input 'master': 'github:nixos/nixpkgs/c0068424f7818d8f284cbf0ea7302417cc76e261' (2021-11-19) → 'github:nixos/nixpkgs/b56d7a70a7158f81d964a55cfeb78848a067cc7d' (2021-11-21) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → 'github:nixos/nixpkgs/24528474d2b3370f2f23879a557ae2cc92a5d50b' (2021-11-19) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source?lastModified=1636944046&narHash=sha256-74KLDsiWSBsYXKj%2fql9EGbw1TbIJRE7clFkhl30HV%2fc=&rev=46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → follows 'rnix-lsp/nixpkgs' --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7083c97f..8b782860 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1637314118, - "narHash": "sha256-npGYpjp2Zc53p3adMQouTq+F+YI/X1aJiDL0DozzWOs=", + "lastModified": 1637459184, + "narHash": "sha256-6zntUneNOs3ik11n/s+sXd51Yt4I7KDvJtiF8Nxe3ug=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cc2cdfc1212057526f1f8f48b91cf58f49a1c3ae", + "rev": "89c94427256d2f9960d3437e96ef93def024b215", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1637249535, - "narHash": "sha256-RCatEYQ+uqsZOZpN4ZOtSoO7CJTiQpHNdPjUA0jtejw=", + "lastModified": 1637398047, + "narHash": "sha256-H6yh2VvABMhrkjYrPccc0Buak4L9jtFzsb98FsNDM2Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "2452979efe92128b03e3c27567267066c2825fab", + "rev": "c82bc787b8990c89f2f7d57df652ce2424129b92", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1637339315, - "narHash": "sha256-qo7R9EzZveIpgqIpRwrIgkohg4NSi+9+v8h8j+qjmuU=", + "lastModified": 1637485046, + "narHash": "sha256-uifEwo9wJflq3XDq3RMZHc5YP69w5Vap/e5FwgDu9AY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c0068424f7818d8f284cbf0ea7302417cc76e261", + "rev": "b56d7a70a7158f81d964a55cfeb78848a067cc7d", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1636944046, - "narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", + "lastModified": 1637316267, + "narHash": "sha256-hfAA/0W3tycKKOSwP7Xt6FXLG9h/FgCu45wdGubHtV0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", + "rev": "24528474d2b3370f2f23879a557ae2cc92a5d50b", "type": "github" }, "original": { From 1de3fa8b0e2abd845e86bf33290bf2f0ff103748 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 22 Nov 2021 21:26:13 +0100 Subject: [PATCH 186/303] add ums partition --- nixos/configurations/hardware/mimas.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index b988e3b5..9bf21672 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -53,6 +53,12 @@ fsType = "ext4"; }; + fileSystems."/var/lib/ums" = { + device = "/dev/disk/by-label/ums"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { device = "/dev/disk/by-uuid/7000-3A85"; From 38d004cc22491d778adebce8130b287daa2938f3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 23 Nov 2021 11:33:51 +0100 Subject: [PATCH 187/303] allow UMS in firewall --- nixos/configurations/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 11313d4b..ba56804f 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -83,7 +83,7 @@ in services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 9002 2342 9999 ]; + networking.firewall.allowedTCPPorts = [ 9002 9003 2342 9999 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; From 0fc6811b1aa0f902a14a22d4b68677fb46e57580 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 24 Nov 2021 21:56:20 +0100 Subject: [PATCH 188/303] enable pest-mode for emacs --- home/modules/languages/rust/default.nix | 5 ++++- home/modules/programs/emacs/default.nix | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/home/modules/languages/rust/default.nix b/home/modules/languages/rust/default.nix index 6b6d79cc..ec13bfe6 100644 --- a/home/modules/languages/rust/default.nix +++ b/home/modules/languages/rust/default.nix @@ -8,7 +8,7 @@ in }; config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.rust-mode ]; + programs.emacs.extraPackages = ep: [ ep.rust-mode ep.pest-mode ]; programs.emacs.lsp-mode = { enable = true; @@ -18,6 +18,9 @@ in programs.emacs.extraInit = '' (setq lsp-rust-rls-server-command "rls") + (autoload 'pest-mode "pest-mode") + (add-to-list #'auto-mode-alist '("\\.pest\\'" .pest-mode)) + (add-hook 'rust-mode-hook (lambda () (subword-mode) diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 4d222a5a..6549f1a4 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -98,6 +98,8 @@ in ;; require all those local packages ${lispRequires} + (require 'pest-mode) + (add-to-list #'auto-mode-alist '("\\.pest\\'" . pest-mode)) (global-auto-revert-mode) (global-whitespace-mode) @@ -142,6 +144,7 @@ in ep.typescript-mode ep.earthfile-mode ep.ledger-mode + ep.pest-mode # ep.bazel-mode From 7fd76de539ad2a78fff4f54670d657cfcd1b4112 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 24 Nov 2021 21:56:56 +0100 Subject: [PATCH 189/303] mimas: open additional ports --- nixos/configurations/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index ba56804f..bfb97cb9 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -83,7 +83,7 @@ in services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 9002 9003 2342 9999 ]; + networking.firewall.allowedTCPPorts = [ 9002 9003 2342 9999 3000 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; From 749c722689225ca8d5e38178348920462ae70102 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 25 Nov 2021 11:09:54 +0100 Subject: [PATCH 190/303] system config: introduce IP/Hostname mapping --- nixos/modules/default.nix | 1 + nixos/modules/hostnames.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/modules/hostnames.nix diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 588bbdd2..9a20c7bc 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -2,4 +2,5 @@ flake = import ./flake.nix; nix = import ./nix.nix; cachix = import ./cachix; + hostnames = import ./hostnames.nix; } diff --git a/nixos/modules/hostnames.nix b/nixos/modules/hostnames.nix new file mode 100644 index 00000000..079ef87f --- /dev/null +++ b/nixos/modules/hostnames.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +let + inherit (config.lib.nobbz) hostnames; + + kv = lib.attrsets.nameValuePair; + + hosts = lib.mapAttrs' (name: ip: kv ip ([ name "${name}.nobbz.lan" ])) hostnames; +in +{ + lib.nobbz.hostnames = { + mimas = "172.24.152.168"; + thetys = "172.24.231.199"; + enceladeus = "172.24.199.101"; + }; + + networking.hosts = hosts; +} From d9b561e8b762b9dc34609023ddcbf4daa4ccffef Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 25 Nov 2021 11:16:57 +0100 Subject: [PATCH 191/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/89c94427256d2f9960d3437e96ef93def024b215' (2021-11-21) → 'github:nix-community/emacs-overlay/640ff172f47d3c6ae959494b888f19a75d41ffbd' (2021-11-25) • Updated input 'home-manager': 'github:nix-community/home-manager/c82bc787b8990c89f2f7d57df652ce2424129b92' (2021-11-20) → 'github:nix-community/home-manager/c27c8f49c0bccaff91f5f637ad727d440b769997' (2021-11-25) • Updated input 'master': 'github:nixos/nixpkgs/b56d7a70a7158f81d964a55cfeb78848a067cc7d' (2021-11-21) → 'github:nixos/nixpkgs/ee31eb664c2c2d7d46a2e0ea0495a988e77076fc' (2021-11-25) • Updated input 'nix': 'github:nixos/nix/9cd8cffefc65fe425c6aa07aa3bc67a8eec46087' (2021-11-19) → 'github:nixos/nix/d58f149140582330bc994d215e54b2a4fc1149ff' (2021-11-24) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/24528474d2b3370f2f23879a557ae2cc92a5d50b' (2021-11-19) → 'github:nixos/nixpkgs/09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de' (2021-11-22) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/ql6s3pl8gfv6v1n3ffsww0yspbji5lx3-source?lastModified=1636944046&narHash=sha256-74KLDsiWSBsYXKj%2fql9EGbw1TbIJRE7clFkhl30HV%2fc=&rev=46251a79f752ae1d46ef733e8e9760b6d3429da4' (2021-11-15) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/715f63411952c86c8f57ab9e3e3cb866a015b5f2' (2021-11-17) → 'github:nixos/nixpkgs/39cb89ef2ffcbef8d2ac2d52267ac69121a6becb' (2021-11-24) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8b782860..b9f43410 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1637459184, - "narHash": "sha256-6zntUneNOs3ik11n/s+sXd51Yt4I7KDvJtiF8Nxe3ug=", + "lastModified": 1637821871, + "narHash": "sha256-fUtP97Ei0GMMNAlA3JIqepJRWP1JcNJSnm8jNlOzLuU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "89c94427256d2f9960d3437e96ef93def024b215", + "rev": "640ff172f47d3c6ae959494b888f19a75d41ffbd", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1637398047, - "narHash": "sha256-H6yh2VvABMhrkjYrPccc0Buak4L9jtFzsb98FsNDM2Q=", + "lastModified": 1637825539, + "narHash": "sha256-TmSZRsBA59HHv6Dym3ZGm2eZDa2z5EmfyAA5F5tW03Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "c82bc787b8990c89f2f7d57df652ce2424129b92", + "rev": "c27c8f49c0bccaff91f5f637ad727d440b769997", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1637485046, - "narHash": "sha256-uifEwo9wJflq3XDq3RMZHc5YP69w5Vap/e5FwgDu9AY=", + "lastModified": 1637834881, + "narHash": "sha256-UD3fKBgv7wW3fg//lA1wq35B+j43/UyVk1XCXdhJH9k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b56d7a70a7158f81d964a55cfeb78848a067cc7d", + "rev": "ee31eb664c2c2d7d46a2e0ea0495a988e77076fc", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1637331232, - "narHash": "sha256-uJhnSkxUXNytAOFmDAgLhgW7JhkvOkYs5ezg73qwJPo=", + "lastModified": 1637765285, + "narHash": "sha256-T35QOOhrhPQ/pOUQrjrwwiihOTMALicXonpU47Wpf4M=", "owner": "nixos", "repo": "nix", - "rev": "9cd8cffefc65fe425c6aa07aa3bc67a8eec46087", + "rev": "d58f149140582330bc994d215e54b2a4fc1149ff", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1637316267, - "narHash": "sha256-hfAA/0W3tycKKOSwP7Xt6FXLG9h/FgCu45wdGubHtV0=", + "lastModified": 1637615379, + "narHash": "sha256-wL5+nm7z+42IHyhc52P3aAj1Kp2fQ6C8IyPBihj7Bjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "24528474d2b3370f2f23879a557ae2cc92a5d50b", + "rev": "09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1637155076, - "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=", + "lastModified": 1637753138, + "narHash": "sha256-yo7E4a/miP77fH3Ksp9tmYECAPjxBeweJFeZ4tX9O/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2", + "rev": "39cb89ef2ffcbef8d2ac2d52267ac69121a6becb", "type": "github" }, "original": { From 52e9a482aa22c81b6d9d8a4c0bba85f0f690f125 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 25 Nov 2021 11:27:48 +0100 Subject: [PATCH 192/303] increase log verbosity --- apps/switch/switch.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/switch/switch.mjs b/apps/switch/switch.mjs index b6f73e42..99b39761 100644 --- a/apps/switch/switch.mjs +++ b/apps/switch/switch.mjs @@ -31,7 +31,7 @@ const targets = [ `.#home/config/${user}@${hostName}`, ] -await $`nix build --keep-going -L ${targets}` +await $`nix build --keep-going --log-format bar-with-logs -v ${targets}` await fs.readdir('.') .then(dirs => Promise.all(dirs From a33fb00ad1f35cfcd1fa346e07e1997fbbec7b29 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 25 Nov 2021 11:33:37 +0100 Subject: [PATCH 193/303] disable agda --- home/configurations/nmelzer@mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index 140078fc..4a5f8589 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -12,7 +12,7 @@ in dconf.enable = true; enabledLanguages = [ - "agda" + # "agda" # Seems as if AGDA2-mode isn't on melpa anymore "clojure" "cpp" "elixir" From 7b385e1ac6588a4414aa04c226fa6b8c6d709e00 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 26 Nov 2021 07:59:29 +0100 Subject: [PATCH 194/303] tag restic --- home/modules/services/restic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index f062a1cd..d3a56923 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -8,7 +8,7 @@ let xFlags = lib.optionalString cfg.oneFileSystem "-x"; flags = "${xFlags} ${excludes}"; - command = "${bin} -vv backup ${flags} %h"; + command = "${bin} --tag home -vv backup ${flags} %h"; in { options.services.restic = { From d0d77b12ced2aeecfd116ba5382e4d91a1d04929 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 29 Nov 2021 06:35:45 +0100 Subject: [PATCH 195/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/640ff172f47d3c6ae959494b888f19a75d41ffbd' (2021-11-25) → 'github:nix-community/emacs-overlay/58236c2d03c4405a560f12cb7536251973f551e0' (2021-11-29) • Updated input 'flake-utils': 'github:numtide/flake-utils/bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4' (2021-11-15) → 'github:numtide/flake-utils/74f7e4319258e287b0f9cb95426c9853b282730b' (2021-11-28) • Updated input 'home-manager': 'github:nix-community/home-manager/c27c8f49c0bccaff91f5f637ad727d440b769997' (2021-11-25) → 'github:nix-community/home-manager/9de77227d7780518cfeaee5a917970247f3ecc56' (2021-11-29) • Updated input 'master': 'github:nixos/nixpkgs/ee31eb664c2c2d7d46a2e0ea0495a988e77076fc' (2021-11-25) → 'github:nixos/nixpkgs/7dcd2f54b82826b05cfd91730a1d77b5d80f008c' (2021-11-29) • Updated input 'nix': 'github:nixos/nix/d58f149140582330bc994d215e54b2a4fc1149ff' (2021-11-24) → 'github:nixos/nix/55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0' (2021-11-26) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de' (2021-11-22) → 'github:nixos/nixpkgs/4f37689c8a219a9d756c5ff38525ad09349f422f' (2021-11-27) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/9462b0d20325a06f7e43b5a0469ec2c92e60f5fe' (2021-11-15) → 'github:nix-community/rnix-lsp/b56f456975d82ebcb9c7ca964148307d7a6b67d9' (2021-11-28) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/9v2i11v8nnfczb3hcvhb195p0m2n5w92-source?lastModified=1637316267&narHash=sha256-hfAA%2f0W3tycKKOSwP7Xt6FXLG9h%2fFgCu45wdGubHtV0=&rev=24528474d2b3370f2f23879a557ae2cc92a5d50b' (2021-11-19) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/39cb89ef2ffcbef8d2ac2d52267ac69121a6becb' (2021-11-24) → 'github:nixos/nixpkgs/942eb9a335b4cd22fa6a7be31c494e53e76f5637' (2021-11-28) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index b9f43410..3b9b8812 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1637821871, - "narHash": "sha256-fUtP97Ei0GMMNAlA3JIqepJRWP1JcNJSnm8jNlOzLuU=", + "lastModified": 1638146980, + "narHash": "sha256-tb5Wj3NI812IiMHhYruw3UVt6vPicHC1NpLGKyTP2uI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "640ff172f47d3c6ae959494b888f19a75d41ffbd", + "rev": "58236c2d03c4405a560f12cb7536251973f551e0", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1637825539, - "narHash": "sha256-TmSZRsBA59HHv6Dym3ZGm2eZDa2z5EmfyAA5F5tW03Q=", + "lastModified": 1638150501, + "narHash": "sha256-aWH3MRmjUtx8ciSGLegBJC5mhymsuroHPs74ZldrNTU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c27c8f49c0bccaff91f5f637ad727d440b769997", + "rev": "9de77227d7780518cfeaee5a917970247f3ecc56", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1637834881, - "narHash": "sha256-UD3fKBgv7wW3fg//lA1wq35B+j43/UyVk1XCXdhJH9k=", + "lastModified": 1638159152, + "narHash": "sha256-M6kwz4ko54zC3ev5LMhmqxWDNFhpN80zN0pckmWmGLI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee31eb664c2c2d7d46a2e0ea0495a988e77076fc", + "rev": "7dcd2f54b82826b05cfd91730a1d77b5d80f008c", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1637765285, - "narHash": "sha256-T35QOOhrhPQ/pOUQrjrwwiihOTMALicXonpU47Wpf4M=", + "lastModified": 1637932864, + "narHash": "sha256-jr85Z+0TA86mdsi3Y91wM3dFHWemmFHKdNwbx9rGz2U=", "owner": "nixos", "repo": "nix", - "rev": "d58f149140582330bc994d215e54b2a4fc1149ff", + "rev": "55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1637615379, - "narHash": "sha256-wL5+nm7z+42IHyhc52P3aAj1Kp2fQ6C8IyPBihj7Bjg=", + "lastModified": 1637973395, + "narHash": "sha256-wp/QgsnnKJAIMZeQgJT1bWQ/OutZ+80lHwtpYAUWDfE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de", + "rev": "4f37689c8a219a9d756c5ff38525ad09349f422f", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1636977689, - "narHash": "sha256-pQmAxKBoEhC851iRsowMErz9CYiJxGpARjhPeSapH1Y=", + "lastModified": 1638119397, + "narHash": "sha256-t7lGKypWtmjwymRb6e4GWedeadsV7Iw8DFTi+oV3QM8=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "9462b0d20325a06f7e43b5a0469ec2c92e60f5fe", + "rev": "b56f456975d82ebcb9c7ca964148307d7a6b67d9", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1637753138, - "narHash": "sha256-yo7E4a/miP77fH3Ksp9tmYECAPjxBeweJFeZ4tX9O/U=", + "lastModified": 1638110343, + "narHash": "sha256-hQaow8sGPyUrXgrqgDRsfA+73uR0vms2goTQNxIAaRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "39cb89ef2ffcbef8d2ac2d52267ac69121a6becb", + "rev": "942eb9a335b4cd22fa6a7be31c494e53e76f5637", "type": "github" }, "original": { From c80de457ae127afd282f202b4be6b058365f2142 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 30 Nov 2021 10:28:43 +0100 Subject: [PATCH 196/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/58236c2d03c4405a560f12cb7536251973f551e0' (2021-11-29) → 'github:nix-community/emacs-overlay/267362e29688657c95c4643e5d50fa3bd5b25f0a' (2021-11-30) • Updated input 'master': 'github:nixos/nixpkgs/7dcd2f54b82826b05cfd91730a1d77b5d80f008c' (2021-11-29) → 'github:nixos/nixpkgs/7b031d0d99e8cdaf0b70457c0cb33f16c0c958bb' (2021-11-30) • Updated input 'nix': 'github:nixos/nix/55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0' (2021-11-26) → 'github:nixos/nix/92bcd77a672875add479684de4732473294bc440' (2021-11-29) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/4f37689c8a219a9d756c5ff38525ad09349f422f' (2021-11-27) → 'github:nixos/nixpkgs/2553aee74fed8c2205a4aeb3ffd206ca14ede60f' (2021-11-29) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/n5d29scxj9i4cq7xmj9smimclwyla1np-source?lastModified=1637615379&narHash=sha256-wL5+nm7z+42IHyhc52P3aAj1Kp2fQ6C8IyPBihj7Bjg=&rev=09650059d7f5ae59a7f0fb2dd3bfc6d2042a74de' (2021-11-22) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/942eb9a335b4cd22fa6a7be31c494e53e76f5637' (2021-11-28) → 'github:nixos/nixpkgs/8a308775674e178495767df90c419425474582a1' (2021-11-29) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3b9b8812..76d9c4c3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1638146980, - "narHash": "sha256-tb5Wj3NI812IiMHhYruw3UVt6vPicHC1NpLGKyTP2uI=", + "lastModified": 1638264220, + "narHash": "sha256-mp+U+mhd/kPGZzm0/o9LcwWZrgI0Qt6KLWgxen3eRK4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "58236c2d03c4405a560f12cb7536251973f551e0", + "rev": "267362e29688657c95c4643e5d50fa3bd5b25f0a", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1638159152, - "narHash": "sha256-M6kwz4ko54zC3ev5LMhmqxWDNFhpN80zN0pckmWmGLI=", + "lastModified": 1638263381, + "narHash": "sha256-1rZDxTw74ETuJEjwPfpMgY0sfx8Cv1tRNt3gibol574=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7dcd2f54b82826b05cfd91730a1d77b5d80f008c", + "rev": "7b031d0d99e8cdaf0b70457c0cb33f16c0c958bb", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1637932864, - "narHash": "sha256-jr85Z+0TA86mdsi3Y91wM3dFHWemmFHKdNwbx9rGz2U=", + "lastModified": 1638185718, + "narHash": "sha256-Wbgy8p9q9SVZUl06qynElGPrUcutbnxiEm1DBYYwM6k=", "owner": "nixos", "repo": "nix", - "rev": "55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0", + "rev": "92bcd77a672875add479684de4732473294bc440", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1637973395, - "narHash": "sha256-wp/QgsnnKJAIMZeQgJT1bWQ/OutZ+80lHwtpYAUWDfE=", + "lastModified": 1638196344, + "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f37689c8a219a9d756c5ff38525ad09349f422f", + "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1638110343, - "narHash": "sha256-hQaow8sGPyUrXgrqgDRsfA+73uR0vms2goTQNxIAaRQ=", + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "942eb9a335b4cd22fa6a7be31c494e53e76f5637", + "rev": "8a308775674e178495767df90c419425474582a1", "type": "github" }, "original": { From 3d11d12cae4cb20af7749215cc3687e00f981a2f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 1 Dec 2021 07:01:36 +0100 Subject: [PATCH 197/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/267362e29688657c95c4643e5d50fa3bd5b25f0a' (2021-11-30) → 'github:nix-community/emacs-overlay/6961edfe6be910db4f7cf5decfafcb29c89201e2' (2021-11-30) • Updated input 'home-manager': 'github:nix-community/home-manager/9de77227d7780518cfeaee5a917970247f3ecc56' (2021-11-29) → 'github:nix-community/home-manager/f23073f1daa769a28a12ac587eea487aa8afb196' (2021-11-30) • Updated input 'master': 'github:nixos/nixpkgs/7b031d0d99e8cdaf0b70457c0cb33f16c0c958bb' (2021-11-30) → 'github:nixos/nixpkgs/3f03bdbceb4953c4b9e1cc672e90c96f9e95d2bc' (2021-12-01) • Updated input 'nix': 'github:nixos/nix/92bcd77a672875add479684de4732473294bc440' (2021-11-29) → 'github:nixos/nix/1a9bfdc4ca0c2786b02801540432badbafa3a811' (2021-11-30) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/liczrx2h7xmsvjwpxp55ls5pmh2f0f54-source?lastModified=1637973395&narHash=sha256-wp%2fQgsnnKJAIMZeQgJT1bWQ%2fOutZ+80lHwtpYAUWDfE=&rev=4f37689c8a219a9d756c5ff38525ad09349f422f' (2021-11-27) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/8a308775674e178495767df90c419425474582a1' (2021-11-29) → 'github:nixos/nixpkgs/29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea' (2021-11-30) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 76d9c4c3..c67defcb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1638264220, - "narHash": "sha256-mp+U+mhd/kPGZzm0/o9LcwWZrgI0Qt6KLWgxen3eRK4=", + "lastModified": 1638293342, + "narHash": "sha256-h76u8CEgoVtnljI+q+HvuVEg1iSXAgg2JKyLt0uwRTE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "267362e29688657c95c4643e5d50fa3bd5b25f0a", + "rev": "6961edfe6be910db4f7cf5decfafcb29c89201e2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1638150501, - "narHash": "sha256-aWH3MRmjUtx8ciSGLegBJC5mhymsuroHPs74ZldrNTU=", + "lastModified": 1638311312, + "narHash": "sha256-OMAd3WZ/VtMK0QQwDrrynP6+jOlWLd1yQtnW56+eZtA=", "owner": "nix-community", "repo": "home-manager", - "rev": "9de77227d7780518cfeaee5a917970247f3ecc56", + "rev": "f23073f1daa769a28a12ac587eea487aa8afb196", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1638263381, - "narHash": "sha256-1rZDxTw74ETuJEjwPfpMgY0sfx8Cv1tRNt3gibol574=", + "lastModified": 1638336326, + "narHash": "sha256-9CkeASYMsHfcwdZezva5GYhEMB9KugivxsfneVAvaeo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7b031d0d99e8cdaf0b70457c0cb33f16c0c958bb", + "rev": "3f03bdbceb4953c4b9e1cc672e90c96f9e95d2bc", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1638185718, - "narHash": "sha256-Wbgy8p9q9SVZUl06qynElGPrUcutbnxiEm1DBYYwM6k=", + "lastModified": 1638302495, + "narHash": "sha256-BdUexOMyLy3xr4MJPQG6gOBsXg6213m0yP/d7PzCHKw=", "owner": "nixos", "repo": "nix", - "rev": "92bcd77a672875add479684de4732473294bc440", + "rev": "1a9bfdc4ca0c2786b02801540432badbafa3a811", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1638198142, - "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", + "lastModified": 1638286143, + "narHash": "sha256-A+rgjbIpz3uPRKHPXwdmouVcVn5pZqLnaZHymjkraG4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a308775674e178495767df90c419425474582a1", + "rev": "29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea", "type": "github" }, "original": { From 39d1467504c7c3fac2dbd1f80c20dee4ede261ec Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 07:50:43 +0100 Subject: [PATCH 198/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/6961edfe6be910db4f7cf5decfafcb29c89201e2' (2021-11-30) → 'github:nix-community/emacs-overlay/360f62afb63ddeb8d8d43547266dfd7f2e2d54eb' (2021-12-02) • Updated input 'home-manager': 'github:nix-community/home-manager/f23073f1daa769a28a12ac587eea487aa8afb196' (2021-11-30) → 'github:nix-community/home-manager/de54d513c74bf8f4f3a58954b80b5f690639fe72' (2021-12-02) • Updated input 'master': 'github:nixos/nixpkgs/3f03bdbceb4953c4b9e1cc672e90c96f9e95d2bc' (2021-12-01) → 'github:nixos/nixpkgs/70b7a52406e9594101fca81fe1a331e90cda161c' (2021-12-02) • Updated input 'nix': 'github:nixos/nix/1a9bfdc4ca0c2786b02801540432badbafa3a811' (2021-11-30) → 'github:nixos/nix/782837d9345b70023c682a177c074333d1cb7baa' (2021-12-01) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/35ghashs2k1whdhfhjvir4kybx433d0f-source?lastModified=1638196344&narHash=sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp%2fouaP+U9gpjEZZs=&rev=2553aee74fed8c2205a4aeb3ffd206ca14ede60f' (2021-11-29) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea' (2021-11-30) → 'github:nixos/nixpkgs/6daa4a5c045d40e6eae60a3b6e427e8700f1c07f' (2021-12-01) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c67defcb..595ead50 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1638293342, - "narHash": "sha256-h76u8CEgoVtnljI+q+HvuVEg1iSXAgg2JKyLt0uwRTE=", + "lastModified": 1638410276, + "narHash": "sha256-t0CsOx6BbvPBtpYYHzEpIbmuwv56O6Asxo7rgrFp5pU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6961edfe6be910db4f7cf5decfafcb29c89201e2", + "rev": "360f62afb63ddeb8d8d43547266dfd7f2e2d54eb", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1638311312, - "narHash": "sha256-OMAd3WZ/VtMK0QQwDrrynP6+jOlWLd1yQtnW56+eZtA=", + "lastModified": 1638415301, + "narHash": "sha256-iqszstbHaO5PYeBXQf1ukgYj/aq9wznBbZMrtYMZzgI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f23073f1daa769a28a12ac587eea487aa8afb196", + "rev": "de54d513c74bf8f4f3a58954b80b5f690639fe72", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1638336326, - "narHash": "sha256-9CkeASYMsHfcwdZezva5GYhEMB9KugivxsfneVAvaeo=", + "lastModified": 1638420228, + "narHash": "sha256-RvKleojcpKU32+JEtkStAB+l/4ui8N8dTcQokLBTUmA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f03bdbceb4953c4b9e1cc672e90c96f9e95d2bc", + "rev": "70b7a52406e9594101fca81fe1a331e90cda161c", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1638302495, - "narHash": "sha256-BdUexOMyLy3xr4MJPQG6gOBsXg6213m0yP/d7PzCHKw=", + "lastModified": 1638391648, + "narHash": "sha256-b+K+6zSbJ7uTPeKhY3lu2DoP9uc79oXeS1wW7guwXRY=", "owner": "nixos", "repo": "nix", - "rev": "1a9bfdc4ca0c2786b02801540432badbafa3a811", + "rev": "782837d9345b70023c682a177c074333d1cb7baa", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1638286143, - "narHash": "sha256-A+rgjbIpz3uPRKHPXwdmouVcVn5pZqLnaZHymjkraG4=", + "lastModified": 1638376152, + "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "29d1f6e1f625d246dcf84a78ef97b4da3cafc6ea", + "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f", "type": "github" }, "original": { From 10eac3c675b7708d2129d9a08d4d7396c7fd208f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 11:00:06 +0100 Subject: [PATCH 199/303] change nixpath handling --- nixos/modules/flake.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index 4c504586..c360698e 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -1,5 +1,8 @@ -{ config, pkgs, nixpkgs-2105, nix, lib, ... }: +{ config, pkgs, unstable, nix, lib, ... }: +let + nixpkgsPath = "/etc/nixpkgs/channels/nixpkgs"; +in { options.nix.flakes.enable = lib.mkEnableOption "nix flakes"; @@ -8,7 +11,15 @@ package = lib.mkDefault (nix.packages.x86_64-linux.nix.overrideAttrs (_: { patches = [ ./unset-is-macho.patch ]; })); # pkgs.nixUnstable; experimentalFeatures = "nix-command flakes"; - registry.nixpkgs.flake = nixpkgs-2105; + registry.nixpkgs.flake = unstable; + + nixPath = [ + "nixpkgs=${nixpkgsPath}" + ]; }; + + systemd.tmpfiles.rules = [ + "L+ ${nixpkgsPath} - - - - ${unstable}" + ]; }; } From 744fd50791d005ab2ab9c851855d6dde056f669b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 13:36:33 +0100 Subject: [PATCH 200/303] add 21.11 --- flake.lock | 35 +++++++++++++++++++++++++++++++---- flake.nix | 1 + 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 595ead50..9855a410 100644 --- a/flake.lock +++ b/flake.lock @@ -84,10 +84,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "rnix-lsp", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1629707199, @@ -170,6 +167,35 @@ "type": "github" } }, + "nixpkgs-2111": { + "locked": { + "lastModified": 1638371214, + "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1638196344, + "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "path": "/nix/store/35ghashs2k1whdhfhjvir4kybx433d0f-source", + "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "rnix-lsp": { "inputs": { "naersk": "naersk", @@ -202,6 +228,7 @@ "nix": "nix", "nixpkgs-2009": "nixpkgs-2009", "nixpkgs-2105": "nixpkgs-2105", + "nixpkgs-2111": "nixpkgs-2111", "rnix-lsp": "rnix-lsp", "unstable": "unstable" } diff --git a/flake.nix b/flake.nix index 537c7bcc..fea6d6c4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs.nixpkgs-2009.url = "github:nixos/nixpkgs/nixos-20.09"; inputs.nixpkgs-2105.url = "github:nixos/nixpkgs/nixos-21.05"; + inputs.nixpkgs-2111.url = "github:nixos/nixpkgs/nixos-21.11"; inputs.unstable.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.master.url = "github:nixos/nixpkgs/master"; From 820d77b83a65853bab284af7ff4a94566c0ac7d9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 13:44:32 +0100 Subject: [PATCH 201/303] add more channel mappings --- nixos/modules/flake.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index c360698e..c4afdec8 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -1,7 +1,10 @@ -{ config, pkgs, unstable, nix, lib, ... }: +{ config, pkgs, unstable, nixpkgs-2105, nixpkgs-2111, nix, lib, ... }: let - nixpkgsPath = "/etc/nixpkgs/channels/nixpkgs"; + base = "/etc/nixpkgs/channels"; + nixpkgsPath = "${base}/nixpkgs"; + nixpkgs2105Path = "${base}/nixpkgs2105"; + nixpkgs2111Path = "${base}/nixpkgs2111"; in { options.nix.flakes.enable = lib.mkEnableOption "nix flakes"; @@ -12,14 +15,21 @@ in experimentalFeatures = "nix-command flakes"; registry.nixpkgs.flake = unstable; + registry.nixpkgs2105.flake = nixpkgs-2105; + registry.nixpkgs2111.flake = nixpkgs-2111; nixPath = [ "nixpkgs=${nixpkgsPath}" + "nixpkgs2105=${nixpkgs2105Path}" + "nixpkgs2111=${nixpkgs2111Path}" + "/nix/var/nix/profiles/per-user/root/channels" ]; }; systemd.tmpfiles.rules = [ - "L+ ${nixpkgsPath} - - - - ${unstable}" + "L+ ${nixpkgsPath} - - - - ${unstable}" + "L+ ${nixpkgs2105Path} - - - - ${nixpkgs-2105}" + "L+ ${nixpkgs2111Path} - - - - ${nixpkgs-2111}" ]; }; } From 1c0b34aebd72cfb67aee77aee2ff20ecaedf52e9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 13:56:11 +0100 Subject: [PATCH 202/303] properly await execution and do not have interleaved output --- apps/switch/switch.mjs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/switch/switch.mjs b/apps/switch/switch.mjs index 99b39761..49f237a0 100644 --- a/apps/switch/switch.mjs +++ b/apps/switch/switch.mjs @@ -36,12 +36,13 @@ await $`nix build --keep-going --log-format bar-with-logs -v ${targets}` await fs.readdir('.') .then(dirs => Promise.all(dirs .filter(name => name.startsWith('result')) - .map(link => { + .map(async link => { const activate = `./${link}/bin/home-manager-generation`; - fs.stat(activate) + await fs.stat(activate) .then(() => $`${activate}`) .catch(() => {}) }))) -await $`sudo nixos-rebuild switch --flake .#${hostName}` \ No newline at end of file +await $`sudo nixos-rebuild switch --flake .#${hostName}` + From c504c6c6e0a204c97ef6db08f071b95a8a9e2794 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 15:54:32 +0100 Subject: [PATCH 203/303] remove nixpkgs-20.09 --- flake.lock | 17 ----------------- flake.nix | 1 - 2 files changed, 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9855a410..023bcb19 100644 --- a/flake.lock +++ b/flake.lock @@ -135,22 +135,6 @@ "type": "indirect" } }, - "nixpkgs-2009": { - "locked": { - "lastModified": 1635350005, - "narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-20.09", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-2105": { "locked": { "lastModified": 1638196344, @@ -226,7 +210,6 @@ "home-manager": "home-manager", "master": "master", "nix": "nix", - "nixpkgs-2009": "nixpkgs-2009", "nixpkgs-2105": "nixpkgs-2105", "nixpkgs-2111": "nixpkgs-2111", "rnix-lsp": "rnix-lsp", diff --git a/flake.nix b/flake.nix index fea6d6c4..96e393e9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,4 @@ { - inputs.nixpkgs-2009.url = "github:nixos/nixpkgs/nixos-20.09"; inputs.nixpkgs-2105.url = "github:nixos/nixpkgs/nixos-21.05"; inputs.nixpkgs-2111.url = "github:nixos/nixpkgs/nixos-21.11"; inputs.unstable.url = "github:nixos/nixpkgs/nixos-unstable"; From 175271d770551af0d7c284f9d7c9e42fed5fddeb Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 15:55:06 +0100 Subject: [PATCH 204/303] remove result links after creation --- apps/switch/switch.mjs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/switch/switch.mjs b/apps/switch/switch.mjs index 49f237a0..a6602e2c 100644 --- a/apps/switch/switch.mjs +++ b/apps/switch/switch.mjs @@ -46,3 +46,7 @@ await fs.readdir('.') await $`sudo nixos-rebuild switch --flake .#${hostName}` +await fs.readdir('.') + .then(dirs => Promise.all(dirs + .filter(name => name.startsWith('result')) + .map(async link => await $`rm ${link}`))) From 6cf47b58e4ce28fb9a95b494961b85c74b40c64e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 2 Dec 2021 15:55:33 +0100 Subject: [PATCH 205/303] thetys: use 21.11 --- nixos/configurations/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/default.nix b/nixos/configurations/default.nix index 60c0d64b..0a1f0174 100644 --- a/nixos/configurations/default.nix +++ b/nixos/configurations/default.nix @@ -2,6 +2,6 @@ { mimas = self.lib.mkSystem "mimas" inputs.unstable; # nixpkgs-2105; - enceladeus = self.lib.mkSystem "enceladeus" inputs.unstable; + enceladeus = self.lib.mkSystem "enceladeus" inputs.nixpkgs-2111; thetys = self.lib.mkSystem "thetys" inputs.unstable; } From 272952e79e630e161f53e9c259c58579c43e5213 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 5 Dec 2021 17:56:45 +0100 Subject: [PATCH 206/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/360f62afb63ddeb8d8d43547266dfd7f2e2d54eb' (2021-12-02) → 'github:nix-community/emacs-overlay/90629e4e1facfacc649c667c157eb5be5dac1e59' (2021-12-05) • Updated input 'home-manager': 'github:nix-community/home-manager/de54d513c74bf8f4f3a58954b80b5f690639fe72' (2021-12-02) → 'github:nix-community/home-manager/781d25b315def05cd7ede3765226c54216f0b1fe' (2021-12-03) • Updated input 'master': 'github:nixos/nixpkgs/70b7a52406e9594101fca81fe1a331e90cda161c' (2021-12-02) → 'github:nixos/nixpkgs/4722a8e10edcf46aaeb0b9f887bb756e25c6930e' (2021-12-05) • Updated input 'nix': 'github:nixos/nix/782837d9345b70023c682a177c074333d1cb7baa' (2021-12-01) → 'github:nixos/nix/2e606e87c44a8dc42664f8938eac1d4b63047dd6' (2021-12-03) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/2553aee74fed8c2205a4aeb3ffd206ca14ede60f' (2021-11-29) → 'github:nixos/nixpkgs/b86b6bc5e753919ab4d7c902210234f324d0efa4' (2021-12-03) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/35ghashs2k1whdhfhjvir4kybx433d0f-source?lastModified=1638196344&narHash=sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp%2fouaP+U9gpjEZZs=&rev=2553aee74fed8c2205a4aeb3ffd206ca14ede60f' (2021-11-29) → follows 'rnix-lsp/nixpkgs' --- flake.lock | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 9855a410..e13e3dcb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1638410276, - "narHash": "sha256-t0CsOx6BbvPBtpYYHzEpIbmuwv56O6Asxo7rgrFp5pU=", + "lastModified": 1638701787, + "narHash": "sha256-5Xry40Fruw0p4LQN9XGaxEZFzECB+0Xjvwi3cKO3oFM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "360f62afb63ddeb8d8d43547266dfd7f2e2d54eb", + "rev": "90629e4e1facfacc649c667c157eb5be5dac1e59", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1638415301, - "narHash": "sha256-iqszstbHaO5PYeBXQf1ukgYj/aq9wznBbZMrtYMZzgI=", + "lastModified": 1638571010, + "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=", "owner": "nix-community", "repo": "home-manager", - "rev": "de54d513c74bf8f4f3a58954b80b5f690639fe72", + "rev": "781d25b315def05cd7ede3765226c54216f0b1fe", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1638420228, - "narHash": "sha256-RvKleojcpKU32+JEtkStAB+l/4ui8N8dTcQokLBTUmA=", + "lastModified": 1638722875, + "narHash": "sha256-B1BSlq6Mg4WLw7eLLW/JCM8xPkNsIkKRYgzJz6YPtEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70b7a52406e9594101fca81fe1a331e90cda161c", + "rev": "4722a8e10edcf46aaeb0b9f887bb756e25c6930e", "type": "github" }, "original": { @@ -84,7 +84,10 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] }, "locked": { "lastModified": 1629707199, @@ -106,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1638391648, - "narHash": "sha256-b+K+6zSbJ7uTPeKhY3lu2DoP9uc79oXeS1wW7guwXRY=", + "lastModified": 1638534074, + "narHash": "sha256-i37NAJjKr7NBkS4I8M3u5ZjRDtdVsUdyw6vMkAduALI=", "owner": "nixos", "repo": "nix", - "rev": "782837d9345b70023c682a177c074333d1cb7baa", + "rev": "2e606e87c44a8dc42664f8938eac1d4b63047dd6", "type": "github" }, "original": { @@ -153,11 +156,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1638196344, - "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", + "lastModified": 1638564543, + "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", + "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4", "type": "github" }, "original": { @@ -183,19 +186,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1638196344, - "narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=", - "path": "/nix/store/35ghashs2k1whdhfhjvir4kybx433d0f-source", - "rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "rnix-lsp": { "inputs": { "naersk": "naersk", From 6b11157488f1701afc7cb94b6e80749b9b2ae16f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 6 Dec 2021 12:05:59 +0100 Subject: [PATCH 207/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/90629e4e1facfacc649c667c157eb5be5dac1e59' (2021-12-05) → 'github:nix-community/emacs-overlay/d266fd6e14cde2a2aa17fd821dd1e7ca6b62f012' (2021-12-06) • Updated input 'master': 'github:nixos/nixpkgs/4722a8e10edcf46aaeb0b9f887bb756e25c6930e' (2021-12-05) → 'github:nixos/nixpkgs/00afdf8c8ebd18dc3d3de203a3b2ae951867bbe2' (2021-12-06) • Updated input 'nix': 'github:nixos/nix/2e606e87c44a8dc42664f8938eac1d4b63047dd6' (2021-12-03) → 'github:nixos/nix/76af9375c1e3599dcd735cb387aaddd65e84b10f' (2021-12-06) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/a640d8394f34714578f3e6335fc767d0755d78f9' (2021-12-01) → 'github:nixos/nixpkgs/e34c5379866833f41e2a36f309912fa675d687c7' (2021-12-04) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/cvcnw3lnf3p76dd697l84qvyj5srql4k-source?lastModified=1638376152&narHash=sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=&rev=6daa4a5c045d40e6eae60a3b6e427e8700f1c07f' (2021-12-01) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/6daa4a5c045d40e6eae60a3b6e427e8700f1c07f' (2021-12-01) → 'github:nixos/nixpkgs/c71f061c68ba8ce53471b767d5049cbd0f3d8490' (2021-12-03) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e13e3dcb..63356142 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1638701787, - "narHash": "sha256-5Xry40Fruw0p4LQN9XGaxEZFzECB+0Xjvwi3cKO3oFM=", + "lastModified": 1638785903, + "narHash": "sha256-Fdcppk+4AIZilRpbSCVPWuDy1/GbV64Slyahf5XR4J4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "90629e4e1facfacc649c667c157eb5be5dac1e59", + "rev": "d266fd6e14cde2a2aa17fd821dd1e7ca6b62f012", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1638722875, - "narHash": "sha256-B1BSlq6Mg4WLw7eLLW/JCM8xPkNsIkKRYgzJz6YPtEY=", + "lastModified": 1638788490, + "narHash": "sha256-OQrQygMIupH5X2o+I2q44/Ru8o1y3Cdiw53NJBS/7Gs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4722a8e10edcf46aaeb0b9f887bb756e25c6930e", + "rev": "00afdf8c8ebd18dc3d3de203a3b2ae951867bbe2", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1638534074, - "narHash": "sha256-i37NAJjKr7NBkS4I8M3u5ZjRDtdVsUdyw6vMkAduALI=", + "lastModified": 1638786311, + "narHash": "sha256-no5/MDWde8wi3BCBAL9RUSm9SW5UT+RIv5eeyds/JoI=", "owner": "nixos", "repo": "nix", - "rev": "2e606e87c44a8dc42664f8938eac1d4b63047dd6", + "rev": "76af9375c1e3599dcd735cb387aaddd65e84b10f", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1638371214, - "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", + "lastModified": 1638587357, + "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", + "rev": "e34c5379866833f41e2a36f309912fa675d687c7", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "unstable": { "locked": { - "lastModified": 1638376152, - "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", + "lastModified": 1638535497, + "narHash": "sha256-tk5LNbdkUhALp00+r5ZmQ3t7n2d5M7YUQB+MznWvVOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f", + "rev": "c71f061c68ba8ce53471b767d5049cbd0f3d8490", "type": "github" }, "original": { From 3993707ecd475aff732d3135edc9dad46ebec757 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 9 Dec 2021 18:37:49 +0100 Subject: [PATCH 208/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/d266fd6e14cde2a2aa17fd821dd1e7ca6b62f012' (2021-12-06) → 'github:nix-community/emacs-overlay/9578b9dbce95d9077c2c9b4e06391985670b059c' (2021-12-09) • Updated input 'home-manager': 'github:nix-community/home-manager/781d25b315def05cd7ede3765226c54216f0b1fe' (2021-12-03) → 'github:nix-community/home-manager/829e89a16f4f96428d1b94e68d4c06107b5491c0' (2021-12-08) • Updated input 'master': 'github:nixos/nixpkgs/00afdf8c8ebd18dc3d3de203a3b2ae951867bbe2' (2021-12-06) → 'github:nixos/nixpkgs/ce5d933f411e37024a80af69eca8b180daffc73c' (2021-12-09) • Updated input 'nix': 'github:nixos/nix/76af9375c1e3599dcd735cb387aaddd65e84b10f' (2021-12-06) → 'github:nixos/nix/bc57b3854e75d3f20929fd63d69a98b8237f23b2' (2021-12-09) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/b86b6bc5e753919ab4d7c902210234f324d0efa4' (2021-12-03) → 'github:nixos/nixpkgs/fe56507bd3063a30f3a741a45bf3ba74a91cfac2' (2021-12-08) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/e34c5379866833f41e2a36f309912fa675d687c7' (2021-12-04) → 'github:nixos/nixpkgs/1bd4bbd49bef217a3d1adea43498270d6e779d65' (2021-12-07) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/cvcnw3lnf3p76dd697l84qvyj5srql4k-source?lastModified=1638376152&narHash=sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=&rev=6daa4a5c045d40e6eae60a3b6e427e8700f1c07f' (2021-12-01) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/c71f061c68ba8ce53471b767d5049cbd0f3d8490' (2021-12-03) → 'github:nixos/nixpkgs/bc5d68306b40b8522ffb69ba6cff91898c2fbbff' (2021-12-06) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 3e7f4d73..3163aae0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1638785903, - "narHash": "sha256-Fdcppk+4AIZilRpbSCVPWuDy1/GbV64Slyahf5XR4J4=", + "lastModified": 1639046940, + "narHash": "sha256-nel+YmvqLWsmtTIU5gWbKLmExMEJt6YcORwDxbRgh3c=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d266fd6e14cde2a2aa17fd821dd1e7ca6b62f012", + "rev": "9578b9dbce95d9077c2c9b4e06391985670b059c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1638571010, - "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=", + "lastModified": 1638959036, + "narHash": "sha256-d75Ow/rV3nq4penfTJz9H3/OlIHttoKoJUDEfink/8k=", "owner": "nix-community", "repo": "home-manager", - "rev": "781d25b315def05cd7ede3765226c54216f0b1fe", + "rev": "829e89a16f4f96428d1b94e68d4c06107b5491c0", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1638788490, - "narHash": "sha256-OQrQygMIupH5X2o+I2q44/Ru8o1y3Cdiw53NJBS/7Gs=", + "lastModified": 1639071201, + "narHash": "sha256-OIf1ch8sqdYlxoTeOR3TbNV2a8ye7AZ2hqYBnGrmQn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00afdf8c8ebd18dc3d3de203a3b2ae951867bbe2", + "rev": "ce5d933f411e37024a80af69eca8b180daffc73c", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1638786311, - "narHash": "sha256-no5/MDWde8wi3BCBAL9RUSm9SW5UT+RIv5eeyds/JoI=", + "lastModified": 1639060268, + "narHash": "sha256-uAUvz6mAk+qEmvBIivFFHjsvCTHEPcZU2yAinYe1/Mg=", "owner": "nixos", "repo": "nix", - "rev": "76af9375c1e3599dcd735cb387aaddd65e84b10f", + "rev": "bc57b3854e75d3f20929fd63d69a98b8237f23b2", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1638564543, - "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=", + "lastModified": 1638922083, + "narHash": "sha256-IlQm69UmCfQBwccn+zZULwun0KRtdWFNYQ4jEA3VwW0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4", + "rev": "fe56507bd3063a30f3a741a45bf3ba74a91cfac2", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1638587357, - "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=", + "lastModified": 1638887115, + "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e34c5379866833f41e2a36f309912fa675d687c7", + "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1638535497, - "narHash": "sha256-tk5LNbdkUhALp00+r5ZmQ3t7n2d5M7YUQB+MznWvVOg=", + "lastModified": 1638806821, + "narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c71f061c68ba8ce53471b767d5049cbd0f3d8490", + "rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff", "type": "github" }, "original": { From dbb16b9cdd1e57ce9401e7b9dc91dd4a8cdc90dc Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 14 Dec 2021 13:40:27 +0100 Subject: [PATCH 209/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/vpcxp9a1zsv9nbhlymyha1ay6251ddfz-source?lastModified=1638535497&narHash=sha256-tk5LNbdkUhALp00+r5ZmQ3t7n2d5M7YUQB+MznWvVOg=&rev=c71f061c68ba8ce53471b767d5049cbd0f3d8490' (2021-12-03) → follows 'rnix-lsp/nixpkgs' --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 3e7f4d73..e5c1ff86 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1638785903, - "narHash": "sha256-Fdcppk+4AIZilRpbSCVPWuDy1/GbV64Slyahf5XR4J4=", + "lastModified": 1639446817, + "narHash": "sha256-mImncqYBGgto1mcdun8vV/JMILgcLvaAskbR4o7MkJE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d266fd6e14cde2a2aa17fd821dd1e7ca6b62f012", + "rev": "90e1419696ac7f13f2a5be35fddd85af8068cabb", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1638571010, - "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=", + "lastModified": 1639464984, + "narHash": "sha256-AOD8hPHpF0XFSk3AO5PWEETNX9M2cYZgMZQ91xA7g6E=", "owner": "nix-community", "repo": "home-manager", - "rev": "781d25b315def05cd7ede3765226c54216f0b1fe", + "rev": "c1677de31a53972a21201d56d4a792461b0c8e73", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1638788490, - "narHash": "sha256-OQrQygMIupH5X2o+I2q44/Ru8o1y3Cdiw53NJBS/7Gs=", + "lastModified": 1639479521, + "narHash": "sha256-4GSYUOaU0UVOzISdPGPUOH9KAv5BmbwCDdZQcSW8W6c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00afdf8c8ebd18dc3d3de203a3b2ae951867bbe2", + "rev": "d995f2abb98b92b26cc4b8044e3a3251a067757b", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1638786311, - "narHash": "sha256-no5/MDWde8wi3BCBAL9RUSm9SW5UT+RIv5eeyds/JoI=", + "lastModified": 1639475631, + "narHash": "sha256-gmxXC/Z+EgMKy6oiyhIfyrer6v69c9SAaEWHSqMtRFw=", "owner": "nixos", "repo": "nix", - "rev": "76af9375c1e3599dcd735cb387aaddd65e84b10f", + "rev": "18e4851752970f1c1de7ea56c98fcdc9b63be97f", "type": "github" }, "original": { @@ -125,26 +125,26 @@ }, "nixpkgs": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1638501222, + "narHash": "sha256-tgOZW/rLcB4P7iffx88K3iF70YH+44PtV6kVg5YGIg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "45c527ae2de6f2f36d5790273343f06cd14bc0d1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", + "ref": "nixos-21.11-small", "type": "indirect" } }, "nixpkgs-2105": { "locked": { - "lastModified": 1638564543, - "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=", + "lastModified": 1639130158, + "narHash": "sha256-/5a/7J3AE5ATzB3HdFZ9C9VlPbUK5bIGsRX7veSujXA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4", + "rev": "3b422991781220853035dbe353ba8b7cb279b6b3", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1638587357, - "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=", + "lastModified": 1639161226, + "narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e34c5379866833f41e2a36f309912fa675d687c7", + "rev": "573095944e7c1d58d30fc679c81af63668b54056", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1638535497, - "narHash": "sha256-tk5LNbdkUhALp00+r5ZmQ3t7n2d5M7YUQB+MznWvVOg=", + "lastModified": 1639347265, + "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c71f061c68ba8ce53471b767d5049cbd0f3d8490", + "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada", "type": "github" }, "original": { From 1f56db4a224fbf5855e8b84e4d2e2ae94eb5d6d6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 14 Dec 2021 13:42:16 +0100 Subject: [PATCH 210/303] prep k3os --- nixos/configurations/hardware/mimas.nix | 1 - nixos/configurations/mimas.nix | 12 ++++++++++-- nixos/modules/default.nix | 5 +++-- nixos/modules/hostnames.nix | 13 +++++++++++-- nixos/modules/k3s.nix | 10 ++++++++++ 5 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 nixos/modules/k3s.nix diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index 9bf21672..6bc4bf9c 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -58,7 +58,6 @@ fsType = "ext4"; }; - fileSystems."/boot" = { device = "/dev/disk/by-uuid/7000-3A85"; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index bfb97cb9..c9ef0b4d 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -42,6 +42,14 @@ in networking.extraHosts = '' # 127.0.0.1 versions.teamspeak.com files.teamspeak-services.com ''; + # networking.firewall.extraCommands = '' + # iptables -A INPUT -p tcp -m state --state NEW -m tcp --dport 443 -s 10.42.0.0/16 -d 127.0.0.1/32 -j ACCEPT + # iptables -A INPUT -p tcp -m state --state NEW -m tcp --dport 6445 -s 10.42.0.0/16 -d 127.0.0.1/32 -j ACCEPT + # ''; + + # services.k3s.enable = true; + # services.k3s.extraFlags = "--write-kubeconfig-mode 0644 --node-external-ip 192.168.178.54 --node-external-ip 172.24.152.168"; + # systemd.services.k3s.after = [ "var-lib-rancher.mount" ]; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -62,7 +70,7 @@ in # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ virt-manager ]; + environment.systemPackages = with pkgs; [ virt-manager iptables ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -86,7 +94,7 @@ in networking.firewall.allowedTCPPorts = [ 9002 9003 2342 9999 3000 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. - # networking.firewall.enable = false; + networking.firewall.enable = false; # services.fwupd.enable = true; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 9a20c7bc..244652aa 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,6 +1,7 @@ { - flake = import ./flake.nix; - nix = import ./nix.nix; cachix = import ./cachix; + flake = import ./flake.nix; hostnames = import ./hostnames.nix; + k3s = import ./k3s.nix; + nix = import ./nix.nix; } diff --git a/nixos/modules/hostnames.nix b/nixos/modules/hostnames.nix index 079ef87f..ba600a41 100644 --- a/nixos/modules/hostnames.nix +++ b/nixos/modules/hostnames.nix @@ -6,13 +6,22 @@ let kv = lib.attrsets.nameValuePair; hosts = lib.mapAttrs' (name: ip: kv ip ([ name "${name}.nobbz.lan" ])) hostnames; + + kubenames = [ + "minio.k3os.nobbz.lan" + "nexus.k3os.nobbz.lan" + "docker.k3os.nobbz.lan" + "argo.k3os.nobbz.lan" + ]; in { lib.nobbz.hostnames = { - mimas = "172.24.152.168"; thetys = "172.24.231.199"; enceladeus = "172.24.199.101"; }; - networking.hosts = hosts; + networking.hosts = hosts // { + "192.168.122.122" = kubenames; + "172.24.152.168" = [ "mimas" "mimas.nobbz.lan" ]; + }; } diff --git a/nixos/modules/k3s.nix b/nixos/modules/k3s.nix new file mode 100644 index 00000000..8e6ac1c1 --- /dev/null +++ b/nixos/modules/k3s.nix @@ -0,0 +1,10 @@ +{ config, lib, ... }: + +let + cfg = config.services.k3s; +in +{ + config = lib.mkIf cfg.enable { + networking.firewall.trustedInterfaces = [ "cni0" ]; + }; +} From 8cc4fd4295c14424973ea26deb8f8201a7a9dc88 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 20 Dec 2021 12:19:31 +0100 Subject: [PATCH 211/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/90e1419696ac7f13f2a5be35fddd85af8068cabb' (2021-12-14) → 'github:nix-community/emacs-overlay/fc661595583e0990534c181f2f139afbf7f84cdc' (2021-12-20) • Updated input 'home-manager': 'github:nix-community/home-manager/c1677de31a53972a21201d56d4a792461b0c8e73' (2021-12-14) → 'github:nix-community/home-manager/3db603677509eb0b8c396a3234b1d4b70d023894' (2021-12-19) • Updated input 'master': 'github:nixos/nixpkgs/d995f2abb98b92b26cc4b8044e3a3251a067757b' (2021-12-14) → 'github:nixos/nixpkgs/e0e8ca98c71b464f94c1566dedcf076c11ee9b6b' (2021-12-20) • Updated input 'nix': 'github:nixos/nix/18e4851752970f1c1de7ea56c98fcdc9b63be97f' (2021-12-14) → 'github:nixos/nix/6e6e998930f0d7361d64644eb37d9134e74e8501' (2021-12-17) • Updated input 'nix/nixpkgs': 'github:NixOS/nixpkgs/45c527ae2de6f2f36d5790273343f06cd14bc0d1' (2021-12-03) → 'github:NixOS/nixpkgs/82891b5e2c2359d7e58d08849e4c89511ab94234' (2021-09-28) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/3b422991781220853035dbe353ba8b7cb279b6b3' (2021-12-10) → 'github:nixos/nixpkgs/2949ed36539dcc6cd08e95b25d42e19ffab3d027' (2021-12-18) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/573095944e7c1d58d30fc679c81af63668b54056' (2021-12-10) → 'github:nixos/nixpkgs/e6377ff35544226392b49fa2cf05590f9f0c4b43' (2021-12-19) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/b56f456975d82ebcb9c7ca964148307d7a6b67d9' (2021-11-28) → 'github:nix-community/rnix-lsp/7cee663a5cbe6c15b9138947b6d4465ec08e8d86' (2021-12-19) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/5kc17g9li7pa7wfjhjam7hlfbsn3vgpc-source?lastModified=1638806821&narHash=sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF%2fMAGuWuDA=&rev=bc5d68306b40b8522ffb69ba6cff91898c2fbbff' (2021-12-06) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/b0bf5f888d377dd2f36d90340df6dc9f035aaada' (2021-12-12) → 'github:nixos/nixpkgs/395879c28386e1abf20c7ecacd45880759548391' (2021-12-19) --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index e5c1ff86..502d87dd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1639446817, - "narHash": "sha256-mImncqYBGgto1mcdun8vV/JMILgcLvaAskbR4o7MkJE=", + "lastModified": 1639967190, + "narHash": "sha256-T0Y856VV1Z4W5ip7I8BdVw9iyV7uo5MhuF+aZgTmaOg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "90e1419696ac7f13f2a5be35fddd85af8068cabb", + "rev": "fc661595583e0990534c181f2f139afbf7f84cdc", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1639464984, - "narHash": "sha256-AOD8hPHpF0XFSk3AO5PWEETNX9M2cYZgMZQ91xA7g6E=", + "lastModified": 1639891275, + "narHash": "sha256-2IMLVTtOHV9kBsirGPRpo8NE48Mjq20iXN7l7uy0YjE=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1677de31a53972a21201d56d4a792461b0c8e73", + "rev": "3db603677509eb0b8c396a3234b1d4b70d023894", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1639479521, - "narHash": "sha256-4GSYUOaU0UVOzISdPGPUOH9KAv5BmbwCDdZQcSW8W6c=", + "lastModified": 1639997288, + "narHash": "sha256-RDsZuvh3qzjR/YCWlxnqcSRGxcfxoKvj5D8mCvuTQKk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d995f2abb98b92b26cc4b8044e3a3251a067757b", + "rev": "e0e8ca98c71b464f94c1566dedcf076c11ee9b6b", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1639475631, - "narHash": "sha256-gmxXC/Z+EgMKy6oiyhIfyrer6v69c9SAaEWHSqMtRFw=", + "lastModified": 1639738809, + "narHash": "sha256-RZSWOJUPkXIlMNYMC5a+WNrOjpqAHyhzyqD57BGfNY8=", "owner": "nixos", "repo": "nix", - "rev": "18e4851752970f1c1de7ea56c98fcdc9b63be97f", + "rev": "6e6e998930f0d7361d64644eb37d9134e74e8501", "type": "github" }, "original": { @@ -125,26 +125,26 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638501222, - "narHash": "sha256-tgOZW/rLcB4P7iffx88K3iF70YH+44PtV6kVg5YGIg0=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45c527ae2de6f2f36d5790273343f06cd14bc0d1", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.11-small", + "ref": "nixos-21.05-small", "type": "indirect" } }, "nixpkgs-2105": { "locked": { - "lastModified": 1639130158, - "narHash": "sha256-/5a/7J3AE5ATzB3HdFZ9C9VlPbUK5bIGsRX7veSujXA=", + "lastModified": 1639832205, + "narHash": "sha256-NCkR7Lr6tPTnRGzAaYPAQTgMJSYwAYkKe2ix+rDl6PU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3b422991781220853035dbe353ba8b7cb279b6b3", + "rev": "2949ed36539dcc6cd08e95b25d42e19ffab3d027", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1639161226, - "narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=", + "lastModified": 1639891440, + "narHash": "sha256-FJxa6ObwOQKZy3VhwN5bJRzX+MV/Yq9WLHK/4jlPKrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "573095944e7c1d58d30fc679c81af63668b54056", + "rev": "e6377ff35544226392b49fa2cf05590f9f0c4b43", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1638119397, - "narHash": "sha256-t7lGKypWtmjwymRb6e4GWedeadsV7Iw8DFTi+oV3QM8=", + "lastModified": 1639933352, + "narHash": "sha256-RNPx4Y7p/Q+aXJD9OD4yI6ErIvZ3ouQVe3/WBX+aQvY=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "b56f456975d82ebcb9c7ca964148307d7a6b67d9", + "rev": "7cee663a5cbe6c15b9138947b6d4465ec08e8d86", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "unstable": { "locked": { - "lastModified": 1639347265, - "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=", + "lastModified": 1639876010, + "narHash": "sha256-naGsoUfsY92NaIGiFI8XFXBnesw8BQGe694xcfaLMDI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada", + "rev": "395879c28386e1abf20c7ecacd45880759548391", "type": "github" }, "original": { From 26b61977a7822d0eef252e4ba4d75a101eb249c0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 20 Dec 2021 14:04:12 +0100 Subject: [PATCH 212/303] remove disfunctional override --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 96e393e9..78586407 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ inputs.nix.url = "github:nixos/nix/master"; inputs.rnix-lsp.url = "github:nix-community/rnix-lsp/master"; inputs.rnix-lsp.inputs.nixpkgs.follows = "unstable"; + # inputs.rnix-lsp.inputs.naersk.inputs.nixpkgs.follows = "unstable"; inputs.home-manager.url = "github:nix-community/home-manager"; inputs.home-manager.inputs.nixpkgs.follows = "unstable"; From 820796c2711063f6ed67b735c45c01ffe94d48cd Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 20 Dec 2021 14:05:13 +0100 Subject: [PATCH 213/303] rename SSH --- home/modules/profiles/base/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index e2f46180..d0e8980c 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -65,19 +65,15 @@ in compression = true; matchBlocks = { - "*.adoring_suess.zerotier" = dag.entryAfter zerotierHosts { + "*.internal.nobbz.dev" = dag.entryAfter zerotierHosts { identityFile = "~/.ssh/id_rsa"; user = "nmelzer"; }; - "delly-nixos.adoring_suess.zerotier" = { - hostname = "172.24.199.101"; - }; "ryzen-ubuntu.adoring_suess.zerotier" = { hostname = "172.24.237.73"; }; - "tux-nixos.adoring_suess.zerotier" = { - hostname = "172.24.152.168"; + "mimas.internal.nobbz.dev" = { localForwards = [ { bind.port = 60080; @@ -86,8 +82,7 @@ in } ]; }; - "nixos.adoring_suess.zerotier" = { - hostname = "172.24.231.199"; + "thetys.internal.nobbz.dev" = { user = "demo"; }; From 3bf6701a1e9299f12f1901606afec7623d911148 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 22 Dec 2021 15:18:35 +0100 Subject: [PATCH 214/303] enable vscode server --- flake.lock | 54 +++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 2 ++ lib/mk_system.nix | 2 ++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e5c1ff86..9a206c60 100644 --- a/flake.lock +++ b/flake.lock @@ -84,10 +84,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "rnix-lsp", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1629707199, @@ -123,6 +120,25 @@ "type": "github" } }, + "nixos-vscode-server": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1631782689, + "narHash": "sha256-/E2kuaU7IPtF2Wf1wWazjWmhmKyfpr/7h6gXZ1UCVY0=", + "owner": "mudrii", + "repo": "nixos-vscode-ssh-fix", + "rev": "b7886e9c046d52a1be8e907a8bdb182b60677acb", + "type": "github" + }, + "original": { + "owner": "mudrii", + "ref": "main", + "repo": "nixos-vscode-ssh-fix", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1638501222, @@ -170,6 +186,35 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1626395775, + "narHash": "sha256-7Uo+4PIQGirfd7WfFuRuspLCyDT7eUn6pnJx/CL9UC8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a165aeceda9f9741d15bc2488425daeb06c0707e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1639347265, + "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=", + "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source", + "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "rnix-lsp": { "inputs": { "naersk": "naersk", @@ -200,6 +245,7 @@ "home-manager": "home-manager", "master": "master", "nix": "nix", + "nixos-vscode-server": "nixos-vscode-server", "nixpkgs-2105": "nixpkgs-2105", "nixpkgs-2111": "nixpkgs-2111", "rnix-lsp": "rnix-lsp", diff --git a/flake.nix b/flake.nix index 96e393e9..8eee3cc4 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,8 @@ inputs.emacs.url = "github:nix-community/emacs-overlay"; inputs.emacs.inputs.nixpkgs.follows = "master"; + inputs.nixos-vscode-server.url = "github:mudrii/nixos-vscode-ssh-fix/main"; + outputs = { self, ... }@inputs: { nixosModules = import ./nixos/modules; diff --git a/lib/mk_system.nix b/lib/mk_system.nix index 06711a85..c2e931d3 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -17,9 +17,11 @@ nixpkgs.lib.nixosSystem ( nix.flakes.enable = true; system.configurationRevision = self.rev or "dirty"; documentation.man = { enable = true; generateCaches = true; }; + services.nixos-vscode-server.enable = true; } entryPoint hardware + args.nixos-vscode-server.nixosModules.system ] ++ __attrValues self.nixosModules; } ) From ed00ba096e12b8bfc65f733c9c87864ee4fae737 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 22 Dec 2021 15:18:52 +0100 Subject: [PATCH 215/303] enable traefik forwarding --- nixos/configurations/mimas.nix | 69 +++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index c9ef0b4d..001fa87a 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -91,10 +91,10 @@ in services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 9002 9003 2342 9999 3000 ]; + networking.firewall.allowedTCPPorts = [ 80 443 1111 8080 9002 9003 2342 9999 3000 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. - networking.firewall.enable = false; + networking.firewall.enable = true; # services.fwupd.enable = true; @@ -249,6 +249,71 @@ in }; }; + services.traefik.enable = true; + systemd.services.traefik.serviceConfig.EnvironmentFile = "/etc/traefik/env"; + services.traefik.staticConfigOptions = { + log.level = "DEBUG"; + + api.dashboard = true; + api.insecure = true; + # experimental.http3 = true; + + certificatesResolvers.mimasWildcard.acme = { + email = "acme@nobbz.dev"; + storage = "/var/lib/traefik/mimas.json"; + # caServer = "https://acme-staging-v02.api.letsencrypt.org/directory"; + dnsChallenge.provider = "cloudflare"; + dnsChallenge.resolvers = [ "1.1.1.1:53" "8.8.8.8:53" ]; + }; + + entryPoints = { + http = { + address = ":80"; + forwardedHeaders.insecure = true; + http.redirections.entryPoint = { + to = "https"; + scheme = "https"; + }; + }; + + https = { + address = ":443"; + # enableHTTP3 = true; + forwardedHeaders.insecure = true; + }; + + experimental = { + address = ":1111"; + forwardedHeaders.insecure = true; + }; + }; + }; + services.traefik.dynamicConfigOptions = { + http.routers = { + api = { + entrypoints = [ "traefik" ]; + rule = "PathPrefix(`/api/`)"; + service = "api@internal"; + }; + minio = { + entryPoints = [ "http" ]; + rule = "Host(`minio.mimas.internal.nobbz.dev`) && PathPrefix(`/`)"; + service = "minio"; + }; + minio-tls = { + entryPoints = [ "https" "experimental" ]; + rule = "HostRegexp(`{subdomain:[a-z0-9]+}.mimas.internal.nobbz.dev`) && PathPrefix(`/`)"; + service = "minio"; + tls.domains = [{ main = "*.mimas.internal.nobbz.dev"; }]; + tls.certresolver = "mimasWildcard"; + }; + }; + http.services = { + minio.loadBalancer.passHostHeader = true; + minio.loadBalancer.servers = [{ url = "http://192.168.122.122/"; }]; + }; + }; + services.prometheus = { enable = true; port = 9001; From 1f9dab231f0395faec810842192d829d8b406ba1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 22 Dec 2021 15:22:24 +0100 Subject: [PATCH 216/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/fc661595583e0990534c181f2f139afbf7f84cdc' (2021-12-20) → 'github:nix-community/emacs-overlay/dcc8d9ada04b3de4a8c3be951c1e9feaff111590' (2021-12-22) • Updated input 'home-manager': 'github:nix-community/home-manager/3db603677509eb0b8c396a3234b1d4b70d023894' (2021-12-19) → 'github:nix-community/home-manager/1b03a8ab7af9385b70b7d7c319c4a31a58c5cfa5' (2021-12-21) • Updated input 'master': 'github:nixos/nixpkgs/e0e8ca98c71b464f94c1566dedcf076c11ee9b6b' (2021-12-20) → 'github:nixos/nixpkgs/4c252f40af8391b4f5efec91db9c6daf1818bd45' (2021-12-22) • Updated input 'nix': 'github:nixos/nix/6e6e998930f0d7361d64644eb37d9134e74e8501' (2021-12-17) → 'github:nixos/nix/ddd78391547be5f34f4042fd48124c0ced1f33b2' (2021-12-22) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/2949ed36539dcc6cd08e95b25d42e19ffab3d027' (2021-12-18) → 'github:nixos/nixpkgs/a0899f066572bb498ea3b4939d27743fd3e78364' (2021-12-20) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/e6377ff35544226392b49fa2cf05590f9f0c4b43' (2021-12-19) → 'github:nixos/nixpkgs/9ab7d12287ced0e1b4c03b61c781901f178d9d77' (2021-12-21) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source?lastModified=1639347265&narHash=sha256-q5feWoC64+h6T6J89o2HJJ8DOnB%2f4vwMODBlZIgeIlA=&rev=b0bf5f888d377dd2f36d90340df6dc9f035aaada' (2021-12-12) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/395879c28386e1abf20c7ecacd45880759548391' (2021-12-19) → 'github:nixos/nixpkgs/81cef6b70fb5d5cdba5a0fef3f714c2dadaf0d6d' (2021-12-22) --- flake.lock | 60 +++++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 1144d370..6e906f35 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1639967190, - "narHash": "sha256-T0Y856VV1Z4W5ip7I8BdVw9iyV7uo5MhuF+aZgTmaOg=", + "lastModified": 1640168448, + "narHash": "sha256-dVdGW7ZDvBiIm08qFeWv0QQQ1fFxQVrmP/PASabgLuQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fc661595583e0990534c181f2f139afbf7f84cdc", + "rev": "dcc8d9ada04b3de4a8c3be951c1e9feaff111590", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1639891275, - "narHash": "sha256-2IMLVTtOHV9kBsirGPRpo8NE48Mjq20iXN7l7uy0YjE=", + "lastModified": 1640126586, + "narHash": "sha256-Brja0wQZFSl+hduOcBfE/oVPs0QattbILSMHC7/9fEg=", "owner": "nix-community", "repo": "home-manager", - "rev": "3db603677509eb0b8c396a3234b1d4b70d023894", + "rev": "1b03a8ab7af9385b70b7d7c319c4a31a58c5cfa5", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1639997288, - "narHash": "sha256-RDsZuvh3qzjR/YCWlxnqcSRGxcfxoKvj5D8mCvuTQKk=", + "lastModified": 1640182329, + "narHash": "sha256-tMCOM9n1RsTit3iLY1Oi0VLgXA+pvJWc9Rv8HuZz6mU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e0e8ca98c71b464f94c1566dedcf076c11ee9b6b", + "rev": "4c252f40af8391b4f5efec91db9c6daf1818bd45", "type": "github" }, "original": { @@ -84,7 +84,10 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] }, "locked": { "lastModified": 1629707199, @@ -106,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1639738809, - "narHash": "sha256-RZSWOJUPkXIlMNYMC5a+WNrOjpqAHyhzyqD57BGfNY8=", + "lastModified": 1640180680, + "narHash": "sha256-fZXNc1vblmPBT+35e5yCLUZPpiiKFxY56Msje9lVy8g=", "owner": "nixos", "repo": "nix", - "rev": "6e6e998930f0d7361d64644eb37d9134e74e8501", + "rev": "ddd78391547be5f34f4042fd48124c0ced1f33b2", "type": "github" }, "original": { @@ -156,11 +159,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1639832205, - "narHash": "sha256-NCkR7Lr6tPTnRGzAaYPAQTgMJSYwAYkKe2ix+rDl6PU=", + "lastModified": 1639996107, + "narHash": "sha256-qEnXR2HwECUbV9UiOus1HN6FKhj3fEpxefKbZVRk9w0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2949ed36539dcc6cd08e95b25d42e19ffab3d027", + "rev": "a0899f066572bb498ea3b4939d27743fd3e78364", "type": "github" }, "original": { @@ -172,11 +175,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1639891440, - "narHash": "sha256-FJxa6ObwOQKZy3VhwN5bJRzX+MV/Yq9WLHK/4jlPKrs=", + "lastModified": 1640077788, + "narHash": "sha256-YMSDk3hlucJTTARaHNOeQEF6zEW3A/x4sXgrz94VbS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e6377ff35544226392b49fa2cf05590f9f0c4b43", + "rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77", "type": "github" }, "original": { @@ -202,19 +205,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1639347265, - "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=", - "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source", - "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "rnix-lsp": { "inputs": { "naersk": "naersk", @@ -254,11 +244,11 @@ }, "unstable": { "locked": { - "lastModified": 1639876010, - "narHash": "sha256-naGsoUfsY92NaIGiFI8XFXBnesw8BQGe694xcfaLMDI=", + "lastModified": 1640139330, + "narHash": "sha256-Nkp3wUOGwtoQ7EH28RLVJ7EqB/e0TU7VcsM7GLy+SdY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "395879c28386e1abf20c7ecacd45880759548391", + "rev": "81cef6b70fb5d5cdba5a0fef3f714c2dadaf0d6d", "type": "github" }, "original": { From b8e7b234e22ddad7d9bf4f906e314574d789012a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 23 Dec 2021 10:33:05 +0100 Subject: [PATCH 217/303] enceladeus: change kernel version --- nixos/configurations/enceladeus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index bd8c65d0..f6c42de2 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -25,7 +25,7 @@ # Define on which hard drive you want to install Grub. boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - boot.kernelPackages = pkgs.linuxPackages_5_4; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.blacklistedKernelModules = [ "rtl8xxxu" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu From 30f44684f22067390eaf4f5b735fe8020ba0b462 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 26 Dec 2021 19:13:11 +0100 Subject: [PATCH 218/303] update --- flake.lock | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 6e906f35..aa812a16 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1640168448, - "narHash": "sha256-dVdGW7ZDvBiIm08qFeWv0QQQ1fFxQVrmP/PASabgLuQ=", + "lastModified": 1640512759, + "narHash": "sha256-5R+qNo8xotExx+BiioFiLE/sF17Z+ZJ5P48vYFLqecA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "dcc8d9ada04b3de4a8c3be951c1e9feaff111590", + "rev": "2baa05f02c714a3821d077b079a680c8461b1f8c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1640126586, - "narHash": "sha256-Brja0wQZFSl+hduOcBfE/oVPs0QattbILSMHC7/9fEg=", + "lastModified": 1640417317, + "narHash": "sha256-jT2uMARXs0Xm65ccroFsKyr4LTHSecw+9HAnmBdJO8U=", "owner": "nix-community", "repo": "home-manager", - "rev": "1b03a8ab7af9385b70b7d7c319c4a31a58c5cfa5", + "rev": "48f2b381dd397ec88040d3354ac9c036739ba139", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1640182329, - "narHash": "sha256-tMCOM9n1RsTit3iLY1Oi0VLgXA+pvJWc9Rv8HuZz6mU=", + "lastModified": 1640540980, + "narHash": "sha256-IFWmc3NY0gMYA3w60v2RMwf60ZJSMwCr/Mu8XCfumcE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c252f40af8391b4f5efec91db9c6daf1818bd45", + "rev": "59b2ed7599c77be71f1d5a1bd05258c35aa28e89", "type": "github" }, "original": { @@ -90,15 +90,15 @@ ] }, "locked": { - "lastModified": 1629707199, - "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=", - "owner": "nmattia", + "lastModified": 1639947939, + "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", + "owner": "nix-community", "repo": "naersk", - "rev": "df71f5e4babda41cd919a8684b72218e2e809fa9", + "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", "type": "github" }, "original": { - "owner": "nmattia", + "owner": "nix-community", "repo": "naersk", "type": "github" } @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1640180680, - "narHash": "sha256-fZXNc1vblmPBT+35e5yCLUZPpiiKFxY56Msje9lVy8g=", + "lastModified": 1640266044, + "narHash": "sha256-+uPOPe6LSczHWyNuDeCnCr98UTKzOTMZ4f0fbNJjdLY=", "owner": "nixos", "repo": "nix", - "rev": "ddd78391547be5f34f4042fd48124c0ced1f33b2", + "rev": "af553b20902b8b8efbccab5f880879b09e95eb32", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1639996107, - "narHash": "sha256-qEnXR2HwECUbV9UiOus1HN6FKhj3fEpxefKbZVRk9w0=", + "lastModified": 1640283157, + "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0899f066572bb498ea3b4939d27743fd3e78364", + "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1640077788, - "narHash": "sha256-YMSDk3hlucJTTARaHNOeQEF6zEW3A/x4sXgrz94VbS0=", + "lastModified": 1640443850, + "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77", + "rev": "6979c0e49bb491e18dd4870abb104cc7375aa7e8", "type": "github" }, "original": { @@ -214,11 +214,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1639933352, - "narHash": "sha256-RNPx4Y7p/Q+aXJD9OD4yI6ErIvZ3ouQVe3/WBX+aQvY=", + "lastModified": 1640347520, + "narHash": "sha256-UkieGBW9ap0pQbumYoG60Ed+BpzMRGuLQ6Zb41u7Fkk=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "7cee663a5cbe6c15b9138947b6d4465ec08e8d86", + "rev": "d7cc2887ac9e65dd01715aac472edbf46b93ed31", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "unstable": { "locked": { - "lastModified": 1640139330, - "narHash": "sha256-Nkp3wUOGwtoQ7EH28RLVJ7EqB/e0TU7VcsM7GLy+SdY=", + "lastModified": 1640408860, + "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "81cef6b70fb5d5cdba5a0fef3f714c2dadaf0d6d", + "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505", "type": "github" }, "original": { From 9c2578b15678c879d3d3e0ae314b2c78a61b337e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 26 Dec 2021 21:49:44 +0100 Subject: [PATCH 219/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/2baa05f02c714a3821d077b079a680c8461b1f8c' (2021-12-26) → 'github:nix-community/emacs-overlay/13bd8f5d68519898e403d3cab231281b1fbd0d71' (2021-12-26) • Updated input 'master': 'github:nixos/nixpkgs/59b2ed7599c77be71f1d5a1bd05258c35aa28e89' (2021-12-26) → 'github:nixos/nixpkgs/7d744a722fbfcb00ae52acf210dcf698f8333ef6' (2021-12-26) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/dxarhsid5al12kv7nnzadvcs9s0q50sa-source?lastModified=1640139330&narHash=sha256-Nkp3wUOGwtoQ7EH28RLVJ7EqB%2fe0TU7VcsM7GLy+SdY=&rev=81cef6b70fb5d5cdba5a0fef3f714c2dadaf0d6d' (2021-12-22) → follows 'rnix-lsp/nixpkgs' --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index aa812a16..9fae2684 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1640512759, - "narHash": "sha256-5R+qNo8xotExx+BiioFiLE/sF17Z+ZJ5P48vYFLqecA=", + "lastModified": 1640541428, + "narHash": "sha256-4Xf66/6pIsLNfIs+M8xqap9pTOidkVF+85BpCPrDHzQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2baa05f02c714a3821d077b079a680c8461b1f8c", + "rev": "13bd8f5d68519898e403d3cab231281b1fbd0d71", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1640540980, - "narHash": "sha256-IFWmc3NY0gMYA3w60v2RMwf60ZJSMwCr/Mu8XCfumcE=", + "lastModified": 1640551733, + "narHash": "sha256-90fHM2NBtPe1IJqo8RCCqVV6Qx8wZ9b+k1+TErtp6i8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59b2ed7599c77be71f1d5a1bd05258c35aa28e89", + "rev": "7d744a722fbfcb00ae52acf210dcf698f8333ef6", "type": "github" }, "original": { From a5c5fa3aabcd6ba5aa8bb86616368bcd566094ac Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 26 Dec 2021 23:59:28 +0100 Subject: [PATCH 220/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'master': 'github:nixos/nixpkgs/7d744a722fbfcb00ae52acf210dcf698f8333ef6' (2021-12-26) → 'github:nixos/nixpkgs/cb2fee8ed3a1315cf8d467153c76318f962dc023' (2021-12-26) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/m6p4m1rs0xi67kaa25bm1rqkm4633qjr-source?lastModified=1640408860&narHash=sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=&rev=cb372c3b8880e504b06946e8fb2ca9777c685505' (2021-12-25) → follows 'rnix-lsp/nixpkgs' --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9fae2684..4dae7c1e 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1640551733, - "narHash": "sha256-90fHM2NBtPe1IJqo8RCCqVV6Qx8wZ9b+k1+TErtp6i8=", + "lastModified": 1640559239, + "narHash": "sha256-Nhhq999VEtDDip0j5asHyPejKeqTs9jqpOt6sOh7FvA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7d744a722fbfcb00ae52acf210dcf698f8333ef6", + "rev": "cb2fee8ed3a1315cf8d467153c76318f962dc023", "type": "github" }, "original": { From e9441f50b14c6304c447a768d5f7fa60fce0d4ea Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 28 Dec 2021 12:30:54 +0100 Subject: [PATCH 221/303] disable rnix from master --- flake.lock | 18 ++++++++++++++---- home/modules/languages/nix/default.nix | 3 ++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 4dae7c1e..267332be 100644 --- a/flake.lock +++ b/flake.lock @@ -84,10 +84,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "rnix-lsp", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1639947939, @@ -205,6 +202,19 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1640408860, + "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=", + "path": "/nix/store/m6p4m1rs0xi67kaa25bm1rqkm4633qjr-source", + "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "rnix-lsp": { "inputs": { "naersk": "naersk", diff --git a/home/modules/languages/nix/default.nix b/home/modules/languages/nix/default.nix index 2a1e93b7..c5387fee 100644 --- a/home/modules/languages/nix/default.nix +++ b/home/modules/languages/nix/default.nix @@ -2,7 +2,8 @@ let cfg = config.languages.nix; - rnixLsp = rnix-lsp.defaultPackage.x86_64-linux; + # rnixLsp = rnix-lsp.defaultPackage.x86_64-linux; + rnixLsp = pkgs.rnix-lsp; in { options.languages.nix = { From 33671ce7aea523ad451d99a4cd2290da7eed6f7d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 29 Dec 2021 00:25:15 +0100 Subject: [PATCH 222/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/13bd8f5d68519898e403d3cab231281b1fbd0d71' (2021-12-26) → 'github:nix-community/emacs-overlay/9ffb648e712f1c48a0c2b4463c5a5702c5427dac' (2021-12-28) • Updated input 'home-manager': 'github:nix-community/home-manager/48f2b381dd397ec88040d3354ac9c036739ba139' (2021-12-25) → 'github:nix-community/home-manager/0b197562ab7bf114dd5f6716f41d4b5be6ccd357' (2021-12-27) • Updated input 'master': 'github:nixos/nixpkgs/cb2fee8ed3a1315cf8d467153c76318f962dc023' (2021-12-26) → 'github:nixos/nixpkgs/eaeea6e9337b93d2acb7c2aa27e3f4617408375a' (2021-12-28) • Updated input 'nix': 'github:nixos/nix/af553b20902b8b8efbccab5f880879b09e95eb32' (2021-12-23) → 'github:nixos/nix/ed3bc63666732bdc0724f2e53c14935a9f0f6fe7' (2021-12-28) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/6979c0e49bb491e18dd4870abb104cc7375aa7e8' (2021-12-25) → 'github:nixos/nixpkgs/d887ac7aee92e8fc54dde9060d60d927afae9d69' (2021-12-27) • Updated input 'rnix-lsp/naersk/nixpkgs': 'path:/nix/store/m6p4m1rs0xi67kaa25bm1rqkm4633qjr-source?lastModified=1640408860&narHash=sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=&rev=cb372c3b8880e504b06946e8fb2ca9777c685505' (2021-12-25) → follows 'rnix-lsp/nixpkgs' • Updated input 'unstable': 'github:nixos/nixpkgs/cb372c3b8880e504b06946e8fb2ca9777c685505' (2021-12-25) → 'github:nixos/nixpkgs/ac169ec6371f0d835542db654a65e0f2feb07838' (2021-12-26) --- flake.lock | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 267332be..de23123d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1640541428, - "narHash": "sha256-4Xf66/6pIsLNfIs+M8xqap9pTOidkVF+85BpCPrDHzQ=", + "lastModified": 1640717235, + "narHash": "sha256-JwKspWndaHeKYkvySDrqlMT7FpLYqvSPz5vZ9f2J+As=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "13bd8f5d68519898e403d3cab231281b1fbd0d71", + "rev": "9ffb648e712f1c48a0c2b4463c5a5702c5427dac", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1640417317, - "narHash": "sha256-jT2uMARXs0Xm65ccroFsKyr4LTHSecw+9HAnmBdJO8U=", + "lastModified": 1640592198, + "narHash": "sha256-F5dWVGQMscmGyLTzNLocPB1v8Ijp8ONx8Nq9Dmi5PSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "48f2b381dd397ec88040d3354ac9c036739ba139", + "rev": "0b197562ab7bf114dd5f6716f41d4b5be6ccd357", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1640559239, - "narHash": "sha256-Nhhq999VEtDDip0j5asHyPejKeqTs9jqpOt6sOh7FvA=", + "lastModified": 1640725200, + "narHash": "sha256-yR8clhRTt1OBFojyBaNnNgD+om51nhuJ1OLqWqdY2Ow=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb2fee8ed3a1315cf8d467153c76318f962dc023", + "rev": "eaeea6e9337b93d2acb7c2aa27e3f4617408375a", "type": "github" }, "original": { @@ -84,7 +84,10 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] }, "locked": { "lastModified": 1639947939, @@ -106,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1640266044, - "narHash": "sha256-+uPOPe6LSczHWyNuDeCnCr98UTKzOTMZ4f0fbNJjdLY=", + "lastModified": 1640732590, + "narHash": "sha256-vClgglrxr3MeaS4t7oViMuKevr3asvsJMxyJ1yJZ0F4=", "owner": "nixos", "repo": "nix", - "rev": "af553b20902b8b8efbccab5f880879b09e95eb32", + "rev": "ed3bc63666732bdc0724f2e53c14935a9f0f6fe7", "type": "github" }, "original": { @@ -172,11 +175,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1640443850, - "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=", + "lastModified": 1640572776, + "narHash": "sha256-pWMTubBy1Ep31iuQ5lEKW2mjSHWEvcbvy9uHVch2764=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6979c0e49bb491e18dd4870abb104cc7375aa7e8", + "rev": "d887ac7aee92e8fc54dde9060d60d927afae9d69", "type": "github" }, "original": { @@ -202,19 +205,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1640408860, - "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=", - "path": "/nix/store/m6p4m1rs0xi67kaa25bm1rqkm4633qjr-source", - "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "rnix-lsp": { "inputs": { "naersk": "naersk", @@ -254,11 +244,11 @@ }, "unstable": { "locked": { - "lastModified": 1640408860, - "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=", + "lastModified": 1640540585, + "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505", + "rev": "ac169ec6371f0d835542db654a65e0f2feb07838", "type": "github" }, "original": { From 72800727daf1dc775c7d563e94a807bc4f277667 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 3 Jan 2022 14:32:30 +0100 Subject: [PATCH 223/303] enceladeus: some small adjustements --- home/configurations/nmelzer@enceladeus.nix | 3 ++- nixos/configurations/enceladeus.nix | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index 82bcba70..78bf8447 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { config = { @@ -25,6 +25,7 @@ oneFileSystem = true; repo = "rest:http://172.24.152.168:9999/nobbz"; }; + systemd.user.timers.restic-backup.Timer.OnCalendar = lib.mkForce "hourly"; home.packages = [ ]; }; diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index f6c42de2..bf4e75d6 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -11,8 +11,7 @@ nixpkgs.config.contentAddressedByDefault = false; # nix.useSandbox = false; - nix.buildCores = 1; - nix.maxJobs = 2; + nix.package = pkgs.nix_2_4; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; @@ -30,7 +29,7 @@ boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu ]; - boot.supportedFilesystems = [ "zfs" "ntfs-3g" ]; + boot.supportedFilesystems = [ "ntfs-3g" ]; # boot.kernelPackages = pkgs.linuxPackages_4_19; boot.kernel.sysctl = { @@ -76,6 +75,7 @@ wget rsync git + firefox ]; # Some programs need SUID wrappers, can be configured further or are From 1f0639f9e07a02dbae5d9e39d161c9b0d3851e5d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 3 Jan 2022 14:55:28 +0100 Subject: [PATCH 224/303] enceladeus: add vscode --- home/configurations/nmelzer@enceladeus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index 78bf8447..c10ce7b9 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -2,7 +2,7 @@ { config = { - nixpkgs.allowedUnfree = [ "google-chrome" ]; + nixpkgs.allowedUnfree = [ "google-chrome" "vscode" ]; nixpkgs.config.contentAddressedByDefault = false; @@ -27,6 +27,6 @@ }; systemd.user.timers.restic-backup.Timer.OnCalendar = lib.mkForce "hourly"; - home.packages = [ ]; + home.packages = [ pkgs.vscode ]; }; } From aa0efcb1b4c55cb46cf8958543328c76dbe8cd42 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 3 Jan 2022 15:17:01 +0100 Subject: [PATCH 225/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/9ffb648e712f1c48a0c2b4463c5a5702c5427dac' (2021-12-28) → 'github:nix-community/emacs-overlay/150c09f3e3029b4d2f0ceecee2bf3d5148404767' (2022-01-03) • Updated input 'home-manager': 'github:nix-community/home-manager/0b197562ab7bf114dd5f6716f41d4b5be6ccd357' (2021-12-27) → 'github:nix-community/home-manager/8e7a10602d1eb1d242c9d3f9b822203d5751a8c6' (2022-01-02) • Updated input 'master': 'github:nixos/nixpkgs/eaeea6e9337b93d2acb7c2aa27e3f4617408375a' (2021-12-28) → 'github:nixos/nixpkgs/75a86ab9f5691930f79de6c72e9f80eb280cf2dd' (2022-01-03) • Updated input 'nix': 'github:nixos/nix/ed3bc63666732bdc0724f2e53c14935a9f0f6fe7' (2021-12-28) → 'github:nixos/nix/1c099dee673f203398fb8372472bddedffb4df7e' (2022-01-03) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/dde1557825c5644c869c5efc7448dc03722a8f09' (2021-12-23) → 'github:nixos/nixpkgs/932ec35ff8ac0fef5667ad2b0db4a009440255a9' (2021-12-31) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/d887ac7aee92e8fc54dde9060d60d927afae9d69' (2021-12-27) → 'github:nixos/nixpkgs/08370e1e271f6fe00d302bebbe510fe0e2c611ca' (2022-01-02) • Updated input 'unstable': 'github:nixos/nixpkgs/ac169ec6371f0d835542db654a65e0f2feb07838' (2021-12-26) → 'github:nixos/nixpkgs/59bfda72480496f32787cec8c557182738b1bd3f' (2021-12-31) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index de23123d..97d20d94 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1640717235, - "narHash": "sha256-JwKspWndaHeKYkvySDrqlMT7FpLYqvSPz5vZ9f2J+As=", + "lastModified": 1641205295, + "narHash": "sha256-DG1JHIBWfLu9wLXcyRyHeQCmbWjtHNKMWSEjJQrYfAU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9ffb648e712f1c48a0c2b4463c5a5702c5427dac", + "rev": "150c09f3e3029b4d2f0ceecee2bf3d5148404767", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1640592198, - "narHash": "sha256-F5dWVGQMscmGyLTzNLocPB1v8Ijp8ONx8Nq9Dmi5PSw=", + "lastModified": 1641121012, + "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b197562ab7bf114dd5f6716f41d4b5be6ccd357", + "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6", "type": "github" }, "original": { @@ -68,11 +68,11 @@ }, "master": { "locked": { - "lastModified": 1640725200, - "narHash": "sha256-yR8clhRTt1OBFojyBaNnNgD+om51nhuJ1OLqWqdY2Ow=", + "lastModified": 1641219057, + "narHash": "sha256-MSR+kkkYhLwywVabD5L7cD6oEIYG2sVhYqmAuBGu27s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eaeea6e9337b93d2acb7c2aa27e3f4617408375a", + "rev": "75a86ab9f5691930f79de6c72e9f80eb280cf2dd", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1640732590, - "narHash": "sha256-vClgglrxr3MeaS4t7oViMuKevr3asvsJMxyJ1yJZ0F4=", + "lastModified": 1641216931, + "narHash": "sha256-+vnJvH5mEt1qDBK6LM/ablHqbW8F9sTDhug5a2ksIxw=", "owner": "nixos", "repo": "nix", - "rev": "ed3bc63666732bdc0724f2e53c14935a9f0f6fe7", + "rev": "1c099dee673f203398fb8372472bddedffb4df7e", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1640283157, - "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", + "lastModified": 1640929225, + "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1640572776, - "narHash": "sha256-pWMTubBy1Ep31iuQ5lEKW2mjSHWEvcbvy9uHVch2764=", + "lastModified": 1641147223, + "narHash": "sha256-eJnmISYGR7LeqEev4bsI/qcU0SgeFKHs3jnL4vMGL+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d887ac7aee92e8fc54dde9060d60d927afae9d69", + "rev": "08370e1e271f6fe00d302bebbe510fe0e2c611ca", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "unstable": { "locked": { - "lastModified": 1640540585, - "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=", + "lastModified": 1640959792, + "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac169ec6371f0d835542db654a65e0f2feb07838", + "rev": "59bfda72480496f32787cec8c557182738b1bd3f", "type": "github" }, "original": { From 1d58676a2ac0f77c4694c9dd2eb37dc851857e17 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 3 Jan 2022 15:56:51 +0100 Subject: [PATCH 226/303] introduce search-domain --- nixos/modules/hostnames.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/nixos/modules/hostnames.nix b/nixos/modules/hostnames.nix index ba600a41..5d7877c2 100644 --- a/nixos/modules/hostnames.nix +++ b/nixos/modules/hostnames.nix @@ -15,13 +15,16 @@ let ]; in { - lib.nobbz.hostnames = { - thetys = "172.24.231.199"; - enceladeus = "172.24.199.101"; - }; + # lib.nobbz.hostnames = { + # thetys = "172.24.231.199"; + # enceladeus = "172.24.199.101"; + # }; - networking.hosts = hosts // { - "192.168.122.122" = kubenames; - "172.24.152.168" = [ "mimas" "mimas.nobbz.lan" ]; - }; + # networking.hosts = hosts // { + # "192.168.122.122" = kubenames; + # "172.24.152.168" = [ "mimas" "mimas.nobbz.lan" ]; + # }; + + networking.search = [ "internal.nobbz.dev" ]; + networking.domain = "internal.nobbz.dev"; } From 28e550133ffd0a084b8b8e4041b37a2fb45181fc Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 4 Jan 2022 00:09:38 +0100 Subject: [PATCH 227/303] statix linting --- flake.lock | 97 +++++++++++++++++++ flake.nix | 2 + home/configurations/nmelzer@enceladeus.nix | 4 +- home/modules/languages/python/default.nix | 4 +- home/modules/programs/emacs/company.nix | 4 +- home/modules/programs/emacs/default.nix | 8 +- .../programs/emacs/whichkey/default.nix | 2 +- lefthook.yml | 7 ++ nixos/configurations/thetys.nix | 6 +- nixos/modules/hostnames.nix | 24 ----- nixos/modules/nix.nix | 2 +- oldstuff/home/nix/myOverlay/default.nix | 2 +- 12 files changed, 126 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 97d20d94..a5eb789d 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "statix", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1638080655, + "narHash": "sha256-ZPx8e8CukEBx31IcgivAWnN9Jg0r+LTBPHV7fREf+QI=", + "owner": "nix-community", + "repo": "fenix", + "rev": "78a0c55b6f9d8bb6f3b89eb995fa5bbdd73e9475", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1638122382, @@ -30,6 +52,27 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "statix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1635165013, + "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -205,6 +248,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1638036523, + "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9c191ebcdfe917043195c54ab6ae8e934434fe7b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "rnix-lsp": { "inputs": { "naersk": "naersk", @@ -239,9 +298,47 @@ "nixpkgs-2105": "nixpkgs-2105", "nixpkgs-2111": "nixpkgs-2111", "rnix-lsp": "rnix-lsp", + "statix": "statix", "unstable": "unstable" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1638036899, + "narHash": "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=", + "owner": "rust-analyzer", + "repo": "rust-analyzer", + "rev": "d9b2291f546abc77d24499339a72a89127464b95", + "type": "github" + }, + "original": { + "owner": "rust-analyzer", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "statix": { + "inputs": { + "fenix": "fenix", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1639455627, + "narHash": "sha256-vqGwh1AndJAG4lpHtRhfkvu+yAoo0Qxym0c6Imr7StA=", + "owner": "nerdypepper", + "repo": "statix", + "rev": "94a2edf57340ac3f3a2276c88a221ba3125172af", + "type": "github" + }, + "original": { + "owner": "nerdypepper", + "repo": "statix", + "type": "github" + } + }, "unstable": { "locked": { "lastModified": 1640959792, diff --git a/flake.nix b/flake.nix index fe81d692..20c8dae3 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,8 @@ inputs.nixos-vscode-server.url = "github:mudrii/nixos-vscode-ssh-fix/main"; + inputs.statix.url = "github:nerdypepper/statix"; + outputs = { self, ... }@inputs: { nixosModules = import ./nixos/modules; diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index c10ce7b9..f4769733 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, statix, ... }: { config = { @@ -27,6 +27,6 @@ }; systemd.user.timers.restic-backup.Timer.OnCalendar = lib.mkForce "hourly"; - home.packages = [ pkgs.vscode ]; + home.packages = [ pkgs.vscode statix.defaultPackage.x86_64-linux ]; }; } diff --git a/home/modules/languages/python/default.nix b/home/modules/languages/python/default.nix index 23c45b9f..09a551bc 100644 --- a/home/modules/languages/python/default.nix +++ b/home/modules/languages/python/default.nix @@ -33,12 +33,12 @@ in tag = "Setup and prepare the python language modes"; comments = [ ]; requires = [ ]; - packageRequires = (ep: + packageRequires = ep: [ ep.lsp-pyright ep.python-docstring (config.programs.emacs.localPackages."init-lsp".packageRequires ep) - ] ++ (if cfg.useMS then [ ep.lsp-python-ms ] else [ ])); + ] ++ (if cfg.useMS then [ ep.lsp-python-ms ] else [ ]); code = '' ${lsHook} diff --git a/home/modules/programs/emacs/company.nix b/home/modules/programs/emacs/company.nix index f5d12496..cfc52896 100644 --- a/home/modules/programs/emacs/company.nix +++ b/home/modules/programs/emacs/company.nix @@ -1,7 +1,9 @@ { config, lib, ... }: with lib; -let emacs = config.programs.emacs; +let + # emacs = config.programs.emacs; + inherit (config.programs) emacs; in { config = lib.mkIf emacs.enable { diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 6549f1a4..3554f40b 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -19,7 +19,8 @@ let cfg.localPackages; derivations = lib.attrsets.mapAttrs (k: v: { - ep = v.ep; + # ep = v.ep; + inherit (v) ep; src = pkgs.writeText "${k}.el" v.src; }) fileContent; @@ -47,7 +48,7 @@ in }; localPackages = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule ({ ... }: { + type = lib.types.attrsOf (lib.types.submodule (_: { options = { tag = lib.mkOption { type = lib.types.str; }; comments = lib.mkOption { type = lib.types.listOf lib.types.str; }; @@ -153,7 +154,8 @@ in (pname: v: ep.trivialBuild { inherit pname; - src = v.src; + inherit (v) src; + # src = v.src; packageRequires = v.ep ep; }) confPackages; diff --git a/home/modules/programs/emacs/whichkey/default.nix b/home/modules/programs/emacs/whichkey/default.nix index c5de1225..e1453398 100644 --- a/home/modules/programs/emacs/whichkey/default.nix +++ b/home/modules/programs/emacs/whichkey/default.nix @@ -5,7 +5,7 @@ let cfg = config.programs.emacs.whichkey; enabled = config.programs.emacs.enable; - keyReplacementType = types.listOf (types.submodule ({ ... }: { + keyReplacementType = types.listOf (types.submodule (_: { options = { keys = lib.mkOption { type = types.str; diff --git a/lefthook.yml b/lefthook.yml index 322f6944..f2f4fabd 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -4,3 +4,10 @@ pre-commit: formatting: glob: "*.nix" run: nix shell --inputs-from . nixpkgs-2105#nixpkgs-fmt -c nixpkgs-fmt --check {all_files} + +statix: + parallel: false + commands: + statix: + glob: "*.nix" + run: statix check -i packages/nodePackages/node-env.nix nixos/modules/grafana.nix \ No newline at end of file diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index d1a93ab0..6bcd9d9a 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -56,7 +56,11 @@ services.zerotierone.enable = true; services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; - services.zerotierone.package = (import nixpkgs-2105 { config.allowUnfree = true; system = pkgs.system; }).zerotierone; + services.zerotierone.package = (import nixpkgs-2105 { + config.allowUnfree = true; + # system = pkgs.system; + inherit (pkgs) system; + }).zerotierone; # services.ipfs.enable = true; diff --git a/nixos/modules/hostnames.nix b/nixos/modules/hostnames.nix index 5d7877c2..a8bfe971 100644 --- a/nixos/modules/hostnames.nix +++ b/nixos/modules/hostnames.nix @@ -1,30 +1,6 @@ { config, lib, pkgs, ... }: -let - inherit (config.lib.nobbz) hostnames; - - kv = lib.attrsets.nameValuePair; - - hosts = lib.mapAttrs' (name: ip: kv ip ([ name "${name}.nobbz.lan" ])) hostnames; - - kubenames = [ - "minio.k3os.nobbz.lan" - "nexus.k3os.nobbz.lan" - "docker.k3os.nobbz.lan" - "argo.k3os.nobbz.lan" - ]; -in { - # lib.nobbz.hostnames = { - # thetys = "172.24.231.199"; - # enceladeus = "172.24.199.101"; - # }; - - # networking.hosts = hosts // { - # "192.168.122.122" = kubenames; - # "172.24.152.168" = [ "mimas" "mimas.nobbz.lan" ]; - # }; - networking.search = [ "internal.nobbz.dev" ]; networking.domain = "internal.nobbz.dev"; } diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 04fafac3..25714fb9 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -24,7 +24,7 @@ in config = lib.mkMerge [ (lib.mkIf (config.nix.experimentalFeatures != "") { nix.extraOptions = "experimental-features = ${config.nix.experimentalFeatures}"; }) - (lib.mkIf (allowed != [ ]) { nixpkgs.config.allowUnfreePredicate = (pkg: __elem (lib.getName pkg) allowed); }) + (lib.mkIf (allowed != [ ]) { nixpkgs.config.allowUnfreePredicate = pkg: __elem (lib.getName pkg) allowed; }) { nix.autoOptimiseStore = lib.mkDefault true; } { nix.gc.automatic = lib.mkDefault true; diff --git a/oldstuff/home/nix/myOverlay/default.nix b/oldstuff/home/nix/myOverlay/default.nix index 032222ba..abdcde35 100644 --- a/oldstuff/home/nix/myOverlay/default.nix +++ b/oldstuff/home/nix/myOverlay/default.nix @@ -21,5 +21,5 @@ rec { # keepass = # final.callPackage "${keepasspkgs}/pkgs/applications/misc/keepass" { }; - nobbzLib = (import ./lib); + nobbzLib = import ./lib; } From 059abf7688bfa3e35a31811ccee30e52f7507b24 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 4 Jan 2022 00:28:55 +0100 Subject: [PATCH 228/303] update node packages --- packages/nodePackages/default.nix | 2 +- packages/nodePackages/node-env.nix | 93 +- packages/nodePackages/node-packages.nix | 1134 +++++------------------ 3 files changed, 273 insertions(+), 956 deletions(-) diff --git a/packages/nodePackages/default.nix b/packages/nodePackages/default.nix index ba9d50d7..8360862d 100644 --- a/packages/nodePackages/default.nix +++ b/packages/nodePackages/default.nix @@ -9,7 +9,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/packages/nodePackages/node-env.nix b/packages/nodePackages/node-env.nix index 9bb0331f..63e444ea 100644 --- a/packages/nodePackages/node-env.nix +++ b/packages/nodePackages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{ lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile }: +{ lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript }: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -40,38 +40,22 @@ let ''; }; - includeDependencies = { dependencies }: - lib.optionalString (dependencies != [ ]) - (lib.concatMapStrings - (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) - dependencies); + local strippedName - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [ ], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -81,28 +65,55 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = { dependencies }: + lib.optionalString (dependencies != [ ]) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings + (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) + dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [ ], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -393,14 +404,15 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? { } , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -417,6 +429,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -449,6 +463,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) @@ -490,6 +509,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} diff --git a/packages/nodePackages/node-packages.nix b/packages/nodePackages/node-packages.nix index ccf061aa..56501f26 100644 --- a/packages/nodePackages/node-packages.nix +++ b/packages/nodePackages/node-packages.nix @@ -4,31 +4,31 @@ let sources = { - "@angular-devkit/architect-0.1202.6" = { + "@angular-devkit/architect-0.1301.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.6"; + version = "0.1301.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.6.tgz"; - sha512 = "DQHK5VGfPof1TuSmRmt2Usw2BuNVLzxKSSy7+tEJbYzqf8N/wQO+1M67ye8qf8gAU88xGo378dD9++DFc/PJZA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1301.2.tgz"; + sha512 = "v8e6OF80Ezo5MTHtFcq1AZJH+Wq+hN9pMZ1iLGkODIfKIW9zx6aPhx0JY0b7sZkfNVL8ay8JA8f339eBMnOE9A=="; }; }; - "@angular-devkit/core-12.2.6" = { + "@angular-devkit/core-13.1.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.2.6"; + version = "13.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.6.tgz"; - sha512 = "E+OhY34Vmwyy1/PaX/nzao40XM70wOr7Urh00sAtV8sPLXMLeW0gHk4DUchCKohxQkrIL0AxYt1aeUVgIc7bSA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.1.2.tgz"; + sha512 = "uXVesIRiCL/Nv+RSV8JM4j8IoZiGCGnqV2FOJ1hvH7DPxIjhjPMdG/B54xMydZpeASW3ofuxeORyAXxFIBm8Zg=="; }; }; - "@angular-devkit/schematics-12.2.6" = { + "@angular-devkit/schematics-13.1.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.2.6"; + version = "13.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.6.tgz"; - sha512 = "CmDNOdJg08p5QrV8dNdg3O5ErYM1hJT06PLnVZzTWkShAL0y/3zxXAP/Wwdg0vAvt9Kh38jvMtC3YTCOThR/hA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.1.2.tgz"; + sha512 = "ayYbHGU8QpMGx8ZyhKOBupz+Zfv/2H1pNQErahYV3qg7hA9hfjTGmNmDQ4iw0fiT04NajjUxuomlKsCsg7oXDw=="; }; }; "@gar/promisify-1.1.2" = { @@ -67,13 +67,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/fs-1.0.0" = { + "@npmcli/fs-1.1.0" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz"; - sha512 = "8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.0.tgz"; + sha512 = "VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA=="; }; }; "@npmcli/git-2.1.0" = { @@ -103,13 +103,13 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@npmcli/node-gyp-1.0.2" = { + "@npmcli/node-gyp-1.0.3" = { name = "_at_npmcli_slash_node-gyp"; packageName = "@npmcli/node-gyp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz"; - sha512 = "yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="; + url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz"; + sha512 = "fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA=="; }; }; "@npmcli/promise-spawn-1.3.2" = { @@ -121,49 +121,22 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.8.6" = { + "@npmcli/run-script-2.0.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.6.tgz"; - sha512 = "e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g=="; - }; - }; - "@rollup/plugin-commonjs-20.0.0" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "20.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz"; - sha512 = "5K0g5W2Ol8hAcTHqcTBHiA7M58tfmYi1o9KxeJuuRNpGaTa5iLjcyemBitCBcKXaHamOBBEH2dGom6v6Unmqjg=="; - }; - }; - "@rollup/plugin-node-resolve-13.0.4" = { - name = "_at_rollup_slash_plugin-node-resolve"; - packageName = "@rollup/plugin-node-resolve"; - version = "13.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz"; - sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w=="; - }; - }; - "@rollup/pluginutils-3.1.0" = { - name = "_at_rollup_slash_pluginutils"; - packageName = "@rollup/pluginutils"; - version = "3.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-2.0.0.tgz"; + sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; - "@schematics/angular-12.2.6" = { + "@schematics/angular-13.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.6"; + version = "13.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.6.tgz"; - sha512 = "53yVIB43jPpqitJXT5IxPm9Kq1P8AyRgzrCIKAl4mESsPsOIFR6ZCpuNRlaumEinHnbMpgzZ2M+RlialzAOS6w=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.1.2.tgz"; + sha512 = "OMbuOsnzUFjIGeo99NYwIPwjX6udJAiT5Sj5K7QZZYj66HuAqNBMV57J8GPA56edx5mOHZZApWMjXLlOxRXbJA=="; }; }; "@tootallnate/once-1.1.2" = { @@ -175,22 +148,13 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/estree-0.0.39" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; - }; - }; - "@types/fs-extra-9.0.12" = { + "@types/fs-extra-9.0.13" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; - version = "9.0.12"; + version = "9.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz"; - sha512 = "I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw=="; + url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; }; "@types/minimist-1.2.2" = { @@ -202,13 +166,13 @@ let sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/node-16.9.4" = { + "@types/node-16.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.9.4"; + version = "16.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.9.4.tgz"; - sha512 = "KDazLNYAGIuJugdbULwFZULF9qQ13yNWEBFnfVpqlpgAAo6H/qnM9RjBgh0A0kmHf3XxAKLdN5mTIng9iUvVLA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.18.tgz"; + sha512 = "7N8AOYWWYuw0g+K+GKCmIwfU1VMHcexYNpLPYzFZ4Uq2W6C/ptfeC7XhXgy/4pcwhz/9KoS5yijMfnYQ0u0Udw=="; }; }; "@types/node-fetch-2.5.12" = { @@ -220,15 +184,6 @@ let sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; }; }; - "@types/resolve-1.17.1" = { - name = "_at_types_slash_resolve"; - packageName = "@types/resolve"; - version = "1.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"; - sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; - }; - }; "@yarnpkg/lockfile-1.1.0" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -256,13 +211,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.1.4" = { + "agentkeepalive-4.2.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.1.4"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; - sha512 = "+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz"; + sha512 = "0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw=="; }; }; "aggregate-error-3.1.0" = { @@ -274,31 +229,22 @@ let sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; - "ajv-6.12.6" = { + "ajv-8.8.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.6"; + version = "8.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz"; + sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; }; }; - "ajv-8.6.2" = { - name = "ajv"; - packageName = "ajv"; - version = "8.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz"; - sha512 = "9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w=="; - }; - }; - "ajv-formats-2.1.0" = { + "ajv-formats-2.1.1" = { name = "ajv-formats"; packageName = "ajv-formats"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz"; - sha512 = "USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q=="; + url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"; + sha512 = "Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="; }; }; "ansi-colors-4.1.1" = { @@ -319,24 +265,6 @@ let sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -355,22 +283,22 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "aproba-1.2.0" = { + "aproba-2.0.0" = { name = "aproba"; packageName = "aproba"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; }; - "are-we-there-yet-1.1.7" = { + "are-we-there-yet-2.0.0" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; + sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; "array-union-3.0.1" = { @@ -382,24 +310,6 @@ let sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; }; }; - "asn1-0.2.4" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -409,24 +319,6 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.11.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; - }; - }; "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; @@ -445,15 +337,6 @@ let sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; - "bcrypt-pbkdf-1.0.2" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -490,15 +373,6 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; - "builtin-modules-3.2.0" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz"; - sha512 = "lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="; - }; - }; "builtins-1.0.3" = { name = "builtins"; packageName = "builtins"; @@ -517,15 +391,6 @@ let sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -571,13 +436,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-spinners-2.6.0" = { + "cli-spinners-2.6.1" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"; - sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz"; + sha512 = "x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="; }; }; "cli-width-3.0.0" = { @@ -598,15 +463,6 @@ let sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; }; }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; "color-convert-2.0.1" = { name = "color-convert"; packageName = "color-convert"; @@ -625,6 +481,15 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + }; + }; "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; @@ -634,15 +499,6 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "commondir-1.0.1" = { - name = "commondir"; - packageName = "commondir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; - sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; - }; - }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -661,49 +517,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "core-util-is-1.0.3" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "debug-4.3.2" = { + "debug-4.3.3" = { name = "debug"; packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; - "deepmerge-4.2.2" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.2.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; "defaults-1.0.3" = { @@ -769,15 +589,6 @@ let sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; - "ecc-jsbn-0.1.2" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -823,24 +634,6 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "estree-walker-1.0.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; - }; - }; - "estree-walker-2.0.2" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"; - sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; - }; - }; "event-stream-3.3.4" = { name = "event-stream"; packageName = "event-stream"; @@ -850,15 +643,6 @@ let sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; }; }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - }; "external-editor-3.1.0" = { name = "external-editor"; packageName = "external-editor"; @@ -868,15 +652,6 @@ let sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; }; }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -931,24 +706,6 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.3.3" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; - }; - }; "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; @@ -994,15 +751,6 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-2.3.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -1012,31 +760,22 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "gauge-2.7.4" = { + "gauge-4.0.0" = { name = "gauge"; packageName = "gauge"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz"; + sha512 = "F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw=="; }; }; - "glob-7.1.7" = { + "glob-7.2.0" = { name = "glob"; packageName = "glob"; - version = "7.1.7"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; "glob-parent-5.1.2" = { @@ -1066,24 +805,6 @@ let sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "har-validator-5.1.5" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; - sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; - }; - }; "has-1.0.3" = { name = "has"; packageName = "has"; @@ -1138,15 +859,6 @@ let sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; }; }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; "https-proxy-agent-5.0.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; @@ -1192,22 +904,22 @@ let sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; - "ignore-5.1.8" = { + "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; - version = "5.1.8"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; - sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; - "ignore-walk-3.0.4" = { + "ignore-walk-4.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "3.0.4"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; - sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz"; + sha512 = "rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw=="; }; }; "imurmurhash-0.1.4" = { @@ -1264,13 +976,13 @@ let sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; }; - "inquirer-8.1.2" = { + "inquirer-8.2.0" = { name = "inquirer"; packageName = "inquirer"; - version = "8.1.2"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz"; - sha512 = "DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz"; + sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; }; }; "ip-1.1.5" = { @@ -1282,13 +994,13 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; - "is-core-module-2.6.0" = { + "is-core-module-2.8.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.6.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; - sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; + sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; }; }; "is-docker-2.2.1" = { @@ -1309,24 +1021,6 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1336,13 +1030,13 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-glob-4.0.1" = { + "is-glob-4.0.3" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; "is-interactive-1.0.0" = { @@ -1363,15 +1057,6 @@ let sha1 = "3d9877899e6a53efc0160504cde15f82e6f061d5"; }; }; - "is-module-1.0.0" = { - name = "is-module"; - packageName = "is-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"; - sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; - }; - }; "is-number-7.0.0" = { name = "is-number"; packageName = "is-number"; @@ -1381,24 +1066,6 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-reference-1.2.1" = { - name = "is-reference"; - packageName = "is-reference"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; - sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; "is-unicode-supported-0.1.0" = { name = "is-unicode-supported"; packageName = "is-unicode-supported"; @@ -1417,15 +1084,6 @@ let sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -1435,24 +1093,6 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; @@ -1462,24 +1102,6 @@ let sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - }; "json-schema-traverse-1.0.0" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -1489,15 +1111,6 @@ let sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; "jsonc-parser-3.0.0" = { name = "jsonc-parser"; packageName = "jsonc-parser"; @@ -1525,15 +1138,6 @@ let sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -1606,22 +1210,22 @@ let sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; - "mime-db-1.49.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.49.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; - sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; - "mime-types-2.1.32" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.32"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; - sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "mimic-fn-2.1.0" = { @@ -1651,13 +1255,13 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "minipass-3.1.5" = { + "minipass-3.1.6" = { name = "minipass"; packageName = "minipass"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; - sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"; + sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; }; }; "minipass-collect-1.0.2" = { @@ -1759,22 +1363,22 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "node-fetch-2.6.4" = { + "node-fetch-2.6.6" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.4"; + version = "2.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.4.tgz"; - sha512 = "aD1fO+xtLiSCc9vuD+sYMxpIuQyhHscGSkBEo2o5LTV/3bTEAYvdUii29n8LlO5uLCmWdGP7uVUVXFo5SRdkLA=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz"; + sha512 = "Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA=="; }; }; - "node-gyp-7.1.2" = { + "node-gyp-8.4.1" = { name = "node-gyp"; packageName = "node-gyp"; - version = "7.1.2"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"; - sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; + sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; "nopt-5.0.0" = { @@ -1822,13 +1426,13 @@ let sha512 = "LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="; }; }; - "npm-packlist-2.2.2" = { + "npm-packlist-3.0.0" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "2.2.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.2.2.tgz"; - sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz"; + sha512 = "L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ=="; }; }; "npm-pick-manifest-6.1.1" = { @@ -1849,40 +1453,13 @@ let sha512 = "jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="; }; }; - "npmlog-4.1.2" = { + "npmlog-6.0.0" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "oauth-sign-0.9.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz"; + sha512 = "03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q=="; }; }; "once-1.4.0" = { @@ -1903,13 +1480,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "open-8.2.1" = { + "open-8.4.0" = { name = "open"; packageName = "open"; - version = "8.2.1"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.2.1.tgz"; - sha512 = "rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ=="; + url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; + sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; }; }; "ora-5.4.1" = { @@ -1939,13 +1516,13 @@ let sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; }; - "pacote-11.3.5" = { + "pacote-12.0.2" = { name = "pacote"; packageName = "pacote"; - version = "11.3.5"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.5.tgz"; - sha512 = "fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-12.0.2.tgz"; + sha512 = "Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg=="; }; }; "path-is-absolute-1.0.1" = { @@ -1984,31 +1561,13 @@ let sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - }; - "picomatch-2.3.0" = { + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; - sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "promise-inflight-1.0.1" = { @@ -2038,15 +1597,6 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; - "psl-1.8.0" = { - name = "psl"; - packageName = "psl"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; - }; - }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -2056,15 +1606,6 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "qs-6.5.2" = { - name = "qs"; - packageName = "qs"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; - }; - }; "queue-microtask-1.2.3" = { name = "queue-microtask"; packageName = "queue-microtask"; @@ -2083,15 +1624,6 @@ let sha512 = "W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ=="; }; }; - "readable-stream-2.3.7" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - }; "readable-stream-3.6.0" = { name = "readable-stream"; packageName = "readable-stream"; @@ -2101,15 +1633,6 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "request-2.88.2" = { - name = "request"; - packageName = "request"; - version = "2.88.2"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; - }; - }; "require-from-string-2.0.2" = { name = "require-from-string"; packageName = "require-from-string"; @@ -2164,15 +1687,6 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; - "rollup-2.56.3" = { - name = "rollup"; - packageName = "rollup"; - version = "2.56.3"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"; - sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg=="; - }; - }; "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; @@ -2200,22 +1714,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.3.0" = { + "rxjs-7.5.1" = { name = "rxjs"; packageName = "rxjs"; - version = "7.3.0"; + version = "7.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz"; - sha512 = "p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.1.tgz"; + sha512 = "KExVEeZWxMZnZhUZtsJcFwz8IvPvgu4G2Z2QyqjZQzUGr32KDYuSxrEYO4w3tFFNbfLozcrKUTvTPi+E9ywJkQ=="; }; }; "safe-buffer-5.2.1" = { @@ -2254,13 +1759,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "signal-exit-3.0.4" = { + "signal-exit-3.0.6" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"; - sha512 = "rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; }; }; "slash-4.0.0" = { @@ -2290,13 +1795,13 @@ let sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; }; }; - "socks-proxy-agent-6.1.0" = { + "socks-proxy-agent-6.1.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"; - sha512 = "57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg=="; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz"; + sha512 = "t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew=="; }; }; "source-map-0.7.3" = { @@ -2326,15 +1831,6 @@ let sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; }; }; - "sshpk-1.16.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; - }; - }; "ssri-8.0.1" = { name = "ssri"; packageName = "ssri"; @@ -2353,40 +1849,13 @@ let sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; }; }; - "string-width-1.0.2" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "1.0.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "string-width-4.2.2" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; - sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; "string_decoder-1.3.0" = { @@ -2398,31 +1867,13 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; - "strip-ansi-3.0.1" = { + "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "3.0.1"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "strip-ansi-6.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; "supports-color-7.2.0" = { @@ -2479,15 +1930,6 @@ let sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "tough-cookie-2.5.0" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; - }; - }; "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -2506,31 +1948,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.1.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; - sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "type-fest-0.21.3" = { @@ -2587,15 +2011,6 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.4.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; - }; - }; "uuid-8.3.2" = { name = "uuid"; packageName = "uuid"; @@ -2614,15 +2029,6 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; "wcwidth-1.0.1" = { name = "wcwidth"; packageName = "wcwidth"; @@ -2659,13 +2065,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "wide-align-1.1.3" = { + "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; "wrappy-1.0.2" = { @@ -2701,37 +2107,21 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@rollup/plugin-commonjs-20.0.0" - sources."@rollup/plugin-node-resolve-13.0.4" - (sources."@rollup/pluginutils-3.1.0" // { - dependencies = [ - sources."estree-walker-1.0.1" - ]; - }) - sources."@types/estree-0.0.39" - sources."@types/fs-extra-9.0.12" + sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-16.9.4" + sources."@types/node-16.11.18" sources."@types/node-fetch-2.5.12" - sources."@types/resolve-1.17.1" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."builtin-modules-3.2.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."duplexer-0.1.2" - sources."estree-walker-2.0.2" sources."event-stream-3.3.4" sources."fast-glob-3.2.7" sources."fastq-1.13.0" @@ -2739,49 +2129,31 @@ in sources."form-data-3.0.1" sources."from-0.1.7" sources."fs-extra-10.0.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-12.0.2" sources."graceful-fs-4.2.8" - sources."has-1.0.3" sources."has-flag-4.0.0" - sources."ignore-5.1.8" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-core-module-2.6.0" + sources."ignore-5.2.0" sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - sources."is-module-1.0.0" + sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."is-reference-1.2.1" sources."isexe-2.0.0" sources."jsonfile-6.1.0" - sources."magic-string-0.25.7" sources."map-stream-0.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.49.0" - sources."mime-types-2.1.32" - sources."minimatch-3.0.4" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" - sources."node-fetch-2.6.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" + sources."node-fetch-2.6.6" sources."path-type-4.0.0" sources."pause-stream-0.0.11" - sources."picomatch-2.3.0" + sources."picomatch-2.3.1" sources."ps-tree-1.2.0" sources."queue-microtask-1.2.3" - sources."resolve-1.20.0" sources."reusify-1.0.4" - sources."rollup-2.56.3" sources."run-parallel-1.2.0" sources."slash-4.0.0" - sources."sourcemap-codec-1.4.8" sources."split-0.3.3" sources."stream-combiner-0.0.4" sources."supports-color-7.2.0" @@ -2792,7 +2164,6 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -2800,88 +2171,70 @@ in homepage = "https://github.com/google/zx#readme"; license = "Apache-2.0"; }; - production = false; + production = true; bypassCache = true; reconstructLock = true; }; "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.6"; + version = "13.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.6.tgz"; - sha512 = "nBCynOi5OVVAXA4ktsVhWP+UyWjjR/7+TlEjNgEfcbtlwkE+HIki+oHETAtXKdn5nPvNum3OXPLZPLX2B8MiRA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.1.2.tgz"; + sha512 = "jEsQWzHgODFpppWGb49jfqlN8YYhphsKY3MPHlrjmd05qWgKItUGSgA46hSoDqjaJKVUN9koUnJBFCc9utERYA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.6" - sources."@angular-devkit/core-12.2.6" - sources."@angular-devkit/schematics-12.2.6" + sources."@angular-devkit/architect-0.1301.2" + sources."@angular-devkit/core-13.1.2" + sources."@angular-devkit/schematics-13.1.2" sources."@gar/promisify-1.1.2" - sources."@npmcli/fs-1.0.0" + sources."@npmcli/fs-1.1.0" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" - sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.6" - sources."@schematics/angular-12.2.6" + sources."@npmcli/run-script-2.0.0" + sources."@schematics/angular-13.1.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.1.4" + sources."agentkeepalive-4.2.0" sources."aggregate-error-3.1.0" - sources."ajv-8.6.2" - sources."ajv-formats-2.1.0" + sources."ajv-8.8.2" + sources."ajv-formats-2.1.1" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.7" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" + sources."aproba-2.0.0" + sources."are-we-there-yet-2.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."builtins-1.0.3" sources."cacache-15.3.0" - sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.0" + sources."cli-spinners-2.6.1" sources."cli-width-3.0.0" sources."clone-1.0.4" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" + sources."color-support-1.1.3" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - sources."dashdash-1.14.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."defaults-1.0.3" sources."define-lazy-prop-2.0.0" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { dependencies = [ @@ -2891,89 +2244,60 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."escape-string-regexp-1.0.5" - sources."extend-3.0.2" sources."external-editor-3.1.0" - sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."gauge-4.0.0" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" - sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" - sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.4" + sources."ignore-walk-4.0.1" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.1.2" // { + (sources."inquirer-8.2.0" // { dependencies = [ - sources."rxjs-7.3.0" - sources."tslib-2.1.0" + sources."rxjs-7.5.1" + sources."tslib-2.3.1" ]; }) sources."ip-1.1.5" - sources."is-core-module-2.6.0" + sources."is-core-module-2.8.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" - sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" - sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" sources."json-schema-traverse-1.0.0" - sources."json-stringify-safe-5.0.1" sources."jsonc-parser-3.0.0" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" sources."lodash-4.17.21" sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" sources."make-fetch-happen-9.1.0" - sources."mime-db-1.49.0" - sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minipass-3.1.5" + sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -2985,42 +2309,30 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."negotiator-0.6.2" - sources."node-gyp-7.1.2" + sources."node-gyp-8.4.1" sources."nopt-5.0.0" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.5" - sources."npm-packlist-2.2.2" + sources."npm-packlist-3.0.0" sources."npm-pick-manifest-6.1.1" sources."npm-registry-fetch-11.0.0" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" + sources."npmlog-6.0.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.2.1" + sources."open-8.4.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-11.3.5" + sources."pacote-12.0.2" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."performance-now-2.1.0" - sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.5.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" - (sources."request-2.88.2" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) sources."require-from-string-2.0.2" sources."resolve-1.20.0" sources."restore-cursor-3.1.0" @@ -3032,26 +2344,22 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.4" + sources."signal-exit-3.0.6" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-6.1.0" + sources."socks-proxy-agent-6.1.1" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" - sources."sshpk-1.16.1" sources."ssri-8.0.1" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.0.33" - sources."tough-cookie-2.5.0" sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-fest-0.21.3" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -3059,21 +2367,9 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."validate-npm-package-name-3.0.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) sources."wcwidth-1.0.1" sources."which-2.0.2" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -3083,7 +2379,7 @@ in homepage = "https://github.com/angular/angular-cli"; license = "MIT"; }; - production = false; + production = true; bypassCache = true; reconstructLock = true; }; From af38ea6a0eb90bb8d039db515934cf5779e1c0f7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 4 Jan 2022 01:30:15 +0100 Subject: [PATCH 229/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/150c09f3e3029b4d2f0ceecee2bf3d5148404767' (2022-01-03) → 'github:nix-community/emacs-overlay/2dbc208e1a3a1f09744ed819f4c9b676bfc15774' (2022-01-03) • Updated input 'home-manager': 'github:nix-community/home-manager/8e7a10602d1eb1d242c9d3f9b822203d5751a8c6' (2022-01-02) → 'github:nix-community/home-manager/65e5b835a94b3bca9a1e219e5c43c1bc5fc04598' (2022-01-03) • Updated input 'master': 'github:nixos/nixpkgs/75a86ab9f5691930f79de6c72e9f80eb280cf2dd' (2022-01-03) → 'github:nixos/nixpkgs/c18f3fb561626c7dbc82bd868b1a9c5e132721d9' (2022-01-04) • Updated input 'nix': 'github:nixos/nix/1c099dee673f203398fb8372472bddedffb4df7e' (2022-01-03) → 'github:nixos/nix/96d08fcd66e2c38598bab4f39a37a98d58347467' (2022-01-03) • Updated input 'unstable': 'github:nixos/nixpkgs/59bfda72480496f32787cec8c557182738b1bd3f' (2021-12-31) → 'github:nixos/nixpkgs/78cd22c1b8604de423546cd49bfe264b786eca13' (2022-01-03) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a5eb789d..4cf89be0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641205295, - "narHash": "sha256-DG1JHIBWfLu9wLXcyRyHeQCmbWjtHNKMWSEjJQrYfAU=", + "lastModified": 1641236893, + "narHash": "sha256-v2xqPcXVPVWXET3ym4XgfAwEtk4Fyg63l739ZOGvfYE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "150c09f3e3029b4d2f0ceecee2bf3d5148404767", + "rev": "2dbc208e1a3a1f09744ed819f4c9b676bfc15774", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1641121012, - "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=", + "lastModified": 1641236600, + "narHash": "sha256-Xsy/vV1iEMjldygMYys9Y7w/h/suzQfdORVbBfih/PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6", + "rev": "65e5b835a94b3bca9a1e219e5c43c1bc5fc04598", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641219057, - "narHash": "sha256-MSR+kkkYhLwywVabD5L7cD6oEIYG2sVhYqmAuBGu27s=", + "lastModified": 1641255501, + "narHash": "sha256-/KRNSVLnlMIoxavwYuSN+STVLjU36q8CsyByHmODw2M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "75a86ab9f5691930f79de6c72e9f80eb280cf2dd", + "rev": "c18f3fb561626c7dbc82bd868b1a9c5e132721d9", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1641216931, - "narHash": "sha256-+vnJvH5mEt1qDBK6LM/ablHqbW8F9sTDhug5a2ksIxw=", + "lastModified": 1641239518, + "narHash": "sha256-/+AU7SUs/BPVlQdapazTGiJhex/GwDWXbyflFnn8h8Y=", "owner": "nixos", "repo": "nix", - "rev": "1c099dee673f203398fb8372472bddedffb4df7e", + "rev": "96d08fcd66e2c38598bab4f39a37a98d58347467", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "unstable": { "locked": { - "lastModified": 1640959792, - "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=", + "lastModified": 1641230035, + "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59bfda72480496f32787cec8c557182738b1bd3f", + "rev": "78cd22c1b8604de423546cd49bfe264b786eca13", "type": "github" }, "original": { From 2ef716f7337989c22b6d0fbf24fba4b678695116 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 4 Jan 2022 10:32:04 +0100 Subject: [PATCH 230/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/2dbc208e1a3a1f09744ed819f4c9b676bfc15774' (2022-01-03) → 'github:nix-community/emacs-overlay/72fa28b1efd631423ce36a15e55fc18af30b6f52' (2022-01-04) • Updated input 'master': 'github:nixos/nixpkgs/c18f3fb561626c7dbc82bd868b1a9c5e132721d9' (2022-01-04) → 'github:nixos/nixpkgs/0432195a4b8d68faaa7d3d4b355260a3120aeeae' (2022-01-04) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/08370e1e271f6fe00d302bebbe510fe0e2c611ca' (2022-01-02) → 'github:nixos/nixpkgs/c6019d8efb5530dcf7ce98086b8e091be5ff900a' (2022-01-03) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 4cf89be0..a36eaeac 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641236893, - "narHash": "sha256-v2xqPcXVPVWXET3ym4XgfAwEtk4Fyg63l739ZOGvfYE=", + "lastModified": 1641262502, + "narHash": "sha256-25II7y/BV6quHI9gIGVAzeyNdmtL00vXsLywkrodDBg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2dbc208e1a3a1f09744ed819f4c9b676bfc15774", + "rev": "72fa28b1efd631423ce36a15e55fc18af30b6f52", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641255501, - "narHash": "sha256-/KRNSVLnlMIoxavwYuSN+STVLjU36q8CsyByHmODw2M=", + "lastModified": 1641285291, + "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c18f3fb561626c7dbc82bd868b1a9c5e132721d9", + "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1641147223, - "narHash": "sha256-eJnmISYGR7LeqEev4bsI/qcU0SgeFKHs3jnL4vMGL+k=", + "lastModified": 1641244400, + "narHash": "sha256-8i4oasWEz/2y9U+F1XU15jfwSbd5YOEBh2tyBBm/W8E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08370e1e271f6fe00d302bebbe510fe0e2c611ca", + "rev": "c6019d8efb5530dcf7ce98086b8e091be5ff900a", "type": "github" }, "original": { From 6b55d556b0369f53bad3ce4db3b1d43926994c16 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 4 Jan 2022 11:17:03 +0100 Subject: [PATCH 231/303] enceladeus: switch to lightdm --- nixos/configurations/enceladeus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index bf4e75d6..0cd6e376 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -116,7 +116,7 @@ # services.xserver.libinput.enable = true; # Enable the KDE Desktop Environment. - services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.lightdm.enable = true; services.xserver.desktopManager.plasma5.enable = false; services.xserver.windowManager.awesome.enable = true; From 121b9d6912648fe7fb057044c0e832c5ead9d494 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 4 Jan 2022 11:18:00 +0100 Subject: [PATCH 232/303] enceladeus: properly enable `zsh` --- nixos/configurations/enceladeus.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 0cd6e376..12cddb66 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -82,6 +82,7 @@ # started in user sessions. # programs.mtr.enable = true; # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; + programs.zsh.enable = true; # List services that you want to enable: From 1f9ea1e8b31096e8c9bdc04a7a4db3441acd38b5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 5 Jan 2022 17:41:27 +0100 Subject: [PATCH 233/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/72fa28b1efd631423ce36a15e55fc18af30b6f52' (2022-01-04) → 'github:nix-community/emacs-overlay/80fcee4b48e517338f370aa16c66d352d2a7ac6f' (2022-01-05) • Updated input 'home-manager': 'github:nix-community/home-manager/65e5b835a94b3bca9a1e219e5c43c1bc5fc04598' (2022-01-03) → 'github:nix-community/home-manager/426ab2cf111fca61308bd86fe652e14aa12cc2d2' (2022-01-05) • Updated input 'master': 'github:nixos/nixpkgs/0432195a4b8d68faaa7d3d4b355260a3120aeeae' (2022-01-04) → 'github:nixos/nixpkgs/ff81162833bf4614766c31f5c3056770817deeec' (2022-01-05) • Updated input 'nix': 'github:nixos/nix/96d08fcd66e2c38598bab4f39a37a98d58347467' (2022-01-03) → 'github:nixos/nix/6d7844695bf14c1fc68f051df0b98db442863fc9' (2022-01-05) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/932ec35ff8ac0fef5667ad2b0db4a009440255a9' (2021-12-31) → 'github:nixos/nixpkgs/88579effa7e88c25087faf6de6388d0cd1738dc0' (2022-01-03) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a36eaeac..64fe8606 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641262502, - "narHash": "sha256-25II7y/BV6quHI9gIGVAzeyNdmtL00vXsLywkrodDBg=", + "lastModified": 1641377966, + "narHash": "sha256-X+X02PyW5tzQwtiVI7NSmCwRwn0YFB3ohWl85qtVp1E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "72fa28b1efd631423ce36a15e55fc18af30b6f52", + "rev": "80fcee4b48e517338f370aa16c66d352d2a7ac6f", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1641236600, - "narHash": "sha256-Xsy/vV1iEMjldygMYys9Y7w/h/suzQfdORVbBfih/PU=", + "lastModified": 1641355100, + "narHash": "sha256-rg5VlPXjmmTxlHJllm3udjuMd2QjHPN1OuaAHn3fe1k=", "owner": "nix-community", "repo": "home-manager", - "rev": "65e5b835a94b3bca9a1e219e5c43c1bc5fc04598", + "rev": "426ab2cf111fca61308bd86fe652e14aa12cc2d2", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641285291, - "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "lastModified": 1641400366, + "narHash": "sha256-I7PsyWGgEU1EIi4U3vQSk/61Ij6dpAoDkMBoswruszA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "rev": "ff81162833bf4614766c31f5c3056770817deeec", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1641239518, - "narHash": "sha256-/+AU7SUs/BPVlQdapazTGiJhex/GwDWXbyflFnn8h8Y=", + "lastModified": 1641373862, + "narHash": "sha256-Jed7zYerhdc1rl4HPoAda08DfjBgtI1NtVAHXMR49zo=", "owner": "nixos", "repo": "nix", - "rev": "96d08fcd66e2c38598bab4f39a37a98d58347467", + "rev": "6d7844695bf14c1fc68f051df0b98db442863fc9", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1640929225, - "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=", + "lastModified": 1641229786, + "narHash": "sha256-WPPcLNbVu6ryj772GooUpF285LOvRHdOo/UNJgPnFYI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9", + "rev": "88579effa7e88c25087faf6de6388d0cd1738dc0", "type": "github" }, "original": { From ea2ea05e01c5865bd2376b37cbd29c95003720a2 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 6 Jan 2022 10:07:42 +0100 Subject: [PATCH 234/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/80fcee4b48e517338f370aa16c66d352d2a7ac6f' (2022-01-05) → 'github:nix-community/emacs-overlay/97739eb7f371e1f7262de20408b1320dbaa7ef1b' (2022-01-06) • Updated input 'home-manager': 'github:nix-community/home-manager/426ab2cf111fca61308bd86fe652e14aa12cc2d2' (2022-01-05) → 'github:nix-community/home-manager/c751aeb19e84a0a777f36fd5ea73482a066bb406' (2022-01-06) • Updated input 'master': 'github:nixos/nixpkgs/ff81162833bf4614766c31f5c3056770817deeec' (2022-01-05) → 'github:nixos/nixpkgs/9ccfc6f4c1a9b68d7f2a731cd03a33146307de0e' (2022-01-06) • Updated input 'nix': 'github:nixos/nix/6d7844695bf14c1fc68f051df0b98db442863fc9' (2022-01-05) → 'github:nixos/nix/bdc577936ff1214e5fb9c7d0f57ddc4a2241322d' (2022-01-06) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 64fe8606..d4eac087 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641377966, - "narHash": "sha256-X+X02PyW5tzQwtiVI7NSmCwRwn0YFB3ohWl85qtVp1E=", + "lastModified": 1641438420, + "narHash": "sha256-7NscOXXYd19X9Rmjz2LkIor61MchxTNme7Ado6dwPec=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "80fcee4b48e517338f370aa16c66d352d2a7ac6f", + "rev": "97739eb7f371e1f7262de20408b1320dbaa7ef1b", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1641355100, - "narHash": "sha256-rg5VlPXjmmTxlHJllm3udjuMd2QjHPN1OuaAHn3fe1k=", + "lastModified": 1641459437, + "narHash": "sha256-z0IOcc6LLbVhyri/aTyWzRqJs3p1pBK9idOiMwCWiqs=", "owner": "nix-community", "repo": "home-manager", - "rev": "426ab2cf111fca61308bd86fe652e14aa12cc2d2", + "rev": "c751aeb19e84a0a777f36fd5ea73482a066bb406", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641400366, - "narHash": "sha256-I7PsyWGgEU1EIi4U3vQSk/61Ij6dpAoDkMBoswruszA=", + "lastModified": 1641458378, + "narHash": "sha256-IOpajVxyF8T3Ym0DuebPDSkW9XySTev05zGbHH13Wtg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff81162833bf4614766c31f5c3056770817deeec", + "rev": "9ccfc6f4c1a9b68d7f2a731cd03a33146307de0e", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1641373862, - "narHash": "sha256-Jed7zYerhdc1rl4HPoAda08DfjBgtI1NtVAHXMR49zo=", + "lastModified": 1641454798, + "narHash": "sha256-p3MvHlS2ZuamM4/et0IGryJflGeJCBn7BZbao2qpZl0=", "owner": "nixos", "repo": "nix", - "rev": "6d7844695bf14c1fc68f051df0b98db442863fc9", + "rev": "bdc577936ff1214e5fb9c7d0f57ddc4a2241322d", "type": "github" }, "original": { From d5c0d10533390ff8b5616a2fe7d61f0b8511e479 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 6 Jan 2022 10:33:47 +0100 Subject: [PATCH 235/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'master': 'github:nixos/nixpkgs/9ccfc6f4c1a9b68d7f2a731cd03a33146307de0e' (2022-01-06) → 'github:nixos/nixpkgs/3096bd5746393afeb97170e2e635eefdedcf88c0' (2022-01-06) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d4eac087..37a3028e 100644 --- a/flake.lock +++ b/flake.lock @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641458378, - "narHash": "sha256-IOpajVxyF8T3Ym0DuebPDSkW9XySTev05zGbHH13Wtg=", + "lastModified": 1641460033, + "narHash": "sha256-Lf10TOyFF9AnFGc5HccHrsrYV/uZfAOcpxeFEd3DwHA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ccfc6f4c1a9b68d7f2a731cd03a33146307de0e", + "rev": "3096bd5746393afeb97170e2e635eefdedcf88c0", "type": "github" }, "original": { From 721bd5e65da7e9ab2dea61e3478d9477a2685ace Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 7 Jan 2022 15:57:59 +0100 Subject: [PATCH 236/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/97739eb7f371e1f7262de20408b1320dbaa7ef1b' (2022-01-06) → 'github:nix-community/emacs-overlay/a24f805ba1240a7adcf95e01d241a9ef2ed80bb7' (2022-01-07) • Updated input 'master': 'github:nixos/nixpkgs/3096bd5746393afeb97170e2e635eefdedcf88c0' (2022-01-06) → 'github:nixos/nixpkgs/bb40350e527facd331c700b6c5a3b744959d9301' (2022-01-07) • Updated input 'nix': 'github:nixos/nix/bdc577936ff1214e5fb9c7d0f57ddc4a2241322d' (2022-01-06) → 'github:nixos/nix/fcddaa4b9b22a910a24a513bc05579a12eb1db41' (2022-01-07) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/c6019d8efb5530dcf7ce98086b8e091be5ff900a' (2022-01-03) → 'github:nixos/nixpkgs/e67c94a1adbb5cf8a0448bc9c434589b2dd293c2' (2022-01-05) • Updated input 'unstable': 'github:nixos/nixpkgs/78cd22c1b8604de423546cd49bfe264b786eca13' (2022-01-03) → 'github:nixos/nixpkgs/ff377a78794d412a35245e05428c8f95fef3951f' (2022-01-07) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 37a3028e..39aedd89 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641438420, - "narHash": "sha256-7NscOXXYd19X9Rmjz2LkIor61MchxTNme7Ado6dwPec=", + "lastModified": 1641551382, + "narHash": "sha256-b9Tu6OSZg2QfD2c0UaAPPBufJ8Da/+fJxeozNr2CEEE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "97739eb7f371e1f7262de20408b1320dbaa7ef1b", + "rev": "a24f805ba1240a7adcf95e01d241a9ef2ed80bb7", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641460033, - "narHash": "sha256-Lf10TOyFF9AnFGc5HccHrsrYV/uZfAOcpxeFEd3DwHA=", + "lastModified": 1641566412, + "narHash": "sha256-gD/ozyiAUlrSV2lZ9UTlZbi1wcJmnuZpmGJCBkyzJ9U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3096bd5746393afeb97170e2e635eefdedcf88c0", + "rev": "bb40350e527facd331c700b6c5a3b744959d9301", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1641454798, - "narHash": "sha256-p3MvHlS2ZuamM4/et0IGryJflGeJCBn7BZbao2qpZl0=", + "lastModified": 1641558197, + "narHash": "sha256-9/k+6B7SteBS5nNrApRMysnQz+DjRNyxNi2rl9gUv+w=", "owner": "nixos", "repo": "nix", - "rev": "bdc577936ff1214e5fb9c7d0f57ddc4a2241322d", + "rev": "fcddaa4b9b22a910a24a513bc05579a12eb1db41", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1641244400, - "narHash": "sha256-8i4oasWEz/2y9U+F1XU15jfwSbd5YOEBh2tyBBm/W8E=", + "lastModified": 1641423937, + "narHash": "sha256-iIBSDySeZ79FDFiI5but9EtOIRc5Ncu/gq27Hg/yXjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6019d8efb5530dcf7ce98086b8e091be5ff900a", + "rev": "e67c94a1adbb5cf8a0448bc9c434589b2dd293c2", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "unstable": { "locked": { - "lastModified": 1641230035, - "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=", + "lastModified": 1641528457, + "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78cd22c1b8604de423546cd49bfe264b786eca13", + "rev": "ff377a78794d412a35245e05428c8f95fef3951f", "type": "github" }, "original": { From ea474fa12c746cbb09f96fd6331f078ae0041d63 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 9 Jan 2022 15:45:55 +0100 Subject: [PATCH 237/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/a24f805ba1240a7adcf95e01d241a9ef2ed80bb7' (2022-01-07) → 'github:nix-community/emacs-overlay/552395eb4ab9f9a6d39f78d92c08151bdd4c36d8' (2022-01-09) • Updated input 'home-manager': 'github:nix-community/home-manager/c751aeb19e84a0a777f36fd5ea73482a066bb406' (2022-01-06) → 'github:nix-community/home-manager/a90ddcd62748e445bbbe01834595eda29dc28db9' (2022-01-09) • Updated input 'master': 'github:nixos/nixpkgs/bb40350e527facd331c700b6c5a3b744959d9301' (2022-01-07) → 'github:nixos/nixpkgs/939a6495bd0983a3c0fb73a5bbc9223b76f3a358' (2022-01-09) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/e67c94a1adbb5cf8a0448bc9c434589b2dd293c2' (2022-01-05) → 'github:nixos/nixpkgs/36480448d470bf41bb21267cf9062a1542c4a95f' (2022-01-07) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 39aedd89..4fc9fcc0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641551382, - "narHash": "sha256-b9Tu6OSZg2QfD2c0UaAPPBufJ8Da/+fJxeozNr2CEEE=", + "lastModified": 1641724923, + "narHash": "sha256-q19K766EWH1rgv/6I1loH/CKqBft0TbvjoyY23jVraI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a24f805ba1240a7adcf95e01d241a9ef2ed80bb7", + "rev": "552395eb4ab9f9a6d39f78d92c08151bdd4c36d8", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1641459437, - "narHash": "sha256-z0IOcc6LLbVhyri/aTyWzRqJs3p1pBK9idOiMwCWiqs=", + "lastModified": 1641700429, + "narHash": "sha256-+Pd33S+4+VX6RYGJQ5Q4n46+iRLr9y9ilq9oC/bcnoc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c751aeb19e84a0a777f36fd5ea73482a066bb406", + "rev": "a90ddcd62748e445bbbe01834595eda29dc28db9", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641566412, - "narHash": "sha256-gD/ozyiAUlrSV2lZ9UTlZbi1wcJmnuZpmGJCBkyzJ9U=", + "lastModified": 1641738327, + "narHash": "sha256-B6YFs63Kf69RhXel8ohpW8hegQvBdYT8FkrMa+Srnqo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bb40350e527facd331c700b6c5a3b744959d9301", + "rev": "939a6495bd0983a3c0fb73a5bbc9223b76f3a358", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1641423937, - "narHash": "sha256-iIBSDySeZ79FDFiI5but9EtOIRc5Ncu/gq27Hg/yXjo=", + "lastModified": 1641593416, + "narHash": "sha256-Vn/vqQtYnVuZlbGGO0gSzLjmtFwb6OPvakwyoG1D/MY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e67c94a1adbb5cf8a0448bc9c434589b2dd293c2", + "rev": "36480448d470bf41bb21267cf9062a1542c4a95f", "type": "github" }, "original": { From da75ed1efe493dd7accc3b83c35963cc5b52320f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 13 Jan 2022 07:47:01 +0100 Subject: [PATCH 238/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/552395eb4ab9f9a6d39f78d92c08151bdd4c36d8' (2022-01-09) → 'github:nix-community/emacs-overlay/7b47359a8007a77b36c8bc2484930f988333f3ce' (2022-01-13) • Updated input 'home-manager': 'github:nix-community/home-manager/a90ddcd62748e445bbbe01834595eda29dc28db9' (2022-01-09) → 'github:nix-community/home-manager/d07df8d9a80a4a34ea881bee7860ae437c5d44a5' (2022-01-11) • Updated input 'master': 'github:nixos/nixpkgs/939a6495bd0983a3c0fb73a5bbc9223b76f3a358' (2022-01-09) → 'github:nixos/nixpkgs/2641efd7d026fc3a44c8cc83c6be959f7e3e99b1' (2022-01-13) • Updated input 'nix': 'github:nixos/nix/fcddaa4b9b22a910a24a513bc05579a12eb1db41' (2022-01-07) → 'github:nixos/nix/e61c4bc25a876ce303022435342748cafeced010' (2022-01-12) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/88579effa7e88c25087faf6de6388d0cd1738dc0' (2022-01-03) → 'github:nixos/nixpkgs/df123677560db3b0db7c19d71981b11091fbeaf6' (2022-01-09) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/36480448d470bf41bb21267cf9062a1542c4a95f' (2022-01-07) → 'github:nixos/nixpkgs/386234e2a61e1e8acf94dfa3a3d3ca19a6776efb' (2022-01-11) • Updated input 'unstable': 'github:nixos/nixpkgs/ff377a78794d412a35245e05428c8f95fef3951f' (2022-01-07) → 'github:nixos/nixpkgs/b2737d4980a17cc2b7d600d7d0b32fd7333aca88' (2022-01-11) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 4fc9fcc0..b7bdbc9d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641724923, - "narHash": "sha256-q19K766EWH1rgv/6I1loH/CKqBft0TbvjoyY23jVraI=", + "lastModified": 1642044102, + "narHash": "sha256-GjDR4EmJw+OUCapU8Lx4VqKsycfr9Kd1gbeHL32q0jM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "552395eb4ab9f9a6d39f78d92c08151bdd4c36d8", + "rev": "7b47359a8007a77b36c8bc2484930f988333f3ce", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1641700429, - "narHash": "sha256-+Pd33S+4+VX6RYGJQ5Q4n46+iRLr9y9ilq9oC/bcnoc=", + "lastModified": 1641937533, + "narHash": "sha256-IJbR1nNV6v/ruWv9iUFi9/qa8tFLmMhbVjzvhSWCWJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a90ddcd62748e445bbbe01834595eda29dc28db9", + "rev": "d07df8d9a80a4a34ea881bee7860ae437c5d44a5", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641738327, - "narHash": "sha256-B6YFs63Kf69RhXel8ohpW8hegQvBdYT8FkrMa+Srnqo=", + "lastModified": 1642052904, + "narHash": "sha256-q+faEQXptqjt1RrOJbVe+qb4NY8NlkjhZMlbyZ+raao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "939a6495bd0983a3c0fb73a5bbc9223b76f3a358", + "rev": "2641efd7d026fc3a44c8cc83c6be959f7e3e99b1", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1641558197, - "narHash": "sha256-9/k+6B7SteBS5nNrApRMysnQz+DjRNyxNi2rl9gUv+w=", + "lastModified": 1641981160, + "narHash": "sha256-rxsMtfTeIzZCyqLcjn91oOBsdnzHlHbqD9jR5s/8qwU=", "owner": "nixos", "repo": "nix", - "rev": "fcddaa4b9b22a910a24a513bc05579a12eb1db41", + "rev": "e61c4bc25a876ce303022435342748cafeced010", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1641229786, - "narHash": "sha256-WPPcLNbVu6ryj772GooUpF285LOvRHdOo/UNJgPnFYI=", + "lastModified": 1641734288, + "narHash": "sha256-/7YwWbvkjinc4uu5aUQMRw3xAthhOVH/esm4tCXPzIQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88579effa7e88c25087faf6de6388d0cd1738dc0", + "rev": "df123677560db3b0db7c19d71981b11091fbeaf6", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1641593416, - "narHash": "sha256-Vn/vqQtYnVuZlbGGO0gSzLjmtFwb6OPvakwyoG1D/MY=", + "lastModified": 1641870998, + "narHash": "sha256-6HkxR2WZsm37VoQS7jgp6Omd71iw6t1kP8bDbaqCDuI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36480448d470bf41bb21267cf9062a1542c4a95f", + "rev": "386234e2a61e1e8acf94dfa3a3d3ca19a6776efb", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "unstable": { "locked": { - "lastModified": 1641528457, - "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", + "lastModified": 1641887635, + "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff377a78794d412a35245e05428c8f95fef3951f", + "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88", "type": "github" }, "original": { From c113a97642041cf1a8c925bb8c747bad5c2921c3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 17 Jan 2022 10:34:05 +0100 Subject: [PATCH 239/303] enable VScode for thetys --- home/configurations/demo@thetys.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/configurations/demo@thetys.nix b/home/configurations/demo@thetys.nix index 4c00d740..e3fb9d0c 100644 --- a/home/configurations/demo@thetys.nix +++ b/home/configurations/demo@thetys.nix @@ -6,7 +6,7 @@ let in { config = { - nixpkgs.allowedUnfree = [ "google-chrome" ]; + nixpkgs.allowedUnfree = [ "google-chrome" "vscode" ]; activeProfiles = [ "browsing" "development" ]; @@ -65,6 +65,7 @@ in home.packages = [ stable.mysqlWorkbench self'.gnucash-de + pkgs.vscode ]; systemd.user.services = { From 6f25ec73b3fe0864f0d4861b6f18ca5d0035c81e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 17 Jan 2022 10:36:47 +0100 Subject: [PATCH 240/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/a24f805ba1240a7adcf95e01d241a9ef2ed80bb7' (2022-01-07) → 'github:nix-community/emacs-overlay/cdd347f1b966415c5473b3e3f4640c0d0fd13b55' (2022-01-16) • Updated input 'home-manager': 'github:nix-community/home-manager/c751aeb19e84a0a777f36fd5ea73482a066bb406' (2022-01-06) → 'github:nix-community/home-manager/f71d41ba360cd49b3647bf91402c7479e859fd2e' (2022-01-17) • Updated input 'master': 'github:nixos/nixpkgs/bb40350e527facd331c700b6c5a3b744959d9301' (2022-01-07) → 'github:nixos/nixpkgs/2cc9cae45db609b99f0167e8c041ab916dbbb7d3' (2022-01-17) • Updated input 'nix': 'github:nixos/nix/fcddaa4b9b22a910a24a513bc05579a12eb1db41' (2022-01-07) → 'github:nixos/nix/008ddef4b08e9bee530a5a4c597c88b344089021' (2022-01-17) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/88579effa7e88c25087faf6de6388d0cd1738dc0' (2022-01-03) → 'github:nixos/nixpkgs/0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00' (2022-01-15) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/e67c94a1adbb5cf8a0448bc9c434589b2dd293c2' (2022-01-05) → 'github:nixos/nixpkgs/3ddd960a3b575bf3230d0e59f42614b71f9e0db9' (2022-01-14) • Updated input 'statix': 'github:nerdypepper/statix/94a2edf57340ac3f3a2276c88a221ba3125172af' (2021-12-14) → 'github:nerdypepper/statix/23892b034d710bfbfa1f82c48fbfecb68f791f13' (2022-01-15) • Updated input 'statix/fenix': 'github:nix-community/fenix/78a0c55b6f9d8bb6f3b89eb995fa5bbdd73e9475' (2021-11-28) → 'github:nix-community/fenix/d75ffc9f1d3b60bb597e48ae01f486a6de27d30e' (2022-01-14) • Updated input 'statix/fenix/rust-analyzer-src': 'github:rust-analyzer/rust-analyzer/d9b2291f546abc77d24499339a72a89127464b95' (2021-11-27) → 'github:rust-analyzer/rust-analyzer/b4c31481a554d0132003228ba319bd9476fe85ae' (2022-01-13) • Updated input 'statix/nixpkgs': 'github:nixos/nixpkgs/9c191ebcdfe917043195c54ab6ae8e934434fe7b' (2021-11-27) → 'github:nixos/nixpkgs/46821ea01c8f54d2a20f5a503809abfc605269d7' (2022-01-13) • Updated input 'unstable': 'github:nixos/nixpkgs/ff377a78794d412a35245e05428c8f95fef3951f' (2022-01-07) → 'github:nixos/nixpkgs/5aaed40d22f0d9376330b6fa413223435ad6fee5' (2022-01-13) --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 39aedd89..d4bfe7d4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1641551382, - "narHash": "sha256-b9Tu6OSZg2QfD2c0UaAPPBufJ8Da/+fJxeozNr2CEEE=", + "lastModified": 1642358862, + "narHash": "sha256-tttyyXdpOQYxFG3HkOOcK0dFxBpdaeWHRrIWWnQRZYA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a24f805ba1240a7adcf95e01d241a9ef2ed80bb7", + "rev": "cdd347f1b966415c5473b3e3f4640c0d0fd13b55", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1638080655, - "narHash": "sha256-ZPx8e8CukEBx31IcgivAWnN9Jg0r+LTBPHV7fREf+QI=", + "lastModified": 1642141613, + "narHash": "sha256-WFS7T5oOLD8anu/77iz7EPz7zQsJZtP5qVa5485k3dI=", "owner": "nix-community", "repo": "fenix", - "rev": "78a0c55b6f9d8bb6f3b89eb995fa5bbdd73e9475", + "rev": "d75ffc9f1d3b60bb597e48ae01f486a6de27d30e", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1641459437, - "narHash": "sha256-z0IOcc6LLbVhyri/aTyWzRqJs3p1pBK9idOiMwCWiqs=", + "lastModified": 1642379981, + "narHash": "sha256-FE0RIZmrG2ScKGRthNzcFAssLW7MgMLun0g7Qg2zZMA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c751aeb19e84a0a777f36fd5ea73482a066bb406", + "rev": "f71d41ba360cd49b3647bf91402c7479e859fd2e", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1641566412, - "narHash": "sha256-gD/ozyiAUlrSV2lZ9UTlZbi1wcJmnuZpmGJCBkyzJ9U=", + "lastModified": 1642412001, + "narHash": "sha256-/KuxH05H4KlYhpcEoFXYQ6MC9gNE4aLhafNBAl4ZZn8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bb40350e527facd331c700b6c5a3b744959d9301", + "rev": "2cc9cae45db609b99f0167e8c041ab916dbbb7d3", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1641558197, - "narHash": "sha256-9/k+6B7SteBS5nNrApRMysnQz+DjRNyxNi2rl9gUv+w=", + "lastModified": 1642410885, + "narHash": "sha256-Sbd9dC8OTVMeml4it8s8X8eXWCpNrWOH0rIVSEM6+6c=", "owner": "nixos", "repo": "nix", - "rev": "fcddaa4b9b22a910a24a513bc05579a12eb1db41", + "rev": "008ddef4b08e9bee530a5a4c597c88b344089021", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1641229786, - "narHash": "sha256-WPPcLNbVu6ryj772GooUpF285LOvRHdOo/UNJgPnFYI=", + "lastModified": 1642244250, + "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88579effa7e88c25087faf6de6388d0cd1738dc0", + "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1641423937, - "narHash": "sha256-iIBSDySeZ79FDFiI5but9EtOIRc5Ncu/gq27Hg/yXjo=", + "lastModified": 1642190797, + "narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e67c94a1adbb5cf8a0448bc9c434589b2dd293c2", + "rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1638036523, - "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=", + "lastModified": 1642069818, + "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9c191ebcdfe917043195c54ab6ae8e934434fe7b", + "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7", "type": "github" }, "original": { @@ -305,11 +305,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1638036899, - "narHash": "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=", + "lastModified": 1642101527, + "narHash": "sha256-C4zcaWULWlrirpEt/pA85CCMBt+7SWZweMaMJ7EvrXw=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "d9b2291f546abc77d24499339a72a89127464b95", + "rev": "b4c31481a554d0132003228ba319bd9476fe85ae", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1639455627, - "narHash": "sha256-vqGwh1AndJAG4lpHtRhfkvu+yAoo0Qxym0c6Imr7StA=", + "lastModified": 1642238855, + "narHash": "sha256-K+J3KeUnjoqMpL67sX7pQodCCCDTrfXSrd8sn/TnZEw=", "owner": "nerdypepper", "repo": "statix", - "rev": "94a2edf57340ac3f3a2276c88a221ba3125172af", + "rev": "23892b034d710bfbfa1f82c48fbfecb68f791f13", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "unstable": { "locked": { - "lastModified": 1641528457, - "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", + "lastModified": 1642104392, + "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff377a78794d412a35245e05428c8f95fef3951f", + "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", "type": "github" }, "original": { From a6d366ec2a50b45353ca9b813d528d92cb7e6c8d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 19 Jan 2022 10:11:33 +0100 Subject: [PATCH 241/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/cdd347f1b966415c5473b3e3f4640c0d0fd13b55' (2022-01-16) → 'github:nix-community/emacs-overlay/bce6deb97784a09d6ca5aa0680d5d32eaf3d5586' (2022-01-18) • Updated input 'home-manager': 'github:nix-community/home-manager/f71d41ba360cd49b3647bf91402c7479e859fd2e' (2022-01-17) → 'github:nix-community/home-manager/c491331718bd41722a2982a5532eb0ff51c3ca28' (2022-01-17) • Updated input 'master': 'github:nixos/nixpkgs/2cc9cae45db609b99f0167e8c041ab916dbbb7d3' (2022-01-17) → 'github:nixos/nixpkgs/f12f99a320c2c748421970800162f462f8dba7e3' (2022-01-19) • Updated input 'nix': 'github:nixos/nix/008ddef4b08e9bee530a5a4c597c88b344089021' (2022-01-17) → 'github:nixos/nix/bc443511eb65420b51d10708e25427fe50de37a8' (2022-01-19) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/3ddd960a3b575bf3230d0e59f42614b71f9e0db9' (2022-01-14) → 'github:nixos/nixpkgs/610d4ea2750e064bf34b33fa38cb671edd893d3d' (2022-01-18) • Updated input 'unstable': 'github:nixos/nixpkgs/5aaed40d22f0d9376330b6fa413223435ad6fee5' (2022-01-13) → 'github:nixos/nixpkgs/d5dae6569ea9952f1ae4e727946d93a71c507821' (2022-01-15) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d4bfe7d4..a2d881d5 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1642358862, - "narHash": "sha256-tttyyXdpOQYxFG3HkOOcK0dFxBpdaeWHRrIWWnQRZYA=", + "lastModified": 1642531343, + "narHash": "sha256-8i1fPpjbwFQoVwJ3hPXKAolMJgdv2UrA/kLpY5V93TQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cdd347f1b966415c5473b3e3f4640c0d0fd13b55", + "rev": "bce6deb97784a09d6ca5aa0680d5d32eaf3d5586", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1642379981, - "narHash": "sha256-FE0RIZmrG2ScKGRthNzcFAssLW7MgMLun0g7Qg2zZMA=", + "lastModified": 1642463065, + "narHash": "sha256-Db53xzDOouhsDAQ/QCvLeM0r7p+my5Zb5jgWGpCrOVo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f71d41ba360cd49b3647bf91402c7479e859fd2e", + "rev": "c491331718bd41722a2982a5532eb0ff51c3ca28", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1642412001, - "narHash": "sha256-/KuxH05H4KlYhpcEoFXYQ6MC9gNE4aLhafNBAl4ZZn8=", + "lastModified": 1642582762, + "narHash": "sha256-0P5eulkDD6fXSun2LzRSsuTltq7ceQg5YPzohRUPOUc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2cc9cae45db609b99f0167e8c041ab916dbbb7d3", + "rev": "f12f99a320c2c748421970800162f462f8dba7e3", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1642410885, - "narHash": "sha256-Sbd9dC8OTVMeml4it8s8X8eXWCpNrWOH0rIVSEM6+6c=", + "lastModified": 1642583127, + "narHash": "sha256-WyCL2SDApuIjQngO0UozOBI/iDUUoDW1QEQ/MUUu/Ec=", "owner": "nixos", "repo": "nix", - "rev": "008ddef4b08e9bee530a5a4c597c88b344089021", + "rev": "bc443511eb65420b51d10708e25427fe50de37a8", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1642190797, - "narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=", + "lastModified": 1642522226, + "narHash": "sha256-m/j9U8KYuwwxjwgRCjmEj8ejftvdMLJ+NGXh/L2I4FU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9", + "rev": "610d4ea2750e064bf34b33fa38cb671edd893d3d", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "unstable": { "locked": { - "lastModified": 1642104392, - "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", + "lastModified": 1642281915, + "narHash": "sha256-jcMsXmmO1knyf99o242A+2cy1A0eKa9afly0cwBknPA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", + "rev": "d5dae6569ea9952f1ae4e727946d93a71c507821", "type": "github" }, "original": { From ebfaccb99d05a0cf2261d4c0129276d0abfd046c Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 20 Jan 2022 11:03:14 +0100 Subject: [PATCH 242/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/bce6deb97784a09d6ca5aa0680d5d32eaf3d5586' (2022-01-18) → 'github:nix-community/emacs-overlay/6dc044d3d10a69d455c9cb1a7698622f6a92a7df' (2022-01-20) • Updated input 'master': 'github:nixos/nixpkgs/f12f99a320c2c748421970800162f462f8dba7e3' (2022-01-19) → 'github:nixos/nixpkgs/fb7a531aa006fe98eb7395e50bf07536696786e9' (2022-01-20) • Updated input 'nix': 'github:nixos/nix/bc443511eb65420b51d10708e25427fe50de37a8' (2022-01-19) → 'github:nixos/nix/067076287bf601f8fa2ffe4feff3057b96fa5be8' (2022-01-20) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/610d4ea2750e064bf34b33fa38cb671edd893d3d' (2022-01-18) → 'github:nixos/nixpkgs/77aa71f66fd05d9e7b7d1c084865d703a8008ab7' (2022-01-19) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a2d881d5..8feca43e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1642531343, - "narHash": "sha256-8i1fPpjbwFQoVwJ3hPXKAolMJgdv2UrA/kLpY5V93TQ=", + "lastModified": 1642647885, + "narHash": "sha256-/qPFVD8iVNaecoEREtp8oV7KU7H/JX1CS5CroUzYklM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bce6deb97784a09d6ca5aa0680d5d32eaf3d5586", + "rev": "6dc044d3d10a69d455c9cb1a7698622f6a92a7df", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1642582762, - "narHash": "sha256-0P5eulkDD6fXSun2LzRSsuTltq7ceQg5YPzohRUPOUc=", + "lastModified": 1642672892, + "narHash": "sha256-TjDwwQYcnhOMhKrgWqfifYRIhEq/rUwfaeEVqtzkRzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f12f99a320c2c748421970800162f462f8dba7e3", + "rev": "fb7a531aa006fe98eb7395e50bf07536696786e9", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1642583127, - "narHash": "sha256-WyCL2SDApuIjQngO0UozOBI/iDUUoDW1QEQ/MUUu/Ec=", + "lastModified": 1642655591, + "narHash": "sha256-CtljkgWm9X6f/KObz9CRfpw1nfZ5EQX+/A3Oy8sIbYA=", "owner": "nixos", "repo": "nix", - "rev": "bc443511eb65420b51d10708e25427fe50de37a8", + "rev": "067076287bf601f8fa2ffe4feff3057b96fa5be8", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1642522226, - "narHash": "sha256-m/j9U8KYuwwxjwgRCjmEj8ejftvdMLJ+NGXh/L2I4FU=", + "lastModified": 1642609835, + "narHash": "sha256-ZwJnV4mdis28u5vH240ec2mrApuEJYJekn23qlTwJ8c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "610d4ea2750e064bf34b33fa38cb671edd893d3d", + "rev": "77aa71f66fd05d9e7b7d1c084865d703a8008ab7", "type": "github" }, "original": { From 63ddd01c21c692af1096272162e0e8c8a82d0525 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 20 Jan 2022 16:26:22 +0100 Subject: [PATCH 243/303] use proper theme and dconf packages --- home/modules/profiles/base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index d0e8980c..bfd6370e 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -35,11 +35,11 @@ in }; gtk.enable = true; - gtk.theme.package = pkgs.gnome3.gnome_themes_standard; + gtk.theme.package = pkgs.gnome3.gnome-themes-extra; gtk.theme.name = "Adwaita-dark"; home.keyboard.layout = "de"; - home.packages = [ pkgs.hydra-check pkgs.gnome3.dconf ]; + home.packages = [ pkgs.hydra-check pkgs.dconf ]; xsession = { enable = true; From 8a1eb89cb1c892118007c1a2088522775bb3a443 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 21 Jan 2022 21:07:57 +0100 Subject: [PATCH 244/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/6dc044d3d10a69d455c9cb1a7698622f6a92a7df' (2022-01-20) → 'github:nix-community/emacs-overlay/fe974d5484e81c93c8b574f7b3f208334a322eb1' (2022-01-21) • Updated input 'flake-utils': 'github:numtide/flake-utils/74f7e4319258e287b0f9cb95426c9853b282730b' (2021-11-28) → 'github:numtide/flake-utils/846b2ae0fc4cc943637d3d1def4454213e203cba' (2022-01-20) • Updated input 'home-manager': 'github:nix-community/home-manager/c491331718bd41722a2982a5532eb0ff51c3ca28' (2022-01-17) → 'github:nix-community/home-manager/7eb5106548eaab99ebeb21c87f93092de54fe931' (2022-01-20) • Updated input 'master': 'github:nixos/nixpkgs/fb7a531aa006fe98eb7395e50bf07536696786e9' (2022-01-20) → 'github:nixos/nixpkgs/0ef11c63c633a26508474527117f7eccf0db469b' (2022-01-21) • Updated input 'nix': 'github:nixos/nix/067076287bf601f8fa2ffe4feff3057b96fa5be8' (2022-01-20) → 'github:nixos/nix/5f08db69d18ea5b868cbb58993822e7dd0307518' (2022-01-21) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/77aa71f66fd05d9e7b7d1c084865d703a8008ab7' (2022-01-19) → 'github:nixos/nixpkgs/6f07605b6916abee5435ea1145a7541299a87c1b' (2022-01-20) • Updated input 'unstable': 'github:nixos/nixpkgs/d5dae6569ea9952f1ae4e727946d93a71c507821' (2022-01-15) → 'github:nixos/nixpkgs/6d8215281b2f87a5af9ed7425a26ac575da0438f' (2022-01-19) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 8feca43e..98eb69fb 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1642647885, - "narHash": "sha256-/qPFVD8iVNaecoEREtp8oV7KU7H/JX1CS5CroUzYklM=", + "lastModified": 1642790458, + "narHash": "sha256-I3vriJApvy0LhwOpnTTQVvEpve1L7ple4vw/8vvYMOM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6dc044d3d10a69d455c9cb1a7698622f6a92a7df", + "rev": "fe974d5484e81c93c8b574f7b3f208334a322eb1", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1642463065, - "narHash": "sha256-Db53xzDOouhsDAQ/QCvLeM0r7p+my5Zb5jgWGpCrOVo=", + "lastModified": 1642676973, + "narHash": "sha256-bLQ6n0pXYaIuNSyJnm30JGCfjmuTi59qAmj8S2ExDXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "c491331718bd41722a2982a5532eb0ff51c3ca28", + "rev": "7eb5106548eaab99ebeb21c87f93092de54fe931", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1642672892, - "narHash": "sha256-TjDwwQYcnhOMhKrgWqfifYRIhEq/rUwfaeEVqtzkRzY=", + "lastModified": 1642794537, + "narHash": "sha256-wylo/vWRoxHIr/OvXvhdf3KerBtj01e15ctaDpGKO10=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7a531aa006fe98eb7395e50bf07536696786e9", + "rev": "0ef11c63c633a26508474527117f7eccf0db469b", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1642655591, - "narHash": "sha256-CtljkgWm9X6f/KObz9CRfpw1nfZ5EQX+/A3Oy8sIbYA=", + "lastModified": 1642777172, + "narHash": "sha256-Sh37PkGIiMhhaiM33+TvacbgQHtg93YITMY0orGJ7y8=", "owner": "nixos", "repo": "nix", - "rev": "067076287bf601f8fa2ffe4feff3057b96fa5be8", + "rev": "5f08db69d18ea5b868cbb58993822e7dd0307518", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1642609835, - "narHash": "sha256-ZwJnV4mdis28u5vH240ec2mrApuEJYJekn23qlTwJ8c=", + "lastModified": 1642707142, + "narHash": "sha256-BzH6xhnkn52yF4+A8C8slWFQRMInS5VYlzrH/rN1bnA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77aa71f66fd05d9e7b7d1c084865d703a8008ab7", + "rev": "6f07605b6916abee5435ea1145a7541299a87c1b", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "unstable": { "locked": { - "lastModified": 1642281915, - "narHash": "sha256-jcMsXmmO1knyf99o242A+2cy1A0eKa9afly0cwBknPA=", + "lastModified": 1642635915, + "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d5dae6569ea9952f1ae4e727946d93a71c507821", + "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f", "type": "github" }, "original": { From 9fab05c5b3d4b75cabaad726efa9bdc916e3f9aa Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 25 Jan 2022 08:29:20 +0100 Subject: [PATCH 245/303] mimas: try to traefik for fritz-box --- nixos/configurations/mimas.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 001fa87a..833222de 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -297,8 +297,10 @@ in }; minio = { entryPoints = [ "http" ]; - rule = "Host(`minio.mimas.internal.nobbz.dev`) && PathPrefix(`/`)"; - service = "minio"; + rule = "Host(`fritz.mimas.internal.nobbz.dev`) && PathPrefix(`/`)"; + service = "fritz"; + tls.domains = [{ main = "*.mimas.internal.nobbz.dev"; }]; + tls.certResolver = "mimasWildcard"; }; minio-tls = { entryPoints = [ "https" "experimental" ]; @@ -311,6 +313,9 @@ in http.services = { minio.loadBalancer.passHostHeader = true; minio.loadBalancer.servers = [{ url = "http://192.168.122.122/"; }]; + + fritz.loadBalancer.passHostHeader = false; + fritz.loadBalancer.servers = [{ url = "http://fritz.box"; }]; }; }; From 2755994af3444c169b85529944a77a2649bb57ca Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 25 Jan 2022 10:15:11 +0100 Subject: [PATCH 246/303] Fix dconf on mimas --- nixos/configurations/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 833222de..34f2702a 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -142,7 +142,7 @@ in services.xserver.desktopManager.plasma5.enable = true; services.xserver.windowManager.awesome.enable = true; - services.dbus.packages = with pkgs; [ gnome3.dconf ]; + services.dbus.packages = with pkgs; [ pkgs.dconf ]; services.udev.extraRules = '' KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666" From 7b8bf1442d15f183f88239a5a45bf7c9fe532aac Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 25 Jan 2022 22:59:53 +0100 Subject: [PATCH 247/303] remove broken disk --- nixos/configurations/hardware/mimas.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index 6bc4bf9c..e72f9c66 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -48,15 +48,15 @@ fsType = "ext4"; }; - fileSystems."/var/lib/restic" = { - device = "/dev/disk/by-uuid/3eb6492a-b126-4ad5-b9df-4eb47df1135c"; - fsType = "ext4"; - }; + # fileSystems."/var/lib/restic" = { + # device = "/dev/disk/by-uuid/3eb6492a-b126-4ad5-b9df-4eb47df1135c"; + # fsType = "ext4"; + # }; - fileSystems."/var/lib/ums" = { - device = "/dev/disk/by-label/ums"; - fsType = "ext4"; - }; + # fileSystems."/var/lib/ums" = { + # device = "/dev/disk/by-label/ums"; + # fsType = "ext4"; + # }; fileSystems."/boot" = { From c83ddba8a28bcba509e7156b93f9aa77448bd634 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 3 Feb 2022 15:49:45 +0100 Subject: [PATCH 248/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/cae9afd0e907be25c65a7ad109815e9df839dd79' (2022-01-25) → 'github:nix-community/emacs-overlay/4faef893814812fda93cc04081d40a09b2064dd9' (2022-02-03) • Updated input 'home-manager': 'github:nix-community/home-manager/462d4a7abdfb8cb762584745a480ad01c207570e' (2022-01-24) → 'github:nix-community/home-manager/9d369c75ce2fdeb296ad42bcdc8c1a523c494550' (2022-02-02) • Updated input 'master': 'github:nixos/nixpkgs/b602b511e14318e31afc3b8528070337970f9756' (2022-01-25) → 'github:nixos/nixpkgs/2a5733edb60c86115f6b7c67f292aba43a87993b' (2022-02-03) • Updated input 'nix': 'github:nixos/nix/0a70b37b5694c769fb855c1afe7642407d1db64f' (2022-01-25) → 'github:nixos/nix/fcb33440b6d3038e6761e546fc9434fa8e9a1666' (2022-02-02) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/604c44137d97b5111be1ca5c0d97f6e24fbc5c2c' (2022-01-23) → 'github:nixos/nixpkgs/0f316e4d72daed659233817ffe52bf08e081b5de' (2022-01-30) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/d7cc2887ac9e65dd01715aac472edbf46b93ed31' (2021-12-24) → 'github:nix-community/rnix-lsp/41eb2f3366e3f351bf2563c2a7c46fd17e78dfe0' (2022-01-30) • Updated input 'rnix-lsp/utils': 'github:numtide/flake-utils/997f7efcb746a9c140ce1f13c72263189225f482' (2021-08-20) → 'github:numtide/flake-utils/74f7e4319258e287b0f9cb95426c9853b282730b' (2021-11-28) • Updated input 'statix': 'github:nerdypepper/statix/7cc887807552b2286c0db5806a9426b3bb50a2be' (2022-01-23) → 'github:nerdypepper/statix/ade09b4d172ff649b716a05ce597d2da864a3623' (2022-01-30) • Updated input 'unstable': 'github:nixos/nixpkgs/689b76bcf36055afdeb2e9852f5ecdd2bf483f87' (2022-01-23) → 'github:nixos/nixpkgs/554d2d8aa25b6e583575459c297ec23750adb6cb' (2022-02-02) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 1271a598..f7857dce 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1643079680, - "narHash": "sha256-2dS8LLdMgM+M9t3CEy4ehMo3bPH1coxSVfCuGlj1mms=", + "lastModified": 1643884389, + "narHash": "sha256-egklJobUIsOELxfsjs2f+gX0qKieTuSkVFtt6HtuDCY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cae9afd0e907be25c65a7ad109815e9df839dd79", + "rev": "4faef893814812fda93cc04081d40a09b2064dd9", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1643066491, - "narHash": "sha256-wIgqFCJ6v7COpgNY0lMHDnU9RP2dJgasa2jKkB0zhWw=", + "lastModified": 1643837728, + "narHash": "sha256-iW/5eMRQmzdctv2dAUlIaZnVWwcmaznNajS+ft1MXHg=", "owner": "nix-community", "repo": "home-manager", - "rev": "462d4a7abdfb8cb762584745a480ad01c207570e", + "rev": "9d369c75ce2fdeb296ad42bcdc8c1a523c494550", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1643093768, - "narHash": "sha256-q/gNZaMHEFGRQ5SXdMXL/VtHD2KwBWwDf8oa7fw5XvU=", + "lastModified": 1643899676, + "narHash": "sha256-8MZEfhLN5EtaIWLf48qgYaupgXqfLfAeUnO6QrNZ6GY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b602b511e14318e31afc3b8528070337970f9756", + "rev": "2a5733edb60c86115f6b7c67f292aba43a87993b", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1643070524, - "narHash": "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg=", + "lastModified": 1643838728, + "narHash": "sha256-ow8b33C/owhzXMBBIgkEGxVq/SG8l0sY7hks9HDdy/w=", "owner": "nixos", "repo": "nix", - "rev": "0a70b37b5694c769fb855c1afe7642407d1db64f", + "rev": "fcb33440b6d3038e6761e546fc9434fa8e9a1666", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1642961095, - "narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=", + "lastModified": 1643503720, + "narHash": "sha256-tJic20ufuRnG8V+fTCd3YU6xl1ImxNspoEkXHct0AG4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c", + "rev": "0f316e4d72daed659233817ffe52bf08e081b5de", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1640347520, - "narHash": "sha256-UkieGBW9ap0pQbumYoG60Ed+BpzMRGuLQ6Zb41u7Fkk=", + "lastModified": 1643586450, + "narHash": "sha256-BRIAc3+zavSlJPYSbov2n1W9/a4Iuh2swFPYRWjCm1g=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "d7cc2887ac9e65dd01715aac472edbf46b93ed31", + "rev": "41eb2f3366e3f351bf2563c2a7c46fd17e78dfe0", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1642912683, - "narHash": "sha256-Q7DElhLh10fK3qf+8IAPwi0JY+rPVqx2CNafxvNKNEg=", + "lastModified": 1643526578, + "narHash": "sha256-+PFujQQ18khy/tr63hOzqfSnwspMFt84Pml7r5OuWPk=", "owner": "nerdypepper", "repo": "statix", - "rev": "7cc887807552b2286c0db5806a9426b3bb50a2be", + "rev": "ade09b4d172ff649b716a05ce597d2da864a3623", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "unstable": { "locked": { - "lastModified": 1642903813, - "narHash": "sha256-0lNfGW8sNfyTrixoQhVG00Drl/ECaf5GbfKAQ1ZDoyE=", + "lastModified": 1643805626, + "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "689b76bcf36055afdeb2e9852f5ecdd2bf483f87", + "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "utils": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { From 5aa03826846e19559273f1d49ab7b89d05370965 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 5 Feb 2022 10:44:08 +0100 Subject: [PATCH 249/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/4faef893814812fda93cc04081d40a09b2064dd9' (2022-02-03) → 'github:nix-community/emacs-overlay/096ed0fdbcf962135ffba53b3cfeb470c40c7e11' (2022-02-05) • Updated input 'home-manager': 'github:nix-community/home-manager/9d369c75ce2fdeb296ad42bcdc8c1a523c494550' (2022-02-02) → 'github:nix-community/home-manager/63dccc4e60422c1db2c3929b2fd1541f36b7e664' (2022-02-04) • Updated input 'master': 'github:nixos/nixpkgs/2a5733edb60c86115f6b7c67f292aba43a87993b' (2022-02-03) → 'github:nixos/nixpkgs/415bdaa0ffe7e512b3ddd7de7586a307f1cc361d' (2022-02-05) • Updated input 'nix': 'github:nixos/nix/fcb33440b6d3038e6761e546fc9434fa8e9a1666' (2022-02-02) → 'github:nixos/nix/bd383d1b6f91c4fe7ac21c52771e92027f649fa0' (2022-02-03) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/0f316e4d72daed659233817ffe52bf08e081b5de' (2022-01-30) → 'github:nixos/nixpkgs/f6ddd55d5f9d5eca08df138c248008c1ba73ecec' (2022-02-02) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f7857dce..09b9610b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1643884389, - "narHash": "sha256-egklJobUIsOELxfsjs2f+gX0qKieTuSkVFtt6HtuDCY=", + "lastModified": 1644031301, + "narHash": "sha256-eg+qSYb1IVWTD2M83hkZA4HlqUAIv2tpp3yKrZS6QT8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4faef893814812fda93cc04081d40a09b2064dd9", + "rev": "096ed0fdbcf962135ffba53b3cfeb470c40c7e11", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1643837728, - "narHash": "sha256-iW/5eMRQmzdctv2dAUlIaZnVWwcmaznNajS+ft1MXHg=", + "lastModified": 1643933104, + "narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d369c75ce2fdeb296ad42bcdc8c1a523c494550", + "rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1643899676, - "narHash": "sha256-8MZEfhLN5EtaIWLf48qgYaupgXqfLfAeUnO6QrNZ6GY=", + "lastModified": 1644049346, + "narHash": "sha256-FBHEO/hOP6yLfw8N0Ui5Aj89Bpx15xeHYlMSfe7vM3s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2a5733edb60c86115f6b7c67f292aba43a87993b", + "rev": "415bdaa0ffe7e512b3ddd7de7586a307f1cc361d", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1643838728, - "narHash": "sha256-ow8b33C/owhzXMBBIgkEGxVq/SG8l0sY7hks9HDdy/w=", + "lastModified": 1643931201, + "narHash": "sha256-/1ZPEah8fGsvGlR72Nwl3v6FmT89VHIif4DgVSwZczw=", "owner": "nixos", "repo": "nix", - "rev": "fcb33440b6d3038e6761e546fc9434fa8e9a1666", + "rev": "bd383d1b6f91c4fe7ac21c52771e92027f649fa0", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1643503720, - "narHash": "sha256-tJic20ufuRnG8V+fTCd3YU6xl1ImxNspoEkXHct0AG4=", + "lastModified": 1643788601, + "narHash": "sha256-6l5Ax44pC/Oo/Muj5Y/NA27Pd38Wty/7GtGSSmYNug4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0f316e4d72daed659233817ffe52bf08e081b5de", + "rev": "f6ddd55d5f9d5eca08df138c248008c1ba73ecec", "type": "github" }, "original": { From 5be571642798d14f06fd7586d1eea382e464c9b9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 5 Feb 2022 22:36:09 +0100 Subject: [PATCH 250/303] use ZFS compatible kernel --- nixos/configurations/mimas.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 34f2702a..7c8cdb69 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -20,6 +20,7 @@ in boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = [ "ntfs" "exfat" "avfs" ]; boot.cleanTmpDir = true; + boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; services.lvm.boot.thin.enable = true; From 9a5e5ef408fdbfb0a3d1ff406717997ce08350dc Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 5 Feb 2022 23:43:52 +0100 Subject: [PATCH 251/303] fix warnings --- nixos/configurations/default.nix | 2 +- nixos/configurations/hardware/enceladeus.nix | 2 +- nixos/configurations/hardware/mimas.nix | 2 +- nixos/configurations/hardware/thetys.nix | 2 +- nixos/configurations/thetys.nix | 2 -- nixos/modules/cachix/caches/nix-community.nix | 4 ++-- nixos/modules/cachix/caches/nobbz.nix | 4 ++-- nixos/modules/cachix/caches/ts-helper.nix | 4 ++-- nixos/modules/cachix/default.nix | 2 +- nixos/modules/nix.nix | 2 +- 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/nixos/configurations/default.nix b/nixos/configurations/default.nix index 0a1f0174..60c0d64b 100644 --- a/nixos/configurations/default.nix +++ b/nixos/configurations/default.nix @@ -2,6 +2,6 @@ { mimas = self.lib.mkSystem "mimas" inputs.unstable; # nixpkgs-2105; - enceladeus = self.lib.mkSystem "enceladeus" inputs.nixpkgs-2111; + enceladeus = self.lib.mkSystem "enceladeus" inputs.unstable; thetys = self.lib.mkSystem "thetys" inputs.unstable; } diff --git a/nixos/configurations/hardware/enceladeus.nix b/nixos/configurations/hardware/enceladeus.nix index fcbea4e4..c6439292 100644 --- a/nixos/configurations/hardware/enceladeus.nix +++ b/nixos/configurations/hardware/enceladeus.nix @@ -39,5 +39,5 @@ swapDevices = [{ device = "/dev/disk/by-uuid/87c5fea1-6bcb-41d4-af9d-b9342a45c9b3"; }]; - nix.maxJobs = lib.mkDefault 1; + nix.settings.max-jobs = lib.mkDefault 1; } diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index e72f9c66..cc00356b 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -66,7 +66,7 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.opengl.extraPackages = with pkgs; [ diff --git a/nixos/configurations/hardware/thetys.nix b/nixos/configurations/hardware/thetys.nix index 67620f34..327ea718 100644 --- a/nixos/configurations/hardware/thetys.nix +++ b/nixos/configurations/hardware/thetys.nix @@ -24,6 +24,6 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 2; + nix.settings.max-jobs = lib.mkDefault 2; virtualisation.virtualbox.guest.enable = true; } diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 6bcd9d9a..f4f3ff52 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -28,8 +28,6 @@ programs.zsh.enable = true; programs.zsh.enableCompletion = false; - nix.useSandbox = true; - virtualisation = { docker.enable = true; docker.extraOptions = "--insecure-registry registry.cap01.cloudseeds.de"; diff --git a/nixos/modules/cachix/caches/nix-community.nix b/nixos/modules/cachix/caches/nix-community.nix index 20a3ddf9..9c27fb72 100644 --- a/nixos/modules/cachix/caches/nix-community.nix +++ b/nixos/modules/cachix/caches/nix-community.nix @@ -2,10 +2,10 @@ { nix = lib.mkIf (config.networking.hostName != "delly-nixos") { - binaryCaches = [ + settings.substituters = [ "https://nix-community.cachix.org" ]; - binaryCachePublicKeys = [ + settings.trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; diff --git a/nixos/modules/cachix/caches/nobbz.nix b/nixos/modules/cachix/caches/nobbz.nix index dc26edca..4b242b9f 100644 --- a/nixos/modules/cachix/caches/nobbz.nix +++ b/nixos/modules/cachix/caches/nobbz.nix @@ -2,10 +2,10 @@ { nix = lib.mkIf (config.networking.hostName != "delly-nixos") { - binaryCaches = [ + settings.substituters = [ "https://nobbz.cachix.org" ]; - binaryCachePublicKeys = [ + settings.trusted-public-keys = [ "nobbz.cachix.org-1:fODxpqE4ni+pFDSuj2ybYZbMUjmxNTjA7rtUNHW61Ok=" ]; }; diff --git a/nixos/modules/cachix/caches/ts-helper.nix b/nixos/modules/cachix/caches/ts-helper.nix index a7dc190c..07f43bf1 100644 --- a/nixos/modules/cachix/caches/ts-helper.nix +++ b/nixos/modules/cachix/caches/ts-helper.nix @@ -2,10 +2,10 @@ { nix = lib.mkIf (config.networking.hostName != "delly-nixos") { - binaryCaches = [ + settings.substituters = [ "https://ts-helper.cachix.org" ]; - binaryCachePublicKeys = [ + settings.trusted-public-keys = [ "ts-helper.cachix.org-1:l9XtzxPqlR/lKsKpTS+DcCn4cCuYiUSgGzIsLF3vz9Q=" ]; }; diff --git a/nixos/modules/cachix/default.nix b/nixos/modules/cachix/default.nix index 38ad5750..9dd55b5d 100644 --- a/nixos/modules/cachix/default.nix +++ b/nixos/modules/cachix/default.nix @@ -7,7 +7,7 @@ let in { inherit imports; - nix.binaryCaches = [ "https://cache.nixos.org/" ]; + nix.settings.substituters = [ "https://cache.nixos.org/" ]; environment.systemPackages = [ pkgs.cachix ]; } diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 25714fb9..347168cb 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -25,7 +25,7 @@ in config = lib.mkMerge [ (lib.mkIf (config.nix.experimentalFeatures != "") { nix.extraOptions = "experimental-features = ${config.nix.experimentalFeatures}"; }) (lib.mkIf (allowed != [ ]) { nixpkgs.config.allowUnfreePredicate = pkg: __elem (lib.getName pkg) allowed; }) - { nix.autoOptimiseStore = lib.mkDefault true; } + { nix.settings.auto-optimise-store = lib.mkDefault true; } { nix.gc.automatic = lib.mkDefault true; nix.gc.options = lib.mkDefault "--delete-older-than 10d"; From c760db313bfec06e42d7a436e1b51bb337927a17 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 11 Feb 2022 07:59:36 +0100 Subject: [PATCH 252/303] update lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 09b9610b..39a0a782 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1644031301, - "narHash": "sha256-eg+qSYb1IVWTD2M83hkZA4HlqUAIv2tpp3yKrZS6QT8=", + "lastModified": 1644489947, + "narHash": "sha256-dUracTZi1GBr4F2QK6OcpdXXEkCjf3QNX4V11zFyY0o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "096ed0fdbcf962135ffba53b3cfeb470c40c7e11", + "rev": "e81fa762762f1f20e0ad2d928280bdeedd9bc7df", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1643933104, - "narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=", + "lastModified": 1644346464, + "narHash": "sha256-hS8hwbr/PflMIfTWTmB7Xo5jIrsWhSAqtz5XXxPa0zQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664", + "rev": "e2aa1f598674aa9c06f28f5db60b89f37f1e961b", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1644049346, - "narHash": "sha256-FBHEO/hOP6yLfw8N0Ui5Aj89Bpx15xeHYlMSfe7vM3s=", + "lastModified": 1644515259, + "narHash": "sha256-sf650Khvd+qReGcUTETnMsR6/9gJ8LFno36gEWlZoLg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "415bdaa0ffe7e512b3ddd7de7586a307f1cc361d", + "rev": "3d50f50730da33cdd3e7cf884f52582ff6abd1d0", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1643931201, - "narHash": "sha256-/1ZPEah8fGsvGlR72Nwl3v6FmT89VHIif4DgVSwZczw=", + "lastModified": 1644487858, + "narHash": "sha256-XHD55Yokwls21Csy1SWFospECPUg3cVj21oRsDOUthE=", "owner": "nixos", "repo": "nix", - "rev": "bd383d1b6f91c4fe7ac21c52771e92027f649fa0", + "rev": "b8d57e28839587832109f6607eb28819559fc30c", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1643788601, - "narHash": "sha256-6l5Ax44pC/Oo/Muj5Y/NA27Pd38Wty/7GtGSSmYNug4=", + "lastModified": 1644193793, + "narHash": "sha256-ggCI5LCXwkUJQwjpkr9qDFbQMiK3JvAfeNR4Uy0ny5Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f6ddd55d5f9d5eca08df138c248008c1ba73ecec", + "rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1643526578, - "narHash": "sha256-+PFujQQ18khy/tr63hOzqfSnwspMFt84Pml7r5OuWPk=", + "lastModified": 1644422658, + "narHash": "sha256-ibz5b+amOTlLxDlCPrC7A6rSFac3JXwiq3HMyIJwdUw=", "owner": "nerdypepper", "repo": "statix", - "rev": "ade09b4d172ff649b716a05ce597d2da864a3623", + "rev": "2aec51a44015e9d466cd4bde3951e4f7e31db0cc", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "unstable": { "locked": { - "lastModified": 1643805626, - "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", + "lastModified": 1644420267, + "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", + "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1", "type": "github" }, "original": { From 8848aa0cc4d65d7960ec2c8535e33d212e6691d2 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 11 Feb 2022 08:00:44 +0100 Subject: [PATCH 253/303] thetys: enable ZFS --- nixos/configurations/thetys.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 6bcd9d9a..f4ba8450 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -4,6 +4,10 @@ # TODO: 👇 move import of `virtualbox-demo.nix` into extra module 👇 imports = [ (modulesPath + "/installer/virtualbox-demo.nix") ]; + boot.initrd.supportedFilesystems = [ "zfs" ]; # boot from zfs + boot.supportedFilesystems = [ "zfs" ]; + networking.hostId = "deadbeef"; + programs.gnupg = { agent = { enable = true; From d3f6a211b64bcf81ba9c37ff02226f6277a35c59 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 13 Feb 2022 18:33:11 +0100 Subject: [PATCH 254/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/e81fa762762f1f20e0ad2d928280bdeedd9bc7df' (2022-02-10) → 'github:nix-community/emacs-overlay/31e9b8c9f4d69d47625efb2510815ec5f529b20c' (2022-02-13) • Updated input 'home-manager': 'github:nix-community/home-manager/e2aa1f598674aa9c06f28f5db60b89f37f1e961b' (2022-02-08) → 'github:nix-community/home-manager/7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06' (2022-02-12) • Updated input 'master': 'github:nixos/nixpkgs/3d50f50730da33cdd3e7cf884f52582ff6abd1d0' (2022-02-10) → 'github:nixos/nixpkgs/8bd4ebee3289ad387903d38828bd6f12edbc7210' (2022-02-13) • Updated input 'nix': 'github:nixos/nix/b8d57e28839587832109f6607eb28819559fc30c' (2022-02-10) → 'github:nixos/nix/4d67ecbbb2a00b22b1b23073f5853bcb5b100b75' (2022-02-11) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/521e4d7d13b09bc0a21976b9d19abd197d4e3b1e' (2022-02-07) → 'github:nixos/nixpkgs/7adc9c14ec74b27358a8df9b973087e351425a79' (2022-02-10) • Updated input 'unstable': 'github:nixos/nixpkgs/98bb5b77c8c6666824a4c13d23befa1e07210ef1' (2022-02-09) → 'github:nixos/nixpkgs/48d63e924a2666baf37f4f14a18f19347fbd54a2' (2022-02-10) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 39a0a782..aed24faf 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1644489947, - "narHash": "sha256-dUracTZi1GBr4F2QK6OcpdXXEkCjf3QNX4V11zFyY0o=", + "lastModified": 1644747720, + "narHash": "sha256-X1D6tIzEkMDK+qvQkBN5KLIwdu9lRUZmXXPSct4f5Wo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e81fa762762f1f20e0ad2d928280bdeedd9bc7df", + "rev": "31e9b8c9f4d69d47625efb2510815ec5f529b20c", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1644346464, - "narHash": "sha256-hS8hwbr/PflMIfTWTmB7Xo5jIrsWhSAqtz5XXxPa0zQ=", + "lastModified": 1644706973, + "narHash": "sha256-xOyxrhc5V79u0ZNmnPmJbY3ngtp43dNISEmrb8Ie6wQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e2aa1f598674aa9c06f28f5db60b89f37f1e961b", + "rev": "7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1644515259, - "narHash": "sha256-sf650Khvd+qReGcUTETnMsR6/9gJ8LFno36gEWlZoLg=", + "lastModified": 1644773500, + "narHash": "sha256-8envOerCfxn8aNJwEtgUFJUB8hLT/aau9uiNn3SJ5xw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3d50f50730da33cdd3e7cf884f52582ff6abd1d0", + "rev": "8bd4ebee3289ad387903d38828bd6f12edbc7210", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1644487858, - "narHash": "sha256-XHD55Yokwls21Csy1SWFospECPUg3cVj21oRsDOUthE=", + "lastModified": 1644598800, + "narHash": "sha256-wce8M8AAFilvENjojAHZd62blCqvoGZcN5yUPB65g6A=", "owner": "nixos", "repo": "nix", - "rev": "b8d57e28839587832109f6607eb28819559fc30c", + "rev": "4d67ecbbb2a00b22b1b23073f5853bcb5b100b75", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1644193793, - "narHash": "sha256-ggCI5LCXwkUJQwjpkr9qDFbQMiK3JvAfeNR4Uy0ny5Q=", + "lastModified": 1644472683, + "narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e", + "rev": "7adc9c14ec74b27358a8df9b973087e351425a79", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "unstable": { "locked": { - "lastModified": 1644420267, - "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { From c8764beb814874b36a25c3048eea37ab653b9bb1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 13 Feb 2022 20:29:28 +0100 Subject: [PATCH 255/303] update and lock to working python commit --- flake.lock | 8 ++++---- flake.nix | 2 +- nixos/configurations/mimas.nix | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index aed24faf..9c5cd211 100644 --- a/flake.lock +++ b/flake.lock @@ -357,17 +357,17 @@ }, "unstable": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "lastModified": 1644420267, + "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 20c8dae3..dc47a175 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs.nixpkgs-2105.url = "github:nixos/nixpkgs/nixos-21.05"; inputs.nixpkgs-2111.url = "github:nixos/nixpkgs/nixos-21.11"; - inputs.unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + inputs.unstable.url = "github:nixos/nixpkgs/98bb5b77c8c6666824a4c13d23befa1e07210ef1"; # nixos-unstable"; inputs.master.url = "github:nixos/nixpkgs/master"; inputs.nix.url = "github:nixos/nix/master"; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 7c8cdb69..2ade8aaa 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -71,7 +71,10 @@ in # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ virt-manager iptables ]; + environment.systemPackages = with pkgs; [ + virt-manager + iptables + ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. From 3e3142e90a139c828ff946f36f5079eff309bd85 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 15 Feb 2022 06:44:17 +0100 Subject: [PATCH 256/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/31e9b8c9f4d69d47625efb2510815ec5f529b20c' (2022-02-13) → 'github:nix-community/emacs-overlay/38122d98f38674d21d1ee16f34006b6fe7195949' (2022-02-15) • Updated input 'master': 'github:nixos/nixpkgs/8bd4ebee3289ad387903d38828bd6f12edbc7210' (2022-02-13) → 'github:nixos/nixpkgs/3a641defd170a4ef25ce8c7c64cb13f91f867fca' (2022-02-15) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/7adc9c14ec74b27358a8df9b973087e351425a79' (2022-02-10) → 'github:nixos/nixpkgs/c28fb0a4671ff2715c1922719797615945e5b6a0' (2022-02-13) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9c5cd211..4bf2762c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1644747720, - "narHash": "sha256-X1D6tIzEkMDK+qvQkBN5KLIwdu9lRUZmXXPSct4f5Wo=", + "lastModified": 1644894171, + "narHash": "sha256-rfXg5zwrErkVKCKkVG+otV60dTkrP2ODRNDKzniBAns=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "31e9b8c9f4d69d47625efb2510815ec5f529b20c", + "rev": "38122d98f38674d21d1ee16f34006b6fe7195949", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1644773500, - "narHash": "sha256-8envOerCfxn8aNJwEtgUFJUB8hLT/aau9uiNn3SJ5xw=", + "lastModified": 1644898910, + "narHash": "sha256-eNUp37Ms7D+2XRv09lygClWEpTu1s8GYD8a+aH8XiRo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bd4ebee3289ad387903d38828bd6f12edbc7210", + "rev": "3a641defd170a4ef25ce8c7c64cb13f91f867fca", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1644598800, - "narHash": "sha256-wce8M8AAFilvENjojAHZd62blCqvoGZcN5yUPB65g6A=", + "lastModified": 1644872771, + "narHash": "sha256-tx8V0AQZbTEyZYrif5Z41m9QmDQcOPOYjqvsl45AD8M=", "owner": "nixos", "repo": "nix", - "rev": "4d67ecbbb2a00b22b1b23073f5853bcb5b100b75", + "rev": "94992a919636fb9df4c7441dacbde08592e4494d", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1644472683, - "narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=", + "lastModified": 1644750380, + "narHash": "sha256-c4LvV88zB9YvM/6rLElbq4e62XtEO9pBINqsrlmH++M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7adc9c14ec74b27358a8df9b973087e351425a79", + "rev": "c28fb0a4671ff2715c1922719797615945e5b6a0", "type": "github" }, "original": { From f18c992bc07c9e6a2d58f68dd5672752541cf7b1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 16 Feb 2022 15:38:12 +0100 Subject: [PATCH 257/303] thetys: disable docker live-restore --- nixos/configurations/thetys.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 361a05d0..1c4f9536 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -35,6 +35,7 @@ virtualisation = { docker.enable = true; docker.extraOptions = "--insecure-registry registry.cap01.cloudseeds.de"; + docker.liveRestore = true; podman.enable = true; }; From e9e17e48bee463b94602243ae6516f633c9ac73a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 16 Feb 2022 15:56:59 +0100 Subject: [PATCH 258/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/31e9b8c9f4d69d47625efb2510815ec5f529b20c' (2022-02-13) → 'github:nix-community/emacs-overlay/782eb436de6f370bfae8ded4d81b0bb002310623' (2022-02-16) • Updated input 'home-manager': 'github:nix-community/home-manager/7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06' (2022-02-12) → 'github:nix-community/home-manager/50204cea940ffe8aa479c255e84ba1f633084a13' (2022-02-15) • Updated input 'master': 'github:nixos/nixpkgs/8bd4ebee3289ad387903d38828bd6f12edbc7210' (2022-02-13) → 'github:nixos/nixpkgs/5e0670ee9117d180e3220cd367ac67b440474349' (2022-02-16) • Updated input 'nix': 'github:nixos/nix/4d67ecbbb2a00b22b1b23073f5853bcb5b100b75' (2022-02-11) → 'github:nixos/nix/aa5b83d93ce1b7bb67bf81ceda7ebf7706b1efa0' (2022-02-16) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/7adc9c14ec74b27358a8df9b973087e351425a79' (2022-02-10) → 'github:nixos/nixpkgs/a03ae0e6d078cfdbb8404c3bff3622bd4e2f1c57' (2022-02-14) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9c5cd211..1ce73da1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1644747720, - "narHash": "sha256-X1D6tIzEkMDK+qvQkBN5KLIwdu9lRUZmXXPSct4f5Wo=", + "lastModified": 1645002771, + "narHash": "sha256-Aau+bnZhMd3iciXlos4QbaM7zGfNaGKtsS7KaR4NfeE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "31e9b8c9f4d69d47625efb2510815ec5f529b20c", + "rev": "782eb436de6f370bfae8ded4d81b0bb002310623", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1644706973, - "narHash": "sha256-xOyxrhc5V79u0ZNmnPmJbY3ngtp43dNISEmrb8Ie6wQ=", + "lastModified": 1644961661, + "narHash": "sha256-x1XdER7VT4jqePCWGGutPL46OxJyw8EGFF3rBn0rsuo=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06", + "rev": "50204cea940ffe8aa479c255e84ba1f633084a13", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1644773500, - "narHash": "sha256-8envOerCfxn8aNJwEtgUFJUB8hLT/aau9uiNn3SJ5xw=", + "lastModified": 1645021969, + "narHash": "sha256-vc1GxhFKgX2EJHX+ckVfcDEOigvW8YppkcT8o0YnOJk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bd4ebee3289ad387903d38828bd6f12edbc7210", + "rev": "5e0670ee9117d180e3220cd367ac67b440474349", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1644598800, - "narHash": "sha256-wce8M8AAFilvENjojAHZd62blCqvoGZcN5yUPB65g6A=", + "lastModified": 1645006441, + "narHash": "sha256-TU6DmiGp5AubjVx+gWVkSYKntJojgmySTuvzagfhCok=", "owner": "nixos", "repo": "nix", - "rev": "4d67ecbbb2a00b22b1b23073f5853bcb5b100b75", + "rev": "aa5b83d93ce1b7bb67bf81ceda7ebf7706b1efa0", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1644472683, - "narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=", + "lastModified": 1644837400, + "narHash": "sha256-treFS89w/xKzeTjJSJdYp/Ceddv6oqq7bL9mZMQDPi0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7adc9c14ec74b27358a8df9b973087e351425a79", + "rev": "a03ae0e6d078cfdbb8404c3bff3622bd4e2f1c57", "type": "github" }, "original": { From b434c4c81743bc98ccac06afe786e91064f99eda Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 17 Feb 2022 17:55:48 +0100 Subject: [PATCH 259/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/782eb436de6f370bfae8ded4d81b0bb002310623' (2022-02-16) → 'github:nix-community/emacs-overlay/3204060454868491463e951a7c29947bbe09bc2f' (2022-02-17) • Updated input 'home-manager': 'github:nix-community/home-manager/50204cea940ffe8aa479c255e84ba1f633084a13' (2022-02-15) → 'github:nix-community/home-manager/2116fe6b50a5118d56f1f443cccf024abee9de40' (2022-02-17) • Updated input 'master': 'github:nixos/nixpkgs/5e0670ee9117d180e3220cd367ac67b440474349' (2022-02-16) → 'github:nixos/nixpkgs/53403fbd69ff155310f94b0696ca4f79de463d00' (2022-02-17) • Updated input 'nix': 'github:nixos/nix/aa5b83d93ce1b7bb67bf81ceda7ebf7706b1efa0' (2022-02-16) → 'github:nixos/nix/b24d541c34b6c85761c63c19ae847816aecd364b' (2022-02-17) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/a03ae0e6d078cfdbb8404c3bff3622bd4e2f1c57' (2022-02-14) → 'github:nixos/nixpkgs/2128d0aa28edef51fd8fef38b132ffc0155595df' (2022-02-16) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1ce73da1..1bfa3354 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1645002771, - "narHash": "sha256-Aau+bnZhMd3iciXlos4QbaM7zGfNaGKtsS7KaR4NfeE=", + "lastModified": 1645093147, + "narHash": "sha256-UnICrypD3PcFuxVjlo5ElgWZgFh5Fh4PS96xhB7a/gY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "782eb436de6f370bfae8ded4d81b0bb002310623", + "rev": "3204060454868491463e951a7c29947bbe09bc2f", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1644961661, - "narHash": "sha256-x1XdER7VT4jqePCWGGutPL46OxJyw8EGFF3rBn0rsuo=", + "lastModified": 1645089656, + "narHash": "sha256-+2eah/jPWwbjTqKmpO0hogM1OHYbHuoSvy3zTJcL0Ik=", "owner": "nix-community", "repo": "home-manager", - "rev": "50204cea940ffe8aa479c255e84ba1f633084a13", + "rev": "2116fe6b50a5118d56f1f443cccf024abee9de40", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1645021969, - "narHash": "sha256-vc1GxhFKgX2EJHX+ckVfcDEOigvW8YppkcT8o0YnOJk=", + "lastModified": 1645116717, + "narHash": "sha256-pWMHpZkKAbKpz8jOUf17gp4nqIKXZOJA+n3e+543Tdc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e0670ee9117d180e3220cd367ac67b440474349", + "rev": "53403fbd69ff155310f94b0696ca4f79de463d00", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1645006441, - "narHash": "sha256-TU6DmiGp5AubjVx+gWVkSYKntJojgmySTuvzagfhCok=", + "lastModified": 1645099220, + "narHash": "sha256-yivwIQA2KFMhkLChqDZQQ9ndYcVd94ki31KrHCghX0E=", "owner": "nixos", "repo": "nix", - "rev": "aa5b83d93ce1b7bb67bf81ceda7ebf7706b1efa0", + "rev": "b24d541c34b6c85761c63c19ae847816aecd364b", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1644837400, - "narHash": "sha256-treFS89w/xKzeTjJSJdYp/Ceddv6oqq7bL9mZMQDPi0=", + "lastModified": 1645010845, + "narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a03ae0e6d078cfdbb8404c3bff3622bd4e2f1c57", + "rev": "2128d0aa28edef51fd8fef38b132ffc0155595df", "type": "github" }, "original": { From 3c22a0abb8c5b72d32f63a8e2b24e0fa4cd8c8eb Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 19 Feb 2022 19:42:44 +0100 Subject: [PATCH 260/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/3204060454868491463e951a7c29947bbe09bc2f' (2022-02-17) → 'github:nix-community/emacs-overlay/edca7c32f53feb54095e0fdb238664aeb1ebf578' (2022-02-19) • Updated input 'home-manager': 'github:nix-community/home-manager/2116fe6b50a5118d56f1f443cccf024abee9de40' (2022-02-17) → 'github:nix-community/home-manager/4f4165a8b9108818ab0193bbd1a252106870b2a2' (2022-02-17) • Updated input 'master': 'github:nixos/nixpkgs/53403fbd69ff155310f94b0696ca4f79de463d00' (2022-02-17) → 'github:nixos/nixpkgs/c248ed4c75e5483df17ee13da268c83c70bac74d' (2022-02-19) • Updated input 'nix': 'github:nixos/nix/b24d541c34b6c85761c63c19ae847816aecd364b' (2022-02-17) → 'github:nixos/nix/9bc03adbba5334663901c1136203bc07e4776be9' (2022-02-18) • Updated input 'statix': 'github:nerdypepper/statix/2aec51a44015e9d466cd4bde3951e4f7e31db0cc' (2022-02-09) → 'github:nerdypepper/statix/a80e252193096f22ae79fa03e66a0853ddae050e' (2022-02-19) • Updated input 'statix/fenix': 'github:nix-community/fenix/d75ffc9f1d3b60bb597e48ae01f486a6de27d30e' (2022-01-14) → 'github:nix-community/fenix/9892337b588c38ec59466a1c89befce464aae7f8' (2022-02-19) • Updated input 'statix/fenix/rust-analyzer-src': 'github:rust-analyzer/rust-analyzer/b4c31481a554d0132003228ba319bd9476fe85ae' (2022-01-13) → 'github:rust-analyzer/rust-analyzer/acf5874b39f3dc5262317a6074d9fc7285081161' (2022-02-18) • Updated input 'statix/nixpkgs': 'github:nixos/nixpkgs/46821ea01c8f54d2a20f5a503809abfc605269d7' (2022-01-13) → 'github:nixos/nixpkgs/b66b39216b1fef2d8c33cc7a5c72d8da80b79970' (2022-02-16) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 1bfa3354..5d93c11c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1645093147, - "narHash": "sha256-UnICrypD3PcFuxVjlo5ElgWZgFh5Fh4PS96xhB7a/gY=", + "lastModified": 1645268618, + "narHash": "sha256-M3fvveoNH+O0nGq27rtCRRQnnbtzDsfSNKZsiuE1RQs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3204060454868491463e951a7c29947bbe09bc2f", + "rev": "edca7c32f53feb54095e0fdb238664aeb1ebf578", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1642141613, - "narHash": "sha256-WFS7T5oOLD8anu/77iz7EPz7zQsJZtP5qVa5485k3dI=", + "lastModified": 1645251813, + "narHash": "sha256-cQ66tGjnZclBCS3nD26mZ5fUH+3/HnysGffBiWXUSHk=", "owner": "nix-community", "repo": "fenix", - "rev": "d75ffc9f1d3b60bb597e48ae01f486a6de27d30e", + "rev": "9892337b588c38ec59466a1c89befce464aae7f8", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1645089656, - "narHash": "sha256-+2eah/jPWwbjTqKmpO0hogM1OHYbHuoSvy3zTJcL0Ik=", + "lastModified": 1645140957, + "narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2116fe6b50a5118d56f1f443cccf024abee9de40", + "rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1645116717, - "narHash": "sha256-pWMHpZkKAbKpz8jOUf17gp4nqIKXZOJA+n3e+543Tdc=", + "lastModified": 1645296110, + "narHash": "sha256-QC7HW+DdwOnQENwr+KDoFakc6FYcQGvKMLeLqTy/k/c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53403fbd69ff155310f94b0696ca4f79de463d00", + "rev": "c248ed4c75e5483df17ee13da268c83c70bac74d", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1645099220, - "narHash": "sha256-yivwIQA2KFMhkLChqDZQQ9ndYcVd94ki31KrHCghX0E=", + "lastModified": 1645189081, + "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", "owner": "nixos", "repo": "nix", - "rev": "b24d541c34b6c85761c63c19ae847816aecd364b", + "rev": "9bc03adbba5334663901c1136203bc07e4776be9", "type": "github" }, "original": { @@ -266,11 +266,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1642069818, - "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=", + "lastModified": 1645013224, + "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7", + "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1642101527, - "narHash": "sha256-C4zcaWULWlrirpEt/pA85CCMBt+7SWZweMaMJ7EvrXw=", + "lastModified": 1645205556, + "narHash": "sha256-e4lZW3qRyOEJ+vLKFQP7m2Dxh5P44NrnekZYLxlucww=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "b4c31481a554d0132003228ba319bd9476fe85ae", + "rev": "acf5874b39f3dc5262317a6074d9fc7285081161", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1644422658, - "narHash": "sha256-ibz5b+amOTlLxDlCPrC7A6rSFac3JXwiq3HMyIJwdUw=", + "lastModified": 1645283699, + "narHash": "sha256-HrR+BoEl6F6m91bL54KdDw9jVqDkaIsvquZ1F9r2eRg=", "owner": "nerdypepper", "repo": "statix", - "rev": "2aec51a44015e9d466cd4bde3951e4f7e31db0cc", + "rev": "a80e252193096f22ae79fa03e66a0853ddae050e", "type": "github" }, "original": { From d09a322a0255cc2873e0ed84c09286a1afaae326 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 19 Feb 2022 20:46:57 +0100 Subject: [PATCH 261/303] thetys: *dis*able docker live restore for faster reboot --- nixos/configurations/thetys.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 1c4f9536..0c6e7cd8 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -35,7 +35,7 @@ virtualisation = { docker.enable = true; docker.extraOptions = "--insecure-registry registry.cap01.cloudseeds.de"; - docker.liveRestore = true; + docker.liveRestore = false; podman.enable = true; }; From e450ad574b0f3700ac0b43af82e74504ef0978d5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Feb 2022 22:23:15 +0100 Subject: [PATCH 262/303] mimas, enceladeus: enable ML --- nixos/configurations/enceladeus.nix | 2 ++ nixos/configurations/mimas.nix | 2 ++ nixos/modules/moonlander.nix | 15 +++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 nixos/modules/moonlander.nix diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 12cddb66..614c989e 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -163,6 +163,8 @@ # should. system.stateVersion = "19.09"; # Did you read the comment? + hardware.keyboard.zsa.enable = true; + security.sudo.extraRules = [ { commands = [ diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 2ade8aaa..46fb9a6a 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -253,6 +253,8 @@ in }; }; + hardware.keyboard.zsa.enable = true; + services.traefik.enable = true; systemd.services.traefik.serviceConfig.EnvironmentFile = "/etc/traefik/env"; services.traefik.staticConfigOptions = { diff --git a/nixos/modules/moonlander.nix b/nixos/modules/moonlander.nix new file mode 100644 index 00000000..c8a3f204 --- /dev/null +++ b/nixos/modules/moonlander.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf; + inherit (pkgs) wally-cli; + + cfg = hardware.keyboard.zsa; +in + +{ + config = mkIf cfg.enable { + users.users.nmelzer.extraGroups = [ "plugdev" ]; + environment.systemPackages = [ wally-cli ]; + }; +} From d3b2343a3b8dbfa12c643d049d7f63b832bf9b78 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 22 Feb 2022 22:40:37 +0100 Subject: [PATCH 263/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/edca7c32f53feb54095e0fdb238664aeb1ebf578' (2022-02-19) → 'github:nix-community/emacs-overlay/3b8b7e3a1bf5b36fe87dbdfe58490bf0f939be01' (2022-02-22) • Updated input 'home-manager': 'github:nix-community/home-manager/4f4165a8b9108818ab0193bbd1a252106870b2a2' (2022-02-17) → 'github:nix-community/home-manager/838d40d61a91e3807836545c4b420572ab2d62eb' (2022-02-22) • Updated input 'master': 'github:nixos/nixpkgs/c248ed4c75e5483df17ee13da268c83c70bac74d' (2022-02-19) → 'github:nixos/nixpkgs/1bfcbcc05d0a962e0a138ccfb14d187c9993e196' (2022-02-22) • Updated input 'nix': 'github:nixos/nix/9bc03adbba5334663901c1136203bc07e4776be9' (2022-02-18) → 'github:nixos/nix/caf51729450d4c57d48ddbef8e855e9bf65f8792' (2022-02-21) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/2128d0aa28edef51fd8fef38b132ffc0155595df' (2022-02-16) → 'github:nixos/nixpkgs/40ef692a55b188b1f5ae3967f3fc7808838c3f1d' (2022-02-20) • Updated input 'statix': 'github:nerdypepper/statix/a80e252193096f22ae79fa03e66a0853ddae050e' (2022-02-19) → 'github:nerdypepper/statix/448e6f2096b855bee1464c514dfb73477fb39774' (2022-02-20) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 5d93c11c..fb91b85e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1645268618, - "narHash": "sha256-M3fvveoNH+O0nGq27rtCRRQnnbtzDsfSNKZsiuE1RQs=", + "lastModified": 1645556069, + "narHash": "sha256-ccuvawvKD3iN3YWE1QycoTtVAF4HgNwEc6HAtvjI3YI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "edca7c32f53feb54095e0fdb238664aeb1ebf578", + "rev": "3b8b7e3a1bf5b36fe87dbdfe58490bf0f939be01", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1645140957, - "narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=", + "lastModified": 1645557328, + "narHash": "sha256-7PCAESO8HxuSk1hH1J2ld+kK6fugFqNd+vqIXSGz1ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2", + "rev": "838d40d61a91e3807836545c4b420572ab2d62eb", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1645296110, - "narHash": "sha256-QC7HW+DdwOnQENwr+KDoFakc6FYcQGvKMLeLqTy/k/c=", + "lastModified": 1645565877, + "narHash": "sha256-R+BVlcj0d14DEe5TosxnGjUHQFC/qqRK8Y++xuB9a9E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c248ed4c75e5483df17ee13da268c83c70bac74d", + "rev": "1bfcbcc05d0a962e0a138ccfb14d187c9993e196", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1645189081, - "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", + "lastModified": 1645479047, + "narHash": "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=", "owner": "nixos", "repo": "nix", - "rev": "9bc03adbba5334663901c1136203bc07e4776be9", + "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1645010845, - "narHash": "sha256-hO9X4PvxkSLMQnGGB7tOrKPwufhLMiNQMNXNwzLqneo=", + "lastModified": 1645379616, + "narHash": "sha256-eLzR3MRS9hcNqSWZxP6BP7xiBjgC3/pB5n2Q0lLFe/g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2128d0aa28edef51fd8fef38b132ffc0155595df", + "rev": "40ef692a55b188b1f5ae3967f3fc7808838c3f1d", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1645283699, - "narHash": "sha256-HrR+BoEl6F6m91bL54KdDw9jVqDkaIsvquZ1F9r2eRg=", + "lastModified": 1645337357, + "narHash": "sha256-tAhWlvSh2ANWckdxYbNiYNk67dc3VliintqA2pwmsck=", "owner": "nerdypepper", "repo": "statix", - "rev": "a80e252193096f22ae79fa03e66a0853ddae050e", + "rev": "448e6f2096b855bee1464c514dfb73477fb39774", "type": "github" }, "original": { From 0bf66de6603c4954f50c0d5cc76a6e3c84c9fab4 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 27 Feb 2022 10:47:06 +0100 Subject: [PATCH 264/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/3b8b7e3a1bf5b36fe87dbdfe58490bf0f939be01' (2022-02-22) → 'github:nix-community/emacs-overlay/058e38892484c1ab517c890b0aaee5d53565a494' (2022-02-27) • Updated input 'home-manager': 'github:nix-community/home-manager/838d40d61a91e3807836545c4b420572ab2d62eb' (2022-02-22) → 'github:nix-community/home-manager/2499b916921adde8a694117bc007efdde8bbd918' (2022-02-27) • Updated input 'master': 'github:nixos/nixpkgs/1bfcbcc05d0a962e0a138ccfb14d187c9993e196' (2022-02-22) → 'github:nixos/nixpkgs/f231f397c5425cd5a27e9ec77849062bceee9038' (2022-02-27) • Updated input 'nix': 'github:nixos/nix/caf51729450d4c57d48ddbef8e855e9bf65f8792' (2022-02-21) → 'github:nixos/nix/df552ff53e68dff8ca360adbdbea214ece1d08ee' (2022-02-25) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/40ef692a55b188b1f5ae3967f3fc7808838c3f1d' (2022-02-20) → 'github:nixos/nixpkgs/4275a321beab5a71872fb7a5fe5da511bb2bec73' (2022-02-23) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index fb91b85e..3ba49830 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1645556069, - "narHash": "sha256-ccuvawvKD3iN3YWE1QycoTtVAF4HgNwEc6HAtvjI3YI=", + "lastModified": 1645953123, + "narHash": "sha256-Be06ikbfQTuRwsU6nxNbMSvSUOzmGzDOLBKXFMekrcA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3b8b7e3a1bf5b36fe87dbdfe58490bf0f939be01", + "rev": "058e38892484c1ab517c890b0aaee5d53565a494", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1645557328, - "narHash": "sha256-7PCAESO8HxuSk1hH1J2ld+kK6fugFqNd+vqIXSGz1ag=", + "lastModified": 1645924784, + "narHash": "sha256-mpwIohyuc3RAHmVXEm/vUHGMu2V9SLr4P3kh0xckwpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "838d40d61a91e3807836545c4b420572ab2d62eb", + "rev": "2499b916921adde8a694117bc007efdde8bbd918", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1645565877, - "narHash": "sha256-R+BVlcj0d14DEe5TosxnGjUHQFC/qqRK8Y++xuB9a9E=", + "lastModified": 1645954488, + "narHash": "sha256-YOxiSKWV2OLexs08BsmvVtgHb0PQfRcRvpO/Yep9B6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1bfcbcc05d0a962e0a138ccfb14d187c9993e196", + "rev": "f231f397c5425cd5a27e9ec77849062bceee9038", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1645479047, - "narHash": "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=", + "lastModified": 1645801982, + "narHash": "sha256-h7oizwxCAN/Iz/VFk6tI6dAZO1xYSay6oPp+uvf8fM8=", "owner": "nixos", "repo": "nix", - "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", + "rev": "df552ff53e68dff8ca360adbdbea214ece1d08ee", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1645379616, - "narHash": "sha256-eLzR3MRS9hcNqSWZxP6BP7xiBjgC3/pB5n2Q0lLFe/g=", + "lastModified": 1645652565, + "narHash": "sha256-yVQN2Wi8xSSpuj6JTck/6IOJ40hNvmoReMvFY86xd9w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40ef692a55b188b1f5ae3967f3fc7808838c3f1d", + "rev": "4275a321beab5a71872fb7a5fe5da511bb2bec73", "type": "github" }, "original": { From de1235fe01ee13dba062dda2acbf1886e836b65f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 27 Feb 2022 11:45:54 +0100 Subject: [PATCH 265/303] Revert "flake.lock: Update" This reverts commit 0bf66de6603c4954f50c0d5cc76a6e3c84c9fab4. --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3ba49830..fb91b85e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1645953123, - "narHash": "sha256-Be06ikbfQTuRwsU6nxNbMSvSUOzmGzDOLBKXFMekrcA=", + "lastModified": 1645556069, + "narHash": "sha256-ccuvawvKD3iN3YWE1QycoTtVAF4HgNwEc6HAtvjI3YI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "058e38892484c1ab517c890b0aaee5d53565a494", + "rev": "3b8b7e3a1bf5b36fe87dbdfe58490bf0f939be01", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1645924784, - "narHash": "sha256-mpwIohyuc3RAHmVXEm/vUHGMu2V9SLr4P3kh0xckwpI=", + "lastModified": 1645557328, + "narHash": "sha256-7PCAESO8HxuSk1hH1J2ld+kK6fugFqNd+vqIXSGz1ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "2499b916921adde8a694117bc007efdde8bbd918", + "rev": "838d40d61a91e3807836545c4b420572ab2d62eb", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1645954488, - "narHash": "sha256-YOxiSKWV2OLexs08BsmvVtgHb0PQfRcRvpO/Yep9B6w=", + "lastModified": 1645565877, + "narHash": "sha256-R+BVlcj0d14DEe5TosxnGjUHQFC/qqRK8Y++xuB9a9E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f231f397c5425cd5a27e9ec77849062bceee9038", + "rev": "1bfcbcc05d0a962e0a138ccfb14d187c9993e196", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1645801982, - "narHash": "sha256-h7oizwxCAN/Iz/VFk6tI6dAZO1xYSay6oPp+uvf8fM8=", + "lastModified": 1645479047, + "narHash": "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=", "owner": "nixos", "repo": "nix", - "rev": "df552ff53e68dff8ca360adbdbea214ece1d08ee", + "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1645652565, - "narHash": "sha256-yVQN2Wi8xSSpuj6JTck/6IOJ40hNvmoReMvFY86xd9w=", + "lastModified": 1645379616, + "narHash": "sha256-eLzR3MRS9hcNqSWZxP6BP7xiBjgC3/pB5n2Q0lLFe/g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4275a321beab5a71872fb7a5fe5da511bb2bec73", + "rev": "40ef692a55b188b1f5ae3967f3fc7808838c3f1d", "type": "github" }, "original": { From 30c673feb33dd4857e0e19f16588acc713ef1410 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 3 Mar 2022 08:02:00 +0100 Subject: [PATCH 266/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/3b8b7e3a1bf5b36fe87dbdfe58490bf0f939be01' (2022-02-22) → 'github:nix-community/emacs-overlay/9c80561882612903edf2a31007f9be2e8fc484d6' (2022-03-03) • Updated input 'home-manager': 'github:nix-community/home-manager/838d40d61a91e3807836545c4b420572ab2d62eb' (2022-02-22) → 'github:nix-community/home-manager/ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25' (2022-02-27) • Updated input 'master': 'github:nixos/nixpkgs/1bfcbcc05d0a962e0a138ccfb14d187c9993e196' (2022-02-22) → 'github:nixos/nixpkgs/ea27b2243bfacde2ed3fa05efdcc2bc842995119' (2022-03-03) • Updated input 'nix': 'github:nixos/nix/caf51729450d4c57d48ddbef8e855e9bf65f8792' (2022-02-21) → 'github:nixos/nix/3e3d0711d4c4409172b3e3f342e204d04d554f4b' (2022-03-02) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/40ef692a55b188b1f5ae3967f3fc7808838c3f1d' (2022-02-20) → 'github:nixos/nixpkgs/b099eaa0e01a45fc3459bbe987c3405c425ef05c' (2022-03-01) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index fb91b85e..458c0c65 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1645556069, - "narHash": "sha256-ccuvawvKD3iN3YWE1QycoTtVAF4HgNwEc6HAtvjI3YI=", + "lastModified": 1646272874, + "narHash": "sha256-I/AKq8Jh4JHfKguf/h6BZoLYK/Ws7RUh+qKYH44kw54=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3b8b7e3a1bf5b36fe87dbdfe58490bf0f939be01", + "rev": "9c80561882612903edf2a31007f9be2e8fc484d6", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1645557328, - "narHash": "sha256-7PCAESO8HxuSk1hH1J2ld+kK6fugFqNd+vqIXSGz1ag=", + "lastModified": 1645970334, + "narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=", "owner": "nix-community", "repo": "home-manager", - "rev": "838d40d61a91e3807836545c4b420572ab2d62eb", + "rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1645565877, - "narHash": "sha256-R+BVlcj0d14DEe5TosxnGjUHQFC/qqRK8Y++xuB9a9E=", + "lastModified": 1646284582, + "narHash": "sha256-F1wbhVAXXaw9IMEaDzwJHUxbMdVlm73NGeXokxGh9T0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1bfcbcc05d0a962e0a138ccfb14d187c9993e196", + "rev": "ea27b2243bfacde2ed3fa05efdcc2bc842995119", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1645479047, - "narHash": "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=", + "lastModified": 1646261332, + "narHash": "sha256-nfI86yNqf/aNnP22PoGNDO8Ie179o3dMVVQyhWkDBo4=", "owner": "nixos", "repo": "nix", - "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", + "rev": "3e3d0711d4c4409172b3e3f342e204d04d554f4b", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1645379616, - "narHash": "sha256-eLzR3MRS9hcNqSWZxP6BP7xiBjgC3/pB5n2Q0lLFe/g=", + "lastModified": 1646162891, + "narHash": "sha256-Yoyur5LD3nRKFZRwVi2lHZi2HKoWUJFAHgIFcYsRhho=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40ef692a55b188b1f5ae3967f3fc7808838c3f1d", + "rev": "b099eaa0e01a45fc3459bbe987c3405c425ef05c", "type": "github" }, "original": { From d235dd7013504f61e0eee396ba9ebb698f0057d8 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 3 Mar 2022 10:23:06 +0100 Subject: [PATCH 267/303] change pinning of inputs --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 458c0c65..60656ec8 100644 --- a/flake.lock +++ b/flake.lock @@ -153,17 +153,17 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1646261332, - "narHash": "sha256-nfI86yNqf/aNnP22PoGNDO8Ie179o3dMVVQyhWkDBo4=", + "lastModified": 1645479047, + "narHash": "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=", "owner": "nixos", "repo": "nix", - "rev": "3e3d0711d4c4409172b3e3f342e204d04d554f4b", + "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", "repo": "nix", + "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", "type": "github" } }, @@ -357,17 +357,17 @@ }, "unstable": { "locked": { - "lastModified": 1644420267, - "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=", + "lastModified": 1646254136, + "narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1", + "rev": "3e072546ea98db00c2364b81491b893673267827", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1", "type": "github" } }, diff --git a/flake.nix b/flake.nix index dc47a175..b7397220 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs.nixpkgs-2105.url = "github:nixos/nixpkgs/nixos-21.05"; inputs.nixpkgs-2111.url = "github:nixos/nixpkgs/nixos-21.11"; - inputs.unstable.url = "github:nixos/nixpkgs/98bb5b77c8c6666824a4c13d23befa1e07210ef1"; # nixos-unstable"; + inputs.unstable.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.master.url = "github:nixos/nixpkgs/master"; - inputs.nix.url = "github:nixos/nix/master"; + inputs.nix.url = "github:nixos/nix/caf51729450d4c57d48ddbef8e855e9bf65f8792"; inputs.rnix-lsp.url = "github:nix-community/rnix-lsp/master"; inputs.rnix-lsp.inputs.nixpkgs.follows = "unstable"; # inputs.rnix-lsp.inputs.naersk.inputs.nixpkgs.follows = "unstable"; From 80df76a2a00d64611dc76f518e4b436073479e02 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 3 Mar 2022 10:23:54 +0100 Subject: [PATCH 268/303] Add paperless --- nixos/configurations/hardware/mimas.nix | 5 ++++ nixos/configurations/mimas.nix | 37 +++++++++++++++++++------ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index cc00356b..dce40b3d 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -48,6 +48,11 @@ fsType = "ext4"; }; + fileSystems."/var/lib/paperless" = { + device = "/dev/disk/by-label/paperless"; + fsType = "ext4"; + }; + # fileSystems."/var/lib/restic" = { # device = "/dev/disk/by-uuid/3eb6492a-b126-4ad5-b9df-4eb47df1135c"; # fsType = "ext4"; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 46fb9a6a..07972661 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -95,7 +95,7 @@ in services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 80 443 1111 8080 9002 9003 2342 9999 3000 ]; + networking.firewall.allowedTCPPorts = [ 80 443 1111 8080 9002 9003 2342 9999 3000 58080 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. networking.firewall.enable = true; @@ -301,20 +301,27 @@ in rule = "PathPrefix(`/api/`)"; service = "api@internal"; }; - minio = { - entryPoints = [ "http" ]; - rule = "Host(`fritz.mimas.internal.nobbz.dev`) && PathPrefix(`/`)"; + fritz = { + entryPoints = [ "https" "http" ]; + rule = "Host(`fritz.mimas.internal.nobbz.dev`)"; service = "fritz"; tls.domains = [{ main = "*.mimas.internal.nobbz.dev"; }]; tls.certResolver = "mimasWildcard"; }; - minio-tls = { - entryPoints = [ "https" "experimental" ]; - rule = "HostRegexp(`{subdomain:[a-z0-9]+}.mimas.internal.nobbz.dev`) && PathPrefix(`/`)"; - service = "minio"; + paperless = { + entryPoints = [ "https" "http" ]; + rule = "Host(`paperless.mimas.internal.nobbz.dev`)"; + service = "paperless"; tls.domains = [{ main = "*.mimas.internal.nobbz.dev"; }]; - tls.certresolver = "mimasWildcard"; + tls.certResolver = "mimasWildcard"; }; + # minio-tls = { + # entryPoints = [ "https" "experimental" ]; + # rule = "HostRegexp(`{subdomain:[a-z0-9]+}.mimas.internal.nobbz.dev`) && PathPrefix(`/`)"; + # service = "minio"; + # tls.domains = [{ main = "*.mimas.internal.nobbz.dev"; }]; + # tls.certresolver = "mimasWildcard"; + # }; }; http.services = { minio.loadBalancer.passHostHeader = true; @@ -322,6 +329,9 @@ in fritz.loadBalancer.passHostHeader = false; fritz.loadBalancer.servers = [{ url = "http://fritz.box"; }]; + + paperless.loadBalancer.passHostHeader = true; + paperless.loadBalancer.servers = [{ url = "http://localhost:58080"; }]; }; }; @@ -369,6 +379,15 @@ in ]; }; + services.paperless-ng = { + enable = true; + # address = "mimas.internal.nobbz.dev"; + address = "0.0.0.0"; + port = 58080; + extraConfig.PAPERLESS_OCR_LANGUAGE = "deu+eng"; + }; + systemd.services.paperless-ng-server.after = [ "var-lib-paperless.mount" ]; + # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you From 0a0fbdeec0d9ae552fd0055d83756a10b60912e2 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Thu, 3 Mar 2022 10:55:35 +0100 Subject: [PATCH 269/303] fix renamed attributes --- nixos/configurations/mimas.nix | 2 +- packages/keyleds/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 07972661..b08fa39c 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -104,7 +104,7 @@ in # Enable CUPS to print documents. services.printing.enable = true; - services.printing.drivers = [ pkgs.hplipWithPlugin pkgs.samsungUnifiedLinuxDriver ]; + services.printing.drivers = [ pkgs.hplipWithPlugin pkgs.samsung-unified-linux-driver ]; services.ratbagd.enable = true; diff --git a/packages/keyleds/default.nix b/packages/keyleds/default.nix index 13128ef8..1a86915c 100644 --- a/packages/keyleds/default.nix +++ b/packages/keyleds/default.nix @@ -13,5 +13,5 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = with pkgs; [ cmake pkgconfig ]; - buildInputs = with pkgs; [ x11 xorg.libXi libuv systemd luajit libyaml ]; + buildInputs = with pkgs; [ xlibsWrapper xorg.libXi libuv systemd luajit libyaml ]; } From 872e16942f5b7db8b8ef9782220bb3d2aa83a428 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 4 Mar 2022 06:37:20 +0100 Subject: [PATCH 270/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/9c80561882612903edf2a31007f9be2e8fc484d6' (2022-03-03) → 'github:nix-community/emacs-overlay/31a7f685c307949959258d72a0840abeeef7b5a7' (2022-03-04) • Updated input 'home-manager': 'github:nix-community/home-manager/ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25' (2022-02-27) → 'github:nix-community/home-manager/d119cea3763977801ad66330668c1ab4346cb7f7' (2022-03-04) • Updated input 'master': 'github:nixos/nixpkgs/ea27b2243bfacde2ed3fa05efdcc2bc842995119' (2022-03-03) → 'github:nixos/nixpkgs/e6d23d087f03a57c68edadbd84cd66ce1e5aa654' (2022-03-04) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/b099eaa0e01a45fc3459bbe987c3405c425ef05c' (2022-03-01) → 'github:nixos/nixpkgs/ed02c2ba0384b2800db41333045a6fb781f12aac' (2022-03-02) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 60656ec8..0b3fcbee 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646272874, - "narHash": "sha256-I/AKq8Jh4JHfKguf/h6BZoLYK/Ws7RUh+qKYH44kw54=", + "lastModified": 1646358694, + "narHash": "sha256-HlYwInjnWqkk0cakuH3AaLTvcOZefT20r5PGrBvWc5Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9c80561882612903edf2a31007f9be2e8fc484d6", + "rev": "31a7f685c307949959258d72a0840abeeef7b5a7", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1645970334, - "narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=", + "lastModified": 1646364779, + "narHash": "sha256-481vkO9b3h++bHzLbGDDhgpBoXQ0Wlo4lm4h5/EJMO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25", + "rev": "d119cea3763977801ad66330668c1ab4346cb7f7", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646284582, - "narHash": "sha256-F1wbhVAXXaw9IMEaDzwJHUxbMdVlm73NGeXokxGh9T0=", + "lastModified": 1646372107, + "narHash": "sha256-67j1t1P1LlAwGFwLSOLnX+QOgaespX4H63gvtZ3ytl4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea27b2243bfacde2ed3fa05efdcc2bc842995119", + "rev": "e6d23d087f03a57c68edadbd84cd66ce1e5aa654", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1646162891, - "narHash": "sha256-Yoyur5LD3nRKFZRwVi2lHZi2HKoWUJFAHgIFcYsRhho=", + "lastModified": 1646258393, + "narHash": "sha256-mKDoCi5Baqainjf0Nx6oTPhaxKQdj4P17XTdhTtXGRA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b099eaa0e01a45fc3459bbe987c3405c425ef05c", + "rev": "ed02c2ba0384b2800db41333045a6fb781f12aac", "type": "github" }, "original": { From 266807a65e39718ce4c2d52c0744ab2337cf58f3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 5 Mar 2022 08:30:30 +0100 Subject: [PATCH 271/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/31a7f685c307949959258d72a0840abeeef7b5a7' (2022-03-04) → 'github:nix-community/emacs-overlay/2796573cf53a8b43ef9b38e49d5abfec8031fe20' (2022-03-05) • Updated input 'master': 'github:nixos/nixpkgs/e6d23d087f03a57c68edadbd84cd66ce1e5aa654' (2022-03-04) → 'github:nixos/nixpkgs/134668df81cb1ef3a7b9f9acaa28ea47421317b6' (2022-03-05) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/ed02c2ba0384b2800db41333045a6fb781f12aac' (2022-03-02) → 'github:nixos/nixpkgs/47cd6702934434dd02bc53a67dbce3e5493e33a2' (2022-03-04) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 0b3fcbee..414b6e67 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646358694, - "narHash": "sha256-HlYwInjnWqkk0cakuH3AaLTvcOZefT20r5PGrBvWc5Q=", + "lastModified": 1646444963, + "narHash": "sha256-qFgre97REYOfv48IJO01VHM1p4jUt1DPYGhfriox/nk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "31a7f685c307949959258d72a0840abeeef7b5a7", + "rev": "2796573cf53a8b43ef9b38e49d5abfec8031fe20", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646372107, - "narHash": "sha256-67j1t1P1LlAwGFwLSOLnX+QOgaespX4H63gvtZ3ytl4=", + "lastModified": 1646463069, + "narHash": "sha256-q4ldHq9Ogeibv3eyM39hNOMaCCFisoYsovlIfxmNIPA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e6d23d087f03a57c68edadbd84cd66ce1e5aa654", + "rev": "134668df81cb1ef3a7b9f9acaa28ea47421317b6", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1646258393, - "narHash": "sha256-mKDoCi5Baqainjf0Nx6oTPhaxKQdj4P17XTdhTtXGRA=", + "lastModified": 1646406548, + "narHash": "sha256-xp+3f76ycZXNf9pG65Ef9KfDl1fas2UQu/cBe/pLd+c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed02c2ba0384b2800db41333045a6fb781f12aac", + "rev": "47cd6702934434dd02bc53a67dbce3e5493e33a2", "type": "github" }, "original": { From f6a26a59a0e054422b56ade750d930535bdb5264 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 5 Mar 2022 22:57:44 +0100 Subject: [PATCH 272/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/2796573cf53a8b43ef9b38e49d5abfec8031fe20' (2022-03-05) → 'github:nix-community/emacs-overlay/8d5080490a0018b80e394f69a5cafd104b4bb765' (2022-03-05) • Updated input 'master': 'github:nixos/nixpkgs/134668df81cb1ef3a7b9f9acaa28ea47421317b6' (2022-03-05) → 'github:nixos/nixpkgs/86162e9bf988fd9d1169bdf29c6e2c38bca2ef00' (2022-03-05) • Updated input 'nixpkgs-2105': 'github:nixos/nixpkgs/0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00' (2022-01-15) → 'github:nixos/nixpkgs/530a53dcbc9437363471167a5e4762c5fcfa34a1' (2022-02-19) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 414b6e67..78011c48 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646444963, - "narHash": "sha256-qFgre97REYOfv48IJO01VHM1p4jUt1DPYGhfriox/nk=", + "lastModified": 1646499853, + "narHash": "sha256-SqIyQ27+5fmWHyeb+mMktRaL9kxWyApjBqelcwcDbOM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2796573cf53a8b43ef9b38e49d5abfec8031fe20", + "rev": "8d5080490a0018b80e394f69a5cafd104b4bb765", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646463069, - "narHash": "sha256-q4ldHq9Ogeibv3eyM39hNOMaCCFisoYsovlIfxmNIPA=", + "lastModified": 1646515198, + "narHash": "sha256-kOPR8qrx7Xy+J5Z6tT15v1dkGZkuHBABcNdI/EGdQ7Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "134668df81cb1ef3a7b9f9acaa28ea47421317b6", + "rev": "86162e9bf988fd9d1169bdf29c6e2c38bca2ef00", "type": "github" }, "original": { @@ -203,11 +203,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1642244250, - "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { From 8f685830ba1da7b37b1491ca769cdebf4392568f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 6 Mar 2022 12:51:07 +0100 Subject: [PATCH 273/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/8d5080490a0018b80e394f69a5cafd104b4bb765' (2022-03-05) → 'github:nix-community/emacs-overlay/0949bcda488e28eab931e7be99400ad5f0094128' (2022-03-06) • Updated input 'home-manager': 'github:nix-community/home-manager/d119cea3763977801ad66330668c1ab4346cb7f7' (2022-03-04) → 'github:nix-community/home-manager/afe96e7433c513bf82375d41473c57d1f66b4e68' (2022-03-06) • Updated input 'master': 'github:nixos/nixpkgs/86162e9bf988fd9d1169bdf29c6e2c38bca2ef00' (2022-03-05) → 'github:nixos/nixpkgs/8f176cfe2c775dbb9959e8767eb856e0d3018f88' (2022-03-06) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 78011c48..3715d9fe 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646499853, - "narHash": "sha256-SqIyQ27+5fmWHyeb+mMktRaL9kxWyApjBqelcwcDbOM=", + "lastModified": 1646559142, + "narHash": "sha256-8PClYIjlkBKsl4hYWMtCGRrbaF127XJB6dtfS8gxTGc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8d5080490a0018b80e394f69a5cafd104b4bb765", + "rev": "0949bcda488e28eab931e7be99400ad5f0094128", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1646364779, - "narHash": "sha256-481vkO9b3h++bHzLbGDDhgpBoXQ0Wlo4lm4h5/EJMO4=", + "lastModified": 1646559628, + "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d119cea3763977801ad66330668c1ab4346cb7f7", + "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646515198, - "narHash": "sha256-kOPR8qrx7Xy+J5Z6tT15v1dkGZkuHBABcNdI/EGdQ7Y=", + "lastModified": 1646567180, + "narHash": "sha256-LXb5TSRk9Y2aMfTt+yg6ZtukFb9zRBbza1QmSBh7fyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "86162e9bf988fd9d1169bdf29c6e2c38bca2ef00", + "rev": "8f176cfe2c775dbb9959e8767eb856e0d3018f88", "type": "github" }, "original": { From 6f9ecda0f0382fe747de6b372edbd5c048736c99 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 6 Mar 2022 17:38:37 +0100 Subject: [PATCH 274/303] awesome -dev --- home/modules/misc/awesome/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home/modules/misc/awesome/default.nix b/home/modules/misc/awesome/default.nix index 95e78e37..71176e6a 100644 --- a/home/modules/misc/awesome/default.nix +++ b/home/modules/misc/awesome/default.nix @@ -73,6 +73,16 @@ in config = lib.mkIf cfg.enable { xsession.enable = true; + + xsession.windowManager.awesome.package = pkgs.awesome.overrideAttrs (oa: { + src = pkgs.fetchFromGitHub { + owner = "awesomewm"; + repo = "awesome"; + rev = "22dedf7"; + sha256 = "sha256-GD0MxMU4tz5SbahL0+ADUQXNoq1fIxOSXiEwoObC0ng="; + }; + }); + home.file.".config/awesome/rc.lua".text = '' --[[ Awesome WM configuration From 2d7cd58c27e4b73711311c0b441022464854a429 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 8 Mar 2022 06:36:23 +0100 Subject: [PATCH 275/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/0949bcda488e28eab931e7be99400ad5f0094128' (2022-03-06) → 'github:nix-community/emacs-overlay/c87af07addadffe974490e91abca0480eda436b7' (2022-03-08) • Updated input 'master': 'github:nixos/nixpkgs/8f176cfe2c775dbb9959e8767eb856e0d3018f88' (2022-03-06) → 'github:nixos/nixpkgs/f22969e855ddb6e4b29d15962912e1aaa7a63bdf' (2022-03-08) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/47cd6702934434dd02bc53a67dbce3e5493e33a2' (2022-03-04) → 'github:nixos/nixpkgs/2ebb6c1e5ae402ba35cca5eec58385e5f1adea04' (2022-03-06) • Updated input 'unstable': 'github:nixos/nixpkgs/3e072546ea98db00c2364b81491b893673267827' (2022-03-02) → 'github:nixos/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026' (2022-03-05) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3715d9fe..be455732 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646559142, - "narHash": "sha256-8PClYIjlkBKsl4hYWMtCGRrbaF127XJB6dtfS8gxTGc=", + "lastModified": 1646705056, + "narHash": "sha256-LwpBOnm4p/2PT2/dliPvFXQWMf56xE+RARSGWI8yhmw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0949bcda488e28eab931e7be99400ad5f0094128", + "rev": "c87af07addadffe974490e91abca0480eda436b7", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646567180, - "narHash": "sha256-LXb5TSRk9Y2aMfTt+yg6ZtukFb9zRBbza1QmSBh7fyE=", + "lastModified": 1646716750, + "narHash": "sha256-Z1MTEYGKr63x1+TDm/M8v+nG6JIHqsGOLwxDMFrvwoM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f176cfe2c775dbb9959e8767eb856e0d3018f88", + "rev": "f22969e855ddb6e4b29d15962912e1aaa7a63bdf", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1646406548, - "narHash": "sha256-xp+3f76ycZXNf9pG65Ef9KfDl1fas2UQu/cBe/pLd+c=", + "lastModified": 1646588256, + "narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "47cd6702934434dd02bc53a67dbce3e5493e33a2", + "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "unstable": { "locked": { - "lastModified": 1646254136, - "narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=", + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e072546ea98db00c2364b81491b893673267827", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", "type": "github" }, "original": { From 8a327a1c2989fe9121e8b47fff13d7d93098bbba Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 9 Mar 2022 13:06:14 +0100 Subject: [PATCH 276/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/c87af07addadffe974490e91abca0480eda436b7' (2022-03-08) → 'github:nix-community/emacs-overlay/55a555f10b76f1e632a429dc6b9d10b81fa86023' (2022-03-09) • Updated input 'master': 'github:nixos/nixpkgs/f22969e855ddb6e4b29d15962912e1aaa7a63bdf' (2022-03-08) → 'github:nixos/nixpkgs/9222b68380eb9195c7c87ca460fcb626d4e600ce' (2022-03-09) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index be455732..3b26efae 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646705056, - "narHash": "sha256-LwpBOnm4p/2PT2/dliPvFXQWMf56xE+RARSGWI8yhmw=", + "lastModified": 1646818969, + "narHash": "sha256-35Ymee1xFKYgGSvpteI0ZT+Fc8qPygYleCy3vyeXj2w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c87af07addadffe974490e91abca0480eda436b7", + "rev": "55a555f10b76f1e632a429dc6b9d10b81fa86023", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646716750, - "narHash": "sha256-Z1MTEYGKr63x1+TDm/M8v+nG6JIHqsGOLwxDMFrvwoM=", + "lastModified": 1646824497, + "narHash": "sha256-NrPZNkvxGRVPE5Rw840225idP1fB3wFxTVi9hjZVUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f22969e855ddb6e4b29d15962912e1aaa7a63bdf", + "rev": "9222b68380eb9195c7c87ca460fcb626d4e600ce", "type": "github" }, "original": { From 97f82463cfceb4ecac1ae20e7fcfeb40b873c555 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 11 Mar 2022 07:39:56 +0100 Subject: [PATCH 277/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/c87af07addadffe974490e91abca0480eda436b7' (2022-03-08) → 'github:nix-community/emacs-overlay/4599731cbeb988158627f5f7aa57b7ece246e097' (2022-03-11) • Updated input 'master': 'github:nixos/nixpkgs/f22969e855ddb6e4b29d15962912e1aaa7a63bdf' (2022-03-08) → 'github:nixos/nixpkgs/267148d196cb0742fa38e11e67a60a47022f492c' (2022-03-11) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/2ebb6c1e5ae402ba35cca5eec58385e5f1adea04' (2022-03-06) → 'github:nixos/nixpkgs/9b1c7ba323732ddc85a51850a7f10ecc5269b8e9' (2022-03-07) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index be455732..6c6a7354 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646705056, - "narHash": "sha256-LwpBOnm4p/2PT2/dliPvFXQWMf56xE+RARSGWI8yhmw=", + "lastModified": 1646964569, + "narHash": "sha256-Jg7GoK64/70iSMajn3SF07VyX7K7jXg/e1Xa+bi5pQ0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c87af07addadffe974490e91abca0480eda436b7", + "rev": "4599731cbeb988158627f5f7aa57b7ece246e097", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646716750, - "narHash": "sha256-Z1MTEYGKr63x1+TDm/M8v+nG6JIHqsGOLwxDMFrvwoM=", + "lastModified": 1646978341, + "narHash": "sha256-C2dX//oGhF6qvFYB/Z801ivQLm78NdNF3BBKa8hSzV8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f22969e855ddb6e4b29d15962912e1aaa7a63bdf", + "rev": "267148d196cb0742fa38e11e67a60a47022f492c", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1646588256, - "narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=", + "lastModified": 1646675913, + "narHash": "sha256-ZvGf51XpXM7JojKLZ5yI0XLUq8UOFX6AwZ3bhtdcpIo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04", + "rev": "9b1c7ba323732ddc85a51850a7f10ecc5269b8e9", "type": "github" }, "original": { From 1d84b17c51cc26cb28c03c0e300b979133fd6486 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 12 Mar 2022 09:27:29 +0100 Subject: [PATCH 278/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'emacs': 'github:nix-community/emacs-overlay/4599731cbeb988158627f5f7aa57b7ece246e097' (2022-03-11) → 'github:nix-community/emacs-overlay/284e92e45ef45a61045f767f8f0e27aa452cf7dc' (2022-03-12) • Updated input 'master': 'github:nixos/nixpkgs/267148d196cb0742fa38e11e67a60a47022f492c' (2022-03-11) → 'github:nixos/nixpkgs/963a524d9313f84d640bf59868e8df3fb8141481' (2022-03-12) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/9b1c7ba323732ddc85a51850a7f10ecc5269b8e9' (2022-03-07) → 'github:nixos/nixpkgs/bacbfd713b4781a4a82c1f390f8fe21ae3b8b95b' (2022-03-10) • Updated input 'unstable': 'github:nixos/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026' (2022-03-05) → 'github:nixos/nixpkgs/fcd48a5a0693f016a5c370460d0c2a8243b882dc' (2022-03-10) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 6c6a7354..8b03731e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1646964569, - "narHash": "sha256-Jg7GoK64/70iSMajn3SF07VyX7K7jXg/e1Xa+bi5pQ0=", + "lastModified": 1647049842, + "narHash": "sha256-FqX4kD86vrCWQlj38P50Wmt2qhR6krfZKu+iDqd3Css=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4599731cbeb988158627f5f7aa57b7ece246e097", + "rev": "284e92e45ef45a61045f767f8f0e27aa452cf7dc", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1646978341, - "narHash": "sha256-C2dX//oGhF6qvFYB/Z801ivQLm78NdNF3BBKa8hSzV8=", + "lastModified": 1647067680, + "narHash": "sha256-UrKEHXY7wwSVXA9ER/5v1qBSjSUZPhc6XFYjQEA2kdE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "267148d196cb0742fa38e11e67a60a47022f492c", + "rev": "963a524d9313f84d640bf59868e8df3fb8141481", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1646675913, - "narHash": "sha256-ZvGf51XpXM7JojKLZ5yI0XLUq8UOFX6AwZ3bhtdcpIo=", + "lastModified": 1646933238, + "narHash": "sha256-RZJnLN0o4B35eTnUc2tEAD12X5TNeeJhhvH3Fd6Pmdo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b1c7ba323732ddc85a51850a7f10ecc5269b8e9", + "rev": "bacbfd713b4781a4a82c1f390f8fe21ae3b8b95b", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "unstable": { "locked": { - "lastModified": 1646497237, - "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "lastModified": 1646939531, + "narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=", "owner": "nixos", "repo": "nixpkgs", - "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc", "type": "github" }, "original": { From 3d6095766869e1079ab37c9db20c30b24e7b0851 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 12 Mar 2022 11:38:10 +0100 Subject: [PATCH 279/303] enable dev-shell again --- flake.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/flake.nix b/flake.nix index b7397220..487fac76 100644 --- a/flake.nix +++ b/flake.nix @@ -41,5 +41,13 @@ update = import ./apps/update inputs; switch = import ./apps/switch inputs; }; + + devShell.x86_64-linux = let pkgs = inputs.unstable.legacyPackages.x86_64-linux; in + pkgs.mkShell { + packages = [ + inputs.rnix-lsp.defaultPackage.x86_64-linux + inputs.statix.defaultPackage.x86_64-linux + ]; + }; }; } From 8f79cc65ad5efd65a94a214ffddbd81bc459f8ea Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 12 Mar 2022 11:38:42 +0100 Subject: [PATCH 280/303] remove accidentally commited file --- nixos/modules/grafana.nix | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 nixos/modules/grafana.nix diff --git a/nixos/modules/grafana.nix b/nixos/modules/grafana.nix deleted file mode 100644 index eae7f139..00000000 --- a/nixos/modules/grafana.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - config = lib.mkMerge [ - - } From 7a25686cc0870094d442db981864029c75e1141a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 15 Mar 2022 12:02:02 +0100 Subject: [PATCH 281/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/284e92e45ef45a61045f767f8f0e27aa452cf7dc' (2022-03-12) → 'github:nix-community/emacs-overlay/d43b200ed5675bf912440975435dd7a7363f9481' (2022-03-15) • Updated input 'home-manager': 'github:nix-community/home-manager/afe96e7433c513bf82375d41473c57d1f66b4e68' (2022-03-06) → 'github:nix-community/home-manager/8eb7c009f09f1f7b1ec151e5d537104acf42213a' (2022-03-13) • Updated input 'master': 'github:nixos/nixpkgs/963a524d9313f84d640bf59868e8df3fb8141481' (2022-03-12) → 'github:nixos/nixpkgs/7371e9d24f1e5b605c06a5538cce842111743be2' (2022-03-15) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/bacbfd713b4781a4a82c1f390f8fe21ae3b8b95b' (2022-03-10) → 'github:nixos/nixpkgs/0f85665118d850aae5164d385d24783d0b16cf1b' (2022-03-12) • Updated input 'rnix-lsp': 'github:nix-community/rnix-lsp/41eb2f3366e3f351bf2563c2a7c46fd17e78dfe0' (2022-01-30) → 'github:nix-community/rnix-lsp/4d1024ccfe1bc569811769d1ef52a2fc6c1d482d' (2022-03-14) • Updated input 'unstable': 'github:nixos/nixpkgs/fcd48a5a0693f016a5c370460d0c2a8243b882dc' (2022-03-10) → 'github:nixos/nixpkgs/b0e141e3fe13ec21f50429773d2e3890e02a80da' (2022-03-12) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8b03731e..79c12d88 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1647049842, - "narHash": "sha256-FqX4kD86vrCWQlj38P50Wmt2qhR6krfZKu+iDqd3Css=", + "lastModified": 1647335267, + "narHash": "sha256-O//CN+V9b7dbnDmWRdrMFVk2Uq0COMLh8PryN4W7fIc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "284e92e45ef45a61045f767f8f0e27aa452cf7dc", + "rev": "d43b200ed5675bf912440975435dd7a7363f9481", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1646559628, - "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=", + "lastModified": 1647210221, + "narHash": "sha256-mUWwEq+ReRQjIqj28ClqmBDyKV4fr6C5ufqlXLzZFsk=", "owner": "nix-community", "repo": "home-manager", - "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68", + "rev": "8eb7c009f09f1f7b1ec151e5d537104acf42213a", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1647067680, - "narHash": "sha256-UrKEHXY7wwSVXA9ER/5v1qBSjSUZPhc6XFYjQEA2kdE=", + "lastModified": 1647341248, + "narHash": "sha256-bPkSWDKR+io/njOZAK8IDL/IEFY4MQaLcVK3WeWAZGg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "963a524d9313f84d640bf59868e8df3fb8141481", + "rev": "7371e9d24f1e5b605c06a5538cce842111743be2", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1646933238, - "narHash": "sha256-RZJnLN0o4B35eTnUc2tEAD12X5TNeeJhhvH3Fd6Pmdo=", + "lastModified": 1647122627, + "narHash": "sha256-w4hGsXYyMgJAQRSBxh7O6AAsawJSbudCxfQXhDRhwPQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bacbfd713b4781a4a82c1f390f8fe21ae3b8b95b", + "rev": "0f85665118d850aae5164d385d24783d0b16cf1b", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1643586450, - "narHash": "sha256-BRIAc3+zavSlJPYSbov2n1W9/a4Iuh2swFPYRWjCm1g=", + "lastModified": 1647240246, + "narHash": "sha256-/MLdBWfFUN1C1eNVBYfaVAIcDiZKXpWEbzBC2pqVXj0=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "41eb2f3366e3f351bf2563c2a7c46fd17e78dfe0", + "rev": "4d1024ccfe1bc569811769d1ef52a2fc6c1d482d", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "unstable": { "locked": { - "lastModified": 1646939531, - "narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=", + "lastModified": 1647125019, + "narHash": "sha256-PXA76/iIqtbrA0ydCyc7Wpdw7TQTnfEowM87YtTXfB4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc", + "rev": "b0e141e3fe13ec21f50429773d2e3890e02a80da", "type": "github" }, "original": { From c162a47ae2c3e08b78a8ee5d7f1ca33465db205f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 16 Mar 2022 07:33:07 +0100 Subject: [PATCH 282/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/d43b200ed5675bf912440975435dd7a7363f9481' (2022-03-15) → 'github:nix-community/emacs-overlay/d7768391bccd5200645cc52324f6ff672269bf31' (2022-03-16) • Updated input 'master': 'github:nixos/nixpkgs/7371e9d24f1e5b605c06a5538cce842111743be2' (2022-03-15) → 'github:nixos/nixpkgs/350731a856a1d901b0d26f6c9892785a63f48e17' (2022-03-16) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/0f85665118d850aae5164d385d24783d0b16cf1b' (2022-03-12) → 'github:nixos/nixpkgs/64fc73bd74f04d3e10cb4e70e1c65b92337e76db' (2022-03-14) • Updated input 'unstable': 'github:nixos/nixpkgs/b0e141e3fe13ec21f50429773d2e3890e02a80da' (2022-03-12) → 'github:nixos/nixpkgs/73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58' (2022-03-14) --- flake.lock | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 79c12d88..58da388f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1647335267, - "narHash": "sha256-O//CN+V9b7dbnDmWRdrMFVk2Uq0COMLh8PryN4W7fIc=", + "lastModified": 1647396147, + "narHash": "sha256-KvIbNi8FEbakfnL32iUTrjRgT0N9mCj8B4DNcyEMSRU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d43b200ed5675bf912440975435dd7a7363f9481", + "rev": "d7768391bccd5200645cc52324f6ff672269bf31", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1647341248, - "narHash": "sha256-bPkSWDKR+io/njOZAK8IDL/IEFY4MQaLcVK3WeWAZGg=", + "lastModified": 1647407259, + "narHash": "sha256-EngnLQLRIIWTI5KAcyFTWVIywhUgT3tTdovdU7Awed0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7371e9d24f1e5b605c06a5538cce842111743be2", + "rev": "350731a856a1d901b0d26f6c9892785a63f48e17", "type": "github" }, "original": { @@ -153,17 +153,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1645479047, - "narHash": "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=", + "lastModified": 1647375824, + "narHash": "sha256-FUYKHv68yVWOmMLmxYUHAcsAaHj37CAEIk1/NVJHcDc=", "owner": "nixos", "repo": "nix", - "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", + "rev": "516a7ac4de63fb248ce6641739f82f4a4edcb13c", "type": "github" }, "original": { "owner": "nixos", "repo": "nix", - "rev": "caf51729450d4c57d48ddbef8e855e9bf65f8792", "type": "github" } }, @@ -219,11 +218,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1647122627, - "narHash": "sha256-w4hGsXYyMgJAQRSBxh7O6AAsawJSbudCxfQXhDRhwPQ=", + "lastModified": 1647282937, + "narHash": "sha256-K8Oo6QyFCfiEWTRpQVfzcwI3YNMKlz6Tu8rr+o3rzRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0f85665118d850aae5164d385d24783d0b16cf1b", + "rev": "64fc73bd74f04d3e10cb4e70e1c65b92337e76db", "type": "github" }, "original": { @@ -357,11 +356,11 @@ }, "unstable": { "locked": { - "lastModified": 1647125019, - "narHash": "sha256-PXA76/iIqtbrA0ydCyc7Wpdw7TQTnfEowM87YtTXfB4=", + "lastModified": 1647297614, + "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0e141e3fe13ec21f50429773d2e3890e02a80da", + "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58", "type": "github" }, "original": { From 914a665908311f7d3bcd50e686f6c1f32e32b14a Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 16 Mar 2022 07:57:41 +0100 Subject: [PATCH 283/303] use nix from master again --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 487fac76..3f6e2295 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs.unstable.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.master.url = "github:nixos/nixpkgs/master"; - inputs.nix.url = "github:nixos/nix/caf51729450d4c57d48ddbef8e855e9bf65f8792"; + inputs.nix.url = "github:nixos/nix"; #/caf51729450d4c57d48ddbef8e855e9bf65f8792"; inputs.rnix-lsp.url = "github:nix-community/rnix-lsp/master"; inputs.rnix-lsp.inputs.nixpkgs.follows = "unstable"; # inputs.rnix-lsp.inputs.naersk.inputs.nixpkgs.follows = "unstable"; From 14b69b6b1153ab4187a14f22daa2c1f2dc0173a9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 18 Mar 2022 06:54:05 +0100 Subject: [PATCH 284/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/d7768391bccd5200645cc52324f6ff672269bf31' (2022-03-16) → 'github:nix-community/emacs-overlay/5b6fc7a4ef21e8ca787429339476b82165b05f3d' (2022-03-18) • Updated input 'home-manager': 'github:nix-community/home-manager/8eb7c009f09f1f7b1ec151e5d537104acf42213a' (2022-03-13) → 'github:nix-community/home-manager/e2a85ac43f06859a50d067a029f0a303c4ca5264' (2022-03-18) • Updated input 'master': 'github:nixos/nixpkgs/350731a856a1d901b0d26f6c9892785a63f48e17' (2022-03-16) → 'github:nixos/nixpkgs/d468bc8524877b97faab506ecf2aaeb422f646d9' (2022-03-18) • Updated input 'nix': 'github:nixos/nix/516a7ac4de63fb248ce6641739f82f4a4edcb13c' (2022-03-15) → 'github:nixos/nix/6afc3617982e872fac2142c3aeccd1e8482e7e52' (2022-03-17) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 58da388f..4a9e7a3f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs": { "locked": { - "lastModified": 1647396147, - "narHash": "sha256-KvIbNi8FEbakfnL32iUTrjRgT0N9mCj8B4DNcyEMSRU=", + "lastModified": 1647568430, + "narHash": "sha256-Uz6pvl07J1Fo6UfTUdXI37D2/Z0cx7/cq8z8nc4JB7s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d7768391bccd5200645cc52324f6ff672269bf31", + "rev": "5b6fc7a4ef21e8ca787429339476b82165b05f3d", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1647210221, - "narHash": "sha256-mUWwEq+ReRQjIqj28ClqmBDyKV4fr6C5ufqlXLzZFsk=", + "lastModified": 1647572216, + "narHash": "sha256-HDOQ/Yq1ga5mbj0eUp/f5FY96TgOxwBjTfIRGsZsAlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "8eb7c009f09f1f7b1ec151e5d537104acf42213a", + "rev": "e2a85ac43f06859a50d067a029f0a303c4ca5264", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "master": { "locked": { - "lastModified": 1647407259, - "narHash": "sha256-EngnLQLRIIWTI5KAcyFTWVIywhUgT3tTdovdU7Awed0=", + "lastModified": 1647582785, + "narHash": "sha256-JpYLhc8h4YLQx315uh3M4rktMmPF9EU5/gaXcRQHAMg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "350731a856a1d901b0d26f6c9892785a63f48e17", + "rev": "d468bc8524877b97faab506ecf2aaeb422f646d9", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1647375824, - "narHash": "sha256-FUYKHv68yVWOmMLmxYUHAcsAaHj37CAEIk1/NVJHcDc=", + "lastModified": 1647552195, + "narHash": "sha256-QjDulAhkGdm0GNiuVxJJmE7fK8NgdDXnO/VWn3Y1A+k=", "owner": "nixos", "repo": "nix", - "rev": "516a7ac4de63fb248ce6641739f82f4a4edcb13c", + "rev": "6afc3617982e872fac2142c3aeccd1e8482e7e52", "type": "github" }, "original": { From 9b56b81775bf95e481830fa5c30bb6c8bf6bddd3 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 19 Mar 2022 11:49:42 +0100 Subject: [PATCH 285/303] slightly re-architect the modules to not depend on `_module.args` anymore --- flake.nix | 2 +- nixos/modules/cachix/default.nix | 2 +- nixos/modules/default.nix | 12 +++++++----- nixos/modules/flake.nix | 4 +++- nixos/modules/hostnames.nix | 2 +- nixos/modules/k3s.nix | 10 ---------- nixos/modules/moonlander.nix | 4 ++-- nixos/modules/nix.nix | 2 +- nixos/modules/zerotier.nix | 8 -------- 9 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 nixos/modules/k3s.nix delete mode 100644 nixos/modules/zerotier.nix diff --git a/flake.nix b/flake.nix index 3f6e2295..05423404 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ outputs = { self, ... }@inputs: { - nixosModules = import ./nixos/modules; + nixosModules = import ./nixos/modules inputs; nixosConfigurations = import ./nixos/configurations inputs; homeModules = import ./home/modules; diff --git a/nixos/modules/cachix/default.nix b/nixos/modules/cachix/default.nix index 9dd55b5d..c19010d4 100644 --- a/nixos/modules/cachix/default.nix +++ b/nixos/modules/cachix/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +_: { config, pkgs, lib, ... }: let folder = ./caches; toImport = name: value: folder + ("/" + name); diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 244652aa..9f631a9e 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,7 +1,9 @@ +inputs: + { - cachix = import ./cachix; - flake = import ./flake.nix; - hostnames = import ./hostnames.nix; - k3s = import ./k3s.nix; - nix = import ./nix.nix; + cachix = import ./cachix inputs; + flake = import ./flake.nix inputs; + hostnames = import ./hostnames.nix inputs; + nix = import ./nix.nix inputs; + moonlander = import ./moonlander.nix inputs; } diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index c4afdec8..6297effe 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -1,4 +1,6 @@ -{ config, pkgs, unstable, nixpkgs-2105, nixpkgs-2111, nix, lib, ... }: +{ unstable, nixpkgs-2105, nixpkgs-2111, nix, ... }: + +{ config, pkgs, lib, ... }: let base = "/etc/nixpkgs/channels"; diff --git a/nixos/modules/hostnames.nix b/nixos/modules/hostnames.nix index a8bfe971..70bb9e1c 100644 --- a/nixos/modules/hostnames.nix +++ b/nixos/modules/hostnames.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { config, lib, pkgs, ... }: { networking.search = [ "internal.nobbz.dev" ]; diff --git a/nixos/modules/k3s.nix b/nixos/modules/k3s.nix deleted file mode 100644 index 8e6ac1c1..00000000 --- a/nixos/modules/k3s.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, ... }: - -let - cfg = config.services.k3s; -in -{ - config = lib.mkIf cfg.enable { - networking.firewall.trustedInterfaces = [ "cni0" ]; - }; -} diff --git a/nixos/modules/moonlander.nix b/nixos/modules/moonlander.nix index c8a3f204..87439738 100644 --- a/nixos/modules/moonlander.nix +++ b/nixos/modules/moonlander.nix @@ -1,10 +1,10 @@ -{ config, lib, pkgs, ... }: +_: { config, lib, pkgs, ... }: let inherit (lib) mkIf; inherit (pkgs) wally-cli; - cfg = hardware.keyboard.zsa; + cfg = config.hardware.keyboard.zsa; in { diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 347168cb..5caffca4 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +_: { config, lib, ... }: let allowed = config.nix.allowedUnfree; diff --git a/nixos/modules/zerotier.nix b/nixos/modules/zerotier.nix deleted file mode 100644 index a6c9b28f..00000000 --- a/nixos/modules/zerotier.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.zerotier; -in -{ - config = lib.mkIf cfg.enable { }; -} From c238cc739fafad467aa18e606937ed06ba60d4f2 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 19 Mar 2022 12:17:03 +0100 Subject: [PATCH 286/303] format using alejandra --- apps/switch/default.nix | 15 +- apps/update/default.nix | 15 +- flake.lock | 75 ++- flake.nix | 50 +- home/configurations/default.nix | 4 +- home/configurations/demo@thetys.nix | 101 +-- home/configurations/nmelzer@enceladeus.nix | 17 +- home/configurations/nmelzer@mimas.nix | 52 +- home/modules/languages/agda/default.nix | 16 +- home/modules/languages/c++/default.nix | 17 +- home/modules/languages/clojure/default.nix | 15 +- home/modules/languages/default.nix | 20 +- home/modules/languages/elixir/default.nix | 18 +- home/modules/languages/erlang/default.nix | 16 +- home/modules/languages/go/default.nix | 17 +- home/modules/languages/lua/default.nix | 12 +- home/modules/languages/nim/default.nix | 19 +- home/modules/languages/nix/default.nix | 14 +- home/modules/languages/python/default.nix | 46 +- home/modules/languages/rust/default.nix | 14 +- home/modules/languages/terraform/default.nix | 16 +- home/modules/languages/tex/default.nix | 13 +- home/modules/misc/awesome/default.nix | 44 +- home/modules/misc/home/default.nix | 62 +- home/modules/profiles/base/default.nix | 58 +- home/modules/profiles/browsing/default.nix | 18 +- home/modules/profiles/default.nix | 19 +- home/modules/profiles/development/default.nix | 37 +- home/modules/profiles/home-office/default.nix | 14 +- home/modules/programs/advcp/default.nix | 14 +- home/modules/programs/emacs/beacon.nix | 15 +- home/modules/programs/emacs/company.nix | 19 +- home/modules/programs/emacs/default.nix | 108 +-- home/modules/programs/emacs/helm.nix | 15 +- home/modules/programs/emacs/lib.nix | 85 +-- home/modules/programs/emacs/lsp.nix | 32 +- .../programs/emacs/polymode/default.nix | 59 +- home/modules/programs/emacs/projectile.nix | 15 +- home/modules/programs/emacs/telephoneline.nix | 15 +- .../programs/emacs/whichkey/default.nix | 32 +- home/modules/programs/exa/default.nix | 16 +- home/modules/programs/nixpkgs/default.nix | 16 +- home/modules/programs/openshift/default.nix | 14 +- home/modules/programs/zshell/default.nix | 17 +- home/modules/services/insync/default.nix | 23 +- home/modules/services/keyleds/default.nix | 29 +- home/modules/services/restic/default.nix | 21 +- lefthook.yml | 2 +- lib/default.nix | 4 +- lib/home_configurations_as_packages.nix | 16 +- lib/mk_home.nix | 34 +- lib/mk_system.nix | 38 +- lib/nixos_configurations_as_packages.nix | 16 +- nixos/configurations/default.nix | 4 +- nixos/configurations/enceladeus.nix | 30 +- nixos/configurations/hardware/enceladeus.nix | 69 +- nixos/configurations/hardware/mimas.nix | 60 +- nixos/configurations/hardware/thetys.nix | 22 +- nixos/configurations/mimas.nix | 89 +-- nixos/configurations/thetys.nix | 74 ++- nixos/modules/cachix/caches/nix-community.nix | 6 +- nixos/modules/cachix/caches/nobbz.nix | 6 +- nixos/modules/cachix/caches/ts-helper.nix | 6 +- nixos/modules/cachix/default.nix | 15 +- nixos/modules/default.nix | 4 +- nixos/modules/flake.nix | 22 +- nixos/modules/hostnames.nix | 11 +- nixos/modules/moonlander.nix | 17 +- nixos/modules/nix.nix | 19 +- oldstuff/home/hosts/WS0005.nix | 8 +- oldstuff/home/modules/default.nix | 24 +- oldstuff/home/modules/languages/c/default.nix | 15 +- .../home/modules/languages/ocaml/default.nix | 19 +- oldstuff/home/nix/default.nix | 9 +- oldstuff/home/nix/myOverlay/default.nix | 6 +- oldstuff/home/overlays.nix | 5 +- oldstuff/packages/devShell.nix | 9 +- packages/advcp/default.nix | 48 +- packages/default.nix | 32 +- packages/dracula/konsole/default.nix | 8 +- packages/elixir-lsp/default.nix | 113 ++-- packages/elixir-lsp/fetch-mix-deps.nix | 30 +- packages/erlang-ls/default.nix | 70 +- packages/gnucash-de/default.nix | 9 +- packages/keyleds/default.nix | 12 +- packages/nodePackages/default.nix | 30 +- packages/nodePackages/node-env.nix | 621 ++++++++++-------- packages/nodePackages/node-packages.nix | 40 +- packages/nodePackages/override.nix | 25 +- packages/rofi-unicode/default.nix | 47 +- 90 files changed, 1733 insertions(+), 1390 deletions(-) diff --git a/apps/switch/default.nix b/apps/switch/default.nix index 4bf981bf..2734d081 100644 --- a/apps/switch/default.nix +++ b/apps/switch/default.nix @@ -1,7 +1,9 @@ -{ self, unstable, ... }: - -let - pkgs = import unstable { system = "x86_64-linux"; }; +{ + self, + unstable, + ... +}: let + pkgs = import unstable {system = "x86_64-linux";}; type = "app"; program = "${switch}/bin/switch"; @@ -17,7 +19,7 @@ let pname = "nobbz-flake-switcher"; version = "0.0.1"; - buildInputs = [ self.packages.x86_64-linux.zx ]; + buildInputs = [self.packages.x86_64-linux.zx]; src = ./.; @@ -34,5 +36,4 @@ let install --mode=555 switch.mjs $out/lib/switch.mjs ''; }; -in -{ inherit type program; } +in {inherit type program;} diff --git a/apps/update/default.nix b/apps/update/default.nix index 7444c8e8..2ba5d011 100644 --- a/apps/update/default.nix +++ b/apps/update/default.nix @@ -1,7 +1,9 @@ -{ self, unstable, ... }: - -let - pkgs = import unstable { system = "x86_64-linux"; }; +{ + self, + unstable, + ... +}: let + pkgs = import unstable {system = "x86_64-linux";}; type = "app"; program = "${update}/bin/update"; @@ -9,7 +11,7 @@ let pname = "nobbz-flake-updater"; version = "0.0.1"; - buildInputs = [ self.packages.x86_64-linux.zx ]; + buildInputs = [self.packages.x86_64-linux.zx]; src = ./.; @@ -26,5 +28,4 @@ let install --mode=555 update.mjs $out/lib/update.mjs ''; }; -in -{ inherit type program; } +in {inherit type program;} diff --git a/flake.lock b/flake.lock index 4a9e7a3f..8e3e7512 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "alejandra": { + "inputs": { + "flakeCompat": "flakeCompat", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1646937181, + "narHash": "sha256-vkFKYnSmhPPXtc3AH7iRtqRRqxhj0o5WySqPT+klDWU=", + "owner": "kamadorueda", + "repo": "alejandra", + "rev": "b75302002c94a158faebf5fca9e0d72f2ca59f4d", + "type": "github" + }, + "original": { + "owner": "kamadorueda", + "ref": "1.1.0", + "repo": "alejandra", + "type": "github" + } + }, "emacs": { "locked": { "lastModified": 1647568430, @@ -52,6 +72,22 @@ "type": "github" } }, + "flakeCompat": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -149,7 +185,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -168,7 +204,7 @@ }, "nixos-vscode-server": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1631782689, @@ -187,17 +223,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-2105": { @@ -248,6 +285,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1626395775, "narHash": "sha256-7Uo+4PIQGirfd7WfFuRuspLCyDT7eUn6pnJx/CL9UC8=", @@ -263,7 +315,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1645013224, "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", @@ -304,6 +356,7 @@ }, "root": { "inputs": { + "alejandra": "alejandra", "emacs": "emacs", "flake-utils": "flake-utils", "home-manager": "home-manager", @@ -338,7 +391,7 @@ "inputs": { "fenix": "fenix", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1645337357, diff --git a/flake.nix b/flake.nix index 05423404..5ef51088 100644 --- a/flake.nix +++ b/flake.nix @@ -20,34 +20,38 @@ inputs.nixos-vscode-server.url = "github:mudrii/nixos-vscode-ssh-fix/main"; inputs.statix.url = "github:nerdypepper/statix"; + inputs.alejandra.url = "github:kamadorueda/alejandra/1.1.0"; - outputs = { self, ... }@inputs: - { - nixosModules = import ./nixos/modules inputs; - nixosConfigurations = import ./nixos/configurations inputs; + outputs = {self, ...} @ inputs: { + nixosModules = import ./nixos/modules inputs; + nixosConfigurations = import ./nixos/configurations inputs; - homeModules = import ./home/modules; - homeConfigurations = import ./home/configurations inputs; + homeModules = import ./home/modules; + homeConfigurations = import ./home/configurations inputs; - packages.x86_64-linux = (import ./packages inputs) - // self.lib.nixosConfigurationsAsPackages.x86_64-linux - // self.lib.homeConfigurationsAsPackages.x86_64-linux; + packages.x86_64-linux = + (import ./packages inputs) + // self.lib.nixosConfigurationsAsPackages.x86_64-linux + // self.lib.homeConfigurationsAsPackages.x86_64-linux; - checks = self.packages; + checks = self.packages; - lib = import ./lib inputs; + lib = import ./lib inputs; - apps.x86_64-linux = { - update = import ./apps/update inputs; - switch = import ./apps/switch inputs; - }; - - devShell.x86_64-linux = let pkgs = inputs.unstable.legacyPackages.x86_64-linux; in - pkgs.mkShell { - packages = [ - inputs.rnix-lsp.defaultPackage.x86_64-linux - inputs.statix.defaultPackage.x86_64-linux - ]; - }; + apps.x86_64-linux = { + update = import ./apps/update inputs; + switch = import ./apps/switch inputs; }; + + devShell.x86_64-linux = let + pkgs = inputs.unstable.legacyPackages.x86_64-linux; + in + pkgs.mkShell { + packages = [ + inputs.rnix-lsp.defaultPackage.x86_64-linux + inputs.statix.defaultPackage.x86_64-linux + inputs.alejandra.defaultPackage.x86_64-linux + ]; + }; + }; } diff --git a/home/configurations/default.nix b/home/configurations/default.nix index 05e05b78..0eb3c720 100644 --- a/home/configurations/default.nix +++ b/home/configurations/default.nix @@ -1,6 +1,4 @@ -{ self, ... }@inputs: - -{ +{self, ...} @ inputs: { "nmelzer@mimas" = self.lib.mkHome "nmelzer" "mimas" "x86_64-linux" inputs.unstable; "nmelzer@enceladeus" = self.lib.mkHome "nmelzer" "enceladeus" "x86_64-linux" inputs.unstable; "demo@thetys" = self.lib.mkHome "demo" "thetys" "x86_64-linux" inputs.unstable; diff --git a/home/configurations/demo@thetys.nix b/home/configurations/demo@thetys.nix index e3fb9d0c..3057f8d9 100644 --- a/home/configurations/demo@thetys.nix +++ b/home/configurations/demo@thetys.nix @@ -1,63 +1,66 @@ -{ pkgs, nixpkgs-2105, self, ... }: - -let +{ + pkgs, + nixpkgs-2105, + self, + ... +}: let stable = nixpkgs-2105.legacyPackages.x86_64-linux; self' = self.packages.x86_64-linux; -in -{ +in { config = { - nixpkgs.allowedUnfree = [ "google-chrome" "vscode" ]; + nixpkgs.allowedUnfree = ["google-chrome" "vscode"]; - activeProfiles = [ "browsing" "development" ]; + activeProfiles = ["browsing" "development"]; - enabledLanguages = - [ "elixir" "go" "lua" "nix" "python" "terraform" "nim" "rust" ]; + enabledLanguages = ["elixir" "go" "lua" "nix" "python" "terraform" "nim" "rust"]; languages.python.useMS = true; programs.emacs.splashScreen = false; - programs.emacs.extraPackages = ep: [ ep.robot-mode ]; + programs.emacs.extraPackages = ep: [ep.robot-mode]; services = { gnome-keyring.enable = true; restic = { enable = true; - exclude = (map - (e: "%h/${e}") - [ - ".cache" - ".cabal" - ".cargo" - ".emacs.d/eln-cache" - ".emacs.d/.cache" - ".gem" - ".gradle" - ".hex" - ".kube" - ".local" - ".m2" - ".minikube" - ".minishift" - ".mix" - ".mozilla" - ".npm" - ".opam" - ".rancher" - ".vscode-oss" - "go/pkg" - "Videos" - "Downloads" - "VirtualBox VMs" - ]) ++ [ - "_build" - "deps" - "result" - "target" - ".elixir_ls" - "ccls-cache" - ".direnv" - ]; + exclude = + (map + (e: "%h/${e}") + [ + ".cache" + ".cabal" + ".cargo" + ".emacs.d/eln-cache" + ".emacs.d/.cache" + ".gem" + ".gradle" + ".hex" + ".kube" + ".local" + ".m2" + ".minikube" + ".minishift" + ".mix" + ".mozilla" + ".npm" + ".opam" + ".rancher" + ".vscode-oss" + "go/pkg" + "Videos" + "Downloads" + "VirtualBox VMs" + ]) + ++ [ + "_build" + "deps" + "result" + "target" + ".elixir_ls" + "ccls-cache" + ".direnv" + ]; repo = "rest:http://172.24.152.168:9999/nobbz"; }; }; @@ -72,13 +75,13 @@ in imwheel = { Unit = { Description = "IMWheel"; - Wants = [ "display-manager.service" ]; - After = [ "display-manager.service" ]; + Wants = ["display-manager.service"]; + After = ["display-manager.service"]; }; Service = { Type = "simple"; - Environment = [ "XAUTHORITY=%h/.Xauthority" ]; + Environment = ["XAUTHORITY=%h/.Xauthority"]; ExecStart = "${pkgs.imwheel}/bin/imwheel -d"; ExecStop = "${pkgs.procps}/bin/pkill imwheel"; @@ -87,7 +90,7 @@ in }; Install = { - WantedBy = [ "graphical-session.target" ]; + WantedBy = ["graphical-session.target"]; }; }; }; diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index f4769733..3df94d90 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -1,19 +1,22 @@ -{ pkgs, lib, statix, ... }: - { + pkgs, + lib, + statix, + ... +}: { config = { - nixpkgs.allowedUnfree = [ "google-chrome" "vscode" ]; + nixpkgs.allowedUnfree = ["google-chrome" "vscode"]; nixpkgs.config.contentAddressedByDefault = false; - activeProfiles = [ "browsing" "development" ]; # "home-office" ]; + activeProfiles = ["browsing" "development"]; # "home-office" ]; xsession.windowManager.awesome.autostart = [ "${pkgs.blueman}/bin/blueman-applet" "${pkgs.networkmanagerapplet}/bin/nm-applet" ]; - enabledLanguages = [ "cpp" "nix" "elixir" "erlang" "python" ]; + enabledLanguages = ["cpp" "nix" "elixir" "erlang" "python"]; languages.python.useMS = true; @@ -21,12 +24,12 @@ services.restic = { enable = true; - exclude = (map (e: "%h/${e}") [ ".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg" ]) ++ [ "_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv" ]; + exclude = (map (e: "%h/${e}") [".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg"]) ++ ["_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv"]; oneFileSystem = true; repo = "rest:http://172.24.152.168:9999/nobbz"; }; systemd.user.timers.restic-backup.Timer.OnCalendar = lib.mkForce "hourly"; - home.packages = [ pkgs.vscode statix.defaultPackage.x86_64-linux ]; + home.packages = [pkgs.vscode statix.defaultPackage.x86_64-linux]; }; } diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index 4a5f8589..a5d2440c 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -1,13 +1,16 @@ -{ pkgs, unstable, self, ... }: -let - keepassWithPlugins = - pkgs.keepass.override { plugins = [ pkgs.keepass-keepasshttp ]; }; -in { + pkgs, + unstable, + self, + ... +}: let + keepassWithPlugins = + pkgs.keepass.override {plugins = [pkgs.keepass-keepasshttp];}; +in { config = { - nixpkgs.allowedUnfree = [ "teamspeak-client" "google-chrome" "vscode" ]; + nixpkgs.allowedUnfree = ["teamspeak-client" "google-chrome" "vscode"]; - activeProfiles = [ "browsing" "development" "home-office" ]; + activeProfiles = ["browsing" "development" "home-office"]; dconf.enable = true; @@ -30,23 +33,21 @@ in programs.emacs.splashScreen = false; - home.packages = - let - p = pkgs; - s = self.packages.x86_64-linux; - in - [ - p.handbrake - p.keybase-gui - p.minikube - p.gnome3.gnome-tweaks - p.freerdp - p.vscode + home.packages = let + p = pkgs; + s = self.packages.x86_64-linux; + in [ + p.handbrake + p.keybase-gui + p.minikube + p.gnome3.gnome-tweaks + p.freerdp + p.vscode - s.gnucash-de + s.gnucash-de - keepassWithPlugins - ]; + keepassWithPlugins + ]; programs.obs-studio.enable = true; programs.htop = { @@ -74,7 +75,7 @@ in restic = { enable = true; - exclude = (map (e: "%h/${e}") [ ".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg" ]) ++ [ "_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv" ]; + exclude = (map (e: "%h/${e}") [".cache" ".cabal" ".cargo" ".emacs.d/eln-cache" ".emacs.d/.cache" ".gem" ".gradle" ".hex" ".kube" ".local" ".m2" ".minikube" ".minishift" ".mix" ".mozilla" "npm" ".opam" ".rancher" ".vscode-oss" "go/pkg"]) ++ ["_build" "deps" "result" "target" ".elixir_ls" "ccls-cache" ".direnv"]; oneFileSystem = true; repo = "rest:http://172.24.152.168:9999/nobbz"; }; @@ -84,8 +85,8 @@ in keybase-gui = { Unit = { Description = "Keybase GUI"; - Requires = [ "keybase.service" "kbfs.service" ]; - After = [ "keybase.service" "kbfs.service" ]; + Requires = ["keybase.service" "kbfs.service"]; + After = ["keybase.service" "kbfs.service"]; }; Service = { ExecStart = "${pkgs.keybase-gui}/share/keybase/Keybase"; @@ -98,3 +99,4 @@ in # environment.pathsToLink = [ "/share/zsh" ]; } # /nix/store/7skqa8vxfydq7w3cix55ffvkmjb3b5da-python-2.7.18 + diff --git a/home/modules/languages/agda/default.nix b/home/modules/languages/agda/default.nix index 811ac3dc..de186038 100644 --- a/home/modules/languages/agda/default.nix +++ b/home/modules/languages/agda/default.nix @@ -1,8 +1,10 @@ -{ config, lib, ... }: -let cfg = config.languages.agda; - -in { + config, + lib, + ... +}: let + cfg = config.languages.agda; +in { options.languages.agda = { enable = lib.mkEnableOption "Agda language support"; }; @@ -11,9 +13,9 @@ in programs.emacs = { localPackages."init-agda" = { tag = "Setup Agda"; - comments = [ ]; - requires = [ ]; - packageRequires = ep: with ep.melpaStablePackages; [ agda2-mode eri annotation ]; + comments = []; + requires = []; + packageRequires = ep: with ep.melpaStablePackages; [agda2-mode eri annotation]; code = '' (load-library "agda2-mode") ''; diff --git a/home/modules/languages/c++/default.nix b/home/modules/languages/c++/default.nix index 6ab09ee3..2fa7935e 100644 --- a/home/modules/languages/c++/default.nix +++ b/home/modules/languages/c++/default.nix @@ -1,10 +1,13 @@ -{ config, lib, pkgs, ... }: -let +{ + config, + lib, + pkgs, + ... +}: let cfg = config.languages.cpp; inherit (pkgs) ccls; -in -{ +in { options.languages.cpp = { enable = lib.mkEnableOption "Enable support for C++ language"; }; @@ -13,9 +16,9 @@ in programs.emacs = { localPackages."init-cpp" = { tag = "Setup C++"; - requires = [ "ccls" ]; - packageRequires = ep: [ ep.ccls ]; - comments = [ ]; + requires = ["ccls"]; + packageRequires = ep: [ep.ccls]; + comments = []; code = '' (setq ccls-executable "${ccls}/bin/ccls") ''; diff --git a/home/modules/languages/clojure/default.nix b/home/modules/languages/clojure/default.nix index 7064e99f..7bea8fb9 100644 --- a/home/modules/languages/clojure/default.nix +++ b/home/modules/languages/clojure/default.nix @@ -1,19 +1,22 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.clojure; - -in { + config, + lib, + pkgs, + ... +}: let + cfg = config.languages.clojure; +in { options.languages.clojure = { enable = lib.mkEnableOption "Enable support for the clojure language"; }; config = lib.mkIf cfg.enable { programs.emacs = { - extraPackages = ep: [ ep.clojure-mode ]; + extraPackages = ep: [ep.clojure-mode]; lsp-mode = { enable = true; - languages = [ "clojure" ]; + languages = ["clojure"]; }; extraInit = '' diff --git a/home/modules/languages/default.nix b/home/modules/languages/default.nix index bdb56cf2..df843f40 100644 --- a/home/modules/languages/default.nix +++ b/home/modules/languages/default.nix @@ -1,13 +1,15 @@ -{ config, lib, ... }: -let - langsEnabler = - let reducer = l: r: { "${r}".enable = true; } // l; - in builtins.foldl' reducer { } config.enabledLanguages; - -in { + config, + lib, + ... +}: let + langsEnabler = let + reducer = l: r: {"${r}".enable = true;} // l; + in + builtins.foldl' reducer {} config.enabledLanguages; +in { options.enabledLanguages = - lib.mkOption { type = lib.types.listOf lib.types.str; }; + lib.mkOption {type = lib.types.listOf lib.types.str;}; - config = { languages = langsEnabler; }; + config = {languages = langsEnabler;}; } diff --git a/home/modules/languages/elixir/default.nix b/home/modules/languages/elixir/default.nix index 491adb51..1e8dc415 100644 --- a/home/modules/languages/elixir/default.nix +++ b/home/modules/languages/elixir/default.nix @@ -1,10 +1,14 @@ -{ config, lib, pkgs, self, ... }: -let +{ + config, + lib, + pkgs, + self, + ... +}: let cfg = config.languages.elixir; inherit (self.packages.x86_64-linux) elixir-lsp; -in -{ +in { options.languages.elixir = { enable = lib.mkEnableOption "Enable support for elixir language"; }; @@ -19,13 +23,13 @@ in programs.emacs = { lsp-mode = { enable = true; - languages = [ "elixir" ]; + languages = ["elixir"]; }; localPackages."init-elixir" = { tag = "Setup elixir"; - comments = [ ]; - requires = [ "company" "flycheck" ]; + comments = []; + requires = ["company" "flycheck"]; packageRequires = ep: [ ep.company ep.elixir-mode diff --git a/home/modules/languages/erlang/default.nix b/home/modules/languages/erlang/default.nix index fc9c636e..4dc10a7a 100644 --- a/home/modules/languages/erlang/default.nix +++ b/home/modules/languages/erlang/default.nix @@ -1,10 +1,14 @@ -{ config, lib, pkgs, self, ... }: -let +{ + config, + lib, + pkgs, + self, + ... +}: let cfg = config.languages.erlang; inherit (self.packages.x86_64-linux) erlang-ls; -in -{ +in { options.languages.erlang = { enable = lib.mkEnableOption "Enable support for erlang language"; }; @@ -12,13 +16,13 @@ in config = lib.mkIf cfg.enable { programs.emacs.extraPackages = ep: [ (ep.erlang.overrideAttrs (oa: { - buildInputs = oa.buildInputs ++ [ pkgs.perl pkgs.ncurses ]; + buildInputs = oa.buildInputs ++ [pkgs.perl pkgs.ncurses]; })) ]; programs.emacs.lsp-mode = { enable = true; - languages = [ "erlang" ]; + languages = ["erlang"]; }; programs.emacs.extraInit = '' diff --git a/home/modules/languages/go/default.nix b/home/modules/languages/go/default.nix index e459eeaf..33bde9b8 100644 --- a/home/modules/languages/go/default.nix +++ b/home/modules/languages/go/default.nix @@ -1,21 +1,24 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.go; - -in { + config, + lib, + pkgs, + ... +}: let + cfg = config.languages.go; +in { options.languages.go = { enable = lib.mkEnableOption "Enable support for the go language"; }; config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.go-mode ]; + programs.emacs.extraPackages = ep: [ep.go-mode]; programs.emacs.lsp-mode = { enable = true; - languages = [ "go" ]; + languages = ["go"]; }; - home.packages = [ pkgs.go ]; + home.packages = [pkgs.go]; programs.emacs.extraInit = '' (add-to-list 'exec-path "${pkgs.gopls}/bin") diff --git a/home/modules/languages/lua/default.nix b/home/modules/languages/lua/default.nix index 754fef6d..533cfaae 100644 --- a/home/modules/languages/lua/default.nix +++ b/home/modules/languages/lua/default.nix @@ -1,12 +1,14 @@ -{ config, lib, ... }: -let cfg = config.languages.lua; - -in { + config, + lib, + ... +}: let + cfg = config.languages.lua; +in { options.languages.lua = { enable = lib.mkEnableOption "Enable support for lua language"; }; config = - lib.mkIf cfg.enable { programs.emacs.extraPackages = ep: [ ep.lua-mode ]; }; + lib.mkIf cfg.enable {programs.emacs.extraPackages = ep: [ep.lua-mode];}; } diff --git a/home/modules/languages/nim/default.nix b/home/modules/languages/nim/default.nix index e9d8c595..3ed11255 100644 --- a/home/modules/languages/nim/default.nix +++ b/home/modules/languages/nim/default.nix @@ -1,11 +1,14 @@ -{ config, lib, pkgs, unstable, ... }: - -let +{ + config, + lib, + pkgs, + unstable, + ... +}: let cfg = config.languages.nim; inherit (unstable.legacyPackage.x86_64-linux) nim; -in -{ +in { options.languages.nim = { enable = lib.mkEnableOption "Nim-lang"; }; @@ -14,9 +17,9 @@ in programs.emacs = { localPackages."init-nim" = { tag = "Setup Nim Mode"; - requires = [ "company" "flycheck" ]; - packageRequires = ep: [ ep.nim-mode ep.lsp-mode ep.company ep.flycheck ]; - comments = [ ]; + requires = ["company" "flycheck"]; + packageRequires = ep: [ep.nim-mode ep.lsp-mode ep.company ep.flycheck]; + comments = []; code = '' (add-hook 'nim-mode-hook (lambda () diff --git a/home/modules/languages/nix/default.nix b/home/modules/languages/nix/default.nix index c5387fee..16ec4322 100644 --- a/home/modules/languages/nix/default.nix +++ b/home/modules/languages/nix/default.nix @@ -1,17 +1,21 @@ -{ config, lib, pkgs, rnix-lsp, ... }: -let +{ + config, + lib, + pkgs, + rnix-lsp, + ... +}: let cfg = config.languages.nix; # rnixLsp = rnix-lsp.defaultPackage.x86_64-linux; rnixLsp = pkgs.rnix-lsp; -in -{ +in { options.languages.nix = { enable = lib.mkEnableOption "Enable support for the nix language"; }; config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.lsp-mode ep.nix-mode ep.flycheck ]; + programs.emacs.extraPackages = ep: [ep.lsp-mode ep.nix-mode ep.flycheck]; programs.emacs.extraInit = '' (require 'lsp-mode) diff --git a/home/modules/languages/python/default.nix b/home/modules/languages/python/default.nix index 09a551bc..256120c2 100644 --- a/home/modules/languages/python/default.nix +++ b/home/modules/languages/python/default.nix @@ -1,23 +1,27 @@ -{ config, lib, pkgs, ... }: -let +{ + config, + lib, + pkgs, + ... +}: let cfg = config.languages.python; pyls = "${pkgs.python37Packages.python-language-server}/bin/pyls"; mspyls = "${pkgs.python-language-server}/bin/python-language-server"; - lsBin = if cfg.useMS then mspyls else pyls; + lsBin = + if cfg.useMS + then mspyls + else pyls; lsHook = - if cfg.useMS then - "(add-hook 'python-mode-hook (lambda () (require 'lsp-python-ms) (lsp)))" - else - ""; + if cfg.useMS + then "(add-hook 'python-mode-hook (lambda () (require 'lsp-python-ms) (lsp)))" + else ""; lsExec = - if cfg.useMS then - ''(setq lsp-python-ms-executable "${lsBin}")'' - else - ''(setq lsp-pyls-server-command '("${lsBin}"))''; -in -{ + if cfg.useMS + then ''(setq lsp-python-ms-executable "${lsBin}")'' + else ''(setq lsp-pyls-server-command '("${lsBin}"))''; +in { options.languages.python = { enable = lib.mkEnableOption "Enable support for python language"; useMS = lib.mkEnableOption "Use MS language server rather than palantirs"; @@ -26,19 +30,27 @@ in config = lib.mkIf cfg.enable { programs.emacs.lsp-mode = { enable = true; - languages = if cfg.useMS then [ ] else [ "python" ]; + languages = + if cfg.useMS + then [] + else ["python"]; }; programs.emacs.localPackages."init-python" = { tag = "Setup and prepare the python language modes"; - comments = [ ]; - requires = [ ]; + comments = []; + requires = []; packageRequires = ep: [ ep.lsp-pyright ep.python-docstring (config.programs.emacs.localPackages."init-lsp".packageRequires ep) - ] ++ (if cfg.useMS then [ ep.lsp-python-ms ] else [ ]); + ] + ++ ( + if cfg.useMS + then [ep.lsp-python-ms] + else [] + ); code = '' ${lsHook} diff --git a/home/modules/languages/rust/default.nix b/home/modules/languages/rust/default.nix index ec13bfe6..e4878fa3 100644 --- a/home/modules/languages/rust/default.nix +++ b/home/modules/languages/rust/default.nix @@ -1,18 +1,20 @@ -{ config, lib, ... }: -let cfg = config.languages.rust; - -in { + config, + lib, + ... +}: let + cfg = config.languages.rust; +in { options.languages.rust = { enable = lib.mkEnableOption "Enable support for Rust language"; }; config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.rust-mode ep.pest-mode ]; + programs.emacs.extraPackages = ep: [ep.rust-mode ep.pest-mode]; programs.emacs.lsp-mode = { enable = true; - languages = [ "rust" ]; + languages = ["rust"]; }; programs.emacs.extraInit = '' diff --git a/home/modules/languages/terraform/default.nix b/home/modules/languages/terraform/default.nix index 3013f311..ada357ed 100644 --- a/home/modules/languages/terraform/default.nix +++ b/home/modules/languages/terraform/default.nix @@ -1,8 +1,10 @@ -{ config, lib, ... }: -let cfg = config.languages.terraform; - -in { + config, + lib, + ... +}: let + cfg = config.languages.terraform; +in { options.languages.terraform = { enable = lib.mkEnableOption "Enable support for the terraform lanugage"; }; @@ -11,9 +13,9 @@ in programs.emacs = { localPackages."init-terraform" = { tag = "Setup and prepare terraform editing modes"; - comments = [ ]; - requires = [ "company-terraform" ]; - packageRequires = ep: [ ep.company-terraform ep.terraform-mode ]; + comments = []; + requires = ["company-terraform"]; + packageRequires = ep: [ep.company-terraform ep.terraform-mode]; code = '' (add-hook 'terraform-mode-hook (lambda () diff --git a/home/modules/languages/tex/default.nix b/home/modules/languages/tex/default.nix index aaad18c4..f8c7e55e 100644 --- a/home/modules/languages/tex/default.nix +++ b/home/modules/languages/tex/default.nix @@ -1,14 +1,17 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.tex; - -in { + config, + lib, + pkgs, + ... +}: let + cfg = config.languages.tex; +in { options.languages.tex = { enable = lib.mkEnableOption "LaTeX language support"; }; config = lib.mkIf cfg.enable { - programs.emacs.extraPackages = ep: [ ep.auctex ]; + programs.emacs.extraPackages = ep: [ep.auctex]; programs.emacs.lsp-mode = { enable = true; diff --git a/home/modules/misc/awesome/default.nix b/home/modules/misc/awesome/default.nix index 71176e6a..2f5b4797 100644 --- a/home/modules/misc/awesome/default.nix +++ b/home/modules/misc/awesome/default.nix @@ -1,28 +1,31 @@ -{ config, lib, pkgs, self, ... }: -let +{ + config, + lib, + pkgs, + self, + ... +}: let cfg = config.xsession.windowManager.awesome; rofi = pkgs.rofi.override { - plugins = [ pkgs.rofi-emoji ]; + plugins = [pkgs.rofi-emoji]; }; self' = self.packages.x86_64-linux; - autostartScript = - let - entries = builtins.map (e: "\"${e}\",") cfg.autostart; - in - '' - -- Autorun programs - autorunApps = { - ${builtins.concatStringsSep "\n " entries} - } + autostartScript = let + entries = builtins.map (e: "\"${e}\",") cfg.autostart; + in '' + -- Autorun programs + autorunApps = { + ${builtins.concatStringsSep "\n " entries} + } - for app = 1, #autorunApps do - awful.util.spawn(autorunApps[app]) - end - -- }}} - ''; + for app = 1, #autorunApps do + awful.util.spawn(autorunApps[app]) + end + -- }}} + ''; errorHandling = '' -- {{{ Error handling @@ -52,8 +55,7 @@ let end -- }}} ''; -in -{ +in { options.xsession.windowManager.awesome = { terminalEmulator = lib.mkOption { type = lib.types.str; @@ -67,7 +69,7 @@ in autostart = lib.mkOption { type = lib.types.listOf lib.types.str; - default = [ ]; + default = []; }; }; @@ -646,7 +648,7 @@ in client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) -- }}} - ${lib.optionalString (cfg.autostart != [ ]) autostartScript} + ${lib.optionalString (cfg.autostart != []) autostartScript} ''; }; } diff --git a/home/modules/misc/home/default.nix b/home/modules/misc/home/default.nix index 190e29b3..70c9296c 100644 --- a/home/modules/misc/home/default.nix +++ b/home/modules/misc/home/default.nix @@ -1,8 +1,14 @@ -{ config, pkgs, lib, nixpkgs-2105, unstable, self, ... }: -let - self' = self.packages.x86_64-linux; -in { + config, + pkgs, + lib, + nixpkgs-2105, + unstable, + self, + ... +}: let + self' = self.packages.x86_64-linux; +in { profiles.base.enable = true; fonts.fontconfig.enable = true; @@ -15,31 +21,29 @@ in home = { # sessionVariables = { NIX_PATH = nixPath; }; - packages = - let - p = pkgs; - s = self'; - in - [ - p.cachix - # nix-prefetch-scripts - p.nix-review - p.exercism - p.tmate - p.element-desktop - # p.powershell - s."dracula/konsole" - - p.fira-code - p.cascadia-code - - p.lefthook - - (p.writeShellScriptBin "timew" '' - export TIMEWARRIORDB="${config.home.homeDirectory}/timmelzer@gmail.com/timewarrior" - exec ${p.timewarrior}/bin/timew "$@" - '') - ]; + packages = let + p = pkgs; + s = self'; + in [ + p.cachix + # nix-prefetch-scripts + p.nix-review + p.exercism + p.tmate + p.element-desktop + # p.powershell + s."dracula/konsole" + + p.fira-code + p.cascadia-code + + p.lefthook + + (p.writeShellScriptBin "timew" '' + export TIMEWARRIORDB="${config.home.homeDirectory}/timmelzer@gmail.com/timewarrior" + exec ${p.timewarrior}/bin/timew "$@" + '') + ]; stateVersion = "20.09"; }; diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index bfd6370e..c1f0370e 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -1,12 +1,17 @@ -{ config, lib, pkgs, self, ... }: -let +{ + config, + lib, + pkgs, + self, + ... +}: let cfg = config.profiles.base; inherit (self.packages.x86_64-linux) emacs; inherit (lib.hm) dag; # TODO: make these a bit more nice, so that repeating the hosts and individual config isn't necessary. - zerotierHosts = [ "delly-nixos.adoring_suess.zerotier" "tux-nixos.adoring_suess.zerotier" "nixos.adoring_suess.zerotier" ]; + zerotierHosts = ["delly-nixos.adoring_suess.zerotier" "tux-nixos.adoring_suess.zerotier" "nixos.adoring_suess.zerotier"]; zsh-complete = pkgs.stdenv.mkDerivation { pname = "nix-zsh-completion-with-flakes"; @@ -14,15 +19,14 @@ let src = ./nix-completions.sh; - phases = [ "installPhase" ]; + phases = ["installPhase"]; installPhase = '' mkdir -p $out cp $src $out/_nix ''; }; -in -{ +in { options.profiles.base = { enable = lib.mkEnableOption "The base profile, should be always enabled"; }; @@ -39,7 +43,7 @@ in gtk.theme.name = "Adwaita-dark"; home.keyboard.layout = "de"; - home.packages = [ pkgs.hydra-check pkgs.dconf ]; + home.packages = [pkgs.hydra-check pkgs.dconf]; xsession = { enable = true; @@ -110,30 +114,31 @@ in identityFile = "~/.ssh/vogel"; }; - "deploy-vogel.custpoc.cloudseeds.de" = dag.entryBefore [ - "*.custpoc.cloudseeds.de" - "*.cloudseeds.de" - ] + "deploy-vogel.custpoc.cloudseeds.de" = + dag.entryBefore [ + "*.custpoc.cloudseeds.de" + "*.cloudseeds.de" + ] { user = "cloudseeds"; identityFile = "~/.ssh/vogel"; }; - "repo.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + "repo.cloudseeds.de" = dag.entryBefore ["*.cloudseeds.de"] { identityFile = "~/.ssh/id_rsa"; }; - "*.custpoc.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + "*.custpoc.cloudseeds.de" = dag.entryBefore ["*.cloudseeds.de"] { user = "norbert.melzer"; identityFile = "~/.ssh/actum-gitlab"; }; - "com01.internal.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + "com01.internal.cloudseeds.de" = dag.entryBefore ["*.cloudseeds.de"] { hostname = "192.168.123.22"; user = "root"; }; - "ironic.internal.cloudseeds.de" = dag.entryBefore [ "*.cloudseeds.de" ] { + "ironic.internal.cloudseeds.de" = dag.entryBefore ["*.cloudseeds.de"] { hostname = "192.168.123.31"; user = "root"; }; @@ -157,17 +162,18 @@ in historyLimit = 10000; terminal = "screen-256color"; - plugins = let tp = pkgs.tmuxPlugins; in - [ - # { - # plugin = tp.dracula; - # extraConfig = '' - # set -g @dracula-show-battery true - # set -g @dracula-show-powerline true - # set -g @dracula-refresh-rate 10 - # ''; - # } - ]; + plugins = let + tp = pkgs.tmuxPlugins; + in [ + # { + # plugin = tp.dracula; + # extraConfig = '' + # set -g @dracula-show-battery true + # set -g @dracula-show-powerline true + # set -g @dracula-refresh-rate 10 + # ''; + # } + ]; }; zsh = { diff --git a/home/modules/profiles/browsing/default.nix b/home/modules/profiles/browsing/default.nix index 44f1448d..84a7936c 100644 --- a/home/modules/profiles/browsing/default.nix +++ b/home/modules/profiles/browsing/default.nix @@ -1,15 +1,19 @@ -{ config, lib, pkgs, ... }: -let cfg = config.profiles.browsing; - -in { + config, + lib, + pkgs, + ... +}: let + cfg = config.profiles.browsing; +in { options.profiles.browsing = { - enable = lib.mkEnableOption + enable = + lib.mkEnableOption "A profile that enables a browser for the GUI and the terminal"; }; config = lib.mkIf cfg.enable { - nixpkgs.config = { google-chrome = { enableWideVine = true; }; }; - home.packages = with pkgs; [ google-chrome lynx ]; + nixpkgs.config = {google-chrome = {enableWideVine = true;};}; + home.packages = with pkgs; [google-chrome lynx]; }; } diff --git a/home/modules/profiles/default.nix b/home/modules/profiles/default.nix index af9d9a85..9ba88c9f 100644 --- a/home/modules/profiles/default.nix +++ b/home/modules/profiles/default.nix @@ -1,13 +1,14 @@ -{ config, lib, ... }: -let - profileEnabler = - let - reducer = l: r: { "${r}".enable = true; } // l; - in - builtins.foldl' reducer { } config.activeProfiles; -in { - options.activeProfiles = lib.mkOption { type = lib.types.listOf lib.types.str; }; + config, + lib, + ... +}: let + profileEnabler = let + reducer = l: r: {"${r}".enable = true;} // l; + in + builtins.foldl' reducer {} config.activeProfiles; +in { + options.activeProfiles = lib.mkOption {type = lib.types.listOf lib.types.str;}; config.profiles = profileEnabler; } diff --git a/home/modules/profiles/development/default.nix b/home/modules/profiles/development/default.nix index 7e99576f..568ffe22 100644 --- a/home/modules/profiles/development/default.nix +++ b/home/modules/profiles/development/default.nix @@ -1,16 +1,20 @@ -{ config, pkgs, lib, ... }: -let cfg = config.profiles.development; - -in { + config, + pkgs, + lib, + ... +}: let + cfg = config.profiles.development; +in { options.profiles.development = { - enable = lib.mkEnableOption + enable = + lib.mkEnableOption "A profile that enables the system to be used for developing programs"; }; config = lib.mkIf cfg.enable { programs.emacs = { - extraPackages = ep: [ ep.magit ]; + extraPackages = ep: [ep.magit]; extraInit = '' ;; prepare magit use from shell (require 'magit) @@ -29,8 +33,7 @@ in userEmail = "timmelzer@gmail.com"; aliases = { - graph = - "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold cyan)%h%C(reset) - %C(green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"; + graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold cyan)%h%C(reset) - %C(green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"; co = "checkout"; br = "branch"; st = "status"; @@ -67,15 +70,17 @@ in "flycheck_*.py" ]; - includes = [{ - condition = "gitdir:~/cloudseeds/**"; - contents = { - init.defaultBranch = "master"; - user.email = "norbert.melzer@cloudseeds.de"; - }; - }]; + includes = [ + { + condition = "gitdir:~/cloudseeds/**"; + contents = { + init.defaultBranch = "master"; + user.email = "norbert.melzer@cloudseeds.de"; + }; + } + ]; }; - home.packages = [ pkgs.ripgrep ]; + home.packages = [pkgs.ripgrep]; }; } diff --git a/home/modules/profiles/home-office/default.nix b/home/modules/profiles/home-office/default.nix index 7de750c1..2dedff01 100644 --- a/home/modules/profiles/home-office/default.nix +++ b/home/modules/profiles/home-office/default.nix @@ -1,10 +1,14 @@ -{ config, lib, pkgs, ... }: -let cfg = config.profiles.home-office; - -in { + config, + lib, + pkgs, + ... +}: let + cfg = config.profiles.home-office; +in { options.profiles.home-office = { - enable = lib.mkEnableOption + enable = + lib.mkEnableOption "A profile that enables remote desktop to the workingplace"; user = lib.mkOption { diff --git a/home/modules/programs/advcp/default.nix b/home/modules/programs/advcp/default.nix index 3f41c398..1436f84b 100644 --- a/home/modules/programs/advcp/default.nix +++ b/home/modules/programs/advcp/default.nix @@ -1,14 +1,18 @@ -{ config, lib, pkgs, self, ... }: -let cfg = config.programs.advancedCopy; - -in { + config, + lib, + pkgs, + self, + ... +}: let + cfg = config.programs.advancedCopy; +in { options.programs.advancedCopy = { enable = lib.mkEnableOption "CP and MV with a progressbar"; }; config = lib.mkIf cfg.enable { - home.packages = [ self.packages.x86_64-linux.advcp ]; + home.packages = [self.packages.x86_64-linux.advcp]; programs.zshell.aliases = { cp = "advcp -g"; diff --git a/home/modules/programs/emacs/beacon.nix b/home/modules/programs/emacs/beacon.nix index 0514bec3..f17c42d6 100644 --- a/home/modules/programs/emacs/beacon.nix +++ b/home/modules/programs/emacs/beacon.nix @@ -1,7 +1,10 @@ -{ config, lib, ... }: -let cfg = config.programs.emacs.packages.beacon; -in { + config, + lib, + ... +}: let + cfg = config.programs.emacs.packages.beacon; +in { options.programs.emacs.packages.beacon = { enable = lib.mkOption { type = lib.types.bool; @@ -15,14 +18,14 @@ in config = lib.mkIf cfg.enable { programs.emacs.localPackages."init-beacon" = { tag = "Setup beacon"; - comments = [ ]; - requires = [ ]; + comments = []; + requires = []; code = '' ;; enable the beacon minor mode globally. (beacon-mode 1) ''; }; - programs.emacs.extraPackages = ep: [ ep.beacon ]; + programs.emacs.extraPackages = ep: [ep.beacon]; }; } diff --git a/home/modules/programs/emacs/company.nix b/home/modules/programs/emacs/company.nix index cfc52896..2ef69eee 100644 --- a/home/modules/programs/emacs/company.nix +++ b/home/modules/programs/emacs/company.nix @@ -1,18 +1,19 @@ -{ config, lib, ... }: - -with lib; -let +{ + config, + lib, + ... +}: +with lib; let # emacs = config.programs.emacs; inherit (config.programs) emacs; -in -{ +in { config = lib.mkIf emacs.enable { - programs.emacs.extraPackages = ep: [ ep.company ]; + programs.emacs.extraPackages = ep: [ep.company]; programs.emacs.localPackages."init-company" = { tag = "Setup and initialise company"; - comments = [ ]; - requires = [ ]; + comments = []; + requires = []; code = '' ;; company (setq tab-always-indent 'complete) diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index 3554f40b..be754719 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -1,42 +1,48 @@ -{ config, lib, pkgs, ... }: -let +{ + config, + lib, + pkgs, + ... +}: let emacsEnabled = config.programs.emacs.enable; cfg = config.programs.emacs; - bool2Lisp = b: if b then "t" else "nil"; - - confPackages = - let - fileContent = lib.attrsets.mapAttrs' - (k: v: { - name = "${k}"; - value = { - ep = v.packageRequires; - src = config.lib.emacs.generatePackage k v.tag v.comments v.requires - v.code; - }; - }) - cfg.localPackages; - derivations = lib.attrsets.mapAttrs - (k: v: { - # ep = v.ep; - inherit (v) ep; - src = pkgs.writeText "${k}.el" v.src; - }) - fileContent; - in + bool2Lisp = b: + if b + then "t" + else "nil"; + + confPackages = let + fileContent = + lib.attrsets.mapAttrs' + (k: v: { + name = "${k}"; + value = { + ep = v.packageRequires; + src = + config.lib.emacs.generatePackage k v.tag v.comments v.requires + v.code; + }; + }) + cfg.localPackages; + derivations = + lib.attrsets.mapAttrs + (k: v: { + # ep = v.ep; + inherit (v) ep; + src = pkgs.writeText "${k}.el" v.src; + }) + fileContent; + in derivations; - lispRequires = - let - names = lib.attrsets.mapAttrsToList (n: _: n) cfg.localPackages; - sorted = builtins.sort (l: r: l < r) names; - required = builtins.map (r: "(require '${r})") sorted; - in + lispRequires = let + names = lib.attrsets.mapAttrsToList (n: _: n) cfg.localPackages; + sorted = builtins.sort (l: r: l < r) names; + required = builtins.map (r: "(require '${r})") sorted; + in builtins.concatStringsSep "\n" required; - -in -{ +in { options.programs.emacs = { splashScreen = lib.mkOption { type = lib.types.bool; @@ -50,13 +56,13 @@ in localPackages = lib.mkOption { type = lib.types.attrsOf (lib.types.submodule (_: { options = { - tag = lib.mkOption { type = lib.types.str; }; - comments = lib.mkOption { type = lib.types.listOf lib.types.str; }; - requires = lib.mkOption { type = lib.types.listOf lib.types.str; }; - code = lib.mkOption { type = lib.types.str; }; + tag = lib.mkOption {type = lib.types.str;}; + comments = lib.mkOption {type = lib.types.listOf lib.types.str;}; + requires = lib.mkOption {type = lib.types.listOf lib.types.str;}; + code = lib.mkOption {type = lib.types.str;}; packageRequires = lib.mkOption { type = lib.types.unspecified; - default = _: [ ]; + default = _: []; }; }; })); @@ -72,7 +78,7 @@ in module = lib.mkOption { description = "Attribute set of modules to link into emacs configuration"; - default = { }; + default = {}; }; }; @@ -150,20 +156,22 @@ in # ep.bazel-mode # (ep.trivialBuild { pname = "configuration"; src = confPackages; }) - ] ++ lib.attrsets.mapAttrsToList - (pname: v: - ep.trivialBuild { - inherit pname; - inherit (v) src; - # src = v.src; - packageRequires = v.ep ep; - }) - confPackages; + ] + ++ lib.attrsets.mapAttrsToList + (pname: v: + ep.trivialBuild { + inherit pname; + inherit (v) src; + # src = v.src; + packageRequires = v.ep ep; + }) + confPackages; home.file = { ".emacs.d/init.el" = { - text = config.lib.emacs.generatePackage "init" - "Initialises emacs configuration" [ ] [ ] + text = + config.lib.emacs.generatePackage "init" + "Initialises emacs configuration" [] [] cfg.extraInit; }; }; diff --git a/home/modules/programs/emacs/helm.nix b/home/modules/programs/emacs/helm.nix index d42118dd..c0956f52 100644 --- a/home/modules/programs/emacs/helm.nix +++ b/home/modules/programs/emacs/helm.nix @@ -1,14 +1,17 @@ -{ config, lib, ... }: -let emacsCfg = config.programs.emacs; -in { + config, + lib, + ... +}: let + emacsCfg = config.programs.emacs; +in { config = lib.mkIf emacsCfg.enable { programs.emacs = { localPackages."init-helm" = { tag = "Setup helm"; - comments = [ ]; - requires = [ "helm" ]; - packageRequires = ep: [ ep.helm ep.helm-rg ]; + comments = []; + requires = ["helm"]; + packageRequires = ep: [ep.helm ep.helm-rg]; code = '' ;; enable and configure auto resize (helm-autoresize-mode t) diff --git a/home/modules/programs/emacs/lib.nix b/home/modules/programs/emacs/lib.nix index 60c2a0fd..41022f62 100644 --- a/home/modules/programs/emacs/lib.nix +++ b/home/modules/programs/emacs/lib.nix @@ -1,51 +1,58 @@ let - generatePackage = { name, tagLine, commentLines, requireList, code }: - let - prelude = generatePrelude { inherit name tagLine commentLines; }; - requires = generateRequires requireList; - postlude = generatePostlude name; - in - '' - ${prelude} - - ${requires} - - ${code} - - ${postlude} - ''; - - generatePrelude = { name, tagLine, commentLines }: - let - generated = "This file is generated! DO NOT CHANGE!"; - comments = builtins.concatStringsSep "\n" - (builtins.map (l: if l == "" then "" else ";; ${l}") - ([ generated ] ++ commentLines)); - in - '' - ;;; ${name} --- ${tagLine} - - ;;; Commentary: - - ${comments} + generatePackage = { + name, + tagLine, + commentLines, + requireList, + code, + }: let + prelude = generatePrelude {inherit name tagLine commentLines;}; + requires = generateRequires requireList; + postlude = generatePostlude name; + in '' + ${prelude} + + ${requires} + + ${code} + + ${postlude} + ''; - ;;; Code: - ''; + generatePrelude = { + name, + tagLine, + commentLines, + }: let + generated = "This file is generated! DO NOT CHANGE!"; + comments = + builtins.concatStringsSep "\n" + (builtins.map (l: + if l == "" + then "" + else ";; ${l}") + ([generated] ++ commentLines)); + in '' + ;;; ${name} --- ${tagLine} + + ;;; Commentary: + + ${comments} + + ;;; Code: + ''; generatePostlude = name: '' (provide '${name}) ;;; ${name}.el ends here ''; - generateRequires = list: - let - sorted = builtins.sort (l: r: l < r) list; - required = builtins.map (r: "(require '${r})") sorted; - in + generateRequires = list: let + sorted = builtins.sort (l: r: l < r) list; + required = builtins.map (r: "(require '${r})") sorted; + in builtins.concatStringsSep "\n" required; - -in -{ +in { config.lib.emacs.generatePackage = name: tagLine: commentLines: requireList: code: generatePackage { inherit name code tagLine commentLines requireList; diff --git a/home/modules/programs/emacs/lsp.nix b/home/modules/programs/emacs/lsp.nix index 2edef0da..978f5bd5 100644 --- a/home/modules/programs/emacs/lsp.nix +++ b/home/modules/programs/emacs/lsp.nix @@ -1,28 +1,28 @@ -{ config, lib, ... }: -let +{ + config, + lib, + ... +}: let cfg = config.programs.emacs.lsp-mode; - mode-hooks = with lib; - let - sorted = builtins.sort (l: r: l < r) cfg.languages; - uni = unique sorted; - hooks = builtins.map (l: "'${l}-mode-hook") uni; - add-hooks = builtins.map (h: "(add-hook ${h} #'lsp)") hooks; - in + mode-hooks = with lib; let + sorted = builtins.sort (l: r: l < r) cfg.languages; + uni = unique sorted; + hooks = builtins.map (l: "'${l}-mode-hook") uni; + add-hooks = builtins.map (h: "(add-hook ${h} #'lsp)") hooks; + in builtins.concatStringsSep "\n" add-hooks; - -in -{ +in { options.programs.emacs.lsp-mode = { enable = lib.mkEnableOption "Enables and installs lsp-mode"; languages = lib.mkOption { type = lib.types.listOf lib.types.str; - default = [ ]; + default = []; description = '' The prefixes of the prog-mode that shall be handled through lsp-mode. ''; - example = [ "erlang" ]; + example = ["erlang"]; }; }; @@ -30,8 +30,8 @@ in programs.emacs = { localPackages."init-lsp" = { tag = "Setup and prepare the LSP mode"; - comments = [ ]; - requires = [ "lsp-mode" ]; + comments = []; + requires = ["lsp-mode"]; packageRequires = ep: [ # ep.company-lsp ep.helm-lsp diff --git a/home/modules/programs/emacs/polymode/default.nix b/home/modules/programs/emacs/polymode/default.nix index c41735d5..af1fafd9 100644 --- a/home/modules/programs/emacs/polymode/default.nix +++ b/home/modules/programs/emacs/polymode/default.nix @@ -1,34 +1,37 @@ -{ config, lib, ... }: - -with lib; # TODO: long term remove this `with` -let - inherit (config.programs) emacs; -in { - config = lib.mkIf emacs.enable { - programs.emacs.extraPackages = ep: [ ep.polymode ]; + config, + lib, + ... +}: +with lib; # TODO: long term remove this `with` + + let + inherit (config.programs) emacs; + in { + config = lib.mkIf emacs.enable { + programs.emacs.extraPackages = ep: [ep.polymode]; - programs.emacs.localPackages."init-polymode" = { - tag = "Setup and initialise polymode"; - comments = [ ]; - requires = [ ]; - code = '' - ;; polymode - (add-to-list 'auto-mode-alist '("\\.nix$" . poly-nix-mode)) + programs.emacs.localPackages."init-polymode" = { + tag = "Setup and initialise polymode"; + comments = []; + requires = []; + code = '' + ;; polymode + (add-to-list 'auto-mode-alist '("\\.nix$" . poly-nix-mode)) - (define-hostmode poly-nix-hostmode :mode 'nix-mode) + (define-hostmode poly-nix-hostmode :mode 'nix-mode) - (define-innermode poly-elisp-expr-nix-innermode - :mode 'emacs-lisp-mode - :head-matcher (cons "'''\n\\( *;;.*\n\\)" 1) - :tail-matcher " *''';$" - :head-mode 'body - :tail-mode 'host) + (define-innermode poly-elisp-expr-nix-innermode + :mode 'emacs-lisp-mode + :head-matcher (cons "'''\n\\( *;;.*\n\\)" 1) + :tail-matcher " *''';$" + :head-mode 'body + :tail-mode 'host) - (define-polymode poly-nix-mode - :hostmode 'poly-nix-hostmode - :innermodes '(poly-elisp-expr-nix-innermode)) - ''; + (define-polymode poly-nix-mode + :hostmode 'poly-nix-hostmode + :innermodes '(poly-elisp-expr-nix-innermode)) + ''; + }; }; - }; -} + } diff --git a/home/modules/programs/emacs/projectile.nix b/home/modules/programs/emacs/projectile.nix index 15e47dc4..08805c61 100644 --- a/home/modules/programs/emacs/projectile.nix +++ b/home/modules/programs/emacs/projectile.nix @@ -1,14 +1,17 @@ -{ config, lib, ... }: -let emacsCfg = config.programs.emacs; -in { + config, + lib, + ... +}: let + emacsCfg = config.programs.emacs; +in { config = lib.mkIf emacsCfg.enable { programs.emacs = { localPackages."init-projectile" = { tag = "Setup projectile"; - comments = [ ]; - requires = [ "projectile" "helm-projectile" "tramp" ]; - packageRequires = ep: [ ep.projectile ep.helm-projectile ]; + comments = []; + requires = ["projectile" "helm-projectile" "tramp"]; + packageRequires = ep: [ep.projectile ep.helm-projectile]; code = '' ;; enable projectile (projectile-mode t) diff --git a/home/modules/programs/emacs/telephoneline.nix b/home/modules/programs/emacs/telephoneline.nix index dbaf7577..52865778 100644 --- a/home/modules/programs/emacs/telephoneline.nix +++ b/home/modules/programs/emacs/telephoneline.nix @@ -1,12 +1,15 @@ -{ config, lib, ... }: -let ecfg = config.programs.emacs; -in { + config, + lib, + ... +}: let + ecfg = config.programs.emacs; +in { config = lib.mkIf ecfg.enable { programs.emacs.localPackages."init-telephoneline" = { tag = "Setup telephone line"; - comments = [ ]; - requires = [ ]; + comments = []; + requires = []; code = '' ;; set up telephone line (setq-default @@ -23,6 +26,6 @@ in ''; }; - programs.emacs.extraPackages = ep: [ ep.telephone-line ]; + programs.emacs.extraPackages = ep: [ep.telephone-line]; }; } diff --git a/home/modules/programs/emacs/whichkey/default.nix b/home/modules/programs/emacs/whichkey/default.nix index e1453398..446ae3f0 100644 --- a/home/modules/programs/emacs/whichkey/default.nix +++ b/home/modules/programs/emacs/whichkey/default.nix @@ -1,7 +1,9 @@ -{ config, lib, ... }: - -with lib; -let +{ + config, + lib, + ... +}: +with lib; let cfg = config.programs.emacs.whichkey; enabled = config.programs.emacs.enable; @@ -22,13 +24,17 @@ let }; })); - replacements = lib.concatStringsSep "\n " - (builtins.map ({ keys, replace, ... }: ''"${keys}" "${replace}"'') - cfg.replacement); -in -{ + replacements = + lib.concatStringsSep "\n " + (builtins.map ({ + keys, + replace, + ... + }: ''"${keys}" "${replace}"'') + cfg.replacement); +in { options.programs.emacs.whichkey = { - replacement = lib.mkOption { type = keyReplacementType; }; + replacement = lib.mkOption {type = keyReplacementType;}; }; config = lib.mkIf enabled { @@ -47,11 +53,11 @@ in replace = "leave emacs"; } ]; - extraPackages = ep: [ ep.which-key ]; + extraPackages = ep: [ep.which-key]; localPackages."init-whichkey" = { tag = "Setup and initialise whichkey"; - comments = [ ]; - requires = [ ]; + comments = []; + requires = []; code = '' ;; which-key (which-key-mode t) diff --git a/home/modules/programs/exa/default.nix b/home/modules/programs/exa/default.nix index 70f122bf..dff24c76 100644 --- a/home/modules/programs/exa/default.nix +++ b/home/modules/programs/exa/default.nix @@ -1,14 +1,16 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.exa; - -in { + config, + lib, + pkgs, + ... +}: let + cfg = config.programs.exa; +in { config = lib.mkIf cfg.enable { - home.packages = [ pkgs.exa ]; + home.packages = [pkgs.exa]; programs.zshell.aliases = { - ll = - "exa --header --git --classify --long --binary --group --time-style=long-iso --links --all --all --group-directories-first --sort=name"; + ll = "exa --header --git --classify --long --binary --group --time-style=long-iso --links --all --all --group-directories-first --sort=name"; }; }; } diff --git a/home/modules/programs/nixpkgs/default.nix b/home/modules/programs/nixpkgs/default.nix index 92653a13..08e18faa 100644 --- a/home/modules/programs/nixpkgs/default.nix +++ b/home/modules/programs/nixpkgs/default.nix @@ -1,20 +1,20 @@ -{ config, lib, ... }: - -let - allowed = config.nixpkgs.allowedUnfree; -in - { + config, + lib, + ... +}: let + allowed = config.nixpkgs.allowedUnfree; +in { options.nixpkgs.allowedUnfree = lib.mkOption { type = lib.types.listOf lib.types.string; - default = [ ]; + default = []; description = '' Allows for unfree packages by their name. ''; }; config.nixpkgs.config.allowUnfreePredicate = - if (allowed == [ ]) + if (allowed == []) then (_: false) else (pkg: __elem (lib.getName pkg) allowed); } diff --git a/home/modules/programs/openshift/default.nix b/home/modules/programs/openshift/default.nix index db2ea7e0..57f4b410 100644 --- a/home/modules/programs/openshift/default.nix +++ b/home/modules/programs/openshift/default.nix @@ -1,15 +1,17 @@ -{ pkgs, lib, config, ... }: -let cfg = config.programs.openshift; - -in { + pkgs, + lib, + config, + ... +}: let + cfg = config.programs.openshift; +in { options.programs.openshift = { enable = lib.mkEnableOption "Tools to manage openshift instances"; }; config = lib.mkIf cfg.enable { - home.packages = - [ pkgs.sops pkgs.openshift (lib.setPrio 0 pkgs.kubectl) pkgs.kubernetes-helm ]; + home.packages = [pkgs.sops pkgs.openshift (lib.setPrio 0 pkgs.kubectl) pkgs.kubernetes-helm]; programs.zsh.initExtra = '' # Enable autocomplete for oc, kubectl and helm diff --git a/home/modules/programs/zshell/default.nix b/home/modules/programs/zshell/default.nix index 514002aa..feb617b7 100644 --- a/home/modules/programs/zshell/default.nix +++ b/home/modules/programs/zshell/default.nix @@ -1,16 +1,19 @@ -{ config, lib, ... }: -let +{ + config, + lib, + ... +}: let cfg = config.programs.zshell; - aliasesStr = lib.concatStringsSep "\n" + aliasesStr = + lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: "alias ${k}=${lib.escapeShellArg v}") cfg.aliases); sourcesStr = lib.concatStringsSep "\n" (builtins.map (s: ". ${s}") cfg.sources); -in -{ +in { options.programs.zshell = { aliases = lib.mkOption { - default = { }; + default = {}; example = { ll = "ls -l"; ".." = "cd .."; @@ -22,7 +25,7 @@ in type = lib.types.attrsOf lib.types.str; }; sources = lib.mkOption { - default = [ ]; + default = []; type = lib.types.listOf lib.types.str; }; }; diff --git a/home/modules/services/insync/default.nix b/home/modules/services/insync/default.nix index 7f3b9bb1..6151096d 100644 --- a/home/modules/services/insync/default.nix +++ b/home/modules/services/insync/default.nix @@ -1,9 +1,12 @@ -{ config, lib, pkgs, self, ... }: - -let - cfg = config.services.insync; -in { + config, + lib, + pkgs, + self, + ... +}: let + cfg = config.services.insync; +in { options.services.insync = { enable = lib.mkEnableOption "Insync cloud sync tool"; @@ -19,18 +22,18 @@ in }; config = lib.mkIf cfg.enable { - nixpkgs.allowedUnfree = [ "insync" ]; + nixpkgs.allowedUnfree = ["insync"]; - home.packages = [ cfg.package ]; + home.packages = [cfg.package]; systemd.user.services.insync = { Unit = { Description = "Insync - Google Drive, OneDrive, and Dropbox Syncing on Linux, Windows & Mac"; - After = [ "graphical-session-pre.target" ]; - PartOf = [ "graphical-session.target" ]; + After = ["graphical-session-pre.target"]; + PartOf = ["graphical-session.target"]; }; - Install = { WantedBy = [ "graphical-session.target" ]; }; + Install = {WantedBy = ["graphical-session.target"];}; Service = { Type = "simple"; diff --git a/home/modules/services/keyleds/default.nix b/home/modules/services/keyleds/default.nix index 671c40c0..f7413146 100644 --- a/home/modules/services/keyleds/default.nix +++ b/home/modules/services/keyleds/default.nix @@ -1,11 +1,16 @@ -{ config, lib, pkgs, self, ... }: -let +{ + config, + lib, + pkgs, + self, + ... +}: let cfg = config.services.keyleds; self' = self.packages.x86_64-linux; -in -{ +in { options.services.keyleds = { - enable = lib.mkEnableOption + enable = + lib.mkEnableOption "Logitech Keyboard animation for Linux — G410, G513, G610, G810, G910, GPro"; package = lib.mkOption { @@ -20,22 +25,20 @@ in }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = [cfg.package]; systemd.user.services.keyleds = { Unit = { - Description = - "Logitech Keyboard animation for Linux — G410, G513, G610, G810, G910, GPro"; - After = [ "graphical-session-pre.target" ]; - PartOf = [ "graphical-session.target" ]; + Description = "Logitech Keyboard animation for Linux — G410, G513, G610, G810, G910, GPro"; + After = ["graphical-session-pre.target"]; + PartOf = ["graphical-session.target"]; }; - Install = { WantedBy = [ "graphical-session.target" ]; }; + Install = {WantedBy = ["graphical-session.target"];}; Service = { Environment = "XDG_DATA_DIRS=${cfg.package}/share"; - ExecStart = - "${cfg.package}/bin/keyledsd --config ${cfg.package}/share/keyledsd/keyledsd.conf.sample"; + ExecStart = "${cfg.package}/bin/keyledsd --config ${cfg.package}/share/keyledsd/keyledsd.conf.sample"; Restart = "always"; RestartSec = 3; }; diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index d3a56923..3965b53d 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -1,6 +1,10 @@ -{ config, lib, pkgs, self, ... }: - -let +{ + config, + lib, + pkgs, + self, + ... +}: let cfg = config.services.restic; bin = "${cfg.package}/bin/restic"; @@ -9,8 +13,7 @@ let flags = "${xFlags} ${excludes}"; command = "${bin} --tag home -vv backup ${flags} %h"; -in -{ +in { options.services.restic = { enable = lib.mkEnableOption "Restic Backup Tool"; @@ -22,7 +25,7 @@ in exclude = lib.mkOption { type = lib.types.listOf lib.types.str; - default = [ ]; + default = []; description = "Corresponds to `--exclude`. Use `%h` instead of `~`"; }; @@ -41,7 +44,7 @@ in }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = [cfg.package]; systemd.user.services.restic-backup = { Unit = { @@ -52,7 +55,7 @@ in Service = { Environment = [ - "PATH=${lib.makeBinPath [ pkgs.openssh ]}" + "PATH=${lib.makeBinPath [pkgs.openssh]}" "RESTIC_PASSWORD_FILE=%h/.config/restic/password" "RESTIC_REPOSITORY=${cfg.repo}" ]; @@ -69,7 +72,7 @@ in Unit = "restic-backup.service"; OnCalendar = "*:0/15"; }; - Install.WantedBy = [ "timers.target" ]; + Install.WantedBy = ["timers.target"]; }; }; } diff --git a/lefthook.yml b/lefthook.yml index f2f4fabd..b64c5253 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -3,7 +3,7 @@ pre-commit: commands: formatting: glob: "*.nix" - run: nix shell --inputs-from . nixpkgs-2105#nixpkgs-fmt -c nixpkgs-fmt --check {all_files} + run: nix shell --inputs-from . alejandra -c alejandra --check {all_files} statix: parallel: false diff --git a/lib/default.nix b/lib/default.nix index b75be102..390f0f13 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,6 +1,4 @@ -inputs: - -{ +inputs: { mkSystem = import ./mk_system.nix inputs; mkHome = import ./mk_home.nix inputs; nixosConfigurationsAsPackages = import ./nixos_configurations_as_packages.nix inputs; diff --git a/lib/home_configurations_as_packages.nix b/lib/home_configurations_as_packages.nix index aa4aa0d1..0d649e03 100644 --- a/lib/home_configurations_as_packages.nix +++ b/lib/home_configurations_as_packages.nix @@ -1,12 +1,14 @@ -{ self, ... }@inputs: - -let - pkgs = import inputs.nixpkgs-2105 { system = "x86_64-linux"; }; +{self, ...} @ inputs: let + pkgs = import inputs.nixpkgs-2105 {system = "x86_64-linux";}; inherit (pkgs.lib) genAttrs mapAttrs'; hostNames = __attrNames self.homeConfigurations; attrHostNames = genAttrs hostNames (name: "home/config/${name}"); - configs = mapAttrs' (name: pname: { name = pname; value = self.homeConfigurations.${name}.activationPackage; }) attrHostNames; -in -{ x86_64-linux = configs; } + configs = + mapAttrs' (name: pname: { + name = pname; + value = self.homeConfigurations.${name}.activationPackage; + }) + attrHostNames; +in {x86_64-linux = configs;} diff --git a/lib/mk_home.nix b/lib/mk_home.nix index e885de98..8089cd54 100644 --- a/lib/mk_home.nix +++ b/lib/mk_home.nix @@ -1,21 +1,23 @@ -{ home-manager, self, ... }@inputs: - -username: hostname: system: nixpkgs: -let +{ + home-manager, + self, + ... +} @ inputs: username: hostname: system: nixpkgs: let args = inputs; entrypoint = "${self}/home/configurations/${username}@${hostname}.nix"; in + home-manager.lib.homeManagerConfiguration { + inherit username system; + homeDirectory = "/home/${username}"; -home-manager.lib.homeManagerConfiguration { - inherit username system; - homeDirectory = "/home/${username}"; - - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}; - configuration = { lib, ... }: { - _module = { inherit args; }; - imports = [ - entrypoint - ] ++ __attrValues self.homeModules; - }; -} + configuration = {lib, ...}: { + _module = {inherit args;}; + imports = + [ + entrypoint + ] + ++ __attrValues self.homeModules; + }; + } diff --git a/lib/mk_system.nix b/lib/mk_system.nix index c2e931d3..b98e8fc9 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -1,27 +1,29 @@ -{ self, ... }@args: - -name: nixpkgs: +{self, ...} @ args: name: nixpkgs: nixpkgs.lib.nixosSystem ( let configFolder = "${self}/nixos/configurations"; entryPoint = "${configFolder}/${name}.nix"; hardware = "${configFolder}/hardware/${name}.nix"; - in - { + in { system = "x86_64-linux"; - modules = [ - { - _module.args = args; - networking.hostName = name; - nix.flakes.enable = true; - system.configurationRevision = self.rev or "dirty"; - documentation.man = { enable = true; generateCaches = true; }; - services.nixos-vscode-server.enable = true; - } - entryPoint - hardware - args.nixos-vscode-server.nixosModules.system - ] ++ __attrValues self.nixosModules; + modules = + [ + { + _module.args = args; + networking.hostName = name; + nix.flakes.enable = true; + system.configurationRevision = self.rev or "dirty"; + documentation.man = { + enable = true; + generateCaches = true; + }; + services.nixos-vscode-server.enable = true; + } + entryPoint + hardware + args.nixos-vscode-server.nixosModules.system + ] + ++ __attrValues self.nixosModules; } ) diff --git a/lib/nixos_configurations_as_packages.nix b/lib/nixos_configurations_as_packages.nix index bbefffcb..37b639d3 100644 --- a/lib/nixos_configurations_as_packages.nix +++ b/lib/nixos_configurations_as_packages.nix @@ -1,12 +1,14 @@ -{ self, ... }@inputs: - -let - pkgs = import inputs.nixpkgs-2105 { system = "x86_64-linux"; }; +{self, ...} @ inputs: let + pkgs = import inputs.nixpkgs-2105 {system = "x86_64-linux";}; inherit (pkgs.lib) genAttrs mapAttrs'; hostNames = __attrNames self.nixosConfigurations; attrHostNames = genAttrs hostNames (name: "nixos/config/${name}"); - configs = mapAttrs' (name: pname: { name = pname; value = self.nixosConfigurations.${name}.config.system.build.toplevel; }) attrHostNames; -in -{ x86_64-linux = configs; } + configs = + mapAttrs' (name: pname: { + name = pname; + value = self.nixosConfigurations.${name}.config.system.build.toplevel; + }) + attrHostNames; +in {x86_64-linux = configs;} diff --git a/nixos/configurations/default.nix b/nixos/configurations/default.nix index 60c0d64b..5cb7e5fa 100644 --- a/nixos/configurations/default.nix +++ b/nixos/configurations/default.nix @@ -1,6 +1,4 @@ -{ self, ... }@inputs: - -{ +{self, ...} @ inputs: { mimas = self.lib.mkSystem "mimas" inputs.unstable; # nixpkgs-2105; enceladeus = self.lib.mkSystem "enceladeus" inputs.unstable; thetys = self.lib.mkSystem "thetys" inputs.unstable; diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 614c989e..74c11298 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -1,13 +1,15 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, lib, ... }: - { - imports = [ ]; - - nix.allowedUnfree = [ "b43-firmware" "broadcom-sta" "zerotierone" ]; + config, + pkgs, + lib, + ... +}: { + imports = []; + + nix.allowedUnfree = ["b43-firmware" "broadcom-sta" "zerotierone"]; nixpkgs.config.contentAddressedByDefault = false; # nix.useSandbox = false; @@ -25,11 +27,11 @@ boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only boot.kernelPackages = pkgs.linuxPackages_latest; - boot.blacklistedKernelModules = [ "rtl8xxxu" ]; + boot.blacklistedKernelModules = ["rtl8xxxu"]; boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu ]; - boot.supportedFilesystems = [ "ntfs-3g" ]; + boot.supportedFilesystems = ["ntfs-3g"]; # boot.kernelPackages = pkgs.linuxPackages_4_19; boot.kernel.sysctl = { @@ -90,7 +92,7 @@ services.openssh.enable = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 9002 ]; + networking.firewall.allowedTCPPorts = [9002]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; @@ -111,7 +113,7 @@ # services.xserver.xkbOptions = "eurosign:e"; services.zerotierone.enable = true; - services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; + services.zerotierone.joinNetworks = ["8286ac0e4768c8ae"]; # Enable touchpad support. # services.xserver.libinput.enable = true; @@ -137,7 +139,7 @@ nmelzer = { isNormalUser = true; shell = pkgs.zsh; - extraGroups = [ "wheel" "networkmanager" "adbusers" ]; # Enable ‘sudo’ for the user. + extraGroups = ["wheel" "networkmanager" "adbusers"]; # Enable ‘sudo’ for the user. }; aroemer = { isNormalUser = true; @@ -151,7 +153,7 @@ exporters = { node = { enable = true; - enabledCollectors = [ "systemd" ]; + enabledCollectors = ["systemd"]; port = 9002; }; }; @@ -170,10 +172,10 @@ commands = [ { command = "/run/current-system/sw/bin/nixos-rebuild"; - options = [ "NOPASSWD" ]; + options = ["NOPASSWD"]; } ]; - groups = [ "wheel" ]; + groups = ["wheel"]; } ]; } diff --git a/nixos/configurations/hardware/enceladeus.nix b/nixos/configurations/hardware/enceladeus.nix index c6439292..3f6e9357 100644 --- a/nixos/configurations/hardware/enceladeus.nix +++ b/nixos/configurations/hardware/enceladeus.nix @@ -1,43 +1,40 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - { - imports = - [ ]; - - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" "wl" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/1be71104-48ad-40c3-bf4c-086cd887969f"; - fsType = "ext4"; - }; - - fileSystems."/nix/store" = - { - device = "/dev/disk/by-uuid/1ee9d669-07e1-4f40-93af-71f9ad999f70"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { - device = "/dev/disk/by-uuid/53a36eeb-9f0e-4cb6-bdd9-53ae5a74c683"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { - device = "/dev/sda1"; - fsType = "ext4"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/87c5fea1-6bcb-41d4-af9d-b9342a45c9b3"; }]; + config, + lib, + pkgs, + ... +}: { + imports = []; + + boot.initrd.availableKernelModules = ["uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel" "wl"]; + boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/1be71104-48ad-40c3-bf4c-086cd887969f"; + fsType = "ext4"; + }; + + fileSystems."/nix/store" = { + device = "/dev/disk/by-uuid/1ee9d669-07e1-4f40-93af-71f9ad999f70"; + fsType = "ext4"; + }; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/53a36eeb-9f0e-4cb6-bdd9-53ae5a74c683"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; + + swapDevices = [{device = "/dev/disk/by-uuid/87c5fea1-6bcb-41d4-af9d-b9342a45c9b3";}]; nix.settings.max-jobs = lib.mkDefault 1; } diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index dce40b3d..e72a45f7 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -1,37 +1,36 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - { - imports = - [ ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ "dm-snapshot" "i915" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.kernelParams = [ "intel_pstate=active" ]; - boot.extraModulePackages = [ ]; + config, + lib, + pkgs, + ... +}: { + imports = []; + + boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = ["dm-snapshot" "i915"]; + boot.kernelModules = ["kvm-intel"]; + boot.kernelParams = ["intel_pstate=active"]; + boot.extraModulePackages = []; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/440c8ce1-1799-4239-936f-a54c879941a5"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/440c8ce1-1799-4239-936f-a54c879941a5"; + fsType = "ext4"; + }; - fileSystems."/home" = - { - device = "/dev/disk/by-uuid/8119ca17-576f-49a2-9496-946d6759a59b"; - fsType = "ext4"; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/8119ca17-576f-49a2-9496-946d6759a59b"; + fsType = "ext4"; + }; - fileSystems."/nix" = - { - device = "/dev/disk/by-uuid/48574e4d-3a82-4b04-ac28-d55c32fa3aff"; - fsType = "ext4"; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/48574e4d-3a82-4b04-ac28-d55c32fa3aff"; + fsType = "ext4"; + }; fileSystems."/var/lib/docker" = { device = "/dev/disk/by-uuid/5da6b8c1-2598-48f1-9541-49c50e95aac9"; @@ -63,13 +62,12 @@ # fsType = "ext4"; # }; - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/7000-3A85"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7000-3A85"; + fsType = "vfat"; + }; - swapDevices = [ ]; + swapDevices = []; nix.settings.max-jobs = lib.mkDefault 4; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; diff --git a/nixos/configurations/hardware/thetys.nix b/nixos/configurations/hardware/thetys.nix index 327ea718..b33daa12 100644 --- a/nixos/configurations/hardware/thetys.nix +++ b/nixos/configurations/hardware/thetys.nix @@ -1,17 +1,21 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - { - imports = [ ]; + config, + lib, + pkgs, + ... +}: { + imports = []; - boot.initrd.availableKernelModules = [ "ohci_pci" "ahci" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ohci_pci" "ahci" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = lib.mkForce + fileSystems."/" = + lib.mkForce { device = "/dev/disk/by-uuid/c1e4f201-3c0a-4d88-bd7c-fcd908412df2"; fsType = "ext4"; @@ -22,7 +26,7 @@ fsType = "vboxsf"; }; - swapDevices = [ ]; + swapDevices = []; nix.settings.max-jobs = lib.mkDefault 2; virtualisation.virtualbox.guest.enable = true; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index b08fa39c..ae0dd5f0 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -1,24 +1,27 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, lib, unstable, ... }: -let - upkgs = import unstable { system = "x86_64-linux"; }; - steamPackages = [ "steam" "steam-original" "steam-runtime" ]; - printerPackages = [ "hplip" "samsung-UnifiedLinuxDriver" ]; -in { - imports = [ ]; - - nix.allowedUnfree = [ "zerotierone" ] ++ printerPackages ++ steamPackages; + config, + pkgs, + lib, + unstable, + ... +}: let + upkgs = import unstable {system = "x86_64-linux";}; + steamPackages = ["steam" "steam-original" "steam-runtime"]; + printerPackages = ["hplip" "samsung-UnifiedLinuxDriver"]; +in { + imports = []; + + nix.allowedUnfree = ["zerotierone"] ++ printerPackages ++ steamPackages; security.chromiumSuidSandbox.enable = true; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = [ "ntfs" "exfat" "avfs" ]; + boot.supportedFilesystems = ["ntfs" "exfat" "avfs"]; boot.cleanTmpDir = true; boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; @@ -92,10 +95,10 @@ in services.flatpak.enable = true; services.zerotierone.enable = true; - services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; + services.zerotierone.joinNetworks = ["8286ac0e4768c8ae"]; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 80 443 1111 8080 9002 9003 2342 9999 3000 58080 ]; + networking.firewall.allowedTCPPorts = [80 443 1111 8080 9002 9003 2342 9999 3000 58080]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. networking.firewall.enable = true; @@ -104,7 +107,7 @@ in # Enable CUPS to print documents. services.printing.enable = true; - services.printing.drivers = [ pkgs.hplipWithPlugin pkgs.samsung-unified-linux-driver ]; + services.printing.drivers = [pkgs.hplipWithPlugin pkgs.samsung-unified-linux-driver]; services.ratbagd.enable = true; @@ -134,9 +137,9 @@ in services.restic.server.enable = true; services.restic.server.prometheus = true; - services.restic.server.extraFlags = [ "--no-auth" ]; + services.restic.server.extraFlags = ["--no-auth"]; services.restic.server.listenAddress = "172.24.152.168:9999"; - systemd.services.restic-rest-server.after = [ "var-lib-restic.mount" ]; + systemd.services.restic-rest-server.after = ["var-lib-restic.mount"]; # Enable touchpad support. # services.xserver.libinput.enable = true; @@ -146,14 +149,14 @@ in services.xserver.desktopManager.plasma5.enable = true; services.xserver.windowManager.awesome.enable = true; - services.dbus.packages = with pkgs; [ pkgs.dconf ]; + services.dbus.packages = with pkgs; [pkgs.dconf]; services.udev.extraRules = '' KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666" ''; services.transmission.enable = true; - systemd.services.transmission.after = [ "var-lib-transmission.mount" ]; + systemd.services.transmission.after = ["var-lib-transmission.mount"]; programs = { steam.enable = true; @@ -165,7 +168,7 @@ in hardware.pulseaudio.support32Bit = true; hardware.opengl.enable = true; - hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.beignet ]; + hardware.opengl.extraPackages = [pkgs.vaapiIntel pkgs.beignet]; services.gitea.enable = true; @@ -214,7 +217,7 @@ in aroemer = { isNormalUser = true; - extraGroups = [ ]; + extraGroups = []; }; }; @@ -223,10 +226,10 @@ in commands = [ { command = "/run/current-system/sw/bin/nixos-rebuild"; - options = [ "NOPASSWD" ]; + options = ["NOPASSWD"]; } ]; - groups = [ "wheel" ]; + groups = ["wheel"]; } ]; @@ -269,7 +272,7 @@ in storage = "/var/lib/traefik/mimas.json"; # caServer = "https://acme-staging-v02.api.letsencrypt.org/directory"; dnsChallenge.provider = "cloudflare"; - dnsChallenge.resolvers = [ "1.1.1.1:53" "8.8.8.8:53" ]; + dnsChallenge.resolvers = ["1.1.1.1:53" "8.8.8.8:53"]; }; entryPoints = { @@ -297,22 +300,22 @@ in services.traefik.dynamicConfigOptions = { http.routers = { api = { - entrypoints = [ "traefik" ]; + entrypoints = ["traefik"]; rule = "PathPrefix(`/api/`)"; service = "api@internal"; }; fritz = { - entryPoints = [ "https" "http" ]; + entryPoints = ["https" "http"]; rule = "Host(`fritz.mimas.internal.nobbz.dev`)"; service = "fritz"; - tls.domains = [{ main = "*.mimas.internal.nobbz.dev"; }]; + tls.domains = [{main = "*.mimas.internal.nobbz.dev";}]; tls.certResolver = "mimasWildcard"; }; paperless = { - entryPoints = [ "https" "http" ]; + entryPoints = ["https" "http"]; rule = "Host(`paperless.mimas.internal.nobbz.dev`)"; service = "paperless"; - tls.domains = [{ main = "*.mimas.internal.nobbz.dev"; }]; + tls.domains = [{main = "*.mimas.internal.nobbz.dev";}]; tls.certResolver = "mimasWildcard"; }; # minio-tls = { @@ -325,13 +328,13 @@ in }; http.services = { minio.loadBalancer.passHostHeader = true; - minio.loadBalancer.servers = [{ url = "http://192.168.122.122/"; }]; + minio.loadBalancer.servers = [{url = "http://192.168.122.122/";}]; fritz.loadBalancer.passHostHeader = false; - fritz.loadBalancer.servers = [{ url = "http://fritz.box"; }]; + fritz.loadBalancer.servers = [{url = "http://fritz.box";}]; paperless.loadBalancer.passHostHeader = true; - paperless.loadBalancer.servers = [{ url = "http://localhost:58080"; }]; + paperless.loadBalancer.servers = [{url = "http://localhost:58080";}]; }; }; @@ -352,7 +355,7 @@ in exporters = { node = { enable = true; - enabledCollectors = [ "systemd" ]; + enabledCollectors = ["systemd"]; port = 9002; }; }; @@ -360,21 +363,23 @@ in scrapeConfigs = [ { job_name = "grafana"; - static_configs = [{ targets = [ "127.0.0.1:2342" ]; }]; + static_configs = [{targets = ["127.0.0.1:2342"];}]; } { job_name = "prometheus"; - static_configs = [{ targets = [ "127.0.0.1:9001" ]; }]; + static_configs = [{targets = ["127.0.0.1:9001"];}]; } { job_name = "node_import"; - static_configs = [{ - targets = [ - "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" - "172.24.199.101:9002" - "172.24.231.199:9002" - ]; - }]; + static_configs = [ + { + targets = [ + "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" + "172.24.199.101:9002" + "172.24.231.199:9002" + ]; + } + ]; } ]; }; @@ -386,7 +391,7 @@ in port = 58080; extraConfig.PAPERLESS_OCR_LANGUAGE = "deu+eng"; }; - systemd.services.paperless-ng-server.after = [ "var-lib-paperless.mount" ]; + systemd.services.paperless-ng-server.after = ["var-lib-paperless.mount"]; # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 0c6e7cd8..b6eb0c37 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -1,11 +1,16 @@ -{ self, config, pkgs, nixpkgs-2105, modulesPath, ... }: - { + self, + config, + pkgs, + nixpkgs-2105, + modulesPath, + ... +}: { # TODO: 👇 move import of `virtualbox-demo.nix` into extra module 👇 - imports = [ (modulesPath + "/installer/virtualbox-demo.nix") ]; + imports = [(modulesPath + "/installer/virtualbox-demo.nix")]; - boot.initrd.supportedFilesystems = [ "zfs" ]; # boot from zfs - boot.supportedFilesystems = [ "zfs" ]; + boot.initrd.supportedFilesystems = ["zfs"]; # boot from zfs + boot.supportedFilesystems = ["zfs"]; networking.hostId = "deadbeef"; programs.gnupg = { @@ -16,14 +21,13 @@ }; }; - users.users.demo = - { - isNormalUser = true; - description = "Demo user account"; - extraGroups = [ "wheel" "docker" ]; - uid = 1000; - shell = pkgs.zsh; - }; + users.users.demo = { + isNormalUser = true; + description = "Demo user account"; + extraGroups = ["wheel" "docker"]; + uid = 1000; + shell = pkgs.zsh; + }; boot.kernel.sysctl = { "vm.max_map_count" = 262144; @@ -44,13 +48,13 @@ services.xserver.layout = pkgs.lib.mkForce "de"; - services.xserver.videoDrivers = [ "vmware" "virtualbox" "modesetting" ]; + services.xserver.videoDrivers = ["vmware" "virtualbox" "modesetting"]; systemd.services.virtualbox-resize = { description = "VirtualBox Guest Screen Resizing"; - wantedBy = [ "multi-user.target" ]; - requires = [ "dev-vboxguest.device" ]; - after = [ "dev-vboxguest.device" ]; + wantedBy = ["multi-user.target"]; + requires = ["dev-vboxguest.device"]; + after = ["dev-vboxguest.device"]; unitConfig.ConditionVirtualization = "oracle"; @@ -58,23 +62,27 @@ }; services.zerotierone.enable = true; - services.zerotierone.joinNetworks = [ "8286ac0e4768c8ae" ]; - services.zerotierone.package = (import nixpkgs-2105 { - config.allowUnfree = true; - # system = pkgs.system; - inherit (pkgs) system; - }).zerotierone; + services.zerotierone.joinNetworks = ["8286ac0e4768c8ae"]; + services.zerotierone.package = + (import nixpkgs-2105 { + config.allowUnfree = true; + # system = pkgs.system; + inherit (pkgs) system; + }) + .zerotierone; # services.ipfs.enable = true; services.openssh.enable = true; - swapDevices = [{ - device = "/var/swap-2"; - size = 2048 * 4; - }]; + swapDevices = [ + { + device = "/var/swap-2"; + size = 2048 * 4; + } + ]; - networking.hosts."127.0.0.1" = [ "ax69_mysql" ]; + networking.hosts."127.0.0.1" = ["ax69_mysql"]; networking.firewall.allowedTCPPorts = [ # ports often used for development, that I want to expose for easier access from the host 3000 @@ -91,8 +99,8 @@ system = "x86_64-linux"; maxJobs = 1; speedFactor = 1; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - mandatoryFeatures = [ ]; + supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; + mandatoryFeatures = []; } ]; @@ -101,10 +109,10 @@ commands = [ { command = "/run/current-system/sw/bin/nixos-rebuild"; - options = [ "NOPASSWD" ]; + options = ["NOPASSWD"]; } ]; - groups = [ "wheel" ]; + groups = ["wheel"]; } ]; @@ -112,7 +120,7 @@ exporters = { node = { enable = true; - enabledCollectors = [ "systemd" ]; + enabledCollectors = ["systemd"]; port = 9002; }; }; diff --git a/nixos/modules/cachix/caches/nix-community.nix b/nixos/modules/cachix/caches/nix-community.nix index 9c27fb72..e4956bdf 100644 --- a/nixos/modules/cachix/caches/nix-community.nix +++ b/nixos/modules/cachix/caches/nix-community.nix @@ -1,6 +1,8 @@ -{ config, lib, ... }: - { + config, + lib, + ... +}: { nix = lib.mkIf (config.networking.hostName != "delly-nixos") { settings.substituters = [ "https://nix-community.cachix.org" diff --git a/nixos/modules/cachix/caches/nobbz.nix b/nixos/modules/cachix/caches/nobbz.nix index 4b242b9f..b5d8615f 100644 --- a/nixos/modules/cachix/caches/nobbz.nix +++ b/nixos/modules/cachix/caches/nobbz.nix @@ -1,6 +1,8 @@ -{ config, lib, ... }: - { + config, + lib, + ... +}: { nix = lib.mkIf (config.networking.hostName != "delly-nixos") { settings.substituters = [ "https://nobbz.cachix.org" diff --git a/nixos/modules/cachix/caches/ts-helper.nix b/nixos/modules/cachix/caches/ts-helper.nix index 07f43bf1..19b5f460 100644 --- a/nixos/modules/cachix/caches/ts-helper.nix +++ b/nixos/modules/cachix/caches/ts-helper.nix @@ -1,6 +1,8 @@ -{ config, lib, ... }: - { + config, + lib, + ... +}: { nix = lib.mkIf (config.networking.hostName != "delly-nixos") { settings.substituters = [ "https://ts-helper.cachix.org" diff --git a/nixos/modules/cachix/default.nix b/nixos/modules/cachix/default.nix index c19010d4..77fc1415 100644 --- a/nixos/modules/cachix/default.nix +++ b/nixos/modules/cachix/default.nix @@ -1,13 +1,16 @@ -_: { config, pkgs, lib, ... }: -let +_: { + config, + pkgs, + lib, + ... +}: let folder = ./caches; toImport = name: value: folder + ("/" + name); filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key; imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); -in -{ +in { inherit imports; - nix.settings.substituters = [ "https://cache.nixos.org/" ]; + nix.settings.substituters = ["https://cache.nixos.org/"]; - environment.systemPackages = [ pkgs.cachix ]; + environment.systemPackages = [pkgs.cachix]; } diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 9f631a9e..966ac227 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,6 +1,4 @@ -inputs: - -{ +inputs: { cachix = import ./cachix inputs; flake = import ./flake.nix inputs; hostnames = import ./hostnames.nix inputs; diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index 6297effe..1102b870 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -1,19 +1,25 @@ -{ unstable, nixpkgs-2105, nixpkgs-2111, nix, ... }: - -{ config, pkgs, lib, ... }: - -let +{ + unstable, + nixpkgs-2105, + nixpkgs-2111, + nix, + ... +}: { + config, + pkgs, + lib, + ... +}: let base = "/etc/nixpkgs/channels"; nixpkgsPath = "${base}/nixpkgs"; nixpkgs2105Path = "${base}/nixpkgs2105"; nixpkgs2111Path = "${base}/nixpkgs2111"; -in -{ +in { options.nix.flakes.enable = lib.mkEnableOption "nix flakes"; config = lib.mkIf config.nix.flakes.enable { nix = { - package = lib.mkDefault (nix.packages.x86_64-linux.nix.overrideAttrs (_: { patches = [ ./unset-is-macho.patch ]; })); # pkgs.nixUnstable; + package = lib.mkDefault (nix.packages.x86_64-linux.nix.overrideAttrs (_: {patches = [./unset-is-macho.patch];})); # pkgs.nixUnstable; experimentalFeatures = "nix-command flakes"; registry.nixpkgs.flake = unstable; diff --git a/nixos/modules/hostnames.nix b/nixos/modules/hostnames.nix index 70bb9e1c..60bd9948 100644 --- a/nixos/modules/hostnames.nix +++ b/nixos/modules/hostnames.nix @@ -1,6 +1,9 @@ -_: { config, lib, pkgs, ... }: - -{ - networking.search = [ "internal.nobbz.dev" ]; +_: { + config, + lib, + pkgs, + ... +}: { + networking.search = ["internal.nobbz.dev"]; networking.domain = "internal.nobbz.dev"; } diff --git a/nixos/modules/moonlander.nix b/nixos/modules/moonlander.nix index 87439738..67407413 100644 --- a/nixos/modules/moonlander.nix +++ b/nixos/modules/moonlander.nix @@ -1,15 +1,16 @@ -_: { config, lib, pkgs, ... }: - -let +_: { + config, + lib, + pkgs, + ... +}: let inherit (lib) mkIf; inherit (pkgs) wally-cli; cfg = config.hardware.keyboard.zsa; -in - -{ +in { config = mkIf cfg.enable { - users.users.nmelzer.extraGroups = [ "plugdev" ]; - environment.systemPackages = [ wally-cli ]; + users.users.nmelzer.extraGroups = ["plugdev"]; + environment.systemPackages = [wally-cli]; }; } diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 5caffca4..790eab9f 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -1,9 +1,10 @@ -_: { config, lib, ... }: - -let +_: { + config, + lib, + ... +}: let allowed = config.nix.allowedUnfree; -in -{ +in { options.nix = { experimentalFeatures = lib.mkOption { type = lib.types.separatedString " "; @@ -15,7 +16,7 @@ in allowedUnfree = lib.mkOption { type = lib.types.listOf lib.types.string; - default = [ ]; + default = []; description = '' Allows for unfree packages by their name. ''; @@ -23,9 +24,9 @@ in }; config = lib.mkMerge [ - (lib.mkIf (config.nix.experimentalFeatures != "") { nix.extraOptions = "experimental-features = ${config.nix.experimentalFeatures}"; }) - (lib.mkIf (allowed != [ ]) { nixpkgs.config.allowUnfreePredicate = pkg: __elem (lib.getName pkg) allowed; }) - { nix.settings.auto-optimise-store = lib.mkDefault true; } + (lib.mkIf (config.nix.experimentalFeatures != "") {nix.extraOptions = "experimental-features = ${config.nix.experimentalFeatures}";}) + (lib.mkIf (allowed != []) {nixpkgs.config.allowUnfreePredicate = pkg: __elem (lib.getName pkg) allowed;}) + {nix.settings.auto-optimise-store = lib.mkDefault true;} { nix.gc.automatic = lib.mkDefault true; nix.gc.options = lib.mkDefault "--delete-older-than 10d"; diff --git a/oldstuff/home/hosts/WS0005.nix b/oldstuff/home/hosts/WS0005.nix index 97244422..5402c5e6 100644 --- a/oldstuff/home/hosts/WS0005.nix +++ b/oldstuff/home/hosts/WS0005.nix @@ -1,8 +1,6 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { config = { - activeProfiles = [ "browsing" "development" ]; + activeProfiles = ["browsing" "development"]; enabledLanguages = [ "erlang" @@ -19,7 +17,7 @@ programs.emacs.splashScreen = false; - home.packages = [ pkgs.nixUnstable ]; + home.packages = [pkgs.nixUnstable]; programs.tmux.secureSocket = false; # disable /run sockets, as those seem to be not available in WSL }; diff --git a/oldstuff/home/modules/default.nix b/oldstuff/home/modules/default.nix index 82f73ad9..ac4c9489 100644 --- a/oldstuff/home/modules/default.nix +++ b/oldstuff/home/modules/default.nix @@ -1,12 +1,16 @@ -{ filterAttrs, mapAttrs, mapAttrsToList, ... }: -let - modules = - let - all = builtins.readDir ./.; - dirs = filterAttrs (k: v: v == "directory") all; - in +{ + filterAttrs, + mapAttrs, + mapAttrsToList, + ... +}: let + modules = let + all = builtins.readDir ./.; + dirs = filterAttrs (k: v: v == "directory") all; + in mapAttrs (k: v: ./. + "/${k}") dirs; in -{ - all-modules = mapAttrsToList (k: v: v) modules; -} // modules + { + all-modules = mapAttrsToList (k: v: v) modules; + } + // modules diff --git a/oldstuff/home/modules/languages/c/default.nix b/oldstuff/home/modules/languages/c/default.nix index 4fdf08ab..8be7b780 100644 --- a/oldstuff/home/modules/languages/c/default.nix +++ b/oldstuff/home/modules/languages/c/default.nix @@ -1,8 +1,11 @@ -{ config, lib, pkgs, ... }: -let enabled = config.languages.c.enable || config.languages.cpp.enable; - -in { + config, + lib, + pkgs, + ... +}: let + enabled = config.languages.c.enable || config.languages.cpp.enable; +in { options.languages.c = { enable = lib.mkEnableOption "Enable support for C language"; }; @@ -12,11 +15,11 @@ in # }; config = lib.mkIf enabled { - programs.emacs.extraPackages = ep: [ ep.cmake-mode ]; + programs.emacs.extraPackages = ep: [ep.cmake-mode]; programs.emacs.lsp-mode = { enable = true; - languages = [ "c" "c++" ]; + languages = ["c" "c++"]; }; programs.emacs.extraInit = '' diff --git a/oldstuff/home/modules/languages/ocaml/default.nix b/oldstuff/home/modules/languages/ocaml/default.nix index 54effd16..b43844a8 100644 --- a/oldstuff/home/modules/languages/ocaml/default.nix +++ b/oldstuff/home/modules/languages/ocaml/default.nix @@ -1,8 +1,11 @@ -{ config, lib, pkgs, ... }: -let cfg = config.languages.ocaml; - -in { + config, + lib, + pkgs, + ... +}: let + cfg = config.languages.ocaml; +in { options.languages.ocaml = { enable = lib.mkEnableOption "Enable support for ocaml language"; }; @@ -10,15 +13,15 @@ in config = lib.mkIf cfg.enable { programs.emacs.lsp-mode = { enable = true; - languages = [ "caml" ]; + languages = ["caml"]; }; programs.emacs = { localPackages."init-ocaml" = { tag = "Setup OCaml"; - comments = [ ]; - requires = [ "caml-font" ]; - packageRequires = ep: [ ep.lsp-mode ep.caml ep.company ep.flycheck ]; + comments = []; + requires = ["caml-font"]; + packageRequires = ep: [ep.lsp-mode ep.caml ep.company ep.flycheck]; code = '' (add-to-list 'exec-path "${pkgs.ocaml-lsp}/bin") (setq lsp-ocaml-lang-server-command '("ocamllsp")) diff --git a/oldstuff/home/nix/default.nix b/oldstuff/home/nix/default.nix index 9a3ec07b..975b0e6c 100644 --- a/oldstuff/home/nix/default.nix +++ b/oldstuff/home/nix/default.nix @@ -1,8 +1,7 @@ -let sources = import ./sources.nix { }; - -in -[ - (_: _: { inherit sources; }) +let + sources = import ./sources.nix {}; +in [ + (_: _: {inherit sources;}) (import sources.mozilla-overlay.outPath) (import sources.emacs-overlay.outPath) (import ./myOverlay) diff --git a/oldstuff/home/nix/myOverlay/default.nix b/oldstuff/home/nix/myOverlay/default.nix index abdcde35..47918c1c 100644 --- a/oldstuff/home/nix/myOverlay/default.nix +++ b/oldstuff/home/nix/myOverlay/default.nix @@ -1,13 +1,11 @@ -final: prev: -let +final: prev: let keepasspkgs = final.fetchFromGitHub { owner = "wnklmnn"; repo = "nixpkgs"; rev = "e1bcd10a071ef746e1078272913048b1eef4ceee"; sha256 = "03bd52y51xr6fhy3r8xggq84z39p94mhipw6xyjnm1niq7iim7cw"; }; -in -rec { +in rec { nix-zsh-completions = prev.nix-zsh-completions.overrideAttrs (_: { version = "overlay"; src = final.fetchFromGitHub { diff --git a/oldstuff/home/overlays.nix b/oldstuff/home/overlays.nix index 2e3b19e4..284a2044 100644 --- a/oldstuff/home/overlays.nix +++ b/oldstuff/home/overlays.nix @@ -1,11 +1,10 @@ let compat = import (builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/99f1c21.tar.gz"); - self = (compat { src = ./.; }).defaultNix; + self = (compat {src = ./.;}).defaultNix; inherit (self) overlay overlays; -in -[ +in [ overlay overlays.inputs overlays.emacs diff --git a/oldstuff/packages/devShell.nix b/oldstuff/packages/devShell.nix index ec1215e9..7dfe3e1d 100644 --- a/oldstuff/packages/devShell.nix +++ b/oldstuff/packages/devShell.nix @@ -1,9 +1,12 @@ -{ mkShell, nixpkgs-fmt, git }: - +{ + mkShell, + nixpkgs-fmt, + git, +}: mkShell { name = "system-and-home-builder"; - buildInputs = [ nixpkgs-fmt git ]; + buildInputs = [nixpkgs-fmt git]; shellHook = '' ${git}/bin/git fetch origin diff --git a/packages/advcp/default.nix b/packages/advcp/default.nix index 25f7b124..40e24e83 100644 --- a/packages/advcp/default.nix +++ b/packages/advcp/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchurl, fetchpatch, ... }: -let upstream = "coreutils"; +{ + stdenv, + fetchurl, + fetchpatch, + ... +}: let + upstream = "coreutils"; in -stdenv.mkDerivation rec { - name = "advcp"; - version = "8.30"; + stdenv.mkDerivation rec { + name = "advcp"; + version = "8.30"; - src = fetchurl { - name = "source-${name}-${version}.tar.xz"; - url = "ftp://ftp.gnu.org/gnu/${upstream}/${upstream}-${version}.tar.xz"; - sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; - }; + src = fetchurl { + name = "source-${name}-${version}.tar.xz"; + url = "ftp://ftp.gnu.org/gnu/${upstream}/${upstream}-${version}.tar.xz"; + sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; + }; - patches = [ - (fetchpatch { - url = - "https://github.com/mrdrogdrog/advcpmv/raw/496bcc9f1e8a13768066c353c238a475ccb91329/advcpmv-0.8-8.30.patch"; - sha256 = "0mw0ramg4ydqdqs33kw9m0rjvw5fvfa0scsq753pn7biwx6gx9hx"; - }) - ]; + patches = [ + (fetchpatch { + url = "https://github.com/mrdrogdrog/advcpmv/raw/496bcc9f1e8a13768066c353c238a475ccb91329/advcpmv-0.8-8.30.patch"; + sha256 = "0mw0ramg4ydqdqs33kw9m0rjvw5fvfa0scsq753pn7biwx6gx9hx"; + }) + ]; - installPhase = '' - install -D src/cp $out/bin/advcp - install -D src/mv $out/bin/advmv - ''; -} + installPhase = '' + install -D src/cp $out/bin/advcp + install -D src/mv $out/bin/advmv + ''; + } diff --git a/packages/default.nix b/packages/default.nix index aa21b505..a3979c96 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,23 +1,27 @@ -{ self, emacs, ... }@inputs: - -let +{ + self, + emacs, + ... +} @ inputs: let pkgs = inputs.nixpkgs-2105.legacyPackages.x86_64-linux; upkgs = inputs.unstable.legacyPackages.x86_64-linux; mpkgs = inputs.master.legacyPackages.x86_64-linux; - epkgs = import inputs.unstable { system = "x86_64-linux"; overlays = [ emacs.overlay ]; }; - nodePkgs = upkgs.callPackage ./nodePackages/override.nix { }; -in -{ - "advcp" = pkgs.callPackage ./advcp { }; - "gnucash-de" = upkgs.callPackage ./gnucash-de { }; - "keyleds" = upkgs.callPackage ./keyleds { }; - "dracula/konsole" = upkgs.callPackage ./dracula/konsole { }; + epkgs = import inputs.unstable { + system = "x86_64-linux"; + overlays = [emacs.overlay]; + }; + nodePkgs = upkgs.callPackage ./nodePackages/override.nix {}; +in { + "advcp" = pkgs.callPackage ./advcp {}; + "gnucash-de" = upkgs.callPackage ./gnucash-de {}; + "keyleds" = upkgs.callPackage ./keyleds {}; + "dracula/konsole" = upkgs.callPackage ./dracula/konsole {}; "emacs" = epkgs.emacsGcc; "emacsPgtkGcc" = epkgs.emacsPgtkGcc; - "elixir-lsp" = upkgs.beam.packages.erlang.callPackage ./elixir-lsp { }; - "erlang-ls" = upkgs.beam.packages.erlang.callPackage ./erlang-ls { }; - "rofi/unicode" = upkgs.callPackage ./rofi-unicode { }; + "elixir-lsp" = upkgs.beam.packages.erlang.callPackage ./elixir-lsp {}; + "erlang-ls" = upkgs.beam.packages.erlang.callPackage ./erlang-ls {}; + "rofi/unicode" = upkgs.callPackage ./rofi-unicode {}; "zx" = nodePkgs.zx; "angular" = nodePkgs."@angular/cli"; } diff --git a/packages/dracula/konsole/default.nix b/packages/dracula/konsole/default.nix index 06e89498..a709e3c7 100644 --- a/packages/dracula/konsole/default.nix +++ b/packages/dracula/konsole/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub }: - +{ + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "dracula-konsole-theme"; version = "fa85573"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-375TOAOEx9FObS9F2tMYEyKboTYCZycawGoNEolZ0Ns="; }; - phases = [ "unpackPhase" "installPhase" ]; + phases = ["unpackPhase" "installPhase"]; installPhase = '' mkdir -p $out/share/konsole diff --git a/packages/elixir-lsp/default.nix b/packages/elixir-lsp/default.nix index 723502fd..0211195e 100644 --- a/packages/elixir-lsp/default.nix +++ b/packages/elixir-lsp/default.nix @@ -1,55 +1,64 @@ -{ stdenv, erlang, elixir, rebar3, hex, callPackage, git, cacert, fetchFromGitHub }: -let - fetchMixDeps = callPackage ./fetch-mix-deps.nix { inherit rebar3; }; +{ + stdenv, + erlang, + elixir, + rebar3, + hex, + callPackage, + git, + cacert, + fetchFromGitHub, +}: let + fetchMixDeps = callPackage ./fetch-mix-deps.nix {inherit rebar3;}; source = builtins.fromJSON (builtins.readFile ./source.json); in -stdenv.mkDerivation rec { - name = "elixir-ls"; - version = "${source.version}-${erlang.version}-${elixir.version}"; - - nativeBuildInputs = [ elixir hex git deps cacert ]; - - deps = fetchMixDeps { - name = "${name}-${version}"; - inherit src; - sha256 = "sha256-8MOV2a/C5uO5Q1S97XY8VP0bJI4ByFRIIHNwRtG94cs="; - }; - - src = fetchFromGitHub rec { - name = "source-${owner}-${repo}-${version}"; - inherit (source) owner repo rev sha256; - }; - - dontStrip = true; - - configurePhase = '' - export MIX_ENV=prod - export HEX_OFFLINE=1 - export HEX_HOME="$PWD/hex" - export MIX_HOME="$PWD" - export MIX_REBAR3="${rebar3}/bin/rebar3" - export REBAR_GLOBAL_CONFIG_DIR="$PWD/rebar3" - export REBAR_CACHE_DIR="$PWD/rebar3.cache" - cp --no-preserve=all -R ${deps} deps - mix deps.compile --no-deps-check - ''; - - buildPhase = '' - mix do compile --no-deps-check, elixir_ls.release - ''; - - installPhase = '' - mkdir -p $out/bin - cp -Rv release $out/lib - # Prepare the wrapper script - substitute release/language_server.sh $out/bin/elixir-ls \ - --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" - chmod +x $out/bin/elixir-ls - # prepare the launcher - substituteInPlace $out/lib/launch.sh \ - --replace "elixir" "${elixir}/bin/elixir" \ - --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ - "ERL_LIBS=$out/lib:\$ERL_LIBS" - ''; -} + stdenv.mkDerivation rec { + name = "elixir-ls"; + version = "${source.version}-${erlang.version}-${elixir.version}"; + + nativeBuildInputs = [elixir hex git deps cacert]; + + deps = fetchMixDeps { + name = "${name}-${version}"; + inherit src; + sha256 = "sha256-8MOV2a/C5uO5Q1S97XY8VP0bJI4ByFRIIHNwRtG94cs="; + }; + + src = fetchFromGitHub rec { + name = "source-${owner}-${repo}-${version}"; + inherit (source) owner repo rev sha256; + }; + + dontStrip = true; + + configurePhase = '' + export MIX_ENV=prod + export HEX_OFFLINE=1 + export HEX_HOME="$PWD/hex" + export MIX_HOME="$PWD" + export MIX_REBAR3="${rebar3}/bin/rebar3" + export REBAR_GLOBAL_CONFIG_DIR="$PWD/rebar3" + export REBAR_CACHE_DIR="$PWD/rebar3.cache" + cp --no-preserve=all -R ${deps} deps + mix deps.compile --no-deps-check + ''; + + buildPhase = '' + mix do compile --no-deps-check, elixir_ls.release + ''; + + installPhase = '' + mkdir -p $out/bin + cp -Rv release $out/lib + # Prepare the wrapper script + substitute release/language_server.sh $out/bin/elixir-ls \ + --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" + chmod +x $out/bin/elixir-ls + # prepare the launcher + substituteInPlace $out/lib/launch.sh \ + --replace "elixir" "${elixir}/bin/elixir" \ + --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ + "ERL_LIBS=$out/lib:\$ERL_LIBS" + ''; + } diff --git a/packages/elixir-lsp/fetch-mix-deps.nix b/packages/elixir-lsp/fetch-mix-deps.nix index ef7b6877..ed8b647b 100644 --- a/packages/elixir-lsp/fetch-mix-deps.nix +++ b/packages/elixir-lsp/fetch-mix-deps.nix @@ -1,11 +1,27 @@ -{ stdenvNoCC, lib, elixir, rebar, rebar3, git, cacert }: - -{ name ? null, src, sha256 ? null, env ? "prod" }: - +{ + stdenvNoCC, + lib, + elixir, + rebar, + rebar3, + git, + cacert, +}: { + name ? null, + src, + sha256 ? null, + env ? "prod", +}: stdenvNoCC.mkDerivation { - name = "mix-deps" + (if name != null then "-${name}" else ""); - - nativeBuildInputs = [ elixir git cacert ]; + name = + "mix-deps" + + ( + if name != null + then "-${name}" + else "" + ); + + nativeBuildInputs = [elixir git cacert]; inherit src; diff --git a/packages/erlang-ls/default.nix b/packages/erlang-ls/default.nix index 08af0add..a383b3d6 100644 --- a/packages/erlang-ls/default.nix +++ b/packages/erlang-ls/default.nix @@ -1,16 +1,28 @@ -{ stdenv, erlang, rebar3, lib, rebar3Relx, fetchFromGitHub, git, cacert }: -let +{ + stdenv, + erlang, + rebar3, + lib, + rebar3Relx, + fetchFromGitHub, + git, + cacert, +}: let source = builtins.fromJSON (builtins.readFile ./source.json); - fetchRebar3Deps = - { name, version, sha256, src, meta ? { } }: - + fetchRebar3Deps = { + name, + version, + sha256, + src, + meta ? {}, + }: stdenv.mkDerivation { name = "rebar-deps-${name}-${version}"; - buildInputs = [ git cacert ]; + buildInputs = [git cacert]; - phases = [ "downloadPhase" "installPhase" ]; + phases = ["downloadPhase" "installPhase"]; downloadPhase = '' cp ${src} . @@ -34,25 +46,25 @@ let inherit meta; }; in -rebar3Relx rec { - pname = "erlang-ls"; - version = "${source.version}-${erlang.version}"; - releaseType = "escript"; - - checkouts = fetchRebar3Deps { - inherit version; - name = pname; - src = "${src}/rebar.lock"; - sha256 = "sha256-nm3e5DfehSCjjTPADSzohilOBFW4QiXnokwVNrpDZ1E="; - }; - - postPatch = '' - substituteInPlace apps/els_lsp/src/els_lsp.app.src \ - --replace '{vsn, git}' '{vsn, "${version}"}' - ''; - - src = fetchFromGitHub { - name = "source-${pname}-${version}"; - inherit (source) owner repo rev sha256; - }; -} + rebar3Relx rec { + pname = "erlang-ls"; + version = "${source.version}-${erlang.version}"; + releaseType = "escript"; + + checkouts = fetchRebar3Deps { + inherit version; + name = pname; + src = "${src}/rebar.lock"; + sha256 = "sha256-nm3e5DfehSCjjTPADSzohilOBFW4QiXnokwVNrpDZ1E="; + }; + + postPatch = '' + substituteInPlace apps/els_lsp/src/els_lsp.app.src \ + --replace '{vsn, git}' '{vsn, "${version}"}' + ''; + + src = fetchFromGitHub { + name = "source-${pname}-${version}"; + inherit (source) owner repo rev sha256; + }; + } diff --git a/packages/gnucash-de/default.nix b/packages/gnucash-de/default.nix index 659d9f1b..155bccd9 100644 --- a/packages/gnucash-de/default.nix +++ b/packages/gnucash-de/default.nix @@ -1,8 +1,11 @@ -{ runCommand, makeWrapper, gnucash }: - +{ + runCommand, + makeWrapper, + gnucash, +}: runCommand "gnucash-de-${gnucash.version}" { - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [makeWrapper]; } '' mkdir -p $out/{bin,share/applications} makeWrapper ${gnucash}/bin/gnucash $out/bin/gnucash \ diff --git a/packages/keyleds/default.nix b/packages/keyleds/default.nix index 1a86915c..ac42e45e 100644 --- a/packages/keyleds/default.nix +++ b/packages/keyleds/default.nix @@ -1,5 +1,9 @@ -{ pkgs, stdenv, fetchFromGitHub, ... }: - +{ + pkgs, + stdenv, + fetchFromGitHub, + ... +}: stdenv.mkDerivation rec { name = "keyleds"; version = "1.1.1"; @@ -12,6 +16,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-KCWmaRmJTmZgTt7HW9o6Jt1u4x6+G2j6T9EqVt21U18="; }; - nativeBuildInputs = with pkgs; [ cmake pkgconfig ]; - buildInputs = with pkgs; [ xlibsWrapper xorg.libXi libuv systemd luajit libyaml ]; + nativeBuildInputs = with pkgs; [cmake pkgconfig]; + buildInputs = with pkgs; [xlibsWrapper xorg.libXi libuv systemd luajit libyaml]; } diff --git a/packages/nodePackages/default.nix b/packages/nodePackages/default.nix index 8360862d..62f633ef 100644 --- a/packages/nodePackages/default.nix +++ b/packages/nodePackages/default.nix @@ -1,20 +1,22 @@ # This file has been generated by node2nix 1.9.0. Do not edit! - -{ pkgs ? import { - inherit system; - } -, system ? builtins.currentSystem -, nodejs ? pkgs."nodejs-14_x" -}: - -let +{ + pkgs ? + import { + inherit system; + }, + system ? builtins.currentSystem, + nodejs ? pkgs."nodejs-14_x", +}: let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + libtool = + if pkgs.stdenv.isDarwin + then pkgs.darwin.cctools + else null; }; in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} + import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; + } diff --git a/packages/nodePackages/node-env.nix b/packages/nodePackages/node-env.nix index 63e444ea..89442210 100644 --- a/packages/nodePackages/node-env.nix +++ b/packages/nodePackages/node-env.nix @@ -1,15 +1,28 @@ # This file originates from node2nix - -{ lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript }: - -let +{ + lib, + stdenv, + nodejs, + python2, + pkgs, + libtool, + runCommand, + writeTextFile, + writeShellScript, +}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + utillinux = + if pkgs ? utillinux + then pkgs.utillinux + else pkgs.util-linux; - python = if nodejs ? python then nodejs.python else python2; + python = + if nodejs ? python + then nodejs.python + else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" { } '' + tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin cat > $out/bin/tar < $out/bin/shell < { - inherit system; - } -, system ? builtins.currentSystem -}: - -let +{ + pkgs ? + import { + inherit system; + }, + system ? builtins.currentSystem, +}: let nodePackages = import ./default.nix { inherit pkgs system; }; in -nodePackages // { - "@angular/cli" = nodePackages."@angular/cli".overrideAttrs (_: { - NG_CLI_ANALYTICS = false; - }); -} + nodePackages + // { + "@angular/cli" = nodePackages."@angular/cli".overrideAttrs (_: { + NG_CLI_ANALYTICS = false; + }); + } diff --git a/packages/rofi-unicode/default.nix b/packages/rofi-unicode/default.nix index d63a7183..3690d5ea 100644 --- a/packages/rofi-unicode/default.nix +++ b/packages/rofi-unicode/default.nix @@ -1,28 +1,31 @@ -{ stdenvNoCC, xsel, fetchgit }: -let +{ + stdenvNoCC, + xsel, + fetchgit, +}: let source = builtins.fromJSON (builtins.readFile ./rofi-unicode.json); in -stdenvNoCC.mkDerivation rec { - pname = "rofiemoji-rofiunicode"; - version = "${source.rev}"; + stdenvNoCC.mkDerivation rec { + pname = "rofiemoji-rofiunicode"; + version = "${source.rev}"; - src = fetchgit { - inherit (source) rev url sha256; - }; + src = fetchgit { + inherit (source) rev url sha256; + }; - installPhase = '' - mkdir -pv $out/{bin,lists} + installPhase = '' + mkdir -pv $out/{bin,lists} - install -v lists/* $out/lists - install -v *.sh $out/bin - ''; + install -v lists/* $out/lists + install -v *.sh $out/bin + ''; - postFixup = '' - for f in $out/bin/*.sh; do - substituteInPlace $f \ - --replace 'DIR="$HOME/.config/rofiemoji-rofiunicode/lists"' \ - 'DIR="${placeholder "out"}/lists"' \ - --replace 'xsel' '${xsel}/bin/xsel' - done; - ''; -} + postFixup = '' + for f in $out/bin/*.sh; do + substituteInPlace $f \ + --replace 'DIR="$HOME/.config/rofiemoji-rofiunicode/lists"' \ + 'DIR="${placeholder "out"}/lists"' \ + --replace 'xsel' '${xsel}/bin/xsel' + done; + ''; + } From 9250520f0a250c311f333fb0c029eec17f791ca9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 00:10:25 +0100 Subject: [PATCH 287/303] slightly re-architect the HM-modules to not depend on anymore --- flake.nix | 2 +- home/modules/default.nix | 78 +++++++++---------- home/modules/languages/agda/default.nix | 2 +- home/modules/languages/c++/default.nix | 2 +- home/modules/languages/clojure/default.nix | 2 +- home/modules/languages/default.nix | 2 +- home/modules/languages/elixir/default.nix | 3 +- home/modules/languages/erlang/default.nix | 3 +- home/modules/languages/go/default.nix | 2 +- home/modules/languages/lua/default.nix | 2 +- home/modules/languages/nim/default.nix | 3 +- home/modules/languages/nix/default.nix | 2 +- home/modules/languages/python/default.nix | 2 +- home/modules/languages/rust/default.nix | 2 +- home/modules/languages/terraform/default.nix | 2 +- home/modules/languages/tex/default.nix | 2 +- home/modules/misc/awesome/default.nix | 3 +- home/modules/misc/home/default.nix | 8 +- home/modules/profiles/base/default.nix | 3 +- home/modules/profiles/browsing/default.nix | 2 +- home/modules/profiles/default.nix | 2 +- home/modules/profiles/development/default.nix | 2 +- home/modules/profiles/home-office/default.nix | 2 +- home/modules/programs/advcp/default.nix | 3 +- home/modules/programs/emacs/beacon.nix | 2 +- home/modules/programs/emacs/company.nix | 2 +- home/modules/programs/emacs/default.nix | 2 +- home/modules/programs/emacs/helm.nix | 2 +- home/modules/programs/emacs/lib.nix | 2 +- home/modules/programs/emacs/lsp.nix | 2 +- home/modules/programs/emacs/projectile.nix | 2 +- home/modules/programs/emacs/telephoneline.nix | 2 +- .../programs/emacs/whichkey/default.nix | 2 +- home/modules/programs/exa/default.nix | 2 +- home/modules/programs/nixpkgs/default.nix | 2 +- home/modules/programs/openshift/default.nix | 2 +- home/modules/programs/zshell/default.nix | 2 +- home/modules/services/insync/default.nix | 3 +- home/modules/services/keyleds/default.nix | 3 +- home/modules/services/restic/default.nix | 2 +- 40 files changed, 82 insertions(+), 88 deletions(-) diff --git a/flake.nix b/flake.nix index 5ef51088..d5362dac 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ nixosModules = import ./nixos/modules inputs; nixosConfigurations = import ./nixos/configurations inputs; - homeModules = import ./home/modules; + homeModules = import ./home/modules inputs; homeConfigurations = import ./home/configurations inputs; packages.x86_64-linux = diff --git a/home/modules/default.nix b/home/modules/default.nix index abb4336d..3388cba1 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,44 +1,44 @@ -{ - "profiles" = import ./profiles; - "profiles/base" = import ./profiles/base; - "profiles/browsing" = import ./profiles/browsing; - "profiles/development" = import ./profiles/development; - "profiles/home-office" = import ./profiles/home-office; +inputs: { + "profiles" = import ./profiles inputs; + "profiles/base" = import ./profiles/base inputs; + "profiles/browsing" = import ./profiles/browsing inputs; + "profiles/development" = import ./profiles/development inputs; + "profiles/home-office" = import ./profiles/home-office inputs; - "languages" = import ./languages; - "languages/agda" = import ./languages/agda; - "languages/c++" = import ./languages/c++; - "languages/clojure" = import ./languages/clojure; - "languages/elixir" = import ./languages/elixir; - "languages/erlang" = import ./languages/erlang; - "languages/go" = import ./languages/go; - "languages/nim" = import ./languages/nim; - "languages/nix" = import ./languages/nix; - "languages/python" = import ./languages/python; - "languages/rust" = import ./languages/rust; - "languages/tex" = import ./languages/tex; - "languages/lua" = import ./languages/lua; - "languages/terraform" = import ./languages/terraform; + "languages" = import ./languages inputs; + "languages/agda" = import ./languages/agda inputs; + "languages/c++" = import ./languages/c++ inputs; + "languages/clojure" = import ./languages/clojure inputs; + "languages/elixir" = import ./languages/elixir inputs; + "languages/erlang" = import ./languages/erlang inputs; + "languages/go" = import ./languages/go inputs; + "languages/nim" = import ./languages/nim inputs; + "languages/nix" = import ./languages/nix inputs; + "languages/python" = import ./languages/python inputs; + "languages/rust" = import ./languages/rust inputs; + "languages/tex" = import ./languages/tex inputs; + "languages/lua" = import ./languages/lua inputs; + "languages/terraform" = import ./languages/terraform inputs; - "programs/advcp" = import ./programs/advcp; - "programs/openshift" = import ./programs/openshift; - "programs/zshell" = import ./programs/zshell; - "programs/nixpkgs" = import ./programs/nixpkgs; - "programs/exa" = import ./programs/exa; - "programs/emacs" = import ./programs/emacs; - "programs/emacs/beacon" = import ./programs/emacs/beacon.nix; - "programs/emacs/company" = import ./programs/emacs/company.nix; - "programs/emacs/helm" = import ./programs/emacs/helm.nix; - "programs/emacs/lsp" = import ./programs/emacs/lsp.nix; - "programs/emacs/projectile" = import ./programs/emacs/projectile.nix; - "programs/emacs/telephoneline" = import ./programs/emacs/telephoneline.nix; - "programs/emacs/lib" = import ./programs/emacs/lib.nix; - "programs/emacs/whichkey" = import ./programs/emacs/whichkey; + "programs/advcp" = import ./programs/advcp inputs; + "programs/openshift" = import ./programs/openshift inputs; + "programs/zshell" = import ./programs/zshell inputs; + "programs/nixpkgs" = import ./programs/nixpkgs inputs; + "programs/exa" = import ./programs/exa inputs; + "programs/emacs" = import ./programs/emacs inputs; + "programs/emacs/beacon" = import ./programs/emacs/beacon.nix inputs; + "programs/emacs/company" = import ./programs/emacs/company.nix inputs; + "programs/emacs/helm" = import ./programs/emacs/helm.nix inputs; + "programs/emacs/lsp" = import ./programs/emacs/lsp.nix inputs; + "programs/emacs/projectile" = import ./programs/emacs/projectile.nix inputs; + "programs/emacs/telephoneline" = import ./programs/emacs/telephoneline.nix inputs; + "programs/emacs/lib" = import ./programs/emacs/lib.nix inputs; + "programs/emacs/whichkey" = import ./programs/emacs/whichkey inputs; - "services/keyleds" = import ./services/keyleds; - "services/insync" = import ./services/insync; - "services/restic" = import ./services/restic; + "services/keyleds" = import ./services/keyleds inputs; + "services/insync" = import ./services/insync inputs; + "services/restic" = import ./services/restic inputs; - "misc/awesome" = import ./misc/awesome; - "misc/home" = import ./misc/home; + "misc/awesome" = import ./misc/awesome inputs; + "misc/home" = import ./misc/home inputs; } diff --git a/home/modules/languages/agda/default.nix b/home/modules/languages/agda/default.nix index de186038..e7e8f605 100644 --- a/home/modules/languages/agda/default.nix +++ b/home/modules/languages/agda/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/languages/c++/default.nix b/home/modules/languages/c++/default.nix index 2fa7935e..6d6c4f6c 100644 --- a/home/modules/languages/c++/default.nix +++ b/home/modules/languages/c++/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/languages/clojure/default.nix b/home/modules/languages/clojure/default.nix index 7bea8fb9..767706fa 100644 --- a/home/modules/languages/clojure/default.nix +++ b/home/modules/languages/clojure/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/languages/default.nix b/home/modules/languages/default.nix index df843f40..7a0843dc 100644 --- a/home/modules/languages/default.nix +++ b/home/modules/languages/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/languages/elixir/default.nix b/home/modules/languages/elixir/default.nix index 1e8dc415..d3e1827d 100644 --- a/home/modules/languages/elixir/default.nix +++ b/home/modules/languages/elixir/default.nix @@ -1,8 +1,7 @@ -{ +{self, ...}: { config, lib, pkgs, - self, ... }: let cfg = config.languages.elixir; diff --git a/home/modules/languages/erlang/default.nix b/home/modules/languages/erlang/default.nix index 4dc10a7a..593b6335 100644 --- a/home/modules/languages/erlang/default.nix +++ b/home/modules/languages/erlang/default.nix @@ -1,8 +1,7 @@ -{ +{self, ...}: { config, lib, pkgs, - self, ... }: let cfg = config.languages.erlang; diff --git a/home/modules/languages/go/default.nix b/home/modules/languages/go/default.nix index 33bde9b8..34a57ea5 100644 --- a/home/modules/languages/go/default.nix +++ b/home/modules/languages/go/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/languages/lua/default.nix b/home/modules/languages/lua/default.nix index 533cfaae..57d2f9be 100644 --- a/home/modules/languages/lua/default.nix +++ b/home/modules/languages/lua/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/languages/nim/default.nix b/home/modules/languages/nim/default.nix index 3ed11255..0573c9e4 100644 --- a/home/modules/languages/nim/default.nix +++ b/home/modules/languages/nim/default.nix @@ -1,8 +1,7 @@ -{ +{unstable, ...}: { config, lib, pkgs, - unstable, ... }: let cfg = config.languages.nim; diff --git a/home/modules/languages/nix/default.nix b/home/modules/languages/nix/default.nix index 16ec4322..af3c5c16 100644 --- a/home/modules/languages/nix/default.nix +++ b/home/modules/languages/nix/default.nix @@ -1,4 +1,4 @@ -{ +{rnix-lsp, ...}: { config, lib, pkgs, diff --git a/home/modules/languages/python/default.nix b/home/modules/languages/python/default.nix index 256120c2..1237628c 100644 --- a/home/modules/languages/python/default.nix +++ b/home/modules/languages/python/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/languages/rust/default.nix b/home/modules/languages/rust/default.nix index e4878fa3..ce053877 100644 --- a/home/modules/languages/rust/default.nix +++ b/home/modules/languages/rust/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/languages/terraform/default.nix b/home/modules/languages/terraform/default.nix index ada357ed..d2e53e16 100644 --- a/home/modules/languages/terraform/default.nix +++ b/home/modules/languages/terraform/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/languages/tex/default.nix b/home/modules/languages/tex/default.nix index f8c7e55e..c1c1d8e8 100644 --- a/home/modules/languages/tex/default.nix +++ b/home/modules/languages/tex/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/misc/awesome/default.nix b/home/modules/misc/awesome/default.nix index 2f5b4797..0702c5b0 100644 --- a/home/modules/misc/awesome/default.nix +++ b/home/modules/misc/awesome/default.nix @@ -1,8 +1,7 @@ -{ +{self, ...}: { config, lib, pkgs, - self, ... }: let cfg = config.xsession.windowManager.awesome; diff --git a/home/modules/misc/home/default.nix b/home/modules/misc/home/default.nix index 70c9296c..a633f1ed 100644 --- a/home/modules/misc/home/default.nix +++ b/home/modules/misc/home/default.nix @@ -1,11 +1,13 @@ { - config, - pkgs, - lib, nixpkgs-2105, unstable, self, ... +}: { + config, + pkgs, + lib, + ... }: let self' = self.packages.x86_64-linux; in { diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index c1f0370e..c652a8ef 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -1,8 +1,7 @@ -{ +{self, ...}: { config, lib, pkgs, - self, ... }: let cfg = config.profiles.base; diff --git a/home/modules/profiles/browsing/default.nix b/home/modules/profiles/browsing/default.nix index 84a7936c..0c02c728 100644 --- a/home/modules/profiles/browsing/default.nix +++ b/home/modules/profiles/browsing/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/profiles/default.nix b/home/modules/profiles/default.nix index 9ba88c9f..3ac77e27 100644 --- a/home/modules/profiles/default.nix +++ b/home/modules/profiles/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/profiles/development/default.nix b/home/modules/profiles/development/default.nix index 568ffe22..ea7dc62d 100644 --- a/home/modules/profiles/development/default.nix +++ b/home/modules/profiles/development/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, pkgs, lib, diff --git a/home/modules/profiles/home-office/default.nix b/home/modules/profiles/home-office/default.nix index 2dedff01..e7384b3f 100644 --- a/home/modules/profiles/home-office/default.nix +++ b/home/modules/profiles/home-office/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/programs/advcp/default.nix b/home/modules/programs/advcp/default.nix index 1436f84b..c7b50874 100644 --- a/home/modules/programs/advcp/default.nix +++ b/home/modules/programs/advcp/default.nix @@ -1,8 +1,7 @@ -{ +{self, ...}: { config, lib, pkgs, - self, ... }: let cfg = config.programs.advancedCopy; diff --git a/home/modules/programs/emacs/beacon.nix b/home/modules/programs/emacs/beacon.nix index f17c42d6..54d3abc9 100644 --- a/home/modules/programs/emacs/beacon.nix +++ b/home/modules/programs/emacs/beacon.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/emacs/company.nix b/home/modules/programs/emacs/company.nix index 2ef69eee..c35cfe26 100644 --- a/home/modules/programs/emacs/company.nix +++ b/home/modules/programs/emacs/company.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/emacs/default.nix b/home/modules/programs/emacs/default.nix index be754719..9835c6c7 100644 --- a/home/modules/programs/emacs/default.nix +++ b/home/modules/programs/emacs/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/programs/emacs/helm.nix b/home/modules/programs/emacs/helm.nix index c0956f52..3977de77 100644 --- a/home/modules/programs/emacs/helm.nix +++ b/home/modules/programs/emacs/helm.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/emacs/lib.nix b/home/modules/programs/emacs/lib.nix index 41022f62..bd1fc8fe 100644 --- a/home/modules/programs/emacs/lib.nix +++ b/home/modules/programs/emacs/lib.nix @@ -1,4 +1,4 @@ -let +_: let generatePackage = { name, tagLine, diff --git a/home/modules/programs/emacs/lsp.nix b/home/modules/programs/emacs/lsp.nix index 978f5bd5..e9dc7cf9 100644 --- a/home/modules/programs/emacs/lsp.nix +++ b/home/modules/programs/emacs/lsp.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/emacs/projectile.nix b/home/modules/programs/emacs/projectile.nix index 08805c61..cc7365f2 100644 --- a/home/modules/programs/emacs/projectile.nix +++ b/home/modules/programs/emacs/projectile.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/emacs/telephoneline.nix b/home/modules/programs/emacs/telephoneline.nix index 52865778..4b9cc2d0 100644 --- a/home/modules/programs/emacs/telephoneline.nix +++ b/home/modules/programs/emacs/telephoneline.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/emacs/whichkey/default.nix b/home/modules/programs/emacs/whichkey/default.nix index 446ae3f0..fba2ee95 100644 --- a/home/modules/programs/emacs/whichkey/default.nix +++ b/home/modules/programs/emacs/whichkey/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/exa/default.nix b/home/modules/programs/exa/default.nix index dff24c76..bc2d56b7 100644 --- a/home/modules/programs/exa/default.nix +++ b/home/modules/programs/exa/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, pkgs, diff --git a/home/modules/programs/nixpkgs/default.nix b/home/modules/programs/nixpkgs/default.nix index 08e18faa..15381d56 100644 --- a/home/modules/programs/nixpkgs/default.nix +++ b/home/modules/programs/nixpkgs/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/programs/openshift/default.nix b/home/modules/programs/openshift/default.nix index 57f4b410..47aab8c7 100644 --- a/home/modules/programs/openshift/default.nix +++ b/home/modules/programs/openshift/default.nix @@ -1,4 +1,4 @@ -{ +_: { pkgs, lib, config, diff --git a/home/modules/programs/zshell/default.nix b/home/modules/programs/zshell/default.nix index feb617b7..e6380401 100644 --- a/home/modules/programs/zshell/default.nix +++ b/home/modules/programs/zshell/default.nix @@ -1,4 +1,4 @@ -{ +_: { config, lib, ... diff --git a/home/modules/services/insync/default.nix b/home/modules/services/insync/default.nix index 6151096d..a5497b77 100644 --- a/home/modules/services/insync/default.nix +++ b/home/modules/services/insync/default.nix @@ -1,8 +1,7 @@ -{ +{self, ...}: { config, lib, pkgs, - self, ... }: let cfg = config.services.insync; diff --git a/home/modules/services/keyleds/default.nix b/home/modules/services/keyleds/default.nix index f7413146..18b9457f 100644 --- a/home/modules/services/keyleds/default.nix +++ b/home/modules/services/keyleds/default.nix @@ -1,8 +1,7 @@ -{ +{self, ...}: { config, lib, pkgs, - self, ... }: let cfg = config.services.keyleds; diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix index 3965b53d..5f238446 100644 --- a/home/modules/services/restic/default.nix +++ b/home/modules/services/restic/default.nix @@ -1,4 +1,4 @@ -{ +{self, ...}: { config, lib, pkgs, From 04e9bc878c4d594e85720645d7e0c2b24b68a8f7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 00:26:46 +0100 Subject: [PATCH 288/303] make sure nixos modules do not require `_module.args` anymore --- lib/mk_system.nix | 8 ++++---- nixos/configurations/enceladeus.nix | 2 +- nixos/configurations/mimas.nix | 3 +-- nixos/configurations/thetys.nix | 5 ++++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/mk_system.nix b/lib/mk_system.nix index b98e8fc9..a8e31141 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -1,8 +1,8 @@ -{self, ...} @ args: name: nixpkgs: +{self, ...} @ inputs: name: nixpkgs: nixpkgs.lib.nixosSystem ( let configFolder = "${self}/nixos/configurations"; - entryPoint = "${configFolder}/${name}.nix"; + entryPoint = import "${configFolder}/${name}.nix" inputs; hardware = "${configFolder}/hardware/${name}.nix"; in { system = "x86_64-linux"; @@ -10,7 +10,7 @@ nixpkgs.lib.nixosSystem ( modules = [ { - _module.args = args; + # _module.args = args; networking.hostName = name; nix.flakes.enable = true; system.configurationRevision = self.rev or "dirty"; @@ -22,7 +22,7 @@ nixpkgs.lib.nixosSystem ( } entryPoint hardware - args.nixos-vscode-server.nixosModules.system + inputs.nixos-vscode-server.nixosModules.system ] ++ __attrValues self.nixosModules; } diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 74c11298..0f588b49 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -1,7 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ +_: { config, pkgs, lib, diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index ae0dd5f0..de1e6256 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -1,11 +1,10 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ +{unstable, ...}: { config, pkgs, lib, - unstable, ... }: let upkgs = import unstable {system = "x86_64-linux";}; diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index b6eb0c37..3ef715b2 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -1,8 +1,11 @@ { + self, + nixpkgs-2105, + ... +}: { self, config, pkgs, - nixpkgs-2105, modulesPath, ... }: { From 6bda148fa0ed4eb93d61c78ac4c5bf1bf6835b6e Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 00:51:10 +0100 Subject: [PATCH 289/303] make sure HM modules do not require `_module.args` anymore --- home/configurations/demo@thetys.nix | 5 ++--- home/configurations/nmelzer@enceladeus.nix | 3 +-- home/configurations/nmelzer@mimas.nix | 3 +-- lib/mk_home.nix | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/home/configurations/demo@thetys.nix b/home/configurations/demo@thetys.nix index 3057f8d9..08c5e872 100644 --- a/home/configurations/demo@thetys.nix +++ b/home/configurations/demo@thetys.nix @@ -1,9 +1,8 @@ { - pkgs, - nixpkgs-2105, self, + nixpkgs-2105, ... -}: let +}: {pkgs, ...}: let stable = nixpkgs-2105.legacyPackages.x86_64-linux; self' = self.packages.x86_64-linux; in { diff --git a/home/configurations/nmelzer@enceladeus.nix b/home/configurations/nmelzer@enceladeus.nix index 3df94d90..96120470 100644 --- a/home/configurations/nmelzer@enceladeus.nix +++ b/home/configurations/nmelzer@enceladeus.nix @@ -1,7 +1,6 @@ -{ +{statix, ...}: { pkgs, lib, - statix, ... }: { config = { diff --git a/home/configurations/nmelzer@mimas.nix b/home/configurations/nmelzer@mimas.nix index a5d2440c..b45887bc 100644 --- a/home/configurations/nmelzer@mimas.nix +++ b/home/configurations/nmelzer@mimas.nix @@ -1,9 +1,8 @@ { - pkgs, unstable, self, ... -}: let +}: {pkgs, ...}: let keepassWithPlugins = pkgs.keepass.override {plugins = [pkgs.keepass-keepasshttp];}; in { diff --git a/lib/mk_home.nix b/lib/mk_home.nix index 8089cd54..79ed52c2 100644 --- a/lib/mk_home.nix +++ b/lib/mk_home.nix @@ -4,7 +4,7 @@ ... } @ inputs: username: hostname: system: nixpkgs: let args = inputs; - entrypoint = "${self}/home/configurations/${username}@${hostname}.nix"; + entrypoint = import "${self}/home/configurations/${username}@${hostname}.nix" inputs; in home-manager.lib.homeManagerConfiguration { inherit username system; @@ -13,7 +13,6 @@ in pkgs = nixpkgs.legacyPackages.${system}; configuration = {lib, ...}: { - _module = {inherit args;}; imports = [ entrypoint From d10804093cf168b303350292e51101922a4fb375 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 00:56:56 +0100 Subject: [PATCH 290/303] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs': 'github:nix-community/emacs-overlay/5b6fc7a4ef21e8ca787429339476b82165b05f3d' (2022-03-18) → 'github:nix-community/emacs-overlay/2938ceb0577e67871610af592f69d9b04294d22d' (2022-03-19) • Updated input 'home-manager': 'github:nix-community/home-manager/e2a85ac43f06859a50d067a029f0a303c4ca5264' (2022-03-18) → 'github:nix-community/home-manager/e96fc6d8f90c96320a9c7e6663b734ab50ec1794' (2022-03-19) • Updated input 'master': 'github:nixos/nixpkgs/d468bc8524877b97faab506ecf2aaeb422f646d9' (2022-03-18) → 'github:nixos/nixpkgs/07200c01bac52b36caa0987e7b011d79fa31b491' (2022-03-19) • Updated input 'nix': 'github:nixos/nix/6afc3617982e872fac2142c3aeccd1e8482e7e52' (2022-03-17) → 'github:nixos/nix/8ad485ea893862029e02cb560a15fd276753b04f' (2022-03-18) • Updated input 'nixpkgs-2111': 'github:nixos/nixpkgs/64fc73bd74f04d3e10cb4e70e1c65b92337e76db' (2022-03-14) → 'github:nixos/nixpkgs/2c66a7a6e036971c4847cca424125f55b9eb0b0b' (2022-03-17) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 8e3e7512..b634c8ef 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "emacs": { "locked": { - "lastModified": 1647568430, - "narHash": "sha256-Uz6pvl07J1Fo6UfTUdXI37D2/Z0cx7/cq8z8nc4JB7s=", + "lastModified": 1647710466, + "narHash": "sha256-mrelPf/Pd0cilPf8kLRxSV/qGQqnu3khBybiektpe6Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5b6fc7a4ef21e8ca787429339476b82165b05f3d", + "rev": "2938ceb0577e67871610af592f69d9b04294d22d", "type": "github" }, "original": { @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1647572216, - "narHash": "sha256-HDOQ/Yq1ga5mbj0eUp/f5FY96TgOxwBjTfIRGsZsAlw=", + "lastModified": 1647731541, + "narHash": "sha256-WQG5HRq9uylQV0urLuy/RKzoXAaBPhWUrYdEGnRDCxM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e2a85ac43f06859a50d067a029f0a303c4ca5264", + "rev": "e96fc6d8f90c96320a9c7e6663b734ab50ec1794", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "master": { "locked": { - "lastModified": 1647582785, - "narHash": "sha256-JpYLhc8h4YLQx315uh3M4rktMmPF9EU5/gaXcRQHAMg=", + "lastModified": 1647731934, + "narHash": "sha256-IdpLUDthIMtYwddClk8lQXzhVZED5qEUP7Sj4bfjbCU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d468bc8524877b97faab506ecf2aaeb422f646d9", + "rev": "07200c01bac52b36caa0987e7b011d79fa31b491", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1647552195, - "narHash": "sha256-QjDulAhkGdm0GNiuVxJJmE7fK8NgdDXnO/VWn3Y1A+k=", + "lastModified": 1647617792, + "narHash": "sha256-UpLDpu4kcyas0GVRkrBdLNEPWmQHijjq+5BSk470YD4=", "owner": "nixos", "repo": "nix", - "rev": "6afc3617982e872fac2142c3aeccd1e8482e7e52", + "rev": "8ad485ea893862029e02cb560a15fd276753b04f", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1647282937, - "narHash": "sha256-K8Oo6QyFCfiEWTRpQVfzcwI3YNMKlz6Tu8rr+o3rzRQ=", + "lastModified": 1647490331, + "narHash": "sha256-Jcc+vHNDN3KDWuzGNTl3A24ICGovPneJDejiN2t57QI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64fc73bd74f04d3e10cb4e70e1c65b92337e76db", + "rev": "2c66a7a6e036971c4847cca424125f55b9eb0b0b", "type": "github" }, "original": { From fbada2d53fbc88761e27776b7fc955533ee2bdeb Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 01:54:42 +0100 Subject: [PATCH 291/303] change default kernel --- nixos/configurations/enceladeus.nix | 1 - nixos/configurations/mimas.nix | 1 - nixos/modules/default.nix | 3 ++- nixos/modules/kernel.nix | 14 ++++++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 nixos/modules/kernel.nix diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 0f588b49..3f46057b 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -26,7 +26,6 @@ _: { # Define on which hard drive you want to install Grub. boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - boot.kernelPackages = pkgs.linuxPackages_latest; boot.blacklistedKernelModules = ["rtl8xxxu"]; boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index de1e6256..78612a91 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -22,7 +22,6 @@ in { boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = ["ntfs" "exfat" "avfs"]; boot.cleanTmpDir = true; - boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; services.lvm.boot.thin.enable = true; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 966ac227..133bb67a 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -2,6 +2,7 @@ inputs: { cachix = import ./cachix inputs; flake = import ./flake.nix inputs; hostnames = import ./hostnames.nix inputs; - nix = import ./nix.nix inputs; + kernel = import ./kernel.nix inputs; moonlander = import ./moonlander.nix inputs; + nix = import ./nix.nix inputs; } diff --git a/nixos/modules/kernel.nix b/nixos/modules/kernel.nix new file mode 100644 index 00000000..cd67c46b --- /dev/null +++ b/nixos/modules/kernel.nix @@ -0,0 +1,14 @@ +_: { + pkgs, + lib, + config, + ... +}: let + zfsUsed = lib.lists.elem "zfs" (config.boot.supportedFilesystems ++ config.boot.initrd.supportedFilesystems); +in { + boot.kernelPackages = lib.mkDefault ( + if zfsUsed + then pkgs.zfs.latestCompatibleLinuxPackages + else pkgs.linuxPackages_latest + ); +} From 2eb44ae5ae49134ed4ef059423aec4b2995c45ce Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 02:11:30 +0100 Subject: [PATCH 292/303] create bootloader config for all --- lib/mk_system.nix | 2 ++ nixos/configurations/bootloader/enceladeus.nix | 12 ++++++++++++ nixos/configurations/bootloader/mimas.nix | 4 ++++ nixos/configurations/bootloader/thetys.nix | 2 ++ nixos/configurations/enceladeus.nix | 13 ------------- nixos/configurations/mimas.nix | 5 ----- 6 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 nixos/configurations/bootloader/enceladeus.nix create mode 100644 nixos/configurations/bootloader/mimas.nix create mode 100644 nixos/configurations/bootloader/thetys.nix diff --git a/lib/mk_system.nix b/lib/mk_system.nix index a8e31141..fbe475b2 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -3,6 +3,7 @@ nixpkgs.lib.nixosSystem ( let configFolder = "${self}/nixos/configurations"; entryPoint = import "${configFolder}/${name}.nix" inputs; + bootloader = "${configFolder}/bootloader/${name}.nix"; hardware = "${configFolder}/hardware/${name}.nix"; in { system = "x86_64-linux"; @@ -21,6 +22,7 @@ nixpkgs.lib.nixosSystem ( services.nixos-vscode-server.enable = true; } entryPoint + bootloader hardware inputs.nixos-vscode-server.nixosModules.system ] diff --git a/nixos/configurations/bootloader/enceladeus.nix b/nixos/configurations/bootloader/enceladeus.nix new file mode 100644 index 00000000..df11b8de --- /dev/null +++ b/nixos/configurations/bootloader/enceladeus.nix @@ -0,0 +1,12 @@ +{ + # Use the GRUB 2 boot loader. + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.useOSProber = false; + + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # Define on which hard drive you want to install Grub. + boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only +} diff --git a/nixos/configurations/bootloader/mimas.nix b/nixos/configurations/bootloader/mimas.nix new file mode 100644 index 00000000..d39e4ca6 --- /dev/null +++ b/nixos/configurations/bootloader/mimas.nix @@ -0,0 +1,4 @@ +{ + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; +} diff --git a/nixos/configurations/bootloader/thetys.nix b/nixos/configurations/bootloader/thetys.nix new file mode 100644 index 00000000..cb933a07 --- /dev/null +++ b/nixos/configurations/bootloader/thetys.nix @@ -0,0 +1,2 @@ +# Thetys' bootloader configuration is done by upstream VBox OVA module +{} diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 3f46057b..a60569c6 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -7,25 +7,12 @@ _: { lib, ... }: { - imports = []; - nix.allowedUnfree = ["b43-firmware" "broadcom-sta" "zerotierone"]; nixpkgs.config.contentAddressedByDefault = false; # nix.useSandbox = false; nix.package = pkgs.nix_2_4; - # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.useOSProber = false; - - # boot.loader.grub.efiSupport = true; - # boot.loader.grub.efiInstallAsRemovable = true; - # boot.loader.efi.efiSysMountPoint = "/boot/efi"; - # Define on which hard drive you want to install Grub. - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - boot.blacklistedKernelModules = ["rtl8xxxu"]; boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 78612a91..1bad7e56 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -11,15 +11,10 @@ steamPackages = ["steam" "steam-original" "steam-runtime"]; printerPackages = ["hplip" "samsung-UnifiedLinuxDriver"]; in { - imports = []; - nix.allowedUnfree = ["zerotierone"] ++ printerPackages ++ steamPackages; security.chromiumSuidSandbox.enable = true; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = ["ntfs" "exfat" "avfs"]; boot.cleanTmpDir = true; From 5ca31fc979741d0aa43e191e1dfdbc4c4b1f9200 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 02:19:25 +0100 Subject: [PATCH 293/303] move supportedFilesystems to hardware --- nixos/configurations/enceladeus.nix | 1 - nixos/configurations/hardware/enceladeus.nix | 1 + nixos/configurations/hardware/mimas.nix | 1 + nixos/configurations/hardware/thetys.nix | 2 ++ nixos/configurations/mimas.nix | 1 - nixos/configurations/thetys.nix | 2 -- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index a60569c6..143062ea 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -17,7 +17,6 @@ _: { boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu ]; - boot.supportedFilesystems = ["ntfs-3g"]; # boot.kernelPackages = pkgs.linuxPackages_4_19; boot.kernel.sysctl = { diff --git a/nixos/configurations/hardware/enceladeus.nix b/nixos/configurations/hardware/enceladeus.nix index 3f6e9357..33164e9f 100644 --- a/nixos/configurations/hardware/enceladeus.nix +++ b/nixos/configurations/hardware/enceladeus.nix @@ -13,6 +13,7 @@ boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-intel" "wl"]; boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; + boot.supportedFilesystems = ["ntfs-3g"]; fileSystems."/" = { device = "/dev/disk/by-uuid/1be71104-48ad-40c3-bf4c-086cd887969f"; diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index e72a45f7..159fb120 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -14,6 +14,7 @@ boot.kernelModules = ["kvm-intel"]; boot.kernelParams = ["intel_pstate=active"]; boot.extraModulePackages = []; + boot.supportedFilesystems = ["ntfs" "exfat" "avfs"]; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/nixos/configurations/hardware/thetys.nix b/nixos/configurations/hardware/thetys.nix index b33daa12..d06b7fa6 100644 --- a/nixos/configurations/hardware/thetys.nix +++ b/nixos/configurations/hardware/thetys.nix @@ -13,6 +13,8 @@ boot.initrd.kernelModules = []; boot.kernelModules = []; boot.extraModulePackages = []; + boot.initrd.supportedFilesystems = ["zfs"]; # boot from zfs + boot.supportedFilesystems = ["zfs"]; fileSystems."/" = lib.mkForce diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 1bad7e56..880a6e75 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -15,7 +15,6 @@ in { security.chromiumSuidSandbox.enable = true; - boot.supportedFilesystems = ["ntfs" "exfat" "avfs"]; boot.cleanTmpDir = true; services.lvm.boot.thin.enable = true; diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index 3ef715b2..afc76783 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -12,8 +12,6 @@ # TODO: 👇 move import of `virtualbox-demo.nix` into extra module 👇 imports = [(modulesPath + "/installer/virtualbox-demo.nix")]; - boot.initrd.supportedFilesystems = ["zfs"]; # boot from zfs - boot.supportedFilesystems = ["zfs"]; networking.hostId = "deadbeef"; programs.gnupg = { From 12d366ae52886883fca329384466c6229d2842e2 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 02:23:48 +0100 Subject: [PATCH 294/303] clean temp on each boot --- lib/mk_system.nix | 2 +- nixos/configurations/mimas.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/mk_system.nix b/lib/mk_system.nix index fbe475b2..1c225429 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -11,7 +11,7 @@ nixpkgs.lib.nixosSystem ( modules = [ { - # _module.args = args; + boot.cleanTmpDir = true; networking.hostName = name; nix.flakes.enable = true; system.configurationRevision = self.rev or "dirty"; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 880a6e75..ba58d457 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -15,8 +15,6 @@ in { security.chromiumSuidSandbox.enable = true; - boot.cleanTmpDir = true; - services.lvm.boot.thin.enable = true; hardware.enableRedistributableFirmware = true; From 73cb1ced8d19742d75f427a49235ebb273b1bf2f Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 02:31:08 +0100 Subject: [PATCH 295/303] =?UTF-8?q?exolicitely=20enable=20=C2=B5code=20upd?= =?UTF-8?q?ates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/configurations/hardware/mimas.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index 159fb120..e38fba5a 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -16,7 +16,7 @@ boot.extraModulePackages = []; boot.supportedFilesystems = ["ntfs" "exfat" "avfs"]; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = true; fileSystems."/" = { device = "/dev/disk/by-uuid/440c8ce1-1799-4239-936f-a54c879941a5"; From c4c57388a8d9a23326be94ca598420d70c4efb3d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 02:33:57 +0100 Subject: [PATCH 296/303] move redist firmware --- nixos/configurations/hardware/mimas.nix | 1 + nixos/configurations/mimas.nix | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix index e38fba5a..cc2812a0 100644 --- a/nixos/configurations/hardware/mimas.nix +++ b/nixos/configurations/hardware/mimas.nix @@ -17,6 +17,7 @@ boot.supportedFilesystems = ["ntfs" "exfat" "avfs"]; hardware.cpu.intel.updateMicrocode = true; + hardware.enableRedistributableFirmware = true; fileSystems."/" = { device = "/dev/disk/by-uuid/440c8ce1-1799-4239-936f-a54c879941a5"; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index ba58d457..03e7aef2 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -17,11 +17,6 @@ in { services.lvm.boot.thin.enable = true; - hardware.enableRedistributableFirmware = true; - # networking.enableRalinkFirmware = true; - - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config # replicates the default behaviour. From 6bec7229979d52476af877c90a1ee1eade17ead9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 02:45:13 +0100 Subject: [PATCH 297/303] move zerotier config --- nixos/configurations/enceladeus.nix | 3 --- nixos/configurations/mimas.nix | 3 --- nixos/configurations/thetys.nix | 12 +++--------- nixos/modules/default.nix | 1 + nixos/modules/zerotier.nix | 4 ++++ 5 files changed, 8 insertions(+), 15 deletions(-) create mode 100644 nixos/modules/zerotier.nix diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix index 143062ea..a2b49837 100644 --- a/nixos/configurations/enceladeus.nix +++ b/nixos/configurations/enceladeus.nix @@ -97,9 +97,6 @@ _: { services.xserver.layout = "de"; # services.xserver.xkbOptions = "eurosign:e"; - services.zerotierone.enable = true; - services.zerotierone.joinNetworks = ["8286ac0e4768c8ae"]; - # Enable touchpad support. # services.xserver.libinput.enable = true; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index 03e7aef2..f611ccbd 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -79,9 +79,6 @@ in { # * $HOME/.local/share/flatpak/exports/share services.flatpak.enable = true; - services.zerotierone.enable = true; - services.zerotierone.joinNetworks = ["8286ac0e4768c8ae"]; - # Open ports in the firewall. networking.firewall.allowedTCPPorts = [80 443 1111 8080 9002 9003 2342 9999 3000 58080]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/nixos/configurations/thetys.nix b/nixos/configurations/thetys.nix index afc76783..832dabf2 100644 --- a/nixos/configurations/thetys.nix +++ b/nixos/configurations/thetys.nix @@ -12,6 +12,8 @@ # TODO: 👇 move import of `virtualbox-demo.nix` into extra module 👇 imports = [(modulesPath + "/installer/virtualbox-demo.nix")]; + nix.allowedUnfree = ["zerotierone"]; + networking.hostId = "deadbeef"; programs.gnupg = { @@ -62,15 +64,7 @@ serviceConfig.ExecStart = "@${config.boot.kernelPackages.virtualboxGuestAdditions}/bin/VBoxClient -fv --vmsvga"; }; - services.zerotierone.enable = true; - services.zerotierone.joinNetworks = ["8286ac0e4768c8ae"]; - services.zerotierone.package = - (import nixpkgs-2105 { - config.allowUnfree = true; - # system = pkgs.system; - inherit (pkgs) system; - }) - .zerotierone; + # services.zerotierone.package = nixpkgs-2105.legacyPackages.${pkgs.system}.zerotierone; # services.ipfs.enable = true; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 133bb67a..c4125a2d 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -5,4 +5,5 @@ inputs: { kernel = import ./kernel.nix inputs; moonlander = import ./moonlander.nix inputs; nix = import ./nix.nix inputs; + zerotier = import ./zerotier.nix inputs; } diff --git a/nixos/modules/zerotier.nix b/nixos/modules/zerotier.nix new file mode 100644 index 00000000..0573e40f --- /dev/null +++ b/nixos/modules/zerotier.nix @@ -0,0 +1,4 @@ +_: { + services.zerotierone.enable = true; + services.zerotierone.joinNetworks = ["8286ac0e4768c8ae"]; +} From 417a5eeb3d06a62bda3135ef17ae51414c1ea890 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 03:07:11 +0100 Subject: [PATCH 298/303] update JS packages --- packages/default.nix | 2 +- packages/nodePackages/default.nix | 2 +- packages/nodePackages/node-env.nix | 3 +- packages/nodePackages/node-packages.json | 3 +- packages/nodePackages/node-packages.nix | 828 +++++------------------ 5 files changed, 192 insertions(+), 646 deletions(-) diff --git a/packages/default.nix b/packages/default.nix index a3979c96..352519b1 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -22,6 +22,6 @@ in { "elixir-lsp" = upkgs.beam.packages.erlang.callPackage ./elixir-lsp {}; "erlang-ls" = upkgs.beam.packages.erlang.callPackage ./erlang-ls {}; "rofi/unicode" = upkgs.callPackage ./rofi-unicode {}; - "zx" = nodePkgs.zx; + "zx" = upkgs.nodePackages.zx; "angular" = nodePkgs."@angular/cli"; } diff --git a/packages/nodePackages/default.nix b/packages/nodePackages/default.nix index 62f633ef..d79cb6fe 100644 --- a/packages/nodePackages/default.nix +++ b/packages/nodePackages/default.nix @@ -5,7 +5,7 @@ inherit system; }, system ? builtins.currentSystem, - nodejs ? pkgs."nodejs-14_x", + nodejs ? pkgs."nodejs-12_x", }: let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; diff --git a/packages/nodePackages/node-env.nix b/packages/nodePackages/node-env.nix index 89442210..cbcab478 100644 --- a/packages/nodePackages/node-env.nix +++ b/packages/nodePackages/node-env.nix @@ -112,8 +112,7 @@ mkdir -p node_modules cd node_modules '' - + (lib.concatMapStrings - ( + + (lib.concatMapStrings ( dependency: '' if [ ! -e "${dependency.name}" ]; then ${composePackage dependency} diff --git a/packages/nodePackages/node-packages.json b/packages/nodePackages/node-packages.json index 171ab173..40dbc35e 100644 --- a/packages/nodePackages/node-packages.json +++ b/packages/nodePackages/node-packages.json @@ -1,4 +1,3 @@ [ - "zx", "@angular/cli" -] +] \ No newline at end of file diff --git a/packages/nodePackages/node-packages.nix b/packages/nodePackages/node-packages.nix index 9ec5ab07..eafae3c7 100644 --- a/packages/nodePackages/node-packages.nix +++ b/packages/nodePackages/node-packages.nix @@ -9,76 +9,49 @@ globalBuildInputs ? [], }: let sources = { - "@angular-devkit/architect-0.1301.2" = { + "@angular-devkit/architect-0.1303.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1301.2"; + version = "0.1303.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1301.2.tgz"; - sha512 = "v8e6OF80Ezo5MTHtFcq1AZJH+Wq+hN9pMZ1iLGkODIfKIW9zx6aPhx0JY0b7sZkfNVL8ay8JA8f339eBMnOE9A=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.0.tgz"; + sha512 = "kTcKB917ICA8j53SGo4gn+qAlzx8si+iHnOTbp5QlMr7qt/Iz07SVVI8mRlMD6c6lr7eE/fVlCLzEZ1+WCQpTA=="; }; }; - "@angular-devkit/core-13.1.2" = { + "@angular-devkit/core-13.3.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.1.2.tgz"; - sha512 = "uXVesIRiCL/Nv+RSV8JM4j8IoZiGCGnqV2FOJ1hvH7DPxIjhjPMdG/B54xMydZpeASW3ofuxeORyAXxFIBm8Zg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.0.tgz"; + sha512 = "8YrreVbWlJVZnk5zs4vfkRItrPEtWhUcxWOBfYT/Kwu4FwJVAnNuhJAxxXOAQ2Ckd7cv30Idh/RFVLbTZ5Gs9w=="; }; }; - "@angular-devkit/schematics-13.1.2" = { + "@angular-devkit/schematics-13.3.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.1.2.tgz"; - sha512 = "ayYbHGU8QpMGx8ZyhKOBupz+Zfv/2H1pNQErahYV3qg7hA9hfjTGmNmDQ4iw0fiT04NajjUxuomlKsCsg7oXDw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.0.tgz"; + sha512 = "hq7tqnB3uVT/iDgqWWZ4kvnijeAcgd4cfLzZiCPaYn1nuhZf0tWsho6exhJ/odMZHvVp7w8OibqWiUKxNY9zHA=="; }; }; - "@gar/promisify-1.1.2" = { + "@gar/promisify-1.1.3" = { name = "_at_gar_slash_promisify"; packageName = "@gar/promisify"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz"; - sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; - }; - }; - "@nodelib/fs.scandir-2.1.5" = { - name = "_at_nodelib_slash_fs.scandir"; - packageName = "@nodelib/fs.scandir"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - }; - "@nodelib/fs.stat-2.0.5" = { - name = "_at_nodelib_slash_fs.stat"; - packageName = "@nodelib/fs.stat"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - }; - "@nodelib/fs.walk-1.2.8" = { - name = "_at_nodelib_slash_fs.walk"; - packageName = "@nodelib/fs.walk"; - version = "1.2.8"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; + url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@npmcli/fs-1.1.0" = { + "@npmcli/fs-1.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.0.tgz"; - sha512 = "VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"; + sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; }; }; "@npmcli/git-2.1.0" = { @@ -135,13 +108,13 @@ sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; - "@schematics/angular-13.1.2" = { + "@schematics/angular-13.3.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.1.2.tgz"; - sha512 = "OMbuOsnzUFjIGeo99NYwIPwjX6udJAiT5Sj5K7QZZYj66HuAqNBMV57J8GPA56edx5mOHZZApWMjXLlOxRXbJA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.0.tgz"; + sha512 = "WND6DXWf0ZFefqlC2hUm1FzHDonRfGpDEPWVhVulhYkB7IUUaXuCz8K41HAScyJ3bxUngs2Lx9+4omikc05fxA=="; }; }; "@tootallnate/once-1.1.2" = { @@ -153,40 +126,13 @@ sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/fs-extra-9.0.13" = { - name = "_at_types_slash_fs-extra"; - packageName = "@types/fs-extra"; - version = "9.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; - }; - }; - "@types/minimist-1.2.2" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; - sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; - }; - }; - "@types/node-16.11.18" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.11.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.18.tgz"; - sha512 = "7N8AOYWWYuw0g+K+GKCmIwfU1VMHcexYNpLPYzFZ4Uq2W6C/ptfeC7XhXgy/4pcwhz/9KoS5yijMfnYQ0u0Udw=="; - }; - }; - "@types/node-fetch-2.5.12" = { - name = "_at_types_slash_node-fetch"; - packageName = "@types/node-fetch"; - version = "2.5.12"; + "@tootallnate/once-2.0.0" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"; - sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; + url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; }; "@yarnpkg/lockfile-1.1.0" = { @@ -216,13 +162,13 @@ sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.0" = { + "agentkeepalive-4.2.1" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz"; - sha512 = "0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; }; }; "aggregate-error-3.1.0" = { @@ -234,13 +180,13 @@ sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; - "ajv-8.8.2" = { + "ajv-8.9.0" = { name = "ajv"; packageName = "ajv"; - version = "8.8.2"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz"; - sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; }; }; "ajv-formats-2.1.1" = { @@ -297,31 +243,13 @@ sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; }; - "are-we-there-yet-2.0.0" = { + "are-we-there-yet-3.0.0" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; - sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; - }; - }; - "array-union-3.0.1" = { - name = "array-union"; - packageName = "array-union"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz"; - sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz"; + sha512 = "0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw=="; }; }; "balanced-match-1.0.2" = { @@ -360,15 +288,6 @@ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; - "braces-3.0.2" = { - name = "braces"; - packageName = "braces"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - }; "buffer-5.7.1" = { name = "buffer"; packageName = "buffer"; @@ -396,6 +315,15 @@ sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; + "cacache-16.0.2" = { + name = "cacache"; + packageName = "cacache"; + version = "16.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-16.0.2.tgz"; + sha512 = "Q17j7s8X81i/QYVrKVQ/qwWGT+pYLfpTcZ+X+p/Qw9FULy9JEfb2FECYTTt6mPV6A/vk92nRZ80ncpKxiGTrIA=="; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -495,15 +423,6 @@ sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -549,15 +468,6 @@ sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; "delegates-1.0.0" = { name = "delegates"; packageName = "delegates"; @@ -576,24 +486,6 @@ sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; - "dir-glob-3.0.1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - }; - "duplexer-0.1.2" = { - name = "duplexer"; - packageName = "duplexer"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; - sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -639,15 +531,6 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "event-stream-3.3.4" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; - sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; - }; - }; "external-editor-3.1.0" = { name = "external-editor"; packageName = "external-editor"; @@ -666,15 +549,6 @@ sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.7" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; - sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; - }; - }; "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; @@ -684,15 +558,6 @@ sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.13.0" = { - name = "fastq"; - packageName = "fastq"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; - }; - }; "figures-3.2.0" = { name = "figures"; packageName = "figures"; @@ -702,42 +567,6 @@ sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - }; - "form-data-3.0.1" = { - name = "form-data"; - packageName = "form-data"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; - sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; - }; - }; - "from-0.1.7" = { - name = "from"; - packageName = "from"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; - sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; - }; - }; - "fs-extra-10.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz"; - sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; - }; - }; "fs-minipass-2.1.0" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -765,13 +594,13 @@ sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "gauge-4.0.0" = { + "gauge-4.0.3" = { name = "gauge"; packageName = "gauge"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz"; - sha512 = "F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw=="; + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz"; + sha512 = "ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw=="; }; }; "glob-7.2.0" = { @@ -783,31 +612,13 @@ sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; - "glob-parent-5.1.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - }; - "globby-12.0.2" = { - name = "globby"; - packageName = "globby"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz"; - sha512 = "lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ=="; - }; - }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "has-1.0.3" = { @@ -837,13 +648,13 @@ sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; }; }; - "hosted-git-info-4.0.2" = { + "hosted-git-info-4.1.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; }; }; "http-cache-semantics-4.1.0" = { @@ -864,6 +675,15 @@ sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; }; }; + "http-proxy-agent-5.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + }; + }; "https-proxy-agent-5.0.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; @@ -909,15 +729,6 @@ sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; - "ignore-5.2.0" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - }; "ignore-walk-4.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; @@ -999,13 +810,13 @@ sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; - "is-core-module-2.8.0" = { + "is-core-module-2.8.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; }; "is-docker-2.2.1" = { @@ -1017,15 +828,6 @@ sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1035,15 +837,6 @@ sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-glob-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; "is-interactive-1.0.0" = { name = "is-interactive"; packageName = "is-interactive"; @@ -1062,15 +855,6 @@ sha1 = "3d9877899e6a53efc0160504cde15f82e6f061d5"; }; }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - }; "is-unicode-supported-0.1.0" = { name = "is-unicode-supported"; packageName = "is-unicode-supported"; @@ -1125,15 +909,6 @@ sha512 = "fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="; }; }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; "jsonparse-1.3.1" = { name = "jsonparse"; packageName = "jsonparse"; @@ -1170,6 +945,15 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.7.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz"; + sha512 = "cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw=="; + }; + }; "magic-string-0.25.7" = { name = "magic-string"; packageName = "magic-string"; @@ -1179,6 +963,15 @@ sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; }; }; + "make-fetch-happen-10.0.6" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "10.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.6.tgz"; + sha512 = "4Gfh6lV3TLXmj7qz79hBFuvVqjYSMW6v2+sxtdX4LFQU0rK3V/txRjE0DoZb7X0IF3t9f8NO3CxPSWlvdckhVA=="; + }; + }; "make-fetch-happen-9.1.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -1188,51 +981,6 @@ sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; }; }; - "map-stream-0.1.0" = { - name = "map-stream"; - packageName = "map-stream"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; - }; - }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - }; - "micromatch-4.0.4" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; - }; - }; - "mime-db-1.51.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.51.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; - }; - }; - "mime-types-2.1.34" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.34"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; - }; - }; "mimic-fn-2.1.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -1242,22 +990,13 @@ sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; - "minimatch-3.0.4" = { + "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - }; - "minimist-1.2.5" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.5"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; "minipass-3.1.6" = { @@ -1287,6 +1026,15 @@ sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; + "minipass-fetch-2.0.3" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.3.tgz"; + sha512 = "VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ=="; + }; + }; "minipass-flush-1.0.5" = { name = "minipass-flush"; packageName = "minipass-flush"; @@ -1359,22 +1107,13 @@ sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; - }; - }; - "node-fetch-2.6.6" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.6"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz"; - sha512 = "Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "node-gyp-8.4.1" = { @@ -1449,22 +1188,22 @@ sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="; }; }; - "npm-registry-fetch-11.0.0" = { + "npm-registry-fetch-12.0.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "11.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz"; - sha512 = "jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz"; + sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; }; }; - "npmlog-6.0.0" = { + "npmlog-6.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz"; - sha512 = "03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q=="; + url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.1.tgz"; + sha512 = "BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg=="; }; }; "once-1.4.0" = { @@ -1521,13 +1260,13 @@ sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; }; - "pacote-12.0.2" = { + "pacote-12.0.3" = { name = "pacote"; packageName = "pacote"; - version = "12.0.2"; + version = "12.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-12.0.2.tgz"; - sha512 = "Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-12.0.3.tgz"; + sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; }; }; "path-is-absolute-1.0.1" = { @@ -1548,33 +1287,6 @@ sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - }; - "pause-stream-0.0.11" = { - name = "pause-stream"; - packageName = "pause-stream"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; - }; - }; - "picomatch-2.3.1" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -1593,15 +1305,6 @@ sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; - "ps-tree-1.2.0" = { - name = "ps-tree"; - packageName = "ps-tree"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz"; - sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; - }; - }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -1611,15 +1314,6 @@ sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "queue-microtask-1.2.3" = { - name = "queue-microtask"; - packageName = "queue-microtask"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - }; "read-package-json-fast-2.0.3" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -1647,13 +1341,13 @@ sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "resolve-1.20.0" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "restore-cursor-3.1.0" = { @@ -1674,15 +1368,6 @@ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - }; "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; @@ -1701,15 +1386,6 @@ sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.2.0" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - }; "rxjs-6.6.7" = { name = "rxjs"; packageName = "rxjs"; @@ -1719,13 +1395,13 @@ sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.5.1" = { + "rxjs-7.5.5" = { name = "rxjs"; packageName = "rxjs"; - version = "7.5.1"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.1.tgz"; - sha512 = "KExVEeZWxMZnZhUZtsJcFwz8IvPvgu4G2Z2QyqjZQzUGr32KDYuSxrEYO4w3tFFNbfLozcrKUTvTPi+E9ywJkQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"; + sha512 = "sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw=="; }; }; "safe-buffer-5.2.1" = { @@ -1764,22 +1440,13 @@ sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "signal-exit-3.0.6" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; - }; - }; - "slash-4.0.0" = { - name = "slash"; - packageName = "slash"; - version = "4.0.0"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; - sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "smart-buffer-4.2.0" = { @@ -1791,13 +1458,13 @@ sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; }; - "socks-2.6.1" = { + "socks-2.6.2" = { name = "socks"; packageName = "socks"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz"; - sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz"; + sha512 = "zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA=="; }; }; "socks-proxy-agent-6.1.1" = { @@ -1827,15 +1494,6 @@ sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; }; }; - "split-0.3.3" = { - name = "split"; - packageName = "split"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; - }; - }; "ssri-8.0.1" = { name = "ssri"; packageName = "ssri"; @@ -1845,15 +1503,6 @@ sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; }; }; - "stream-combiner-0.0.4" = { - name = "stream-combiner"; - packageName = "stream-combiner"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; - }; - }; "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; @@ -1890,6 +1539,15 @@ sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; "symbol-observable-4.0.0" = { name = "symbol-observable"; packageName = "symbol-observable"; @@ -1926,24 +1584,6 @@ sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; - }; - }; "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; @@ -1989,15 +1629,6 @@ sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; @@ -2043,24 +1674,6 @@ sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; - }; - }; - "whatwg-url-5.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; - }; - }; "which-2.0.2" = { name = "which"; packageName = "which"; @@ -2099,121 +1712,41 @@ }; }; in { - zx = nodeEnv.buildNodePackage { - name = "zx"; - packageName = "zx"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-4.2.0.tgz"; - sha512 = "/4f7FaJecA9I655KXKXIHO3CFNYjAz2uSmTz6v2eNlKdrQKyz4VyF3RjqFuP6nQG+Hd3+NjOvrVNBkv8Ne9d4Q=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/fs-extra-9.0.13" - sources."@types/minimist-1.2.2" - sources."@types/node-16.11.18" - sources."@types/node-fetch-2.5.12" - sources."ansi-styles-4.3.0" - sources."array-union-3.0.1" - sources."asynckit-0.4.0" - sources."braces-3.0.2" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."delayed-stream-1.0.0" - sources."dir-glob-3.0.1" - sources."duplexer-0.1.2" - sources."event-stream-3.3.4" - sources."fast-glob-3.2.7" - sources."fastq-1.13.0" - sources."fill-range-7.0.1" - sources."form-data-3.0.1" - sources."from-0.1.7" - sources."fs-extra-10.0.0" - sources."glob-parent-5.1.2" - sources."globby-12.0.2" - sources."graceful-fs-4.2.8" - sources."has-flag-4.0.0" - sources."ignore-5.2.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jsonfile-6.1.0" - sources."map-stream-0.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" - sources."node-fetch-2.6.6" - sources."path-type-4.0.0" - sources."pause-stream-0.0.11" - sources."picomatch-2.3.1" - sources."ps-tree-1.2.0" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."slash-4.0.0" - sources."split-0.3.3" - sources."stream-combiner-0.0.4" - sources."supports-color-7.2.0" - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."universalify-2.0.0" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for writing better scripts"; - homepage = "https://github.com/google/zx#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.1.2.tgz"; - sha512 = "jEsQWzHgODFpppWGb49jfqlN8YYhphsKY3MPHlrjmd05qWgKItUGSgA46hSoDqjaJKVUN9koUnJBFCc9utERYA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.0.tgz"; + sha512 = "2qCKP/QsyxrJnpd3g4P/iTQ4TjI04N8r+bG5YLLfudoMDsQ/Ti4ogdI7PBeG2IMbRylZW9XLjHraWG42+Y9tWw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1301.2" - sources."@angular-devkit/core-13.1.2" - sources."@angular-devkit/schematics-13.1.2" - sources."@gar/promisify-1.1.2" - sources."@npmcli/fs-1.1.0" + sources."@angular-devkit/architect-0.1303.0" + sources."@angular-devkit/core-13.3.0" + sources."@angular-devkit/schematics-13.3.0" + sources."@gar/promisify-1.1.3" + sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.1.2" + sources."@schematics/angular-13.3.0" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" - sources."ajv-8.8.2" + sources."ajv-8.9.0" sources."ajv-formats-2.1.1" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" + sources."are-we-there-yet-3.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -2256,13 +1789,13 @@ in { sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.0" + sources."gauge-4.0.3" sources."glob-7.2.0" - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" - sources."hosted-git-info-4.0.2" + sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -2279,12 +1812,12 @@ in { (sources."inquirer-8.2.0" // { dependencies = [ - sources."rxjs-7.5.1" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) sources."ip-1.1.5" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -2302,7 +1835,7 @@ in { sources."magic-string-0.25.7" sources."make-fetch-happen-9.1.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -2314,7 +1847,7 @@ in { sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-gyp-8.4.1" sources."nopt-5.0.0" sources."npm-bundled-1.1.2" @@ -2323,15 +1856,29 @@ in { sources."npm-package-arg-8.1.5" sources."npm-packlist-3.0.0" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-11.0.0" - sources."npmlog-6.0.0" + (sources."npm-registry-fetch-12.0.2" + // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."cacache-16.0.2" + sources."http-proxy-agent-5.0.0" + sources."lru-cache-7.7.1" + (sources."make-fetch-happen-10.0.6" + // { + dependencies = [ + sources."minipass-fetch-2.0.3" + ]; + }) + ]; + }) + sources."npmlog-6.0.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-12.0.2" + sources."pacote-12.0.3" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."promise-inflight-1.0.1" @@ -2340,7 +1887,7 @@ in { sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."rimraf-3.0.2" @@ -2350,9 +1897,9 @@ in { sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" @@ -2361,6 +1908,7 @@ in { sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tar-6.1.11" sources."through-2.3.8" From 9e8ed0ab9566c0682eb240f05b4f45e5c971d7d6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 10:02:25 +0100 Subject: [PATCH 299/303] update JS callPacke --- packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/default.nix b/packages/default.nix index 352519b1..a9f6c9bb 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -11,7 +11,7 @@ system = "x86_64-linux"; overlays = [emacs.overlay]; }; - nodePkgs = upkgs.callPackage ./nodePackages/override.nix {}; + nodePkgs = upkgs.callPackages ./nodePackages/override.nix {}; in { "advcp" = pkgs.callPackage ./advcp {}; "gnucash-de" = upkgs.callPackage ./gnucash-de {}; From 871b9b2269968d432c81c402c11a508b712951f9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 10:10:52 +0100 Subject: [PATCH 300/303] purge oldstuff folder --- oldstuff/home/LICENSE => LICENSE | 0 oldstuff/home/hosts/WS0005.nix | 24 ----------- oldstuff/home/modules/default.nix | 16 ------- oldstuff/home/modules/languages/c/default.nix | 29 ------------- .../home/modules/languages/ocaml/default.nix | 43 ------------------- oldstuff/home/nix/default.nix | 8 ---- oldstuff/home/nix/myOverlay/default.nix | 23 ---------- oldstuff/home/overlays.nix | 11 ----- oldstuff/packages/devShell.nix | 14 ------ 9 files changed, 168 deletions(-) rename oldstuff/home/LICENSE => LICENSE (100%) delete mode 100644 oldstuff/home/hosts/WS0005.nix delete mode 100644 oldstuff/home/modules/default.nix delete mode 100644 oldstuff/home/modules/languages/c/default.nix delete mode 100644 oldstuff/home/modules/languages/ocaml/default.nix delete mode 100644 oldstuff/home/nix/default.nix delete mode 100644 oldstuff/home/nix/myOverlay/default.nix delete mode 100644 oldstuff/home/overlays.nix delete mode 100644 oldstuff/packages/devShell.nix diff --git a/oldstuff/home/LICENSE b/LICENSE similarity index 100% rename from oldstuff/home/LICENSE rename to LICENSE diff --git a/oldstuff/home/hosts/WS0005.nix b/oldstuff/home/hosts/WS0005.nix deleted file mode 100644 index 5402c5e6..00000000 --- a/oldstuff/home/hosts/WS0005.nix +++ /dev/null @@ -1,24 +0,0 @@ -{pkgs, ...}: { - config = { - activeProfiles = ["browsing" "development"]; - - enabledLanguages = [ - "erlang" - "go" - "nix" - "python" - ]; - - programs.zsh.initExtraBeforeCompInit = '' - . ~/.nix-profile/etc/profile.d/nix.sh - ''; - - languages.python.useMS = true; - - programs.emacs.splashScreen = false; - - home.packages = [pkgs.nixUnstable]; - - programs.tmux.secureSocket = false; # disable /run sockets, as those seem to be not available in WSL - }; -} diff --git a/oldstuff/home/modules/default.nix b/oldstuff/home/modules/default.nix deleted file mode 100644 index ac4c9489..00000000 --- a/oldstuff/home/modules/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - filterAttrs, - mapAttrs, - mapAttrsToList, - ... -}: let - modules = let - all = builtins.readDir ./.; - dirs = filterAttrs (k: v: v == "directory") all; - in - mapAttrs (k: v: ./. + "/${k}") dirs; -in - { - all-modules = mapAttrsToList (k: v: v) modules; - } - // modules diff --git a/oldstuff/home/modules/languages/c/default.nix b/oldstuff/home/modules/languages/c/default.nix deleted file mode 100644 index 8be7b780..00000000 --- a/oldstuff/home/modules/languages/c/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - enabled = config.languages.c.enable || config.languages.cpp.enable; -in { - options.languages.c = { - enable = lib.mkEnableOption "Enable support for C language"; - }; - - # options.languages.cpp = { - # enable = lib.mkEnableOption "Enable support for C++ language"; - # }; - - config = lib.mkIf enabled { - programs.emacs.extraPackages = ep: [ep.cmake-mode]; - - programs.emacs.lsp-mode = { - enable = true; - languages = ["c" "c++"]; - }; - - programs.emacs.extraInit = '' - (setq lsp-clients-clangd-executable "${pkgs.clang-tools}/bin/clangd") - ''; - }; -} diff --git a/oldstuff/home/modules/languages/ocaml/default.nix b/oldstuff/home/modules/languages/ocaml/default.nix deleted file mode 100644 index b43844a8..00000000 --- a/oldstuff/home/modules/languages/ocaml/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.languages.ocaml; -in { - options.languages.ocaml = { - enable = lib.mkEnableOption "Enable support for ocaml language"; - }; - - config = lib.mkIf cfg.enable { - programs.emacs.lsp-mode = { - enable = true; - languages = ["caml"]; - }; - - programs.emacs = { - localPackages."init-ocaml" = { - tag = "Setup OCaml"; - comments = []; - requires = ["caml-font"]; - packageRequires = ep: [ep.lsp-mode ep.caml ep.company ep.flycheck]; - code = '' - (add-to-list 'exec-path "${pkgs.ocaml-lsp}/bin") - (setq lsp-ocaml-lang-server-command '("ocamllsp")) - - (add-to-list 'auto-mode-alist '("\\.ml[iylp]?$" . caml-mode)) - (autoload 'caml-mode "caml" "Major mode for editing OCaml code." t) - - (add-hook 'caml-mode-hook - (lambda () - (lsp-ui-mode) - (lsp-lens-mode) - (subword-mode) - (company-mode) - (flycheck-mode))) - ''; - }; - }; - }; -} diff --git a/oldstuff/home/nix/default.nix b/oldstuff/home/nix/default.nix deleted file mode 100644 index 975b0e6c..00000000 --- a/oldstuff/home/nix/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -let - sources = import ./sources.nix {}; -in [ - (_: _: {inherit sources;}) - (import sources.mozilla-overlay.outPath) - (import sources.emacs-overlay.outPath) - (import ./myOverlay) -] diff --git a/oldstuff/home/nix/myOverlay/default.nix b/oldstuff/home/nix/myOverlay/default.nix deleted file mode 100644 index 47918c1c..00000000 --- a/oldstuff/home/nix/myOverlay/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -final: prev: let - keepasspkgs = final.fetchFromGitHub { - owner = "wnklmnn"; - repo = "nixpkgs"; - rev = "e1bcd10a071ef746e1078272913048b1eef4ceee"; - sha256 = "03bd52y51xr6fhy3r8xggq84z39p94mhipw6xyjnm1niq7iim7cw"; - }; -in rec { - nix-zsh-completions = prev.nix-zsh-completions.overrideAttrs (_: { - version = "overlay"; - src = final.fetchFromGitHub { - owner = "Ma27"; - repo = "nix-zsh-completions"; - rev = "939c48c182e9d018eaea902b1ee9d00a415dba86"; - sha256 = "sha256-3HVYez/wt7EP8+TlhTppm968Wl8x5dXuGU0P+8xNDpo="; - }; - }); - - # keepass = - # final.callPackage "${keepasspkgs}/pkgs/applications/misc/keepass" { }; - - nobbzLib = import ./lib; -} diff --git a/oldstuff/home/overlays.nix b/oldstuff/home/overlays.nix deleted file mode 100644 index 284a2044..00000000 --- a/oldstuff/home/overlays.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - compat = import (builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/99f1c21.tar.gz"); - - self = (compat {src = ./.;}).defaultNix; - - inherit (self) overlay overlays; -in [ - overlay - overlays.inputs - overlays.emacs -] diff --git a/oldstuff/packages/devShell.nix b/oldstuff/packages/devShell.nix deleted file mode 100644 index 7dfe3e1d..00000000 --- a/oldstuff/packages/devShell.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - mkShell, - nixpkgs-fmt, - git, -}: -mkShell { - name = "system-and-home-builder"; - - buildInputs = [nixpkgs-fmt git]; - - shellHook = '' - ${git}/bin/git fetch origin - ''; -} From 889d0b2d2e608038adb45ed3eba129686d1bfd58 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 10:14:00 +0100 Subject: [PATCH 301/303] use `devShells.default` --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d5362dac..cefc7dbc 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,8 @@ switch = import ./apps/switch inputs; }; - devShell.x86_64-linux = let + devShell.x86_64-linux = self.devShells.x86_64-linux.default; + devShells.x86_64-linux.default = let pkgs = inputs.unstable.legacyPackages.x86_64-linux; in pkgs.mkShell { From 1b6c7d739663acd0ff877e6c609e7bcab4c79f39 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 10:32:11 +0100 Subject: [PATCH 302/303] remove TODO-me --- README.org | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 README.org diff --git a/README.org b/README.org deleted file mode 100644 index 3096a1e8..00000000 --- a/README.org +++ /dev/null @@ -1,45 +0,0 @@ -#+TITLE: README -#+AUTHOR: Norbert Melzer - - -* TODO Overhaul [16/35] -** TODO Systemconfiguration [3/3] -*** DONE =tux-nixos= -> =mimas= -*** DONE =delly-nixos= -> =enceladeus= -*** DONE =nixos= -> =thetys= -** TODO Homeconfiguration [3/4] -*** DONE =tux-nixos= -> =nmelzer@mimas= -*** DONE =delly-nixos= -> =nmelzer@enceladeus= -*** DONE =nixos= -> =demo@thetys= -*** TODO =WS0005= -** TODO Helper functions [2/3] -*** TODO apply overlays -*** DONE create home config -*** DONE create system config -** TODO Overlay [0/11] -*** TODO re-expose ~emacs-overlay~ -*** TODO expose each package -**** TODO ~advcp~ -**** TODO ~elixir-lsp~ -**** TODO ~erlang-ls~ -**** TODO ~keyleds~ -**** TODO ~rofi-unicode~ -**** TODO ~dracula-console~ -**** TODO ~gnucash-de~ -**** TODO ~kmymoney-de~ -**** TODO ~emacs~ -** TODO Packages [8/9] -*** DONE ~advcp~ -*** DONE ~elixir-lsp~ -*** DONE ~erlang-ls~ -*** DONE ~keyleds~ -*** DONE ~rofi-unicode~ -*** DONE ~dracula-console~ -*** DONE ~gnucash-de~ -*** TODO ~kmymoney-de~ -*** DONE ~emacs~ - - -# Local Variables: -# org-hierarchical-todo-statistics: nil -# End: From 1632dc2963139bc5604ff42189338b4689553197 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 20 Mar 2022 10:45:49 +0100 Subject: [PATCH 303/303] reduce "instances" of `nixpkgs` --- apps/switch/default.nix | 2 +- apps/update/default.nix | 2 +- lib/home_configurations_as_packages.nix | 2 +- lib/nixos_configurations_as_packages.nix | 2 +- nixos/configurations/mimas.nix | 2 +- packages/nodePackages/override.nix | 7 ++----- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/apps/switch/default.nix b/apps/switch/default.nix index 2734d081..76136501 100644 --- a/apps/switch/default.nix +++ b/apps/switch/default.nix @@ -3,7 +3,7 @@ unstable, ... }: let - pkgs = import unstable {system = "x86_64-linux";}; + pkgs = unstable.legacyPackages.x86_64-linux; type = "app"; program = "${switch}/bin/switch"; diff --git a/apps/update/default.nix b/apps/update/default.nix index 2ba5d011..84946ea2 100644 --- a/apps/update/default.nix +++ b/apps/update/default.nix @@ -3,7 +3,7 @@ unstable, ... }: let - pkgs = import unstable {system = "x86_64-linux";}; + pkgs = unstable.legacyPackages.x86_64-linux; type = "app"; program = "${update}/bin/update"; diff --git a/lib/home_configurations_as_packages.nix b/lib/home_configurations_as_packages.nix index 0d649e03..78315a68 100644 --- a/lib/home_configurations_as_packages.nix +++ b/lib/home_configurations_as_packages.nix @@ -1,5 +1,5 @@ {self, ...} @ inputs: let - pkgs = import inputs.nixpkgs-2105 {system = "x86_64-linux";}; + pkgs = inputs.nixpkgs-2105.legacyPackages.x86_64-linux; inherit (pkgs.lib) genAttrs mapAttrs'; diff --git a/lib/nixos_configurations_as_packages.nix b/lib/nixos_configurations_as_packages.nix index 37b639d3..7d38b60f 100644 --- a/lib/nixos_configurations_as_packages.nix +++ b/lib/nixos_configurations_as_packages.nix @@ -1,5 +1,5 @@ {self, ...} @ inputs: let - pkgs = import inputs.nixpkgs-2105 {system = "x86_64-linux";}; + pkgs = inputs.nixpkgs-2105.legacyPackages.x86_64-linux; inherit (pkgs.lib) genAttrs mapAttrs'; diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix index f611ccbd..27a446c2 100644 --- a/nixos/configurations/mimas.nix +++ b/nixos/configurations/mimas.nix @@ -7,7 +7,7 @@ lib, ... }: let - upkgs = import unstable {system = "x86_64-linux";}; + upkgs = unstable.legacyPackages.x86_64-linux; steamPackages = ["steam" "steam-original" "steam-runtime"]; printerPackages = ["hplip" "samsung-UnifiedLinuxDriver"]; in { diff --git a/packages/nodePackages/override.nix b/packages/nodePackages/override.nix index 97fa418d..1c8679df 100644 --- a/packages/nodePackages/override.nix +++ b/packages/nodePackages/override.nix @@ -1,9 +1,6 @@ { - pkgs ? - import { - inherit system; - }, - system ? builtins.currentSystem, + pkgs, + system, }: let nodePackages = import ./default.nix { inherit pkgs system;