l: use new xserver architecture
This commit is contained in:
lassulus
parent
ccb6884708
commit
58890bc80b
@ -5,7 +5,8 @@ let
|
|||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./base.nix
|
./base.nix
|
||||||
./urxvt.nix
|
#./urxvt.nix
|
||||||
|
./xserver
|
||||||
];
|
];
|
||||||
|
|
||||||
users.extraUsers.mainUser.extraGroups = [ "audio" ];
|
users.extraUsers.mainUser.extraGroups = [ "audio" ];
|
||||||
@ -37,36 +38,36 @@ in {
|
|||||||
zathura
|
zathura
|
||||||
|
|
||||||
#window manager stuff
|
#window manager stuff
|
||||||
haskellPackages.xmobar
|
#haskellPackages.xmobar
|
||||||
haskellPackages.yeganesh
|
#haskellPackages.yeganesh
|
||||||
dmenu2
|
#dmenu2
|
||||||
xlibs.fontschumachermisc
|
#xlibs.fontschumachermisc
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.fonts = [
|
#fonts.fonts = [
|
||||||
pkgs.xlibs.fontschumachermisc
|
# pkgs.xlibs.fontschumachermisc
|
||||||
];
|
#];
|
||||||
|
|
||||||
services.xserver = {
|
#services.xserver = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
|
|
||||||
windowManager.xmonad.extraPackages = hspkgs: with hspkgs; [
|
# windowManager.xmonad.extraPackages = hspkgs: with hspkgs; [
|
||||||
X11-xshape
|
# X11-xshape
|
||||||
];
|
# ];
|
||||||
windowManager.xmonad.enable = true;
|
# windowManager.xmonad.enable = true;
|
||||||
windowManager.xmonad.enableContribAndExtras = true;
|
# windowManager.xmonad.enableContribAndExtras = true;
|
||||||
windowManager.default = "xmonad";
|
# windowManager.default = "xmonad";
|
||||||
desktopManager.default = "none";
|
# desktopManager.default = "none";
|
||||||
desktopManager.xterm.enable = false;
|
# desktopManager.xterm.enable = false;
|
||||||
displayManager.slim.enable = true;
|
# displayManager.slim.enable = true;
|
||||||
displayManager.auto.enable = true;
|
# displayManager.auto.enable = true;
|
||||||
displayManager.auto.user = mainUser.name;
|
# displayManager.auto.user = mainUser.name;
|
||||||
|
|
||||||
layout = "us";
|
# layout = "us";
|
||||||
xkbModel = "evdev";
|
# xkbModel = "evdev";
|
||||||
xkbVariant = "altgr-intl";
|
# xkbVariant = "altgr-intl";
|
||||||
xkbOptions = "caps:backspace";
|
# xkbOptions = "caps:backspace";
|
||||||
};
|
#};
|
||||||
|
|
||||||
services.logind.extraConfig = ''
|
services.logind.extraConfig = ''
|
||||||
HandleLidSwitch=ignore
|
HandleLidSwitch=ignore
|
||||||
|
|||||||
27
lass/2configs/xserver/Xresources.nix
Normal file
27
lass/2configs/xserver/Xresources.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
pkgs.writeText "Xresources" ''
|
||||||
|
URxvt*scrollBar: false
|
||||||
|
URxvt*urgentOnBell: true
|
||||||
|
URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-*
|
||||||
|
URxvt*boldFont: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-*
|
||||||
|
|
||||||
|
! ref https://github.com/muennich/urxvt-perls
|
||||||
|
URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl
|
||||||
|
URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select
|
||||||
|
URxvt.url-select.launcher: browser-select
|
||||||
|
URxvt.url-select.underline: true
|
||||||
|
URxvt.keysym.M-u: perl:url-select:select_next
|
||||||
|
URxvt.keysym.M-Escape: perl:keyboard-select:activate
|
||||||
|
URxvt.keysym.M-s: perl:keyboard-select:search
|
||||||
|
|
||||||
|
URxvt.intensityStyles: false
|
||||||
|
|
||||||
|
URxvt*background: #000000
|
||||||
|
URxvt*foreground: #ffffff
|
||||||
|
|
||||||
|
!change unreadable blue
|
||||||
|
URxvt*color4: #268bd2
|
||||||
|
''
|
||||||
161
lass/2configs/xserver/default.nix
Normal file
161
lass/2configs/xserver/default.nix
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
{ config, lib, pkgs, ... }@args:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
# TODO krebs.build.user
|
||||||
|
user = config.users.users.mainUser;
|
||||||
|
|
||||||
|
out = {
|
||||||
|
|
||||||
|
services.xserver = {
|
||||||
|
display = 11;
|
||||||
|
tty = 11;
|
||||||
|
|
||||||
|
synaptics = {
|
||||||
|
enable = true;
|
||||||
|
twoFingerScroll = true;
|
||||||
|
accelFactor = "0.035";
|
||||||
|
};
|
||||||
|
|
||||||
|
#keyboard stuff
|
||||||
|
layout = "us";
|
||||||
|
xkbVariant = "altgr-intl";
|
||||||
|
xkbOptions = "caps:backspace";
|
||||||
|
};
|
||||||
|
|
||||||
|
fonts.fonts = [
|
||||||
|
pkgs.xlibs.fontschumachermisc
|
||||||
|
];
|
||||||
|
|
||||||
|
systemd.services.urxvtd = {
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
reloadIfChanged = true;
|
||||||
|
serviceConfig = {
|
||||||
|
ExecReload = need-reload "urxvtd.service";
|
||||||
|
ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "2s";
|
||||||
|
StartLimitBurst = 0;
|
||||||
|
User = user.name;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.gitAndTools.qgit
|
||||||
|
pkgs.mpv
|
||||||
|
pkgs.pavucontrol
|
||||||
|
pkgs.slock
|
||||||
|
pkgs.sxiv
|
||||||
|
pkgs.xsel
|
||||||
|
pkgs.zathura
|
||||||
|
];
|
||||||
|
|
||||||
|
security.setuidPrograms = [
|
||||||
|
"slock"
|
||||||
|
];
|
||||||
|
|
||||||
|
systemd.services.display-manager = mkForce {};
|
||||||
|
|
||||||
|
services.xserver.enable = true;
|
||||||
|
|
||||||
|
systemd.services.xmonad = {
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
requires = [ "xserver.service" ];
|
||||||
|
environment = xmonad-environment;
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${xmonad-start}/bin/xmonad";
|
||||||
|
ExecStop = "${xmonad-stop}/bin/xmonad-stop";
|
||||||
|
User = user.name;
|
||||||
|
WorkingDirectory = user.home;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.xserver = {
|
||||||
|
after = [
|
||||||
|
"systemd-udev-settle.service"
|
||||||
|
"local-fs.target"
|
||||||
|
"acpid.service"
|
||||||
|
];
|
||||||
|
reloadIfChanged = true;
|
||||||
|
environment = xserver-environment;
|
||||||
|
serviceConfig = {
|
||||||
|
ExecReload = need-reload "xserver.service";
|
||||||
|
ExecStart = "${xserver}/bin/xserver";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
xmonad-environment = {
|
||||||
|
DISPLAY = ":${toString config.services.xserver.display}";
|
||||||
|
XMONAD_STATE = "/tmp/xmonad.state";
|
||||||
|
|
||||||
|
# XXX JSON is close enough :)
|
||||||
|
XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [
|
||||||
|
"cr"
|
||||||
|
"gm"
|
||||||
|
"ff"
|
||||||
|
"IM"
|
||||||
|
"mail"
|
||||||
|
"stockholm"
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
xmonad-start = pkgs.writeScriptBin "xmonad" ''
|
||||||
|
#! ${pkgs.bash}/bin/bash
|
||||||
|
set -efu
|
||||||
|
export PATH; PATH=${makeSearchPath "bin" ([
|
||||||
|
pkgs.rxvt_unicode
|
||||||
|
pkgs.i3lock
|
||||||
|
pkgs.haskellPackages.yeganesh
|
||||||
|
pkgs.haskellPackages.xmobar
|
||||||
|
pkgs.dmenu
|
||||||
|
] ++ config.environment.systemPackages)}:/var/setuid-wrappers
|
||||||
|
settle() {(
|
||||||
|
# Use PATH for a clean journal
|
||||||
|
command=''${1##*/}
|
||||||
|
PATH=''${1%/*}; export PATH
|
||||||
|
shift
|
||||||
|
until "$command" "$@"; do
|
||||||
|
${pkgs.coreutils}/bin/sleep 1
|
||||||
|
done
|
||||||
|
)&}
|
||||||
|
settle ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
|
||||||
|
settle ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args}
|
||||||
|
settle ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c'
|
||||||
|
exec ${pkgs.xmonad-lass}/bin/xmonad
|
||||||
|
'';
|
||||||
|
|
||||||
|
xmonad-stop = pkgs.writeScriptBin "xmonad-stop" ''
|
||||||
|
#! /bin/sh
|
||||||
|
exec ${pkgs.xmonad-lass}/bin/xmonad --shutdown
|
||||||
|
'';
|
||||||
|
|
||||||
|
xserver-environment = {
|
||||||
|
XKB_BINDIR = "${pkgs.xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
|
||||||
|
XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
|
||||||
|
LD_LIBRARY_PATH = concatStringsSep ":" (
|
||||||
|
[ "${pkgs.xorg.libX11}/lib" "${pkgs.xorg.libXext}/lib" ]
|
||||||
|
++ concatLists (catAttrs "libPath" config.services.xserver.drivers));
|
||||||
|
};
|
||||||
|
|
||||||
|
xserver = pkgs.writeScriptBin "xserver" ''
|
||||||
|
#! /bin/sh
|
||||||
|
set -efu
|
||||||
|
exec ${pkgs.xorg.xorgserver}/bin/X \
|
||||||
|
:${toString config.services.xserver.display} \
|
||||||
|
vt${toString config.services.xserver.tty} \
|
||||||
|
-config ${import ./xserver.conf.nix args} \
|
||||||
|
-logfile /var/log/X.${toString config.services.xserver.display}.log \
|
||||||
|
-nolisten tcp \
|
||||||
|
-xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb \
|
||||||
|
'';
|
||||||
|
|
||||||
|
need-reload = s: let
|
||||||
|
pkg = pkgs.writeScriptBin "need-reload" ''
|
||||||
|
#! /bin/sh
|
||||||
|
echo "$*"
|
||||||
|
'';
|
||||||
|
in "${pkg}/bin/need-reload ${s}";
|
||||||
|
|
||||||
|
in out
|
||||||
40
lass/2configs/xserver/xserver.conf.nix
Normal file
40
lass/2configs/xserver/xserver.conf.nix
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.xserver;
|
||||||
|
in
|
||||||
|
|
||||||
|
pkgs.stdenv.mkDerivation {
|
||||||
|
name = "xserver.conf";
|
||||||
|
|
||||||
|
xfs = optionalString (cfg.useXFS != false)
|
||||||
|
''FontPath "${toString cfg.useXFS}"'';
|
||||||
|
|
||||||
|
inherit (cfg) config;
|
||||||
|
|
||||||
|
buildCommand =
|
||||||
|
''
|
||||||
|
echo 'Section "Files"' >> $out
|
||||||
|
echo $xfs >> $out
|
||||||
|
|
||||||
|
for i in ${toString config.fonts.fonts}; do
|
||||||
|
if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
|
||||||
|
for j in $(find $i -name fonts.dir); do
|
||||||
|
echo " FontPath \"$(dirname $j)\"" >> $out
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
for i in $(find ${toString cfg.modules} -type d); do
|
||||||
|
if test $(echo $i/*.so* | wc -w) -ne 0; then
|
||||||
|
echo " ModulePath \"$i\"" >> $out
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo 'EndSection' >> $out
|
||||||
|
|
||||||
|
echo "$config" >> $out
|
||||||
|
'';
|
||||||
|
}
|
||||||
@ -15,4 +15,7 @@ rec {
|
|||||||
};
|
};
|
||||||
go = callPackage ./go/default.nix {};
|
go = callPackage ./go/default.nix {};
|
||||||
newsbot-js = callPackage ./newsbot-js/default.nix {};
|
newsbot-js = callPackage ./newsbot-js/default.nix {};
|
||||||
|
xmonad-lass =
|
||||||
|
let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
|
||||||
|
pkgs.haskellPackages.callPackage src {};
|
||||||
}
|
}
|
||||||
|
|||||||
1
lass/5pkgs/xmonad-lass/.gitignore
vendored
Normal file
1
lass/5pkgs/xmonad-lass/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/shell.nix
|
||||||
190
lass/5pkgs/xmonad-lass/Main.hs
Normal file
190
lass/5pkgs/xmonad-lass/Main.hs
Normal file
@ -0,0 +1,190 @@
|
|||||||
|
{-# LANGUAGE DeriveDataTypeable #-} -- for XS
|
||||||
|
{-# LANGUAGE FlexibleContexts #-} -- for xmonad'
|
||||||
|
{-# LANGUAGE LambdaCase #-}
|
||||||
|
{-# LANGUAGE ScopedTypeVariables #-}
|
||||||
|
|
||||||
|
|
||||||
|
module Main where
|
||||||
|
|
||||||
|
import Control.Exception
|
||||||
|
import Text.Read (readEither)
|
||||||
|
import XMonad
|
||||||
|
import System.IO (hPutStrLn, stderr)
|
||||||
|
import System.Environment (getArgs, withArgs, getEnv, getEnvironment)
|
||||||
|
import System.Posix.Process (executeFile)
|
||||||
|
import XMonad.Prompt (defaultXPConfig)
|
||||||
|
import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
|
||||||
|
, removeEmptyWorkspace)
|
||||||
|
import XMonad.Actions.GridSelect
|
||||||
|
import XMonad.Actions.CycleWS (toggleWS)
|
||||||
|
--import XMonad.Actions.CopyWindow ( copy )
|
||||||
|
import XMonad.Layout.NoBorders ( smartBorders )
|
||||||
|
import qualified XMonad.StackSet as W
|
||||||
|
import Data.Map (Map)
|
||||||
|
import qualified Data.Map as Map
|
||||||
|
-- TODO import XMonad.Layout.WorkspaceDir
|
||||||
|
import XMonad.Hooks.UrgencyHook (SpawnUrgencyHook(..), withUrgencyHook)
|
||||||
|
-- import XMonad.Layout.Tabbed
|
||||||
|
--import XMonad.Layout.MouseResizableTile
|
||||||
|
import XMonad.Layout.Reflect (reflectVert)
|
||||||
|
import XMonad.Layout.FixedColumn (FixedColumn(..))
|
||||||
|
import XMonad.Hooks.Place (placeHook, smart)
|
||||||
|
import XMonad.Hooks.FloatNext (floatNextHook)
|
||||||
|
import XMonad.Actions.PerWorkspaceKeys (chooseAction)
|
||||||
|
import XMonad.Layout.PerWorkspace (onWorkspace)
|
||||||
|
--import XMonad.Layout.BinarySpacePartition
|
||||||
|
import XMonad.Util.EZConfig (additionalKeysP)
|
||||||
|
|
||||||
|
import XMonad.Prompt (autoComplete, defaultXPConfig, XPConfig, mkXPrompt)
|
||||||
|
import XMonad.Hooks.UrgencyHook (focusUrgent, withUrgencyHook, urgencyBorderColor, BorderUrgencyHook(BorderUrgencyHook))
|
||||||
|
import XMonad.Actions.DynamicWorkspaces (addWorkspacePrompt, removeEmptyWorkspace, renameWorkspace, withWorkspace)
|
||||||
|
import XMonad.Hooks.FloatNext (floatNext, floatNextHook)
|
||||||
|
import XMonad.Prompt.Workspace
|
||||||
|
import XMonad.Actions.CopyWindow (copy, kill1)
|
||||||
|
import qualified Data.Map as M
|
||||||
|
import XMonad.Hooks.ManageDocks (avoidStruts, manageDocks, ToggleStruts(ToggleStruts))
|
||||||
|
|
||||||
|
--import XMonad.Actions.Submap
|
||||||
|
import XMonad.Stockholm.Pager
|
||||||
|
import XMonad.Stockholm.Rhombus
|
||||||
|
import XMonad.Stockholm.Shutdown
|
||||||
|
|
||||||
|
myTerm :: String
|
||||||
|
myTerm = "urxvtc"
|
||||||
|
|
||||||
|
myRootTerm :: String
|
||||||
|
myRootTerm = "urxvtc -name root-urxvt -e su -"
|
||||||
|
|
||||||
|
myFont :: String
|
||||||
|
myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*"
|
||||||
|
|
||||||
|
main :: IO ()
|
||||||
|
main = getArgs >>= \case
|
||||||
|
["--shutdown"] -> sendShutdownEvent
|
||||||
|
_ -> mainNoArgs
|
||||||
|
|
||||||
|
mainNoArgs :: IO ()
|
||||||
|
mainNoArgs = do
|
||||||
|
xmonad'
|
||||||
|
-- $ withUrgencyHookC dzenUrgencyHook { args = ["-bg", "magenta", "-fg", "magenta", "-h", "2"], duration = 500000 }
|
||||||
|
-- urgencyConfig { remindWhen = Every 1 }
|
||||||
|
-- $ withUrgencyHook borderUrgencyHook "magenta"
|
||||||
|
-- $ withUrgencyHookC BorderUrgencyHook { urgencyBorderColor = "magenta" } urgencyConfig { suppressWhen = Never }
|
||||||
|
$ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
|
||||||
|
$ defaultConfig
|
||||||
|
{ terminal = myTerm
|
||||||
|
, modMask = mod4Mask
|
||||||
|
, layoutHook = smartBorders $ myLayoutHook
|
||||||
|
-- , handleEventHook = myHandleEventHooks <+> handleTimerEvent
|
||||||
|
--, handleEventHook = handleTimerEvent
|
||||||
|
, manageHook = placeHook (smart (1,0)) <+> floatNextHook
|
||||||
|
, startupHook = spawn "echo emit XMonadStartup"
|
||||||
|
, normalBorderColor = "#1c1c1c"
|
||||||
|
, focusedBorderColor = "#f000b0"
|
||||||
|
, handleEventHook = handleShutdownEvent
|
||||||
|
} `additionalKeysP` myKeyMap
|
||||||
|
|
||||||
|
myLayoutHook = defLayout
|
||||||
|
where
|
||||||
|
defLayout = (avoidStruts $ Tall 1 (3/100) (1/2) ||| Full ||| Mirror (Tall 1 (3/100) (1/2))) ||| FixedColumn 2 80 80 1
|
||||||
|
|
||||||
|
|
||||||
|
xmonad' :: (LayoutClass l Window, Read (l Window)) => XConfig l -> IO ()
|
||||||
|
xmonad' conf = do
|
||||||
|
path <- getEnv "XMONAD_STATE"
|
||||||
|
try (readFile path) >>= \case
|
||||||
|
Right content -> do
|
||||||
|
hPutStrLn stderr ("resuming from " ++ path)
|
||||||
|
withArgs ("--resume" : lines content) (xmonad conf)
|
||||||
|
Left e -> do
|
||||||
|
hPutStrLn stderr (displaySomeException e)
|
||||||
|
xmonad conf
|
||||||
|
|
||||||
|
|
||||||
|
displaySomeException :: SomeException -> String
|
||||||
|
displaySomeException = displayException
|
||||||
|
|
||||||
|
|
||||||
|
myKeyMap =
|
||||||
|
[ ("M4-<F11>", spawn "i3lock -i ~/lock.png -u" )
|
||||||
|
, ("M4-p", spawn "passmenu --type")
|
||||||
|
, ("M4-r", spawn "exe=$(yeganesh -x) && eval \"exec $exe\"")
|
||||||
|
-- , ("M4-r", io (readProcess "yeganesh" ["-x"] "" >>= putStrLn ) )
|
||||||
|
, ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%")
|
||||||
|
, ("<XF86AudioLowerVolume>", spawn "pactl -- set-sink-volume 0 -4%")
|
||||||
|
, ("<XF86Launch1>", gridselectWorkspace myWSConfig W.view)
|
||||||
|
|
||||||
|
, ("M4-a", focusUrgent)
|
||||||
|
, ("M4-S-r", renameWorkspace defaultXPConfig)
|
||||||
|
, ("M4-S-a", addWorkspacePrompt defaultXPConfig)
|
||||||
|
, ("M4-S-<Backspace>", removeEmptyWorkspace)
|
||||||
|
, ("M4-S-c", kill1)
|
||||||
|
, ("M4-<Esc>", toggleWS)
|
||||||
|
, ("M4-S-<Enter>", spawn myTerm)
|
||||||
|
, ("M4-x", floatNext True >> spawn myTerm)
|
||||||
|
, ("M4-f", floatNext True)
|
||||||
|
, ("M4-b", sendMessage ToggleStruts)
|
||||||
|
|
||||||
|
, ("M4-v", withWorkspace myXPConfig (windows . W.view))
|
||||||
|
, ("M4-S-v", withWorkspace myXPConfig (windows . W.shift))
|
||||||
|
, ("M4-C-v", withWorkspace myXPConfig (windows . copy))
|
||||||
|
|
||||||
|
-- , (_4 , xK_q ) & \k -> (k, goToSelected myCNConfig { gs_navigate = makeGSNav k } )
|
||||||
|
-- , (_4S, xK_q ) & \k -> (k, bringSelected myCNConfig { gs_navigate = makeGSNav k } )
|
||||||
|
-- , (_4C, xK_q ) & \k -> (k, withSelectedWindow ( \a -> get >>= \s -> put s { windowset = copyWindow a (W.tag $ W.workspace $ W.current $ windowset s) (windowset s) } ) myCNConfig { gs_navigate = makeGSNav k } )
|
||||||
|
|
||||||
|
--, ("M4-<F1>", perWorkspaceAction workspaceConfigs)
|
||||||
|
, ("M4-S-q", return ())
|
||||||
|
]
|
||||||
|
|
||||||
|
myGSConfig = defaultGSConfig
|
||||||
|
{ gs_cellheight = 50
|
||||||
|
, gs_cellpadding = 2
|
||||||
|
, gs_navigate = navNSearch
|
||||||
|
, gs_font = myFont
|
||||||
|
}
|
||||||
|
|
||||||
|
myXPConfig :: XPConfig
|
||||||
|
myXPConfig = defaultXPConfig
|
||||||
|
{ autoComplete = Just 5000
|
||||||
|
}
|
||||||
|
|
||||||
|
myWSConfig = myGSConfig
|
||||||
|
{ gs_cellwidth = 50
|
||||||
|
}
|
||||||
|
|
||||||
|
pagerConfig :: PagerConfig
|
||||||
|
pagerConfig = defaultPagerConfig
|
||||||
|
{ pc_font = myFont
|
||||||
|
, pc_cellwidth = 64
|
||||||
|
--, pc_cellheight = 36 -- TODO automatically keep screen aspect
|
||||||
|
--, pc_borderwidth = 1
|
||||||
|
--, pc_matchcolor = "#f0b000"
|
||||||
|
, pc_matchmethod = MatchPrefix
|
||||||
|
--, pc_colors = pagerWorkspaceColors
|
||||||
|
, pc_windowColors = windowColors
|
||||||
|
}
|
||||||
|
where
|
||||||
|
windowColors _ _ _ True _ = ("#ef4242","#ff2323")
|
||||||
|
windowColors wsf m c u wf = do
|
||||||
|
let def = defaultWindowColors wsf m c u wf
|
||||||
|
if m == False && wf == True
|
||||||
|
then ("#402020", snd def)
|
||||||
|
else def
|
||||||
|
|
||||||
|
wGSConfig :: GSConfig Window
|
||||||
|
wGSConfig = defaultGSConfig
|
||||||
|
{ gs_cellheight = 20
|
||||||
|
, gs_cellwidth = 192
|
||||||
|
, gs_cellpadding = 5
|
||||||
|
, gs_font = myFont
|
||||||
|
, gs_navigate = navNSearch
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
(&) :: a -> (a -> c) -> c
|
||||||
|
(&) = flip ($)
|
||||||
|
|
||||||
|
allWorkspaceNames :: W.StackSet i l a sid sd -> X [i]
|
||||||
|
allWorkspaceNames ws =
|
||||||
|
return $ map W.tag (W.hidden ws) ++ [W.tag $ W.workspace $ W.current ws]
|
||||||
6
lass/5pkgs/xmonad-lass/Makefile
Normal file
6
lass/5pkgs/xmonad-lass/Makefile
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
.PHONY: ghci
|
||||||
|
ghci: shell.nix
|
||||||
|
nix-shell --command 'exec ghci -Wall'
|
||||||
|
|
||||||
|
shell.nix: xmonad.cabal
|
||||||
|
cabal2nix --shell . > $@
|
||||||
52
lass/5pkgs/xmonad-lass/Util/PerWorkspaceConfig.hs
Normal file
52
lass/5pkgs/xmonad-lass/Util/PerWorkspaceConfig.hs
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
module Util.PerWorkspaceConfig
|
||||||
|
( WorkspaceConfig (..)
|
||||||
|
, WorkspaceConfigs
|
||||||
|
, switchToWorkspace
|
||||||
|
, defaultWorkspaceConfig
|
||||||
|
, perWorkspaceAction
|
||||||
|
, perWorkspaceTermAction
|
||||||
|
-- , myLayoutHack
|
||||||
|
)
|
||||||
|
where
|
||||||
|
|
||||||
|
import XMonad
|
||||||
|
import XMonad.Core (LayoutClass)
|
||||||
|
import Control.Monad (when)
|
||||||
|
|
||||||
|
import qualified Data.Map as M
|
||||||
|
import qualified XMonad.StackSet as W
|
||||||
|
|
||||||
|
data WorkspaceConfig l =
|
||||||
|
WorkspaceConfig
|
||||||
|
{ switchAction :: X ()
|
||||||
|
, startAction :: X ()
|
||||||
|
, keyAction :: X ()
|
||||||
|
, termAction :: X ()
|
||||||
|
}
|
||||||
|
|
||||||
|
type WorkspaceConfigs l = M.Map WorkspaceId (WorkspaceConfig l)
|
||||||
|
|
||||||
|
defaultWorkspaceConfig = WorkspaceConfig
|
||||||
|
{ switchAction = return ()
|
||||||
|
, startAction = return ()
|
||||||
|
, keyAction = return ()
|
||||||
|
, termAction = spawn "urxvtc"
|
||||||
|
}
|
||||||
|
|
||||||
|
whenLookup wsId cfg a =
|
||||||
|
when (M.member wsId cfg) (a $ cfg M.! wsId)
|
||||||
|
|
||||||
|
switchToWorkspace :: WorkspaceConfigs l -> WorkspaceId -> X ()
|
||||||
|
switchToWorkspace cfg wsId = do
|
||||||
|
windows $ W.greedyView wsId
|
||||||
|
wins <- gets (W.integrate' . W.stack . W.workspace . W.current . windowset)
|
||||||
|
when (null wins) $ whenLookup wsId cfg startAction
|
||||||
|
whenLookup wsId cfg switchAction
|
||||||
|
|
||||||
|
perWorkspaceAction :: WorkspaceConfigs l -> X ()
|
||||||
|
perWorkspaceAction cfg = withWindowSet $ \s -> whenLookup (W.currentTag s) cfg keyAction
|
||||||
|
|
||||||
|
perWorkspaceTermAction :: WorkspaceConfigs l -> X ()
|
||||||
|
perWorkspaceTermAction cfg = withWindowSet $ \s -> case M.lookup (W.currentTag s) cfg of
|
||||||
|
Just x -> termAction x
|
||||||
|
_ -> termAction defaultWorkspaceConfig
|
||||||
17
lass/5pkgs/xmonad-lass/xmonad.cabal
Normal file
17
lass/5pkgs/xmonad-lass/xmonad.cabal
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
Author: lass
|
||||||
|
Build-Type: Simple
|
||||||
|
Cabal-Version: >= 1.2
|
||||||
|
License: MIT
|
||||||
|
Name: xmonad-lass
|
||||||
|
Version: 0
|
||||||
|
|
||||||
|
Executable xmonad
|
||||||
|
Build-Depends:
|
||||||
|
base,
|
||||||
|
containers,
|
||||||
|
unix,
|
||||||
|
xmonad,
|
||||||
|
xmonad-contrib,
|
||||||
|
xmonad-stockholm
|
||||||
|
GHC-Options: -Wall -O3 -threaded -rtsopts
|
||||||
|
Main-Is: Main.hs
|
||||||
Loading…
Reference in New Issue
Block a user