Merge remote-tracking branch 'prism/staging/jeschli'
This commit is contained in:
commit
6166b3b84e
@ -1,13 +1,15 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
# bln config file
|
# bln config file
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ <stockholm/jeschli>
|
./hardware-configuration.nix
|
||||||
<stockholm/jeschli/2configs/virtualbox.nix>
|
<stockholm/jeschli>
|
||||||
<stockholm/jeschli/2configs/urxvt.nix>
|
<stockholm/jeschli/2configs/virtualbox.nix>
|
||||||
<stockholm/jeschli/2configs/emacs.nix>
|
<stockholm/jeschli/2configs/urxvt.nix>
|
||||||
./hardware-configuration.nix
|
<stockholm/jeschli/2configs/emacs.nix>
|
||||||
];
|
<stockholm/jeschli/2configs/xdg.nix>
|
||||||
|
<stockholm/jeschli/2configs/xserver>
|
||||||
|
];
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
@ -91,14 +93,14 @@
|
|||||||
services.printing.drivers = [ pkgs.postscript-lexmark ];
|
services.printing.drivers = [ pkgs.postscript-lexmark ];
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = true;
|
# services.xserver.enable = true;
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
|
||||||
services.xserver.windowManager.xmonad.enable = true;
|
# services.xserver.windowManager.xmonad.enable = true;
|
||||||
services.xserver.windowManager.xmonad.enableContribAndExtras = true;
|
# services.xserver.windowManager.xmonad.enableContribAndExtras = true;
|
||||||
services.xserver.displayManager.sddm.enable = true;
|
# services.xserver.displayManager.sddm.enable = true;
|
||||||
services.xserver.dpi = 100;
|
# services.xserver.dpi = 100;
|
||||||
fonts.fontconfig.dpi = 100;
|
# fonts.fontconfig.dpi = 100;
|
||||||
|
|
||||||
users.extraUsers.jeschli = {
|
users.extraUsers.jeschli = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
|
@ -44,6 +44,9 @@ in {
|
|||||||
display = 11;
|
display = 11;
|
||||||
tty = 11;
|
tty = 11;
|
||||||
|
|
||||||
|
dpi = 100;
|
||||||
|
|
||||||
|
videoDrivers = [ "nvidia" ];
|
||||||
synaptics = {
|
synaptics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
twoFingerScroll = true;
|
twoFingerScroll = true;
|
||||||
|
@ -44,6 +44,7 @@ import XMonad.Layout.Reflect (reflectVert)
|
|||||||
import XMonad.Layout.FixedColumn (FixedColumn(..))
|
import XMonad.Layout.FixedColumn (FixedColumn(..))
|
||||||
import XMonad.Hooks.Place (placeHook, smart)
|
import XMonad.Hooks.Place (placeHook, smart)
|
||||||
import XMonad.Hooks.FloatNext (floatNextHook)
|
import XMonad.Hooks.FloatNext (floatNextHook)
|
||||||
|
import XMonad.Hooks.SetWMName
|
||||||
import XMonad.Actions.PerWorkspaceKeys (chooseAction)
|
import XMonad.Actions.PerWorkspaceKeys (chooseAction)
|
||||||
import XMonad.Layout.PerWorkspace (onWorkspace)
|
import XMonad.Layout.PerWorkspace (onWorkspace)
|
||||||
--import XMonad.Layout.BinarySpacePartition
|
--import XMonad.Layout.BinarySpacePartition
|
||||||
@ -86,7 +87,8 @@ mainNoArgs = do
|
|||||||
-- , handleEventHook = myHandleEventHooks <+> handleTimerEvent
|
-- , handleEventHook = myHandleEventHooks <+> handleTimerEvent
|
||||||
--, handleEventHook = handleTimerEvent
|
--, handleEventHook = handleTimerEvent
|
||||||
, manageHook = placeHook (smart (1,0)) <+> floatNextHook
|
, manageHook = placeHook (smart (1,0)) <+> floatNextHook
|
||||||
, startupHook =
|
, startupHook = do
|
||||||
|
setWMName "LG3D"
|
||||||
whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK"))
|
whenJustM (liftIO (lookupEnv "XMONAD_STARTUP_HOOK"))
|
||||||
(\path -> forkFile path [] Nothing)
|
(\path -> forkFile path [] Nothing)
|
||||||
, normalBorderColor = "#1c1c1c"
|
, normalBorderColor = "#1c1c1c"
|
||||||
@ -217,7 +219,7 @@ myKeys conf = Map.fromList $
|
|||||||
pagerConfig :: PagerConfig
|
pagerConfig :: PagerConfig
|
||||||
pagerConfig = def
|
pagerConfig = def
|
||||||
{ pc_font = myFont
|
{ pc_font = myFont
|
||||||
, pc_cellwidth = 64
|
, 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"
|
||||||
|
Loading…
Reference in New Issue
Block a user