Update nixpkgs

jlesquembre · Oct 10, 2023 · 83291e1 · 83291e1
1 parent c63e9aa
commit 83291e1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 26 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home-manager/neovim-plugins-generated.nix b/home-manager/neovim-plugins-generated.nix
@@ -1,9 +1,9 @@
 # GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
-{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }:
+{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }:
 
 final: prev:
 {
-  baleia-nvim = buildVimPluginFrom2Nix {
+  baleia-nvim = buildVimPlugin {
     pname = "baleia.nvim";
     version = "2023-04-18";
     src = fetchFromGitHub {
@@ -16,7 +16,7 @@ final: prev:
     meta.homepage = "https://github.com/m00qek/baleia.nvim/";
   };
 
-  nterm-nvim = buildVimPluginFrom2Nix {
+  nterm-nvim = buildVimPlugin {
     pname = "nterm.nvim";
     version = "2022-05-10";
     src = fetchFromGitHub {

diff --git a/home-manager/neovim.nix b/home-manager/neovim.nix
@@ -1,9 +1,10 @@
 { config, pkgs, lib, nix-medley, rootPath, ... }:
 let
   nvim-deps = (import ./neovim-deps.nix) { pkgs = pkgs; };
+
   custom-vim-plugs = pkgs.vimPlugins.extend (
     (pkgs.callPackage ./neovim-plugins-generated.nix {
-      inherit (pkgs.vimUtils) buildVimPluginFrom2Nix;
+      inherit (pkgs.vimUtils) buildVimPlugin;
       inherit (pkgs.neovimUtils) buildNeovimPlugin;
     })
   );

diff --git a/nixos/common-configuration.nix b/nixos/common-configuration.nix
@@ -61,11 +61,12 @@ in
       }
     ];
   };
-  nixpkgs.config.allowUnfree = true;
 
   # mount /tmp on tmpfs
   boot.tmp.useTmpfs = true;
 
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
   # Select internationalisation properties.
   console.keyMap = "us";
   i18n.defaultLocale = "en_US.UTF-8";