From c1a06bdab6708da80686cb1e8cabe2b9addc98b6 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 5 Feb 2019 19:19:09 +0100
Subject: j brauerei: remove commented dead code

---
 jeschli/1systems/brauerei/config.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'jeschli/1systems')

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index d342acb..f7f5452 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -7,6 +7,9 @@ in
     <stockholm/jeschli>
     ./hardware-configuration.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>
   ];
@@ -147,8 +150,17 @@ in
         '';
         }
       ];
-    };
+#      xmonad = {
+#        enable = true;
+#        enableContribAndExtras = true;
+#        extraPackages = haskellPackages: [
+#          haskellPackages.xmonad-contrib
+#          haskellPackages.xmonad-extras
+#          haskellPackages.xmonad
+#        ];
+#      }
 
+    };
   };
 
   users.extraUsers.jeschli = { # TODO: define as krebs.users
-- 
cgit v1.2.3


From 5a4c91d150d64a2ad201318471c4b08e260490d9 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 5 Feb 2019 19:19:29 +0100
Subject: j brauerei: remove not working tokei override

---
 jeschli/1systems/brauerei/config.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'jeschli/1systems')

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index f7f5452..7ac4cc2 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -109,14 +109,7 @@ in
   # xorg
     xorg.xbacklight
   # tokei
-    tokei = overrideDerivation super.tokei (old: {
-      patches = old.patches or [] ++ [
-        (self.fetchurl {
-          url = https://github.com/4z3/tokei/commit/c27529c.patch;
-          sha256 = "1rdw8bk379cav603ryrb57yfkvk2z8wavfw9prfh01agk3ml693x";
-        })
-      ];
-    });
+    tokei
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
-- 
cgit v1.2.3


From e90c7b15c7640fc44461b251d3baae1cefc046db Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 26 Feb 2019 21:48:20 +0100
Subject: j brauerei: -rustc (provoided by rustup)

---
 jeschli/1systems/brauerei/config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'jeschli/1systems')

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 7ac4cc2..f0f8b9e 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -103,7 +103,9 @@ in
     gotools
   # rust
     cargo
-    rustc
+    rustracer
+    rustup
+    vscode
   # orga tools
     taskwarrior
   # xorg
-- 
cgit v1.2.3


From 07915f04077841a1afd253cd474fd71a1cb92bcb Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 26 Feb 2019 21:50:30 +0100
Subject: j brauerei: -xmomad (is part of windowManager sessionnow )

---
 jeschli/1systems/brauerei/config.nix | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'jeschli/1systems')

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index f0f8b9e..ecf40a6 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -145,15 +145,6 @@ in
         '';
         }
       ];
-#      xmonad = {
-#        enable = true;
-#        enableContribAndExtras = true;
-#        extraPackages = haskellPackages: [
-#          haskellPackages.xmonad-contrib
-#          haskellPackages.xmonad-extras
-#          haskellPackages.xmonad
-#        ];
-#      }
 
     };
   };
-- 
cgit v1.2.3


From a670535cb361a1019034d078c7dc13bc058b5081 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Thu, 21 Mar 2019 20:08:41 +0100
Subject: j brauerei: now on i3

---
 jeschli/1systems/brauerei/config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'jeschli/1systems')

diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index ecf40a6..b9bb021 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -145,10 +145,11 @@ in
         '';
         }
       ];
-
     };
   };
 
+  services.xserver.windowManager.i3.enable = true;
+
   users.extraUsers.jeschli = { # TODO: define as krebs.users
     isNormalUser = true;
     extraGroups = ["docker" "vboxusers" "audio"];
-- 
cgit v1.2.3