diff options
| author | jeschli <jeschli@gmail.com> | 2018-07-31 16:33:33 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-07-31 16:33:33 +0200 |
| commit | 676f5668de1f15b9297dd5ca36385cbfc0f33d87 (patch) | |
| tree | 132a46ddc2a1863ebe58ab3bdf56c9a06cefab91 /jeschli | |
| parent | d34cfa4cc8953ee227f99a36d56ec9335cba532e (diff) | |
| parent | 46e725b6ee1259ad8a0d33f9ffbda6fd1dc2228d (diff) | |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'jeschli')
| -rw-r--r-- | jeschli/1systems/bln/config.nix | 2 | ||||
| -rw-r--r-- | jeschli/2configs/IM.nix | 2 | ||||
| -rw-r--r-- | jeschli/2configs/urxvt.nix | 4 | ||||
| -rw-r--r-- | jeschli/2configs/xserver/Xresources.nix | 2 | ||||
| -rw-r--r-- | jeschli/5pkgs/simple/xmonad-jeschli/default.nix | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 2c8c9383c..e17d5a41b 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 171b78242..288134fa2 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 014918748..4049a47a3 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 e8154912c..adf06ee63 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 5aa3c2f96..88856021c 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" |