3 files changed, 15 insertions, 22 deletions
diff --git a/modules/nixfiles/profiles/dev/containers.nix b/modules/nixfiles/profiles/dev/containers.nix
index da7aa27..7ec6768 100644
--- a/modules/nixfiles/profiles/dev/containers.nix
+++ b/modules/nixfiles/profiles/dev/containers.nix
@@ -14,12 +14,9 @@ in {
     };
 
   config = mkIf cfg.enable {
-    nixfiles.modules.podman.enable = true;
-
     hm = {
       home = {
         sessionVariables = {
-          MINIKUBE_HOME = "${config.dirs.config}/minikube";
           MINIKUBE_IN_STYLE = "false";
           WERF_DEV = "true";
           WERF_INSECURE_REGISTRY = "true";
@@ -31,15 +28,16 @@ in {
         };
 
         packages = with pkgs; [
-          buildah
           chart-testing
           cmctl
           datree
           helm
           kubectl
           kubectx
+          kubelogin
           kubescape
           kubespy
+          lima
           minikube
           skaffold
           skopeo
@@ -49,12 +47,6 @@ in {
         ];
       };
 
-      xdg.dataFile."minikube/config/config.json".text = generators.toJSON {} {
-        config.Rootless = true;
-        driver = "podman";
-        container-runtime = "cri-o";
-      };
-
       programs.bash = {
         shellAliases = with pkgs; {
           b = "${buildah}/bin/buildah";
diff --git a/modules/nixfiles/profiles/dev/default.nix b/modules/nixfiles/profiles/dev/default.nix
index 4656ade..b05aeac 100644
--- a/modules/nixfiles/profiles/dev/default.nix
+++ b/modules/nixfiles/profiles/dev/default.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  this,
   ...
 }:
 with lib; let
@@ -34,7 +35,7 @@ in {
 
         ".ghc/ghci.conf".source = ./ghci.conf;
 
-        "${config.dirs.data}/stack/config.yaml".text = generators.toYAML {} {
+        ".stack/config.yaml".text = generators.toYAML {} {
           templates.params = rec {
             author-name = my.fullname;
             author-email = my.email;
@@ -43,16 +44,14 @@ in {
           };
         };
 
-        "${config.dirs.data}/stack/global-project/stack.yaml".text = generators.toYAML {} {
+        ".stack/global-project/stack.yaml".text = generators.toYAML {} {
           packages = [];
-          resolver = "lts-19.28";
+          resolver = "lts-20.3";
         };
       };
 
       sessionVariables = with config.dirs; rec {
-        ANDROID_HOME = "${data}/android";
-
-        CABAL_DIR = "${data}/cabal";
+        CABAL_DIR = "${config.my.home}/.cabal";
         CABAL_CONFIG = pkgs.writeText "cabal-config" ''
           repository hackage.haskell.org
             url: https://hackage.haskell.org/
@@ -71,11 +70,11 @@ in {
           extra-prog-path: ${CABAL_DIR}/bin
         '';
 
-        STACK_ROOT = "${data}/stack";
+        STACK_ROOT = "${config.my.home}/.stack";
 
-        CARGO_HOME = "${data}/cargo";
+        CARGO_HOME = "${config.my.home}/.cargo";
 
-        GOPATH = "${data}/go";
+        GOPATH = "${config.my.home}/.go";
 
         PYTHONSTARTUP = ./pystartup.py;
       };
@@ -86,7 +85,5 @@ in {
         yq
       ];
     };
-
-    my.extraGroups = ["kvm"];
   };
 }
diff --git a/modules/nixfiles/profiles/dev/sql.nix b/modules/nixfiles/profiles/dev/sql.nix
index d6bcba8..7a2a09c 100644
--- a/modules/nixfiles/profiles/dev/sql.nix
+++ b/modules/nixfiles/profiles/dev/sql.nix
@@ -15,7 +15,11 @@ in {
 
   config = mkIf cfg.enable {
     hm = {
-      home.packages = with pkgs; [pgcli litecli];
+      home.packages = with pkgs; [
+        dbeaver
+        pgcli
+        litecli
+      ];
 
       xdg = let
         mainSection = {