Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
66586d70be
@ -28,8 +28,8 @@ in
|
|||||||
systemd.network.networks.wiregrill = {
|
systemd.network.networks.wiregrill = {
|
||||||
matchConfig.Name = "wiregrill";
|
matchConfig.Name = "wiregrill";
|
||||||
address =
|
address =
|
||||||
optional (!isNull cfg.net.ip4) (toCidrNotation cfg.net.ip4) ++
|
optional (cfg.net.ip4 != null) (toCidrNotation cfg.net.ip4) ++
|
||||||
optional (!isNull cfg.net.ip6) (toCidrNotation cfg.net.ip6);
|
optional (cfg.net.ip6 != null) (toCidrNotation cfg.net.ip6);
|
||||||
};
|
};
|
||||||
tv.iptables.extra.filter.INPUT = [
|
tv.iptables.extra.filter.INPUT = [
|
||||||
"-p udp --dport ${toString cfg.net.wireguard.port} -j ACCEPT"
|
"-p udp --dport ${toString cfg.net.wireguard.port} -j ACCEPT"
|
||||||
|
@ -23,6 +23,7 @@ import System.Posix.Process (executeFile)
|
|||||||
import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
|
import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
|
||||||
, removeEmptyWorkspace)
|
, removeEmptyWorkspace)
|
||||||
import XMonad.Actions.CycleWS (toggleWS)
|
import XMonad.Actions.CycleWS (toggleWS)
|
||||||
|
import XMonad.Layout.Gaps (Direction2D(U,R,D,L), gaps)
|
||||||
import XMonad.Layout.NoBorders ( smartBorders )
|
import XMonad.Layout.NoBorders ( smartBorders )
|
||||||
import XMonad.Layout.ResizableTile (ResizableTall(ResizableTall))
|
import XMonad.Layout.ResizableTile (ResizableTall(ResizableTall))
|
||||||
import XMonad.Layout.ResizableTile (MirrorResize(MirrorExpand,MirrorShrink))
|
import XMonad.Layout.ResizableTile (MirrorResize(MirrorExpand,MirrorShrink))
|
||||||
@ -58,13 +59,19 @@ main = getArgs >>= \case
|
|||||||
|
|
||||||
readEnv :: Data.Aeson.FromJSON b => String -> IO b
|
readEnv :: Data.Aeson.FromJSON b => String -> IO b
|
||||||
readEnv name =
|
readEnv name =
|
||||||
Data.Maybe.fromJust
|
readEnv' (error $ "could not get environment variable: " <> name) name
|
||||||
|
|
||||||
|
readEnv' :: Data.Aeson.FromJSON b => b -> String -> IO b
|
||||||
|
readEnv' defaultValue name =
|
||||||
|
Data.Maybe.fromMaybe defaultValue
|
||||||
. Data.Aeson.decodeStrict'
|
. Data.Aeson.decodeStrict'
|
||||||
. Data.ByteString.Char8.pack
|
. Data.ByteString.Char8.pack
|
||||||
<$> getEnv name
|
. Data.Maybe.fromMaybe mempty
|
||||||
|
<$> lookupEnv name
|
||||||
|
|
||||||
mainNoArgs :: IO ()
|
mainNoArgs :: IO ()
|
||||||
mainNoArgs = do
|
mainNoArgs = do
|
||||||
|
myScreenGaps <- readEnv' [] "XMONAD_SCREEN_GAPS" :: IO [Int]
|
||||||
myScreenWidth <- readEnv "XMONAD_SCREEN_WIDTH" :: IO Dimension
|
myScreenWidth <- readEnv "XMONAD_SCREEN_WIDTH" :: IO Dimension
|
||||||
myTermFont <- getEnv "XMONAD_TERM_FONT"
|
myTermFont <- getEnv "XMONAD_TERM_FONT"
|
||||||
myTermFontWidth <- readEnv "XMONAD_TERM_FONT_WIDTH" :: IO Dimension
|
myTermFontWidth <- readEnv "XMONAD_TERM_FONT_WIDTH" :: IO Dimension
|
||||||
@ -89,6 +96,7 @@ mainNoArgs = do
|
|||||||
, workspaces = workspaces0
|
, workspaces = workspaces0
|
||||||
, layoutHook =
|
, layoutHook =
|
||||||
refocusLastLayoutHook $
|
refocusLastLayoutHook $
|
||||||
|
gaps (zip [U,R,D,L] myScreenGaps) $
|
||||||
smartBorders $
|
smartBorders $
|
||||||
ResizableTall
|
ResizableTall
|
||||||
1
|
1
|
||||||
|
Loading…
Reference in New Issue
Block a user