Use derivations from pkgs.kummerlaender.eu

6 files changed, 35 insertions, 169 deletions

diff --git a/gui/gtk.nix b/gui/gtk.nix
index f373cd9..bd1465a 100644
--- a/gui/gtk.nix
+++ b/gui/gtk.nix
@@ -1,49 +1,42 @@
 { pkgs, ... }:
 
-{
+let
+  mypkgs = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
+in {
   gtk = {
     enable = true;
 
-    theme = let
-      oomox-gtk-theme = pkgs.callPackage ./pkgs/oomox-gtk-theme.nix {
-        pkgs-unstable = import <nixpkgs-unstable> {};
-        theme = {
-          accent_bg  = "aadb0f";
-          bg         = "d8d8d8";
-          fg         = "101010";
-          btn_bg     = "f5f5f5";
-          btn_fg     = "111111";
-          caret_size = 0.04;
-          caret1_fg  = "101010";
-          caret2_fg  = "101010";
-          hdr_btn_bg = "161616";
-          hdr_btn_fg = "aadb0f";
-          menu_bg    = "909636";
-          menu_fg    = "1a1a1a";
-          sel_bg     = "aadb0f";
-          sel_fg     = "101010";
-          txt_bg     = "ffffff";
-          txt_fg     = "101010";
-          gradient   = 0.0;
-          roundness  = 0;
-          spacing    = 1;
-          wm_border_focus   = "909636";
-          wm_border_unfocus = "909636";
-          gtk3_generate_dark = false;
-        };
+    theme = {
+      name = "oomox";
+      package = mypkgs.oomox-gtk-theme {
+        accent_bg  = "aadb0f";
+        bg         = "d8d8d8";
+        fg         = "101010";
+        btn_bg     = "f5f5f5";
+        btn_fg     = "111111";
+        caret_size = 0.04;
+        caret1_fg  = "101010";
+        caret2_fg  = "101010";
+        hdr_btn_bg = "161616";
+        hdr_btn_fg = "aadb0f";
+        menu_bg    = "909636";
+        menu_fg    = "1a1a1a";
+        sel_bg     = "aadb0f";
+        sel_fg     = "101010";
+        txt_bg     = "ffffff";
+        txt_fg     = "101010";
+        gradient   = 0.0;
+        roundness  = 0;
+        spacing    = 1;
+        wm_border_focus   = "909636";
+        wm_border_unfocus = "909636";
+        gtk3_generate_dark = false;
       };
-    in {
-      name    = "oomox";
-      package = oomox-gtk-theme;
     };
 
-    iconTheme = let
-      oomox-archdroid-icon-theme = pkgs.callPackage ./pkgs/oomox-archdroid-icon-theme.nix {
-        color = "909636";
-      };
-    in {
+    iconTheme = {
       name    = "oomox-archdroid";
-      package = oomox-archdroid-icon-theme;
+      package = mypkgs.oomox-archdroid-icon-theme "909636";
     };
 
     font = {
diff --git a/gui/pkgs/modem-manager-gui.nix b/gui/pkgs/modem-manager-gui.nix
deleted file mode 100644
index 50d64a8..0000000
--- a/gui/pkgs/modem-manager-gui.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, pkgs, ... }:
-
-stdenv.mkDerivation rec {
-  name = "modem-manager-gui";
-
-  src = pkgs.fetchhg {
-    url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui";
-    rev = "5c6456f";
-  };
-
-  # required for locale generation
-  LANG = "en_US.UTF-8";
-  LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-  # required to get Po4a to work
-  PERL5LIB="${pkgs.perlPackages.Po4a}/lib/perl5";
-
-  buildInputs = with pkgs; [
-    pkgconfig
-    gtk3
-    glib
-    gdbm
-    perlPackages.Po4a
-    itstool
-    libappindicator-gtk3
-    meson
-    gettext
-    ninja
-  ];
-
-  meta = {
-    description = "modem-manager-gui";
-    homepage = https://linuxonly.ru/page/modem-manager-gui;
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
diff --git a/gui/pkgs/nvim-gui.nix b/gui/pkgs/nvim-gui.nix
index 7f0ba7e..b5093e2 100644
--- a/gui/pkgs/nvim-gui.nix
+++ b/gui/pkgs/nvim-gui.nix
@@ -1,10 +1,7 @@
 { pkgs, ... }:
 
 let
-  custom_nvim = pkgs.neovim.override {
-    vimAlias  = false;
-    configure = (import /etc/nixos/pkgs/vim/custom.nix { pkgs = pkgs; });
-  };
+  mypkgs = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
 in pkgs.neovim-qt.override {
-  neovim = custom_nvim;
+  neovim = mypkgs.custom-neovim;
 }
diff --git a/gui/pkgs/oomox-archdroid-icon-theme.nix b/gui/pkgs/oomox-archdroid-icon-theme.nix
deleted file mode 100644
index 764bf2f..0000000
--- a/gui/pkgs/oomox-archdroid-icon-theme.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, pkgs, color, ... }:
-
-stdenv.mkDerivation rec {
-  name = "oomox-archdroid-icon-theme";
-
-  src = pkgs.fetchFromGitHub {
-    repo   = "archdroid-icon-theme";
-    owner  = "themix-project";
-    rev    = "6dc4c92689ea2ce99534d6f461283efdf8ffd270";
-    sha256 = "073iwaamzrmj0l6h4gzmbnmazq16lgpc027mr3l778b35qwwraq5";
-  };
-
-  postPatch = ''
-    patchShebangs .
-  '';
-
-  installPhase = ''
-    HOME="$out/share/icons"
-    sed -i "66s/\.icons\///" change_color.sh
-    ./change_color.sh --output oomox-archdroid --color ${color}
-  '';
-
-  meta = {
-    description = "oomox-archdroid-icon-theme is a customizable fork of archdroid-icon-theme";
-    homepage = https://github.com/themix-project/archdroid-icon-theme;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/gui/pkgs/oomox-gtk-theme.nix b/gui/pkgs/oomox-gtk-theme.nix
deleted file mode 100644
index 6e217dd..0000000
--- a/gui/pkgs/oomox-gtk-theme.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, pkgs, pkgs-unstable, theme, ... }:
-
-stdenv.mkDerivation rec {
-  name = "oomox-gtk-theme";
-
-  src = pkgs.fetchFromGitHub {
-    repo   = "oomox-gtk-theme";
-    owner  = "themix-project";
-    rev    = "aa9081b2899d7e8ba8ae47543173d2d9f0f13921";
-    sha256 = "1yxhd6d61npx43qwa6gyvrwmivv42k3d6qn54q276aihwxlbgj4r";
-  };
-
-  nativeBuildInputs = with pkgs; [ librsvg glib libxml2 gdk_pixbuf bc pkgs-unstable.sass pkgs-unstable.sassc ];
-  propagatedUserEnvPkgs = with pkgs; [ gtk-engine-murrine ];
-
-  config = with theme; ''
-    ACCENT_BG=${accent_bg}
-    BG=${bg}
-    FG=${fg}
-    BTN_BG=${btn_bg}
-    BTN_FG=${btn_fg}
-    CARET1_FG=${caret1_fg}
-    CARET2_FG=${caret2_fg}
-    HDR_BTN_BG=${hdr_btn_bg}
-    HDR_BTN_FG=${hdr_btn_fg}
-    MENU_BG=${menu_bg}
-    MENU_FG=${menu_fg}
-    SEL_BG=${sel_bg}
-    SEL_FG=${sel_fg}
-    TXT_BG=${txt_bg}
-    TXT_FG=${txt_fg}
-    WM_BORDER_FOCUS=${wm_border_focus}
-    WM_BORDER_UNFOCUS=${wm_border_unfocus}
-    GTK3_GENERATE_DARK=${if gtk3_generate_dark then "True" else "False"}
-    CARET_SIZE=${toString caret_size}
-    GRADIENT=${toString gradient}
-    ROUNDNESS=${toString roundness}
-    SPACING=${toString spacing}
-  '';
-
-  postPatch = ''
-    patchShebangs .
-  '';
-
-  buildPhase = ''
-    HOME="$out/share/themes/oomox"
-    ./change_color.sh --make-opts all --target-dir "$out/share/themes" --output oomox <(echo -e "${config}")
-  '';
-
-  installPhase = ''
-    cd oomox-gtk-theme-*
-  '';
-
-  meta = {
-    description = "oomox-gtk-theme is a customizable fork of numix-gtk-theme.";
-    homepage = https://github.com/themix-project/oomox-gtk-theme;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/host/asterix.nix b/host/asterix.nix
index e53512c..984bfd0 100644
--- a/host/asterix.nix
+++ b/host/asterix.nix
@@ -7,9 +7,9 @@
   ];
 
   home.packages = let
-  # only asterix has a 3g modem
-    modem-manager-gui = import ../gui/pkgs/modem-manager-gui.nix pkgs;
+    mypkgs = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
   in [
-    modem-manager-gui
+  # only asterix has a 3g modem
+    mypkgs.modem-manager-gui
   ];
 }