Drop heoric and few improvements

5 files changed, 3 insertions, 44 deletions

diff --git a/nixos/machine/lipwig.nix b/nixos/machine/lipwig.nix
index aa3d448..0069638 100644
--- a/nixos/machine/lipwig.nix
+++ b/nixos/machine/lipwig.nix
@@ -8,7 +8,7 @@ with lib;
     boot.isContainer = true;
     boot.loader.initScript.enable = true;
 
-    cynerd.openvpn.enable = true;
+    cynerd.openvpn.personal = true;
 
     # Git ######################################################################
     services.gitolite = {
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 8d34a16..c1458c8 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -31,7 +31,7 @@ with lib;
     environment.systemPackages = with pkgs; [
       git # We need git for this repository to even work
       # Administration tools
-      coreutils moreutils psmisc progress lshw file
+      coreutils moreutils binutils psmisc progress lshw file
       ldns wget
       gnumake
       exfat exfatprogs
@@ -53,10 +53,6 @@ with lib;
       sourceHighlight # Colors for less
       unrar p7zip zip unzip
 
-      # Vim plugins (used for root account)
-      vimPlugins.vim-nix
-      vimPlugins.vim-nftables
-
       # Network
       nmap netcat traceroute
       iftop nethogs
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4ac6ec4..23f4e25 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -26,7 +26,6 @@ let
         nixpkgs.path + "/pkgs/applications/networking/instant-messengers/franz/generic.nix"
       ) { };
     };
-    heroic = callPackage ./heroic { };
 
   };
 
diff --git a/pkgs/heroic/default.nix b/pkgs/heroic/default.nix
deleted file mode 100644
index 5eba770..0000000
--- a/pkgs/heroic/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, fetchurl, appimageTools }:
-
-let
-  pname = "heroic";
-  version = "2.3.9";
-  name = "${pname}-${version}";
-  src = fetchurl {
-    url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${version}/Heroic-${version}.AppImage";
-    sha256 = "17jzrh4qqcxvib9bbk2x224xwg67n6z5xsc9978w9vxb04mr0x7d";
-  };
-  appimageContents = appimageTools.extractType2 { inherit name src; };
-
-in appimageTools.wrapType2 {
-  inherit name version src;
-
-  extraInstallCommands = ''
-    mv $out/bin/${name} $out/bin/${pname}
-
-    mkdir -p $out/share/${pname}
-    cp -a ${appimageContents}/locales $out/share/${pname}
-    cp -a ${appimageContents}/resources $out/share/${pname}
-
-    install -m 444 -D ${appimageContents}/heroic.desktop -t $out/share/applications
-
-    cp -a ${appimageContents}/usr/share/icons $out/share/
-
-    substituteInPlace $out/share/applications/heroic.desktop \
-      --replace 'Exec=AppRun' 'Exec=heroic'
-  '';
-
-  meta = with lib; {
-    description = "A Native GUI Epic Games Launcher for Linux, Windows and Mac";
-    homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
-    license = licenses.gpl3Only;
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/stardict/default.nix b/pkgs/stardict/default.nix
index 03a6b63..e349d61 100644
--- a/pkgs/stardict/default.nix
+++ b/pkgs/stardict/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Cross-platform and international dictionary software";
     homepage = "http://stardict-4.sourceforge.net/";
+    platform = platforms.linux;
     license = licenses.gpl3;
   };
 }