Compare commits

..

No commits in common. "25cc957e90791de2806312b71874fe04197970b4" and "36001254bfd1847fc4328d22020cdd71ba344611" have entirely different histories.

4 changed files with 10 additions and 9 deletions

View file

@ -83,7 +83,6 @@ let
avidemux avidemux
#linphone #linphone
soundkonverter soundkonverter
gpodder
]; ];
cliApps = [ cliApps = [
@ -363,7 +362,6 @@ in
*.swp *.swp
*.swo *.swo
''); '');
core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab";
}; };
lfs.enable = true; lfs.enable = true;
}; };

View file

@ -1,9 +1,17 @@
let
unstable = (import <nixos-unstable> { overlays = [ seaf-overlay ]; }).pkgs;
seaf-overlay = (import ./ov/seafile-overlay);
in
[ [
( (
self: super: self: super:
rec { rec {
#jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {}; #jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {};
seafile-server = unstable.seafile-server;
libevhtp = unstable.libevhtp;
seafile-bindings = unstable.python3Packages.seafile-bindings;
myVim = with super; (vim_configurable.override { python = python3; }).customize { myVim = with super; (vim_configurable.override { python = python3; }).customize {
# executable/ package name # executable/ package name
name = "vim"; name = "vim";

View file

@ -190,11 +190,6 @@ in
wantedBy = [ ]; wantedBy = [ ];
script = '' script = ''
ln -sf ${pkgs.writeText "blockedHosts" '' ln -sf ${pkgs.writeText "blockedHosts" ''
127.0.0.1 localhost
::1 localhost
127.0.0.2 ${config.networking.hostName}
::1 ${config.networking.hostName}
::1 twitter.com ::1 twitter.com
127.0.0.1 twitter.com 127.0.0.1 twitter.com
::1 api.twitter.com ::1 api.twitter.com
@ -204,8 +199,6 @@ in
::1 tagesschau.de ::1 tagesschau.de
127.0.0.1 tagesschau.de 127.0.0.1 tagesschau.de
::1 dnn.de ::1 dnn.de
127.0.0.1 www.dnn.de
::1 www.dnn.de
127.0.0.1 dnn.de 127.0.0.1 dnn.de
''} /etc/hosts ''} /etc/hosts
''; '';

View file

@ -55,10 +55,12 @@
#kaddressbook #kaddressbook
#kalarm #kalarm
#kalarmcal #kalarmcal
#kcalcore
#kcalutils #kcalutils
#kcontacts #kcontacts
#kdav #kdav
#kdepim-addons #kdepim-addons
#kdepim-apps-libs
#kdepim-runtime #kdepim-runtime
#kidentitymanagement #kidentitymanagement