From 646aa3fdeca4466e5d4c4ff7db6b9686582516c6 Mon Sep 17 00:00:00 2001 From: davidpkj Date: Tue, 3 Sep 2024 18:51:49 +0200 Subject: Xmonad changes --- .gitignore | 4 +++ xmonad/.config/xmonad/stack.yaml | 68 +++++++++++++++++++++++++++++++++++ xmonad/.config/xmonad/stack.yaml.lock | 13 +++++++ xmonad/.config/xmonad/xmonad.hs | 2 ++ 4 files changed, 87 insertions(+) create mode 100644 xmonad/.config/xmonad/stack.yaml create mode 100644 xmonad/.config/xmonad/stack.yaml.lock diff --git a/.gitignore b/.gitignore index 14742f5..458c03e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,10 @@ todo +xmonad/.config/xmonad/xmonad/ +xmonad/.config/xmonad/xmonad-contrib/ +xmonad/.config/xmonad/.stack-work/ + mpd/.config/mpd/pid mpd/.config/mpd/database mpd/.config/mpd/playlists/ diff --git a/xmonad/.config/xmonad/stack.yaml b/xmonad/.config/xmonad/stack.yaml new file mode 100644 index 0000000..ef22835 --- /dev/null +++ b/xmonad/.config/xmonad/stack.yaml @@ -0,0 +1,68 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# A 'specific' Stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# snapshot: lts-22.28 +# snapshot: nightly-2024-07-05 +# snapshot: ghc-9.6.6 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# snapshot: ./custom-snapshot.yaml +# snapshot: https://example.com/snapshots/2024-01-01.yaml +snapshot: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/32.yaml + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# subdirs: +# - auto-update +# - wai +packages: +- xmonad +- xmonad-contrib +# Dependency packages to be pulled from upstream that are not in the snapshot. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +# extra-deps: [] + +# Override default flag values for project packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of Stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=3.1" +# +# Override the architecture used by Stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by Stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor diff --git a/xmonad/.config/xmonad/stack.yaml.lock b/xmonad/.config/xmonad/stack.yaml.lock new file mode 100644 index 0000000..d0d0d10 --- /dev/null +++ b/xmonad/.config/xmonad/stack.yaml.lock @@ -0,0 +1,13 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: 417fa04a2ed8916cdae74c475ff97ac80857fed5000f19dce4f9564b5e635294 + size: 720000 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/32.yaml + original: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/32.yaml diff --git a/xmonad/.config/xmonad/xmonad.hs b/xmonad/.config/xmonad/xmonad.hs index 2602184..1a5732a 100644 --- a/xmonad/.config/xmonad/xmonad.hs +++ b/xmonad/.config/xmonad/xmonad.hs @@ -5,6 +5,7 @@ import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.StatusBar import XMonad.Hooks.StatusBar.PP import XMonad.Hooks.ManageDocks +import XMonad.Hooks.FloatConfigureReq import XMonad.Layout.Spacing import XMonad.Layout.NoBorders import XMonad.Util.EZConfig @@ -37,6 +38,7 @@ customConfig = def , modMask = myMod , normalBorderColor = background , focusedBorderColor = primary + , handleEventHook = fixSteamFlicker <+> handleEventHook def , layoutHook = myLayout } `removeKeysP` removeKeys' `additionalKeysP` additionalKeys' -- cgit v1.2.3