From 0831ed6931b9078a293f908bcb557b4e40032c15 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Thu, 25 Mar 2021 18:27:58 +1030 Subject: [PATCH] not sure what happened but I've updated some things and added a default config in case I break things! --- .xinitrc | 3 +- .xmonad/xmonad.hs | 13 +- .xmonad/xmonad.hs.default | 261 ++++++++++++++++++++++++++++++++++++++ .xprofile | 3 + 4 files changed, 269 insertions(+), 11 deletions(-) create mode 100644 .xmonad/xmonad.hs.default diff --git a/.xinitrc b/.xinitrc index 4301932..e5cca0e 100644 --- a/.xinitrc +++ b/.xinitrc @@ -48,4 +48,5 @@ if [ "$HOST" == "archmetabox" ] ; then fi # start my trusty window manager -xmonad & +exec xmonad + diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 646acab..43a782c 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -412,10 +412,12 @@ myManageHook = composeAll , className =? "net-runelite-client-RuneLite" --> doFloat , className =? "net-runelite-launcher-Launcher" --> doIgnore , resource =? "desktop_window" --> doIgnore - , (className =? "firefox" <&&> resource =? "Dialog") --> doFloat -- Float Firefox Dialog + , (className =? "firefox" <&&> resource =? "Dialog")--> doFloat -- Float Firefox Dialog , resource =? "kdesktop" --> doIgnore , className =? "MusicBrainz Picard" --> doIgnore , className =? "Steam" --> doShift ( myWorkspaces !! (7-1) ) + , className =? "discord" --> doShift ( myWorkspaces !! (8-1) ) + , className =? "telegram-desktop" --> doShift ( myWorkspaces !! (8-1) ) , className =? "Pavucontrol" --> doShift ( myWorkspaces !! (5-1) )] ------------------------------------------------------------------------ -- Event handling @@ -443,16 +445,7 @@ myLogHook = fadeInactiveLogHook fadeAmount -- -- By default, do nothing. myStartupHook = do - -- .xprofile contains numlock, compositor, nitrogen, cursor set, and kbd set. - -- Move to .xprofile on desktop - spawnOnce "/usr/lib/x86_64-linux-gnu/libexec/org_kde_powerdevil &" - spawnOnce "compton &" - spawnOnce "nitrogen --restore &" - spawnOnce "xsetroot -cursor_name left_ptr" - spawnOnce "numlockx" - -- Startup apps (tray) and settings - spawnOnce "/home/solomon/.screenlayout/normal.sh" -- really only matters for desktop spawnOnce "volumeicon &" spawnOnce "nm-applet &" spawnOnce "blueman-applet &" diff --git a/.xmonad/xmonad.hs.default b/.xmonad/xmonad.hs.default new file mode 100644 index 0000000..8600bcc --- /dev/null +++ b/.xmonad/xmonad.hs.default @@ -0,0 +1,261 @@ +-- +-- xmonad example config file. +-- +-- A template showing all available configuration hooks, +-- and how to override the defaults in your own xmonad.hs conf file. +-- +-- Normally, you'd only override those defaults you care about. +-- + +import XMonad +import System.Exit + +import qualified XMonad.StackSet as W +import qualified Data.Map as M + +-- The preferred terminal program, which is used in a binding below and by +-- certain contrib modules. +-- +myTerminal = "xterm" + +-- Width of the window border in pixels. +-- +myBorderWidth = 1 + +-- modMask lets you specify which modkey you want to use. The default +-- is mod1Mask ("left alt"). You may also consider using mod3Mask +-- ("right alt"), which does not conflict with emacs keybindings. The +-- "windows key" is usually mod4Mask. +-- +myModMask = mod1Mask + +-- The default number of workspaces (virtual screens) and their names. +-- By default we use numeric strings, but any string may be used as a +-- workspace name. The number of workspaces is determined by the length +-- of this list. +-- +-- A tagging example: +-- +-- > workspaces = ["web", "irc", "code" ] ++ map show [4..9] +-- +myWorkspaces = ["1","2","3","4","5","6","7","8","9"] + +-- Border colors for unfocused and focused windows, respectively. +-- +myNormalBorderColor = "#dddddd" +myFocusedBorderColor = "#ff0000" + +------------------------------------------------------------------------ +-- Key bindings. Add, modify or remove key bindings here. +-- +myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ + + -- launch a terminal + [ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) + + -- launch dmenu + , ((modm, xK_p ), spawn "dmenu_run | dmenu -b") + + -- launch gmrun + , ((modm .|. shiftMask, xK_p ), spawn "gmrun") + + -- close focused window + , ((modm .|. shiftMask, xK_c ), kill) + + -- Rotate through the available layout algorithms + , ((modm, xK_space ), sendMessage NextLayout) + + -- Reset the layouts on the current workspace to default + , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) + + -- Resize viewed windows to the correct size + , ((modm, xK_n ), refresh) + + -- Move focus to the next window + , ((modm, xK_Tab ), windows W.focusDown) + + -- Move focus to the next window + , ((modm, xK_j ), windows W.focusDown) + + -- Move focus to the previous window + , ((modm, xK_k ), windows W.focusUp ) + + -- Move focus to the master window + , ((modm, xK_m ), windows W.focusMaster ) + + -- Swap the focused window and the master window + , ((modm, xK_Return), windows W.swapMaster) + + -- Swap the focused window with the next window + , ((modm .|. shiftMask, xK_j ), windows W.swapDown ) + + -- Swap the focused window with the previous window + , ((modm .|. shiftMask, xK_k ), windows W.swapUp ) + + -- Shrink the master area + , ((modm, xK_h ), sendMessage Shrink) + + -- Expand the master area + , ((modm, xK_l ), sendMessage Expand) + + -- Push window back into tiling + , ((modm, xK_t ), withFocused $ windows . W.sink) + + -- Increment the number of windows in the master area + , ((modm , xK_comma ), sendMessage (IncMasterN 1)) + + -- Deincrement the number of windows in the master area + , ((modm , xK_period), sendMessage (IncMasterN (-1))) + + -- toggle the status bar gap (used with avoidStruts from Hooks.ManageDocks) + -- , ((modm , xK_b ), sendMessage ToggleStruts) + + -- Quit xmonad + , ((modm .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) + + -- Restart xmonad + , ((modm , xK_q ), restart "xmonad" True) + ] + ++ + + -- + -- 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)]] + ++ + + -- + -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 + -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 + -- + [((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f)) + | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..] + , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]] + + +------------------------------------------------------------------------ +-- Mouse bindings: default actions bound to mouse events +-- +myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $ + + -- mod-button1, Set the window to floating mode and move by dragging + [ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w)) + + -- mod-button2, Raise the window to the top of the stack + , ((modMask, button2), (\w -> focus w >> windows W.swapMaster)) + + -- mod-button3, Set the window to floating mode and resize by dragging + , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w)) + + -- you may also bind events to the mouse scroll wheel (button4 and button5) + ] + +------------------------------------------------------------------------ +-- Layouts: + +-- You can specify and transform your layouts by modifying these values. +-- If you change layout bindings be sure to use 'mod-shift-space' after +-- restarting (with 'mod-q') to reset your layout state to the new +-- defaults, as xmonad preserves your old layout settings by default. +-- +-- The available layouts. Note that each layout is separated by |||, +-- which denotes layout choice. +-- +myLayout = tiled ||| Mirror tiled ||| Full + where + -- default tiling algorithm partitions the screen into two panes + tiled = Tall nmaster delta ratio + + -- The default number of windows in the master pane + nmaster = 1 + + -- Default proportion of screen occupied by master pane + ratio = 1/2 + + -- Percent of screen to increment by when resizing panes + delta = 3/100 + +------------------------------------------------------------------------ +-- Window rules: + +-- Execute arbitrary actions and WindowSet manipulations when managing +-- a new window. You can use this to, for example, always float a +-- particular program, or have a client always appear on a particular +-- workspace. +-- +-- To find the property name associated with a program, use +-- > xprop | grep WM_CLASS +-- and click on the client you're interested in. +-- +-- To match on the WM_NAME, you can use 'title' in the same way that +-- 'className' and 'resource' are used below. +-- +myManageHook = composeAll + [ className =? "MPlayer" --> doFloat + , className =? "Gimp" --> doFloat + , resource =? "desktop_window" --> doIgnore + , resource =? "kdesktop" --> doIgnore ] + +-- Whether focus follows the mouse pointer. +myFocusFollowsMouse :: Bool +myFocusFollowsMouse = True + + +------------------------------------------------------------------------ +-- Status bars and logging + +-- Perform an arbitrary action on each internal state change or X event. +-- See the 'DynamicLog' extension for examples. +-- +-- To emulate dwm's status bar +-- +-- > logHook = dynamicLogDzen +-- +myLogHook = return () + +------------------------------------------------------------------------ +-- Startup hook + +-- Perform an arbitrary action each time xmonad starts or is restarted +-- with mod-q. Used by, e.g., XMonad.Layout.PerWorkspace to initialize +-- per-workspace layout choices. +-- +-- By default, do nothing. +myStartupHook = spawn "xmonad-wallpaper-set" + +------------------------------------------------------------------------ +-- Now run xmonad with all the defaults we set up. + +-- Run xmonad with the settings you specify. No need to modify this. +-- +main = xmonad defaults + +-- A structure containing your configuration settings, overriding +-- fields in the default config. Any you don't override, will +-- use the defaults defined in xmonad/XMonad/Config.hs +-- +-- No need to modify this. +-- +defaults = defaultConfig { + -- simple stuff + terminal = myTerminal, + focusFollowsMouse = myFocusFollowsMouse, + borderWidth = myBorderWidth, + modMask = myModMask, + workspaces = myWorkspaces, + normalBorderColor = myNormalBorderColor, + focusedBorderColor = myFocusedBorderColor, + + -- key bindings + keys = myKeys, + mouseBindings = myMouseBindings, + + -- hooks, layouts + layoutHook = myLayout, + manageHook = myManageHook, + logHook = myLogHook, + startupHook = myStartupHook + } \ No newline at end of file diff --git a/.xprofile b/.xprofile index 2ada9ae..5a57048 100644 --- a/.xprofile +++ b/.xprofile @@ -12,3 +12,6 @@ numlockx # cursor xsetroot -cursor_name left_ptr + +# screenlayout +/home/solomon/.screenlayout/normal.sh