Merge remote-tracking branch 'origin/staging/jeschli'

7 files changed, 14 insertions, 14 deletions

diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 2c8c938..e17d5a4 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 # bln config file
 {
-  imports = [ 
+  imports = [
     ./hardware-configuration.nix
     <stockholm/jeschli>
     <stockholm/jeschli/2configs/virtualbox.nix>
diff --git a/jeschli/2configs/IM.nix b/jeschli/2configs/IM.nix
index 171b782..288134f 100644
--- a/jeschli/2configs/IM.nix
+++ b/jeschli/2configs/IM.nix
@@ -30,7 +30,7 @@ in {
       jeschli-bln.pubkey
       jeschli-brauerei.pubkey
     ];
-    packages = [ tmux ]; 
+    packages = [ tmux ];
   };
 
 
diff --git a/jeschli/2configs/urxvt.nix b/jeschli/2configs/urxvt.nix
index 0149187..4049a47 100644
--- a/jeschli/2configs/urxvt.nix
+++ b/jeschli/2configs/urxvt.nix
@@ -29,11 +29,11 @@ with import <stockholm/lib>;
     *color13: rgb:fc/54/fc
     *color14: rgb:54/fc/fc
     *color15: rgb:fc/fc/fc
-    
+
     URxvt*scrollBar:                      false
     URxvt*urgentOnBell:                   true
     URxvt*font: xft:DejaVu Sans Mono:pixelsize=${toString config.jeschliFontSize}
     URXvt*faceSize: ${toString config.jeschliFontSize}
     '';
-  }; 
+  };
 }
diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix
index e815491..adf06ee 100644
--- a/jeschli/2configs/xserver/Xresources.nix
+++ b/jeschli/2configs/xserver/Xresources.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
 
 pkgs.writeText "Xresources" /* xdefaults */ ''
   Xcursor.theme: aero-large-drop
-  Xcursor.size: 128 
+  Xcursor.size: 128
   Xft.dpi: 144
 
   URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
diff --git a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
index 5aa3c2f..8885602 100644
--- a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
+++ b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
@@ -90,7 +90,7 @@ mainNoArgs = do
             , startupHook = do
                 setWMName "LG3D"
                 whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK"))
-                          (\path -> forkFile path [] Nothing) <+> setWMName "LG3D"  
+                          (\path -> forkFile path [] Nothing) <+> setWMName "LG3D"
             , normalBorderColor  = "#1c1c1c"
             , focusedBorderColor = "#f000b0"
             , handleEventHook = handleShutdownEvent
@@ -150,7 +150,7 @@ myKeys conf = Map.fromList $
     , ((_S  , xK_Print   ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.shift) )
     , ((_C  , xK_Print   ), toggleWS)
     , ((_4  , xK_Print   ), rhombus horseConfig (liftIO . hPutStrLn stderr) ["Correct", "Horse", "Battery", "Staple", "Stuhl", "Tisch"] )
-    
+
     -- %! Rotate through the available layout algorithms
     , ((_4  , xK_space  ), sendMessage NextLayout)
     , ((_4S , xK_space  ), setLayout $ XMonad.layoutHook conf) -- reset layout
@@ -222,7 +222,7 @@ myKeys conf = Map.fromList $
 pagerConfig :: PagerConfig
 pagerConfig = def
     { pc_font           = myFont
-    , pc_cellwidth      = 256 
+    , pc_cellwidth      = 256
     --, pc_cellheight     = 36 -- TODO automatically keep screen aspect
     --, pc_borderwidth    = 1
     --, pc_matchcolor     = "#f0b000"
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index b3e084f..17eeff5 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -26,18 +26,15 @@ with import <stockholm/lib>;
   fileSystems = {
     "/" = {
       device = "/dev/mapper/wuvga-root";
-      fsType = "btrfs";
-      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+      fsType = "ext4";
     };
     "/bku" = {
       device = "/dev/mapper/wuvga-bku";
-      fsType = "btrfs";
-      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+      fsType = "ext4";
     };
     "/home" = {
       device = "/dev/mapper/wuvga-home";
-      fsType = "btrfs";
-      options = ["defaults" "noatime" "ssd" "compress=lzo"];
+      fsType = "ext4";
     };
     "/boot" = {
       device = "/dev/sda1";
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 6e4830a..0687503 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -32,6 +32,9 @@ let {
     dic = {
       cgit.desc = "dict.leo.org command line interface";
     };
+    disko = {
+      cgit.desc = "declarative partitioning and formatting tool";
+    };
     get = {};
     hstool = {
       cgit.desc = "Haskell Development Environment ^_^";