diff options
Diffstat (limited to 'jeschli/1systems/brauerei/config.nix')
-rw-r--r-- | jeschli/1systems/brauerei/config.nix | 67 |
1 files changed, 26 insertions, 41 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 059ec6d7..860c5d11 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -1,13 +1,14 @@ { 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/steam.nix> <stockholm/jeschli/2configs/virtualbox.nix> @@ -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 @@ -122,29 +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.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; - }; - }; +# 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; @@ -156,16 +151,6 @@ in gnome3.enable = true; }; - windowManager = { - session = [{ - name = "xmonad"; - start = '' - ${xmonad-jeschli}/bin/xmonad & - waitPID=$! - ''; - } - ]; - }; }; services.xserver.windowManager.i3.enable = true; |