.devcontainer/Dockerfile

@@ -1 +0,0 @@
-FROM ghcr.io/xtruder/nix-devcontainer:v1

.devcontainer/devcontainer.json

@@ -1,51 +0,0 @@
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or the definition README at
-// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/docker-existing-dockerfile
-{
-    "name": "devcontainer-project",
-    "dockerFile": "Dockerfile",
-    "context": "${localWorkspaceFolder}",
-    "build": {
-      "args": {
-        "USER_UID": "${localEnv:USER_UID}",
-        "USER_GID": "${localEnv:USER_GID}"
-      }
-    },
-  
-    // run arguments passed to docker
-    "runArgs": [
-      "--security-opt", "label=disable"
-    ],
-  
-    "containerEnv": {
-       // extensions to preload before other extensions
-      "PRELOAD_EXTENSIONS": "arrterian.nix-env-selector"
-    },
-  
-     // disable command overriding and updating remote user ID
-    "overrideCommand": false,
-    "userEnvProbe": "loginShell",
-    "updateRemoteUserUID": false,
-  
-    // build development environment on creation, make sure you already have shell.nix
-    "onCreateCommand": "nix develop",
-  
-    // Add the IDs of extensions you want installed when the container is created.
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                // select nix environment
-                "arrterian.nix-env-selector",
-            
-                // extra extensions
-                //"fsevenm.run-it-on",
-                "jnoortheen.nix-ide"
-            ]
-        }
-    },
-  
-    // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": []
-  
-    // Use 'postCreateCommand' to run commands after the container is created.
-    // "postCreateCommand": "go version",
-  }

flake.nix

@@ -52,11 +52,9 @@
             }
           );
 
+          # Base dev shell
           devenv.shells.default = {
-            imports = [
+            imports = [ "${self}/shells/base.nix" ];
-              "${self}/shells/base.nix"
-              "${self}/shells/nix.nix"
-            ];
           };
 
           formatter = pkgs.nixfmt-rfc-style;

shells/base.nix

@@ -1,9 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
-  packages = with pkgs; [
-    gnupg
-    git
-  ];
 
-  env.GPG_TTY = "\$(tty)";
 }

shells/nix.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  languages.nix.enable = true;
-
-  packages = [
-    nixfmt-rfc-style
-  ];
-}