From 0c6ad1dfe898c8b963102bc352eea7e5d523aead Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 9 Jun 2021 12:06:56 +0200 Subject: [PATCH 1/6] don't forget localhost host alias in blocked state --- nixos/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index fd0cbd2..f824c62 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -190,6 +190,11 @@ 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 From 1eb244907d1ed96cdb9eb6aceb96a694edee4292 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 15 Aug 2021 13:01:03 +0200 Subject: [PATCH 2/6] remove nonexisting kdepim support packages --- nixos/packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/packages.nix b/nixos/packages.nix index 98fb6a7..488d64c 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -55,12 +55,10 @@ #kaddressbook #kalarm #kalarmcal - #kcalcore #kcalutils #kcontacts #kdav #kdepim-addons - #kdepim-apps-libs #kdepim-runtime #kidentitymanagement From e1eea0f769d8f8a08fabb5297b809eb5f76b2624 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 15 Aug 2021 13:01:32 +0200 Subject: [PATCH 3/6] remove seafile stuff from overlays --- home/overlays.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/home/overlays.nix b/home/overlays.nix index 3cb5752..9b4e923 100644 --- a/home/overlays.nix +++ b/home/overlays.nix @@ -1,17 +1,9 @@ -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"; From e2596f26ce3ebcfedf8f09d84f8268a43b5041f7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 15 Aug 2021 13:02:14 +0200 Subject: [PATCH 4/6] install gpodder as a podcatcher --- home/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home.nix b/home/home.nix index fe42b87..820acfd 100644 --- a/home/home.nix +++ b/home/home.nix @@ -83,6 +83,7 @@ let avidemux #linphone soundkonverter + gpodder ]; cliApps = [ From 755c9cc444de674140339b0a50632236ec32d6d5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 15 Aug 2021 13:03:03 +0200 Subject: [PATCH 5/6] disable trailing whitespace warnings in git --- home/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home.nix b/home/home.nix index 820acfd..11c66ca 100644 --- a/home/home.nix +++ b/home/home.nix @@ -363,6 +363,7 @@ in *.swp *.swo ''); + core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab"; }; lfs.enable = true; }; From 25cc957e90791de2806312b71874fe04197970b4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 15 Aug 2021 13:03:41 +0200 Subject: [PATCH 6/6] add dnn to blocked sites for procrastination stopper --- nixos/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f824c62..15dcc7b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -204,6 +204,8 @@ 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 '';