From 1b39cfb14b608f374208a9483db661ccd1a43230 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Thu, 16 Nov 2023 01:47:45 +0300
Subject: 2023-11-16

---
 modules/common/profiles/dev/containers.nix |  3 +--
 modules/common/profiles/dev/default.nix    |  6 ++++--
 modules/common/profiles/dev/sql.nix        | 14 +++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'modules/common/profiles')

diff --git a/modules/common/profiles/dev/containers.nix b/modules/common/profiles/dev/containers.nix
index 61a9f09..38852ad 100644
--- a/modules/common/profiles/dev/containers.nix
+++ b/modules/common/profiles/dev/containers.nix
@@ -44,7 +44,6 @@ in {
           kubelogin-oidc
           kubent
           kubernetes-helm
-          # kubescape
           kubeseal
           kubespy
           minikube
@@ -57,7 +56,7 @@ in {
       };
 
       programs.bash = {
-        shellAliases = with pkgs; {
+        shellAliases = {
           b = "buildah";
           h = "helm";
           k = "kubectl";
diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix
index 4f2a80f..4c52961 100644
--- a/modules/common/profiles/dev/default.nix
+++ b/modules/common/profiles/dev/default.nix
@@ -45,11 +45,11 @@ in {
 
         ".stack/global-project/stack.yaml".text = generators.toYAML {} {
           packages = [];
-          resolver = "lts-20.14";
+          resolver = "lts-21.20";
         };
       };
 
-      sessionVariables = with config.dirs; rec {
+      sessionVariables = rec {
         CABAL_DIR = "${config.my.home}/.cabal";
         CABAL_CONFIG = pkgs.writeText "cabal-config" ''
           repository hackage.haskell.org
@@ -87,6 +87,8 @@ in {
         yq
         htmlq
         sops
+        httpie
+        logcli
       ];
     };
   };
diff --git a/modules/common/profiles/dev/sql.nix b/modules/common/profiles/dev/sql.nix
index 7a2a09c..6a32a76 100644
--- a/modules/common/profiles/dev/sql.nix
+++ b/modules/common/profiles/dev/sql.nix
@@ -73,25 +73,25 @@ in {
           {
             name = "pgcli";
             custom = {
+              prompt = "'\\u@\\h:\\d> '";
+              multi_line_mode = "psql";
+              on_error = "STOP";
               auto_expand = "True";
-              casing_file = "/dev/null";
               expand = "True";
-              history_file = "/dev/null";
               keyring = "False";
-              multi_line_mode = "psql";
-              on_error = "STOP";
-              prompt = "'\\u@\\h:\\d> '";
               vi = "True";
+              casing_file = "/dev/null";
+              history_file = "/dev/null";
             };
           }
           {
             name = "litecli";
             custom = {
-              audit_log = "/dev/null";
-              key_bindings = "vi";
               prompt = "'\\d> '";
               prompt_continuation = "'-> '";
               auto_vertical_output = "True";
+              key_bindings = "vi";
+              audit_log = "/dev/null";
             };
           }
         ]);
-- 
cgit 1.4.1