diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-07 15:18:50 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-07 15:18:50 +0200 |
| commit | eef7ff0ca525d71c9477e8b2d4a72f61f848abb3 (patch) | |
| tree | fb6a084a5984d628b5fe6ccb442540dfc873aebb /lass/2configs | |
| parent | 973e7adab745c7493c592e6bc0e3f8367b32dfbc (diff) | |
| parent | eabf194460f695044d32713900419583986a9bd5 (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/desktop-base.nix | 4 | ||||
| -rw-r--r-- | lass/2configs/git.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/realwallpaper.nix | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix index ed84edefa..4e693997d 100644 --- a/lass/2configs/desktop-base.nix +++ b/lass/2configs/desktop-base.nix @@ -28,14 +28,14 @@ in { environment.systemPackages = with pkgs; [ powertop + sxiv + much #window manager stuff haskellPackages.xmobar haskellPackages.yeganesh dmenu2 xlibs.fontschumachermisc - - sxiv ]; fonts.fonts = [ diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 78e6f0baa..595936da5 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -51,7 +51,7 @@ let nick = config.krebs.build.host.name; channel = "#retiolum"; server = "cd.retiolum"; - verbose = config.krebs.build.host.name == "cloudkrebs"; + verbose = config.krebs.build.host.name == "echelon"; }; }; }; diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index f1c8861e1..c69cb1660 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -1,9 +1,5 @@ { config, ... }: { - imports = [ - ../3modules/realwallpaper.nix - ]; - - lass.realwallpaper.enable = true; + krebs.realwallpaper.enable = true; } |