diff --git a/pkgs/image-generator/default.nix b/pkgs/image-generator/default.nix index 2c8e911..1a120f6 100644 --- a/pkgs/image-generator/default.nix +++ b/pkgs/image-generator/default.nix @@ -6,8 +6,8 @@ mkDerivation { version = "0.1.1.0"; src = fetchgit { url = "https://git.ingolf-wagner.de/palo/image-generator.git"; - sha256 = "19f6zj06avcqk711yx88z9ymyibci4qcb4r7fjpjxqvi702kvc1f"; - rev = "a4d68ceca2e8e72cf75055b3796dd57b19265226"; + sha256 = "0hgbp0sxy7vjgx2zv1r05gvry0k6r2cldjmj5q75d9c8gp6n5cc1"; + rev = "ef68d8bd027b69fc96f821849c695a2b3e5c9e49"; fetchSubmodules = true; }; isLibrary = true; diff --git a/system/desktop/home-manager/xmonad/Main.hs b/system/desktop/home-manager/xmonad/Main.hs index ad4c595..f6d5ced 100644 --- a/system/desktop/home-manager/xmonad/Main.hs +++ b/system/desktop/home-manager/xmonad/Main.hs @@ -2,7 +2,6 @@ module Main where - import BoringWindows (BoringMessage (..), boringWindows, clearBoring, focusDown, focusUp) @@ -48,21 +47,20 @@ import XMonad.Util.Scratchpad (scratchpadManageHook, scratchpadSpawnAction) import XMonad.Util.SpawnOnce (spawnOnce) - - ------------------------------------------------------------------------ -- -- Layouts -- ------------------------------------------------------------------------ - selectionColor :: String selectionColor = Solarized.magenta nonSelectionColor :: String nonSelectionColor = Solarized.base02 -myLayout = (windowConfiguration $ smartBorders $ boringWindows resizeableTall) ||| noBorders Full +myLayout = + (windowConfiguration $ smartBorders $ boringWindows resizeableTall) ||| + noBorders Full where resizeableTall = ResizableTall nmaster delta ratio [] -- The default number of windows in the master pane @@ -71,10 +69,8 @@ myLayout = (windowConfiguration $ smartBorders $ boringWindows resizeableTall) ratio = 1 / 2 -- Percent of screen to increment by when resizing panes delta = 3 / 100 - windowConfiguration = configurableNavigation noNavigateBorders - -- ------------------------------------------------------------ -- -- predefined workspaces @@ -86,12 +82,12 @@ myWorkspaces :: [String] myWorkspaces = ["1", "2", "3", "4"] -- workspaces names to be used only by one program, partly spawning on startup. -autoSpawnWorkspaces :: [ String ] -autoSpawnWorkspaces = [ "-copyq" ] +autoSpawnWorkspaces :: [String] +autoSpawnWorkspaces = ["-copyq"] -- theses workspaces should not be removed by the workspace -- switch commands -nonRemovableWorkspaces :: [ String ] +nonRemovableWorkspaces :: [String] nonRemovableWorkspaces = myWorkspaces ++ autoSpawnWorkspaces -- projects @@ -137,16 +133,15 @@ myKeys XConfig {modMask = modm} = -- mod-[1..9], Switch to workspace N [ ( (m .|. modm, k) , do removeEmptyWorkspaceAfterExcept nonRemovableWorkspaces $ windows $ f i - updateBoring - ) + updateBoring) | (i, k) <- zip myWorkspaces [xK_1 .. xK_9] , (f, m) <- [(W.greedyView, 0)] ] ++ -- mod--[1..9] move window to workspace N -- mod--[1..9] copy window to workspace N - [ ((m .|. modm, k), - do windows $ f i - updateBoring) + [ ( (m .|. modm, k) + , do windows $ f i + updateBoring) | (i, k) <- zip myWorkspaces [xK_1 .. xK_9] , (f, m) <- [(W.shift, shiftMask), (copy, controlMask)] ] @@ -301,15 +296,15 @@ myAdditionaKeys (do sendMessage MirrorShrink sendMessage Reset)) -- Toggle window tiling/floating - , ("t", do - next <- nextRectangle - withFocused $ toggleFloating next) - , ("n", withFocused $ floatTileCommand - (do - position <- nextRectangle - withFocused (windows . (`W.float` position))) - (return ()) - ) + , ( "t" + , do next <- nextRectangle + withFocused $ toggleFloating next) + , ( "n" + , withFocused $ + floatTileCommand + (do position <- nextRectangle + withFocused (windows . (`W.float` position))) + (return ())) -- Increment the number of windows in the master area , (",", sendMessage (IncMasterN 1)) -- Deincrement the number of windows in the master area @@ -344,7 +339,13 @@ myAdditionaKeys -- Redshift -- -- ------------------------------------------------------------ - [("M4-", spawn nixStartRedshift), ("M4-", spawn nixResetRedshift)] + [("M4-", spawn nixStartRedshift), ("M4-", spawn nixResetRedshift)] ++ + -- ------------------------------------------------------------ + -- + -- programs + -- + -- ------------------------------------------------------------ + [("M4-b", spawn nixSetBackground)] ------------------------------------------------------------------------ -- Mouse bindings: default actions bound to mouse events @@ -373,8 +374,6 @@ mouse XConfig {XMonad.modMask = modm} = -- you may also bind events to the mouse scroll wheel (button4 and button5) ] - - ------------------------------------------------------------------------ -- Window rules: -- Execute arbitrary actions and WindowSet manipulations when managing @@ -446,14 +445,14 @@ startUp spawn nixStartAlbert spawnOnce nixStartCopyq - ------------------------------------------------------------------------ -- Now run xmonad with all the defaults we set up. -- Run xmonad with the settings you specify. No need to modify this. -- main :: IO () main = do - xmonad $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ") $ + xmonad $ + withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ") $ dynamicProjects projects $ -- debugManageHook $ defaults @@ -463,10 +462,10 @@ myTerm = nixStartTerminal -- make sure we never select a boring window -- when we select another workspace. -updateBoring :: X() -updateBoring = do focusUp - focusDown - +updateBoring :: X () +updateBoring = do + focusUp + focusDown -- A structure containing your configuration settings, overriding -- fields in the default config. Any you don't override, will @@ -508,7 +507,6 @@ defaults = } `additionalKeysP` myAdditionaKeys - autoXPConfig :: XPConfig autoXPConfig = myXPConfig {autoComplete = Just 5000}