From: James Bunton Date: Mon, 19 Nov 2018 13:53:34 +0000 (+1100) Subject: remove more unused files X-Git-Url: https://code.delx.au/dotfiles/commitdiff_plain/b5d7af7d2304d0cc165f4a9c83aa07400749e291 remove more unused files --- diff --git a/.config/autostart/Kupfer.desktop b/.config/autostart/Kupfer.desktop deleted file mode 100644 index b5a5e8c..0000000 --- a/.config/autostart/Kupfer.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=0.9.4 -Type=Application -Name=Kupfer -Comment=App launcher -Exec=kupfer --no-splash -OnlyShowIn=XFCE; -StartupNotify=false -Terminal=false -Hidden=false - diff --git a/.config/autostart/xmonad-xfce4-session.desktop b/.config/autostart/xmonad-xfce4-session.desktop deleted file mode 100644 index 3de9386..0000000 --- a/.config/autostart/xmonad-xfce4-session.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=0.9.4 -Type=Application -Name=xmonad/xfce4 session with hacks -Comment= -Exec=/home/jamesbunton/bin/xmonad-xfce4-session.sh -OnlyShowIn=XFCE; -StartupNotify=false -Terminal=false -Hidden=false - diff --git a/.xmonad/xmobar.hs b/.xmonad/xmobar.hs deleted file mode 100644 index c65b859..0000000 --- a/.xmonad/xmobar.hs +++ /dev/null @@ -1,10 +0,0 @@ -Config { - font = "xft:sans-serif:size=10", - bgColor = "#edeceb", - fgColor = "black", - position = TopSize L 100 20, - commands = [Run StdinReader], - sepChar = "%", - template = "%StdinReader%", - lowerOnStart = False, -} diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs deleted file mode 100644 index bf5ae5a..0000000 --- a/.xmonad/xmonad.hs +++ /dev/null @@ -1,179 +0,0 @@ -{-# LANGUAGE FlexibleContexts #-} -import System.IO -import XMonad -import XMonad.Actions.CycleRecentWS -import XMonad.Actions.PhysicalScreens -import XMonad.Config.Desktop -import XMonad.Hooks.DynamicLog -import XMonad.Hooks.EwmhDesktops -import XMonad.Hooks.ICCCMFocus -import XMonad.Hooks.ManageDocks -import XMonad.Hooks.ManageHelpers -import XMonad.Hooks.SetWMName -import XMonad.Layout.IM -import XMonad.Layout.LayoutHints -import qualified XMonad.Layout.Magnifier as Mag -import XMonad.Layout.Master -import XMonad.Layout.NoBorders -import XMonad.Layout.NoFrillsDecoration -import XMonad.Layout.PerWorkspace -import XMonad.Layout.Renamed -import XMonad.Layout.Reflect -import XMonad.Layout.Tabbed -import XMonad.Util.Run(spawnPipe) -import qualified Data.Map as M -import qualified XMonad.StackSet as W - - -myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ - [ - ((modm .|. shiftMask, xK_h), spawn "xfce4-session-logout"), - ((modm .|. shiftMask, xK_l), spawn "xscreensaver-command --lock"), - ((modm .|. shiftMask, xK_r), spawn "xmonad --restart"), - - ((modm, xK_n), spawn "xfce4-terminal"), - ((modm, xK_i), spawn "firefox"), - ((modm .|. shiftMask, xK_i), spawn "firefox --private-window"), - ((modm, xK_c), spawn "emacsclient --create-frame --no-wait"), - ((modm, xK_p), spawn "kupfer"), - - ((modm, xK_w ), kill), - ((modm, xK_space ), sendMessage NextLayout), - ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf), - ((modm, xK_j ), windows W.focusDown), - ((modm, xK_k ), windows W.focusUp ), - ((modm, xK_m ), windows W.focusMaster ), - ((modm, xK_Return), windows W.swapMaster), - ((modm .|. shiftMask, xK_j ), windows W.swapDown ), - ((modm .|. shiftMask, xK_k ), windows W.swapUp ), - ((modm, xK_h ), sendMessage Shrink), - ((modm, xK_l ), sendMessage Expand), - ((modm, xK_t ), withFocused $ windows . W.sink), - ((modm , xK_comma ), sendMessage (IncMasterN 1)), - ((modm , xK_period), sendMessage (IncMasterN (-1))), - ((modm , xK_b ), sendMessage ToggleStruts), - ((modm , xK_z ), sendMessage Mag.Toggle), - ((modm , xK_a), cycleRecentWorkspaceOnSingleScreen [xK_Super_L] xK_a xK_a) - ] - ++ - - -- mod-{o,e,u}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-shift-{o,e,u}, Move client to screen 1, 2, or 3 - [((m .|. modm, key), f sc) - | (key, sc) <- zip [xK_o, xK_e, xK_u] [0..] - , (f, m) <- [(viewScreen def, 0), (sendToScreen def, shiftMask)]] - ++ - - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - [((m .|. modm, k), windows $ f i) - | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] - , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)] - ] - -cycleRecentWorkspaceOnSingleScreen = cycleWindowSets options - where - options w = map (W.view `flip` w) (recentTags w) - recentTags w = map W.tag $ W.hidden w ++ [W.workspace (W.current w)] - -avoidMaster = W.modify' $ \c -> case c of - W.Stack t [] (r:rs) -> W.Stack t [r] rs - otherwise -> c - -isSkipTaskBar = isInProperty "_NET_WM_STATE" "_NET_WM_STATE_SKIP_TASKBAR" - -myManageHook = - manageDocks <+> - composeOne [ - transience, - (isSkipTaskBar -?> doFloat), - (isDialog -?> doFloatAt 0.1 0.1), - (isFullscreen -?> doFullFloat), - (fmap Just $ doF avoidMaster) - ] - - -myWorkspaces = ["1", "2", "3", "4", "5", "6", "7", "8", "9"] - -myPP = xmobarPP - { - ppCurrent = xmobarColor "#A01010" "" . wrap "[" "]", - ppTitle = xmobarColor "#10A010" "" - } - -myLogHook hooks = do - mapM (\h -> dynamicLogWithPP myPP { ppOutput = hPutStrLn h }) hooks - takeTopFocus -- fix for Java Swing apps - -myStartupHook = do - setWMName "LG3D" -- fix for Java Swing apps - spawn "xfce4-panel --restart" -- ensure it appears on top of xmobar - -goldenRatio = (toRational (2/(1+sqrt(5)::Double))) - -myTitleTheme = defaultTheme { - fontName = "xft:sans-serif:size=10", - decoHeight = 24 - } - -createLayout name layout = - renamed [Replace name] $ - layoutHints $ - smartBorders $ - layout - -myFullLayout = createLayout "Full" $ - noBorders $ - Full - -myTiledLayout = createLayout "Tall" $ - avoidStruts $ - Mag.magnifierOff $ - Tall nMaster ratioIncrement masterRatio - where - nMaster = 1 - ratioIncrement = 3/100 - masterRatio = goldenRatio - -myTabbedLayout = createLayout "Tab" $ - avoidStruts $ - tabbed shrinkText myTitleTheme - -myMasterTabbedLayout = createLayout "MTab" $ - avoidStruts $ - Mag.magnifierOff $ - mastered resizeDelta masterRatio $ - tabbed shrinkText myTitleTheme - where - resizeDelta = 3/100 - masterRatio = goldenRatio - -myGimpLayout = createLayout "Gimp" $ - avoidStruts $ - withIM (1/6) (Role "gimp-toolbox") $ - reflectHoriz $ - withIM (1/6) (Role "gimp-dock") $ - reflectHoriz $ - tabbed shrinkText myTitleTheme - -myLayout = - ( - onWorkspace "9" (myTabbedLayout ||| myFullLayout ||| myGimpLayout) $ - (myTabbedLayout ||| myMasterTabbedLayout ||| myTiledLayout) - ) - -main = do - xmonadDir <- getXMonadDir - xmobars <- mapM (\x -> spawnPipe ("xmobar -x " ++ (show x) ++ " " ++ xmonadDir ++ "/xmobar.hs")) [1, 2] - xmonad $ desktopConfig { - manageHook = myManageHook, - layoutHook = myLayout, - workspaces = myWorkspaces, - logHook = myLogHook xmobars, - startupHook = myStartupHook, - keys = myKeys, - modMask = mod4Mask, - handleEventHook = handleEventHook desktopConfig <+> fullscreenEventHook, - focusFollowsMouse = False - } -