diff --git a/configuration.nix b/configuration.nix
index 510a2db..b882672 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -15,7 +15,7 @@
         ./services/enabled.nix
         ./users.nix
         ./module/news2kindle/news2kindle.nix
-        ./module/etherpad/etherpad.nix
+#        ./module/etherpad/etherpad.nix
     ];
 
     nixpkgs.config.allowUnfree = true;
diff --git a/programs/installed.nix b/programs/installed.nix
index 9714eee..c1c7653 100644
--- a/programs/installed.nix
+++ b/programs/installed.nix
@@ -2,12 +2,12 @@
 
 {
     environment.systemPackages = with pkgs; [
-        wget curl vim nano zsh fzf tmux unzip bzip2 zip p7zip ncurses zlibStatic ncurses5 zlib
+        wget curl vim nano zsh fzf tmux git
     ];
 
     imports =
     [
         ./zsh.nix
-        ./ledebuild_progs.nix
+#        ./ledebuild_progs.nix
     ];
 }
diff --git a/services/enabled.nix b/services/enabled.nix
index d876167..914222e 100644
--- a/services/enabled.nix
+++ b/services/enabled.nix
@@ -6,11 +6,11 @@
         ./sshd.nix
         ./teamspeak.nix
         ./nginx.nix
-        ./gitlab.nix
+#        ./gitlab.nix
         ./nextcloud.nix
         ./news2kindle.nix
         ./resilio.nix
         ./sks.nix
-#        ./etherpad.nix
+       ./gitea.nix
     ];
 }
diff --git a/services/gitea.nix b/services/gitea.nix
new file mode 100644
index 0000000..25585ee
--- /dev/null
+++ b/services/gitea.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+
+#let
+# pkgs = import <nixos-unstable> {};
+#in 
+{
+#  environment.systemPackages = [ (import <nixos-unstable> {}).gitea ];
+  services.nginx.virtualHosts."gitea.stubbe.rocks" = {
+        enableACME = true;
+        forceSSL = true;
+	locations."/".proxyPass = "http://localhost:3000";
+    };
+
+nixpkgs.config.packageOverrides = pkgs: {
+     gitea = (import <nixos-unstable> {}).gitea;
+  };
+
+ users.users.gitea.shell = pkgs.zsh;
+  imports = [
+      <nixos-unstable/nixos/modules/services/misc/gitea.nix>
+    ];
+
+  services.postgresql.enable = true;
+  services.gitea = {
+        enable = true;
+	useWizard = true;
+   };
+
+}
diff --git a/services/gitlab.nix b/services/gitlab.nix
index d92dbe9..39e1b00 100644
--- a/services/gitlab.nix
+++ b/services/gitlab.nix
@@ -5,6 +5,7 @@
         enableACME = true;
         forceSSL = true;
         locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+#	 locations."/".proxyPass = "http://localhost:3000";
     };
 
     services.gitlab = {
diff --git a/users.nix b/users.nix
index 0a36147..d523121 100644
--- a/users.nix
+++ b/users.nix
@@ -9,12 +9,16 @@ let
   };
 in
 {
+
+    virtualisation.docker.enable = true;
+
     users = {
         defaultUserShell = pkgs.zsh;
 	extraUsers.etherpad = myPublicSshKeys //  { isNormalUser = true;  home = "/home/etherpad";};
         extraUsers.sshuser = myPublicSshKeys //  { isNormalUser = true;  home = "/home/sshuser";};
         extraUsers.nextcloud = myPublicSshKeys //  { isNormalUser = true;  home = "/home/nextcloud"; group = "nextcloud";};
-        extraUsers.ledebuild = myPublicSshKeys //  { isNormalUser = true;  home = "/home/ledebuild";};
+        extraUsers.ledebuild = myPublicSshKeys //  { isNormalUser = true;  home = "/home/ledebuild"; extraGroups = [ "docker" ];};
+#        extraUsers.gitea = myPublicSshKeys //  { isNormalUser = true;  home = "/home/gitea"; };
         extraGroups.nexdcloud.name = "nextcloud";
     };
 }