Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2021-08-09 03:13:50 -06:00
commit 94453a59bc
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 3 additions and 1 deletions

View File

@ -9,6 +9,7 @@ application/pdf=okularApplication_pdf.desktop;
image/png=okularApplication_kimgio.desktop; image/png=okularApplication_kimgio.desktop;
video/mp4=vlc.desktop;org.gnome.Totem.desktop; video/mp4=vlc.desktop;org.gnome.Totem.desktop;
x-scheme-handler/magnet=userapp-transmission-gtk-24GQLZ.desktop; x-scheme-handler/magnet=userapp-transmission-gtk-24GQLZ.desktop;
element=element-desktop.desktop
[Default Applications] [Default Applications]
text/html=google-chrome.desktop text/html=google-chrome.desktop

View File

@ -105,7 +105,7 @@ myConfig = def
toggleFadeInactiveLogHook 0.9 <> workspaceHistoryHook <> toggleFadeInactiveLogHook 0.9 <> workspaceHistoryHook <>
setWorkspaceNames <> activateLogHook (reader W.focusWindow >>= doF) <+> logHook def setWorkspaceNames <> activateLogHook (reader W.focusWindow >>= doF) <+> logHook def
, handleEventHook = , handleEventHook =
fullscreenEventHook <> followIfNoMagicFocus <> minimizeEventHook <> restartEventHook followIfNoMagicFocus <> minimizeEventHook <> restartEventHook
, startupHook = myStartup , startupHook = myStartup
, keys = customKeys (const []) addKeys , keys = customKeys (const []) addKeys
} }
@ -125,6 +125,7 @@ main = do
. docks . docks
. pagerHints . pagerHints
. ewmh . ewmh
. ewmhFullscreen
. withNavigation2DConfig myNavigation2DConfig $ myConfig . withNavigation2DConfig myNavigation2DConfig $ myConfig
-- Utility functions -- Utility functions