From 01af2614019c665b7977c0022e184a20c023f959 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 28 Dec 2018 14:49:44 +0100 Subject: tv gitrepos: with-ssh --- tv/2configs/gitrepos.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/2configs') diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index a89d130..9409246 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -71,6 +71,7 @@ let { stockholm = { cgit.desc = "NixOS configuration"; }; + with-ssh = {}; } // mapAttrs (_: recursiveUpdate { cgit.section = "2. Host configurations"; }) { ni = { }; -- cgit v1.3.1 From 6868856e271c57e6721de26d910a49d60b41236d Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Dec 2018 12:18:14 +0100 Subject: tv nixpkgs-overlays: RIP --- tv/1systems/xu/config.nix | 5 ----- tv/2configs/default.nix | 1 - tv/3modules/default.nix | 1 - tv/3modules/nixpkgs-overlays.nix | 23 ----------------------- 4 files changed, 30 deletions(-) delete mode 100644 tv/3modules/nixpkgs-overlays.nix (limited to 'tv/2configs') diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index b9c76cf..c47608a 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -156,10 +156,5 @@ with import ; # The NixOS release to be compatible with for stateful data such as databases. system.stateVersion = "15.09"; - tv.nixpkgs-overlays = { - krebs = "/home/tv/stockholm/krebs/5pkgs"; - tv = "/home/tv/stockholm/tv/5pkgs"; - }; - virtualisation.virtualbox.host.enable = true; } diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 484a337..e18ba31 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -92,7 +92,6 @@ with import ; environment.variables = { NIX_PATH = mkForce (concatStringsSep ":" [ "secrets=/var/src/stockholm/null" - "nixpkgs-overlays=${config.tv.nixpkgs-overlays}" "/var/src" ]); }; diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index f53a58e..67fb3f6 100644 --- a/tv/3modules/default.nix +++ b/tv/3modules/default.nix @@ -5,7 +5,6 @@ ./ejabberd ./hosts.nix ./iptables.nix - ./nixpkgs-overlays.nix ./slock.nix ./x0vncserver.nix ]; diff --git a/tv/3modules/nixpkgs-overlays.nix b/tv/3modules/nixpkgs-overlays.nix deleted file mode 100644 index 4eb7a86..0000000 --- a/tv/3modules/nixpkgs-overlays.nix +++ /dev/null @@ -1,23 +0,0 @@ -with import ; -{ config, pkgs, ... }: { - - options.tv.nixpkgs-overlays = mkOption { - apply = src: - pkgs.runCommand "nixpkgs-overlays" {} '' - mkdir $out - ${concatStringsSep "\n" (mapAttrsToList (name: path: - "ln -s ${shell.escape path} $out/${shell.escape name}" - ) src)} - '' // { - inherit src; - }; - type = types.attrsOf types.absolute-pathname; - }; - - config = { - tv.nixpkgs-overlays = { - krebs = mkDefault "/var/src/stockholm/krebs/5pkgs"; - tv = mkDefault "/var/src/stockholm/tv/5pkgs"; - }; - }; -} -- cgit v1.3.1 From 395c42571bbef3361c07d1f25913e7c15990e542 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Dec 2018 12:58:45 +0100 Subject: tv ejabberd: move home to /var/lib --- tv/2configs/backup.nix | 4 ++-- tv/3modules/ejabberd/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix index f8de72d..b8dec8d 100644 --- a/tv/2configs/backup.nix +++ b/tv/2configs/backup.nix @@ -60,7 +60,7 @@ with import ; }; xu-pull-ni-ejabberd = { method = "pull"; - src = { host = config.krebs.hosts.ni; path = "/var/ejabberd"; }; + src = { host = config.krebs.hosts.ni; path = "/var/lib/ejabberd"; }; dst = { host = config.krebs.hosts.xu; path = "/bku/ni-ejabberd"; }; startAt = "07:00"; }; @@ -78,7 +78,7 @@ with import ; }; zu-pull-ni-ejabberd = { method = "pull"; - src = { host = config.krebs.hosts.ni; path = "/var/ejabberd"; }; + src = { host = config.krebs.hosts.ni; path = "/var/lib/ejabberd"; }; dst = { host = config.krebs.hosts.zu; path = "/bku/ni-ejabberd"; }; startAt = "06:00"; }; diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix index e99b94f..f16dfac 100644 --- a/tv/3modules/ejabberd/default.nix +++ b/tv/3modules/ejabberd/default.nix @@ -67,7 +67,7 @@ in { type = types.user; default = { name = "ejabberd"; - home = "/var/ejabberd"; + home = "/var/lib/ejabberd"; }; }; }; -- cgit v1.3.1 From 56b1783854a81d13711fb168f0a3a458f7bfb06b Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 7 Jan 2019 15:31:55 +0100 Subject: tv xkiller service: init --- tv/2configs/xserver/xkiller.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tv/2configs/xserver/xkiller.nix (limited to 'tv/2configs') diff --git a/tv/2configs/xserver/xkiller.nix b/tv/2configs/xserver/xkiller.nix new file mode 100644 index 0000000..2f97630 --- /dev/null +++ b/tv/2configs/xserver/xkiller.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: { + + services.acpid.enable = true; + services.acpid.handlers.xkiller = { + action = /* sh */ '' + event=($1) + if test "''${event[2]}" = 00000080; then + ${pkgs.systemd}/bin/systemd-cat -t xkiller ${pkgs.xkiller} + fi + ''; + event = "button/prog1"; + }; + +} -- cgit v1.3.1 From 30c877780b33bbe4db3a0bc229a44c5c518c6746 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 8 Jan 2019 21:08:19 +0100 Subject: tv htop: header_margin=0 --- tv/2configs/htop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/htop.nix b/tv/2configs/htop.nix index d7d2d7b..e78caeb 100644 --- a/tv/2configs/htop.nix +++ b/tv/2configs/htop.nix @@ -22,7 +22,7 @@ with import ; highlight_megabytes=1 highlight_threads=1 tree_view=1 - header_margin=1 + header_margin=0 detailed_cpu_time=0 cpu_count_from_zero=0 update_process_names=0 -- cgit v1.3.1 From 7fb9aa112966b6d2ab835d2a2d9ee01e6793bdaa Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 13 Jan 2019 18:38:23 +0100 Subject: tv xmodmap: add δ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tv/2configs/xserver/Xmodmap.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/2configs') diff --git a/tv/2configs/xserver/Xmodmap.nix b/tv/2configs/xserver/Xmodmap.nix index d2b1b26..8e8e3df 100644 --- a/tv/2configs/xserver/Xmodmap.nix +++ b/tv/2configs/xserver/Xmodmap.nix @@ -17,6 +17,7 @@ pkgs.writeText "Xmodmap" '' keycode 39 = s S ssharp keycode 33 = p P Greek_pi Greek_PI + keycode 40 = d D Greek_delta Greek_DELTA keycode 46 = l L Greek_lambda Greek_LAMBDA keycode 54 = c C cacute Cacute -- cgit v1.3.1 From 3df38498845e5adb2f515b6240cbac1df5c307ef Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 13 Jan 2019 23:42:14 +0100 Subject: tv gitrepos: add Reaktor --- tv/2configs/gitrepos.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/2configs') diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 9409246..3eab1ce 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -103,6 +103,7 @@ let { nixos-infest = {}; painload = {}; push = {}; + Reaktor = {}; with-tmpdir = {}; get = {}; load-env = {}; -- cgit v1.3.1 From ba16186593fda4160fd268efa35052f280975614 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 13 Jan 2019 23:42:22 +0100 Subject: tv gitrepos: add reaktor2 --- tv/2configs/gitrepos.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv/2configs') diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 3eab1ce..725ddef 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -67,6 +67,7 @@ let { cgit.desc = "source code installer"; }; q = {}; + reaktor2 = {}; regfish = {}; stockholm = { cgit.desc = "NixOS configuration"; -- cgit v1.3.1 From a10178e5e7afb819a211a94f306bd8f029677bb6 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 25 Jan 2019 14:26:50 +0100 Subject: blessings: 1.3.0 -> 2.1.0 --- tv/2configs/mail-client.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/mail-client.nix b/tv/2configs/mail-client.nix index 8b6f8bb..0caf526 100644 --- a/tv/2configs/mail-client.nix +++ b/tv/2configs/mail-client.nix @@ -1,13 +1,10 @@ -{ pkgs, ... }: - -with pkgs; -{ +{ pkgs, ... }: { environment.systemPackages = [ - much - msmtp - notmuch - pythonPackages.alot - qprint - w3m + pkgs.haskellPackages.much + pkgs.msmtp + pkgs.notmuch + pkgs.pythonPackages.alot + pkgs.qprint + pkgs.w3m ]; } -- cgit v1.3.1