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

This commit is contained in:
lassulus 2018-07-19 17:03:34 +02:00
commit 4a74ef353a
6 changed files with 11 additions and 8 deletions

View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
# bln config file # bln config file
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
<stockholm/jeschli> <stockholm/jeschli>
<stockholm/jeschli/2configs/virtualbox.nix> <stockholm/jeschli/2configs/virtualbox.nix>

View File

@ -30,7 +30,7 @@ in {
jeschli-bln.pubkey jeschli-bln.pubkey
jeschli-brauerei.pubkey jeschli-brauerei.pubkey
]; ];
packages = [ tmux ]; packages = [ tmux ];
}; };

View File

@ -29,11 +29,11 @@ with import <stockholm/lib>;
*color13: rgb:fc/54/fc *color13: rgb:fc/54/fc
*color14: rgb:54/fc/fc *color14: rgb:54/fc/fc
*color15: rgb:fc/fc/fc *color15: rgb:fc/fc/fc
URxvt*scrollBar: false URxvt*scrollBar: false
URxvt*urgentOnBell: true URxvt*urgentOnBell: true
URxvt*font: xft:DejaVu Sans Mono:pixelsize=${toString config.jeschliFontSize} URxvt*font: xft:DejaVu Sans Mono:pixelsize=${toString config.jeschliFontSize}
URXvt*faceSize: ${toString config.jeschliFontSize} URXvt*faceSize: ${toString config.jeschliFontSize}
''; '';
}; };
} }

View File

@ -4,7 +4,7 @@ with import <stockholm/lib>;
pkgs.writeText "Xresources" /* xdefaults */ '' pkgs.writeText "Xresources" /* xdefaults */ ''
Xcursor.theme: aero-large-drop Xcursor.theme: aero-large-drop
Xcursor.size: 128 Xcursor.size: 128
Xft.dpi: 144 Xft.dpi: 144
URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}" URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}"

View File

@ -90,7 +90,7 @@ mainNoArgs = do
, startupHook = do , startupHook = do
setWMName "LG3D" setWMName "LG3D"
whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK")) whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK"))
(\path -> forkFile path [] Nothing) <+> setWMName "LG3D" (\path -> forkFile path [] Nothing) <+> setWMName "LG3D"
, normalBorderColor = "#1c1c1c" , normalBorderColor = "#1c1c1c"
, focusedBorderColor = "#f000b0" , focusedBorderColor = "#f000b0"
, handleEventHook = handleShutdownEvent , handleEventHook = handleShutdownEvent
@ -150,7 +150,7 @@ myKeys conf = Map.fromList $
, ((_S , xK_Print ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.shift) ) , ((_S , xK_Print ), gets windowset >>= allWorkspaceNames >>= pager pagerConfig (windows . W.shift) )
, ((_C , xK_Print ), toggleWS) , ((_C , xK_Print ), toggleWS)
, ((_4 , xK_Print ), rhombus horseConfig (liftIO . hPutStrLn stderr) ["Correct", "Horse", "Battery", "Staple", "Stuhl", "Tisch"] ) , ((_4 , xK_Print ), rhombus horseConfig (liftIO . hPutStrLn stderr) ["Correct", "Horse", "Battery", "Staple", "Stuhl", "Tisch"] )
-- %! Rotate through the available layout algorithms -- %! Rotate through the available layout algorithms
, ((_4 , xK_space ), sendMessage NextLayout) , ((_4 , xK_space ), sendMessage NextLayout)
, ((_4S , xK_space ), setLayout $ XMonad.layoutHook conf) -- reset layout , ((_4S , xK_space ), setLayout $ XMonad.layoutHook conf) -- reset layout
@ -222,7 +222,7 @@ myKeys conf = Map.fromList $
pagerConfig :: PagerConfig pagerConfig :: PagerConfig
pagerConfig = def pagerConfig = def
{ pc_font = myFont { pc_font = myFont
, pc_cellwidth = 256 , pc_cellwidth = 256
--, pc_cellheight = 36 -- TODO automatically keep screen aspect --, pc_cellheight = 36 -- TODO automatically keep screen aspect
--, pc_borderwidth = 1 --, pc_borderwidth = 1
--, pc_matchcolor = "#f0b000" --, pc_matchcolor = "#f0b000"

View File

@ -10,6 +10,9 @@ with import <stockholm/lib>;
}; };
plugins = with pkgs.ReaktorPlugins; [ plugins = with pkgs.ReaktorPlugins; [
sed-plugin sed-plugin
task-add
task-delete
task-list
] ++ ] ++
(attrValues (todo "agenda")) (attrValues (todo "agenda"))
; ;