From cc815afb96800acaf09299228606bceca7bdbe92 Mon Sep 17 00:00:00 2001
From: Alexandre LUCAZEAU <alexandre@dri.fr>
Date: Thu, 16 Dec 2021 15:16:09 +0100
Subject: [PATCH] FIX : remove postgresql conf from services.nix ADD : variable
 environnement to home.nix

---
 nixos/services.nix | 19 -------------------
 nixpkgs/home.nix   | 10 ++++++++++
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/nixos/services.nix b/nixos/services.nix
index feca716..4ee6d3a 100644
--- a/nixos/services.nix
+++ b/nixos/services.nix
@@ -29,25 +29,6 @@
       updater.enable = true;
     };
 
-    postgresql = {
-      enable = true;
-      package = pkgs.postgresql_10;
-      enableTCPIP = true;
-      authentication = pkgs.lib.mkOverride 10 ''
-        local all all trust
-        host all all ::1/128 trust
-        host all all 127.0.0.1/32 trust
-      '';
-      initialScript =  pkgs.writeText "backend-initScript" ''
-        CREATE ROLE foreman WITH LOGIN PASSWORD 'word' CREATEDB;
-        CREATE ROLE sylvain CREATEDB;
-        ALTER USER foreman WITH SUPERUSER;
-        CREATE DATABASE foremandb;
-        GRANT ALL PRIVILEGES ON DATABASE foremandb TO foreman;
-      '';
-
-    };
-    
     ntp.enable = true;
     tlp.enable = true;
 
diff --git a/nixpkgs/home.nix b/nixpkgs/home.nix
index 4cadfe9..3d412b9 100644
--- a/nixpkgs/home.nix
+++ b/nixpkgs/home.nix
@@ -7,4 +7,14 @@
     layout = "fr";
     variant = "bepo";
   };
+   environment.variables = let
+    apps = (import ./variables.nix).apps;
+  in
+    {
+      EDITOR = apps.EDITOR;
+      VISUAL = apps.EDITOR;
+      TERMINAL = apps.TERMINAL;
+      BROWSER = apps.BROWSER;
+      PRIVATE_BROWSER = apps.PRIVATE_BROWSER;
+    };
 }