diff options
| author | jeschli <jeschli@gmail.com> | 2018-05-04 16:57:21 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-05-04 16:57:21 +0200 |
| commit | 74cab14502ce3f482d96759eed4c7e648204e78e (patch) | |
| tree | 1f82d99cc0dafdf87d33fcc3e3a9a865f95f3384 /jeschli | |
| parent | 4f2bf83ff906b9ee0421dabba4ff7e9dab5b7802 (diff) | |
| parent | b81fe57e3e137a2449fb8cc5e627e484d84bb00e (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'jeschli')
| -rw-r--r-- | jeschli/1systems/bln/config.nix | 8 | ||||
| -rw-r--r-- | jeschli/2configs/xserver/default.nix | 1 | ||||
| -rw-r--r-- | jeschli/5pkgs/simple/xmonad-jeschli/default.nix | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index ad397728..190f6f53 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> @@ -95,6 +95,12 @@ # Enable the X11 windowing system. services.xserver.videoDrivers = [ "nvidia" ]; +# services.xserver.windowManager.xmonad.enable = true; +# services.xserver.windowManager.xmonad.enableContribAndExtras = true; +# services.xserver.displayManager.sddm.enable = true; +# services.xserver.dpi = 100; +# fonts.fontconfig.dpi = 100; + users.extraUsers.jeschli = { isNormalUser = true; extraGroups = ["docker" "vboxusers" "audio"]; diff --git a/jeschli/2configs/xserver/default.nix b/jeschli/2configs/xserver/default.nix index 4e646811..748d1225 100644 --- a/jeschli/2configs/xserver/default.nix +++ b/jeschli/2configs/xserver/default.nix @@ -46,6 +46,7 @@ in { dpi = 200; + videoDrivers = [ "nvidia" ]; synaptics = { enable = true; twoFingerScroll = true; diff --git a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix index 5bb391f9..578a51c8 100644 --- a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix +++ b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix @@ -44,6 +44,7 @@ import XMonad.Layout.Reflect (reflectVert) import XMonad.Layout.FixedColumn (FixedColumn(..)) import XMonad.Hooks.Place (placeHook, smart) import XMonad.Hooks.FloatNext (floatNextHook) +import XMonad.Hooks.SetWMName import XMonad.Actions.PerWorkspaceKeys (chooseAction) import XMonad.Layout.PerWorkspace (onWorkspace) --import XMonad.Layout.BinarySpacePartition @@ -86,7 +87,8 @@ mainNoArgs = do -- , handleEventHook = myHandleEventHooks <+> handleTimerEvent --, handleEventHook = handleTimerEvent , manageHook = placeHook (smart (1,0)) <+> floatNextHook - , startupHook = + , startupHook = do + setWMName "LG3D" whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK")) (\path -> forkFile path [] Nothing) , normalBorderColor = "#1c1c1c" @@ -217,7 +219,7 @@ myKeys conf = Map.fromList $ pagerConfig :: PagerConfig pagerConfig = def { pc_font = myFont - , pc_cellwidth = 64 + , pc_cellwidth = 256 --, pc_cellheight = 36 -- TODO automatically keep screen aspect --, pc_borderwidth = 1 --, pc_matchcolor = "#f0b000" |