1 files changed, 42 insertions, 32 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index b9bb021b..860c5d11 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -1,19 +1,18 @@
 { config, pkgs, lib, ... }:
 let
-  xmonad-jeschli = pkgs.callPackage <stockholm/jeschli/5pkgs/simple/xmonad-jeschli> { inherit config; };
+  mainUser = config.krebs.build.user.name;
+  unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
 in
 {
   imports = [
     <stockholm/jeschli>
     ./hardware-configuration.nix
+    <home-manager/nixos>
+    <stockholm/jeschli/2configs/emacs.nix>
     <stockholm/jeschli/2configs/urxvt.nix>
-#    <stockholm/jeschli/2configs/emacs.nix>
-#    <stockholm/jeschli/2configs/xdg.nix>
-#    <stockholm/jeschli/2configs/xserver>
     <stockholm/jeschli/2configs/steam.nix>
     <stockholm/jeschli/2configs/virtualbox.nix>
-  ];
-
+   ];
   krebs.build.host = config.krebs.hosts.brauerei;
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
@@ -54,7 +53,12 @@ in
     copyq
     curl
     dmenu
+    aspell
+    ispell
+    rofi
+    xdotool
     git
+    gnupg
     i3lock
     keepass
     networkmanagerapplet
@@ -74,27 +78,21 @@ in
     elixir
     elmPackages.elm
     exercism
-    gcc
+    gcc9
+    ccls
+    unstable.clang_8
     ghc
     go
-    python35
-    python35Packages.pip
-    (vagrant.override {
-      bundlerEnv = bundlerEnv.override {
-        bundler = bundler.overrideAttrs (old: {
-          name = "bundler-1.16.1";
-          src = fetchurl {
-            url = "https://rubygems.org/gems/bundler-1.16.1.gem";
-            sha256 = "1s2nq4qnffxg3kwrk7cnwxcvfihlhxm9absl2l6d3qckf3sy1f22";
-          };
-        });
-      };
-    })
+    python37
+    python37Packages.pip
+    pipenv
   # dev tools
     gnumake
+    jetbrains.clion
     jetbrains.goland
     jetbrains.pycharm-professional
     jetbrains.webstorm
+    vscode
   # document viewer
     evince
     zathura
@@ -105,7 +103,6 @@ in
     cargo
     rustracer
     rustup
-    vscode
   # orga tools
     taskwarrior
   # xorg
@@ -120,11 +117,29 @@ in
   # programs.mtr.enable = true;
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
 
+#  home-manager.useUserPackages = true;
+#  home-manager.users.jeschli = {
+#    home.stateVersion = "19.03";
+#  };
+#  home-manager.enable = true;
+
+#  home-manager.users.jeschli.home.file = {
+#     ".emacs.d" = {
+#       source = pkgs.fetchFromGitHub {
+#         owner = "jeschli";
+#         repo = "emacs.d";
+#         rev = "8ed6c40";
+#         sha256 = "1q2y478srwp9f58l8cixnd2wj51909gp1z68k8pjlbjy2mrvibs0";
+#       };
+#       recursive = true;
+#     };
+#  };
+
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.emacs.enable = true;
+#  services.emacs.enable = true;
 
   virtualisation.docker.enable = true;
 
@@ -136,16 +151,6 @@ in
       gnome3.enable = true;
     };
 
-    windowManager = {
-      session = [{
-        name = "xmonad";
-        start = ''
-          ${xmonad-jeschli}/bin/xmonad &
-          waitPID=$!
-        '';
-        }
-      ];
-    };
   };
 
   services.xserver.windowManager.i3.enable = true;
@@ -155,6 +160,11 @@ in
     extraGroups = ["docker" "vboxusers" "audio"];
     uid = 1000;
   };
+  users.extraUsers.blafoo = {
+    isNormalUser = true;
+    extraGroups = ["audio"];
+    uid = 1002;
+  };
   users.extraUsers.jamie = {
     isNormalUser = true;
     uid = 1001; # TODO genid