diff --git a/home/home.nix b/home/home.nix index 11c66ca..fe42b87 100644 --- a/home/home.nix +++ b/home/home.nix @@ -83,7 +83,6 @@ let avidemux #linphone soundkonverter - gpodder ]; cliApps = [ @@ -363,7 +362,6 @@ in *.swp *.swo ''); - core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab"; }; lfs.enable = true; }; diff --git a/home/overlays.nix b/home/overlays.nix index 9b4e923..3cb5752 100644 --- a/home/overlays.nix +++ b/home/overlays.nix @@ -1,9 +1,17 @@ +let + unstable = (import { overlays = [ seaf-overlay ]; }).pkgs; + + seaf-overlay = (import ./ov/seafile-overlay); +in [ ( self: super: rec { #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 { # executable/ package name name = "vim"; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 15dcc7b..fd0cbd2 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -190,11 +190,6 @@ in wantedBy = [ ]; script = '' 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 127.0.0.1 twitter.com ::1 api.twitter.com @@ -204,8 +199,6 @@ in ::1 tagesschau.de 127.0.0.1 tagesschau.de ::1 dnn.de - 127.0.0.1 www.dnn.de - ::1 www.dnn.de 127.0.0.1 dnn.de ''} /etc/hosts ''; diff --git a/nixos/packages.nix b/nixos/packages.nix index 488d64c..98fb6a7 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -55,10 +55,12 @@ #kaddressbook #kalarm #kalarmcal + #kcalcore #kcalutils #kcontacts #kdav #kdepim-addons + #kdepim-apps-libs #kdepim-runtime #kidentitymanagement