diff options
| author | lassulus <lassulus@lassul.us> | 2019-08-13 19:30:54 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-08-13 19:30:54 +0200 |
| commit | b92d16a0776fe4493104ff008b7a75ba65b9ad7a (patch) | |
| tree | 7546e0543d3eb7f5391a2ba50821137a8376aeac /jeschli/1systems/brauerei | |
| parent | 31d85e4997f081dd09186e66b6ec042a2013df66 (diff) | |
| parent | 6ec5b1abcf5d93b38f9531d74ce7a44f5526fc26 (diff) | |
Merge remote-tracking branch 'enklave/master'
Diffstat (limited to 'jeschli/1systems/brauerei')
| -rw-r--r-- | jeschli/1systems/brauerei/config.nix | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 059ec6d..aabb4b7 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -2,6 +2,7 @@ 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 = [ @@ -52,6 +53,8 @@ in copyq curl dmenu + aspell + ispell rofi xdotool git @@ -75,22 +78,14 @@ 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 |