From d21d7a1fdd7f78441f373f54fb69614ea53ed65e Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Fri, 22 May 2020 17:46:14 +0200 Subject: [PATCH] fix: allow usage of p7zip --- desktop/gnome.nix | 7 +++---- home-pc.nix | 4 ++++ home/editors/neovim.nix | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/desktop/gnome.nix b/desktop/gnome.nix index ae0b91a..fdafbd5 100644 --- a/desktop/gnome.nix +++ b/desktop/gnome.nix @@ -30,21 +30,20 @@ in gnome-shell-extension-pop-shell ]; - # Enable Gnome 3 services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.wayland = false; services.xserver.desktopManager.gnome3.enable = true; + + # exclude some default applications environment.gnome3.excludePackages = with pkgs; [ - gnome3.geary gnome3.gnome-weather gnome3.gnome-calendar gnome3.gnome-maps gnome3.gnome-contacts gnome3.gnome-software - gnome3.gnome-packagekit gnome3.totem gnome3.epiphany ]; - programs.gnome-terminal.enable = false; + programs.geary.enable = false; } diff --git a/home-pc.nix b/home-pc.nix index 05fd3ea..ceabe4d 100644 --- a/home-pc.nix +++ b/home-pc.nix @@ -14,6 +14,10 @@ nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ + "p7zip-16.02" # currently used by lutris + ]; + networking.hostName = "felix-nixos"; hardware.enableAllFirmware = true; diff --git a/home/editors/neovim.nix b/home/editors/neovim.nix index 9f8b6c9..4117f14 100644 --- a/home/editors/neovim.nix +++ b/home/editors/neovim.nix @@ -9,8 +9,11 @@ let src = pkgs.fetchFromGitHub { owner = "FelschR"; repo = "omnisharp-vim"; - rev = "3eb38ffbf6295d24e544b72fb349e876cd28ad96"; - sha256 = "0wvhjv7rdscm0kps72wlbyhqk99j6c6flqsd2vkj0v985l48nzhz"; + # new + # rev = "3eb38ffbf6295d24e544b72fb349e876cd28ad96"; + # sha256 = "0wvhjv7rdscm0kps72wlbyhqk99j6c6flqsd2vkj0v985l48nzhz"; + rev = "bc5066790e6f1bc46e1b3278b9b49046c75574b8"; + sha256 = "0ayz6c7iyl91wwl55jvhqy8rgfl3cxhh24k1jphimmvb7zmbp0hc"; }; }; nvim-lsp = buildVimPluginFrom2Nix {