summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems/brauerei/config.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-09-25 16:28:56 +0200
committerlassulus <lassulus@lassul.us>2019-09-25 16:28:56 +0200
commitd94cdfaff478b848aa85849402057ba2054021fb (patch)
treec22bdf8b23167e95a20018402b2657e499117b1b /jeschli/1systems/brauerei/config.nix
parent3624f3cdc33a95e05db04e5af02933ee28bbd547 (diff)
parent4153a452495a061d6e5c756b0c4dc8ac105978a2 (diff)
Merge remote-tracking branch 'enklave/master'
Diffstat (limited to 'jeschli/1systems/brauerei/config.nix')
-rw-r--r--jeschli/1systems/brauerei/config.nix44
1 files changed, 17 insertions, 27 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index aabb4b7ba..860c5d11c 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -1,6 +1,5 @@
{ 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
@@ -9,6 +8,7 @@ in
<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>
@@ -117,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;
@@ -151,16 +151,6 @@ in
gnome3.enable = true;
};
- windowManager = {
- session = [{
- name = "xmonad";
- start = ''
- ${xmonad-jeschli}/bin/xmonad &
- waitPID=$!
- '';
- }
- ];
- };
};
services.xserver.windowManager.i3.enable = true;