diff options
| -rw-r--r-- | doc/plugins.org | 8 | ||||
| -rw-r--r-- | doc/quick-start.org | 9 | ||||
| -rw-r--r-- | doc/using-haskell.org | 4 | ||||
| -rw-r--r-- | etc/build (renamed from examples/build) | 0 | ||||
| -rwxr-xr-x | etc/padding-icon.sh (renamed from examples/padding-icon.sh) | 0 | ||||
| -rwxr-xr-x | etc/status.sh (renamed from examples/status.sh) | 0 | ||||
| -rw-r--r-- | etc/xmobar.config (renamed from examples/xmobar.config) | 0 | ||||
| -rw-r--r-- | etc/xmobar.el (renamed from examples/xmobar.el) | 0 | ||||
| -rw-r--r-- | etc/xmobar.hs (renamed from examples/xmobar.hs) | 0 | ||||
| -rw-r--r-- | etc/xmonadpropwrite.hs (renamed from examples/xmonadpropwrite.hs) | 0 | ||||
| -rw-r--r-- | examples/cirrus.yml | 39 | ||||
| -rw-r--r-- | examples/gh-ci.yml | 77 | ||||
| -rw-r--r-- | readme.org | 2 | ||||
| -rw-r--r-- | xmobar.cabal | 13 |
14 files changed, 19 insertions, 133 deletions
diff --git a/doc/plugins.org b/doc/plugins.org index 558bdef..ccf5780 100644 --- a/doc/plugins.org +++ b/doc/plugins.org @@ -1385,9 +1385,9 @@ - Aliases to =PropName= - Reads the X property named by =PropName= (a string) and displays its - value. The [[../examples/xmonadpropwrite.hs][examples/xmonadpropwrite.hs script]] in xmobar's distribution - can be used to set the given property from the output of any other - program or script. + value. The [[../etc/xmonadpropwrite.hs][etc/xmonadpropwrite.hs script]] in xmobar's distribution can be + used to set the given property from the output of any other program or + script. *** =UnsafeXPropertyLog PropName= @@ -1480,7 +1480,7 @@ =/tmp/xmobar_status= will reveal xmonad for 1.5 seconds and temporarily overwrite the window titles. - - Take a look at [[../examples/status.sh][examples/status.sh]] + - Take a look at [[../etc/status.sh][etc/status.sh]] - Expands environment variables for the pipe path diff --git a/doc/quick-start.org b/doc/quick-start.org index 4b060e2..a206a45 100644 --- a/doc/quick-start.org +++ b/doc/quick-start.org @@ -3,9 +3,8 @@ Xmobar can either be configured using the configuration language, or [[file:using-haskell.org][used as a Haskell library]] (similar to xmonad) and compiled with your specific configuration. For an example of a configuration file using the plain -configuration language, see [[../examples/xmobar.config][examples/xmobar.config]], and you can have a look at -[[../examples/xmobar.hs][examples/xmobar.hs]] for an example of how to write your own xmobar using -Haskell. +configuration language, see [[../etc/xmobar.config][etc/xmobar.config]], and you can have a look at +[[../etc/xmobar.hs][etc/xmobar.hs]] for an example of how to write your own xmobar using Haskell. * Command Line Options @@ -432,7 +431,7 @@ Haskell. Other options are ~Ansi~, ~Pango~, and ~Swaybar~. ** Showing xmobar output in Emacs tab or mode line Using xmobar's ANSI color text ouput, one can plug it inside Emacs, and - display your monitors in the mode line or the tab bar. The [[../examples/xmobar.el][xmobar.el + display your monitors in the mode line or the tab bar. The [[../etc/xmobar.el][xmobar.el package]] provides a simple way of doing it. ** Using xmobar in wayland with swaybar or waybar :PROPERTIES: @@ -476,7 +475,7 @@ Haskell. dynamically xmobar's size and run it alongside a system tray widget such as trayer or stalonetray (although the idea is not limited to trays, really). For your convenience, there is a version of Jonas' script in - [[../examples/padding-icon.sh][examples/padding-icon.sh]]. + [[../etc/padding-icon.sh][etc/padding-icon.sh]]. ** Signal handling diff --git a/doc/using-haskell.org b/doc/using-haskell.org index 667ab4d..4020557 100644 --- a/doc/using-haskell.org +++ b/doc/using-haskell.org @@ -75,7 +75,7 @@ =run= can be used for simpler plugins. If you define only =run= the plugin will be run every second. To overwrite this default you just need to implement =rate=, which must return the number of tenth of seconds between - every successive runs. See [[../examples/xmobar.hs][examples/xmobar.hs]] for an example of a plugin + every successive runs. See [[../etc/xmobar.hs][etc/xmobar.hs]] for an example of a plugin that runs just once, and [[../src/Xmobar/Plugins/Date.hs][src/Xmobar/Plugins/Date.hs]] for one that implements =rate=. @@ -114,7 +114,7 @@ To use your new plugin, you just need to use a pure Haskell configuration for xmobar (as explained [[#xmobar-in-haskell][above]]) and load your definitions in your =xmobar.hs= - file. You can see an example in [[../examples/xmobar.hs][examples/xmobar.hs]] showing you how to write + file. You can see an example in [[../etc/xmobar.hs][etc/xmobar.hs]] showing you how to write a Haskell configuration that uses a new plugin, all in one file. When xmobar runs with the full path to that Haskell file as its argument diff --git a/examples/build b/etc/build index 9e9eb72..9e9eb72 100644 --- a/examples/build +++ b/etc/build diff --git a/examples/padding-icon.sh b/etc/padding-icon.sh index ec3ada2..ec3ada2 100755 --- a/examples/padding-icon.sh +++ b/etc/padding-icon.sh diff --git a/examples/status.sh b/etc/status.sh index 151728b..151728b 100755 --- a/examples/status.sh +++ b/etc/status.sh diff --git a/examples/xmobar.config b/etc/xmobar.config index e951b67..e951b67 100644 --- a/examples/xmobar.config +++ b/etc/xmobar.config diff --git a/examples/xmobar.el b/etc/xmobar.el index 905af3d..905af3d 100644 --- a/examples/xmobar.el +++ b/etc/xmobar.el diff --git a/examples/xmobar.hs b/etc/xmobar.hs index f8434fe..f8434fe 100644 --- a/examples/xmobar.hs +++ b/etc/xmobar.hs diff --git a/examples/xmonadpropwrite.hs b/etc/xmonadpropwrite.hs index f3f4a5d..f3f4a5d 100644 --- a/examples/xmonadpropwrite.hs +++ b/etc/xmonadpropwrite.hs diff --git a/examples/cirrus.yml b/examples/cirrus.yml deleted file mode 100644 index 6105386..0000000 --- a/examples/cirrus.yml +++ /dev/null @@ -1,39 +0,0 @@ -freebsd_instance: - image_family: freebsd-13-0 - -build_task: - env: - CONFIG: "--enable-tests --enable-benchmarks -fwith_mpd -fwith_xft" - - # caches the freebsd package downloads - # saves probably just a couple of seconds, but hey... - pkg_cache: - folder: /var/cache/pkg - - install_script: - - pkg install -y ghc hs-hlint xorg-libraries hs-cabal-install git autoconf libmpdclient pkgconf libXft hs-hspec-discover - - # cache the hackage index file and downloads which are - # cabal v2-update downloads an incremental update, so we don't need to keep this up2date - packages_cache: - # warning: don't use ~/.cabal here, this will break the cache - folder: /.cabal/packages - reupload_on_changes: false - - # cache the dependencies built by cabal - # they have to be uploaded on every change to make the next build fast - store_cache: - # warning: don't use ~/.cabal here, this will break the cache - folder: /.cabal/store - fingerprint_script: cat xmobar.cabal - reupload_on_changes: true - - build_script: - - cabal v2-update - - timeout 1800 cabal v2-build -j4 $CONFIG || (($?==124)) - - lint_script: - - hlint src - - test_script: - - cabal v2-test -j4 $CONFIG diff --git a/examples/gh-ci.yml b/examples/gh-ci.yml deleted file mode 100644 index e720e9e..0000000 --- a/examples/gh-ci.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: Haskell CI (PRs) - -on: - pull_request: - branches: [ master ] - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - cabal: ["3.2"] - ghc: ["8.4", "8.6", "8.8.3", "8.10"] - env: - CONFIG: "--enable-tests --enable-benchmarks -fall_extensions" - - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-haskell@v1 - with: - ghc-version: ${{ matrix.ghc }} - cabal-version: ${{ matrix.cabal }} - - - name: Cache - uses: actions/cache@v1 - env: - cache-name: cache-cabal - with: - path: ~/.cabal - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: Install packages - run: | - sudo apt-get update - sudo apt-get install -y xorg-dev - sudo apt-get install -y libasound2-dev libxpm-dev libmpd-dev libxrandr-dev - sudo apt-get install -y happy c2hs hspec-discover - - - name: Install dependencies - run: | - cabal update - cabal build --dependencies-only $CONFIG - - - name: Build - run: cabal build $CONFIG - - - name: Run hlint - run: | - wget https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh - sh ./travis.sh src - - name: Run tests - run: cabal test - - # build-freebsd: - # runs-on: macos-latest - # env: - # CONFIG: "--enable-tests --enable-benchmarks -fwith_xft -fwith_mpd" - - # steps: - # - uses: actions/checkout@v2 - - # - name: Install dependencies - # uses: vmactions/freebsd-vm@v0.1.5 - # with: - # usesh: true - # prepare: pkg install -y ghc hs-hlint xorg-libraries hs-cabal-install git autoconf - # run: | - # cabal update - # cabal build --dependencies-only $CONFIG - # cabal build $CONFIG - # hlint - # cabal test @@ -127,7 +127,7 @@ channel, ~#xmobar~, at [[ircs://irc.libera.chat][Libera]]. inside a terminal o console, or its output piped to other applications, and there is no need for an X11 display. See [[./doc/quick-start.org#text-mode][Running xmobar in text mode]] for details. Using this mode, you could [[file:doc/quick-start.org#wayland][pipe xmobar's output to, say, swaybar]], - and use it in wayland, or, with the [[./examples/xmobar.el][xmobar.el]] package, show it in Emacs's + and use it in wayland, or, with the [[./etc/xmobar.el][xmobar.el]] package, show it in Emacs's tab bar. * Configuration and further documentation diff --git a/xmobar.cabal b/xmobar.cabal index 3098ec5..95c7a6f 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -17,11 +17,14 @@ cabal-version: >= 1.10 build-type: Simple extra-source-files: readme.org, changelog.md, - doc/quick-start.org, doc/plugins.org - examples/padding-icon.sh, - examples/xmobar.config, - examples/xmobar.hs, - examples/xmonadpropwrite.hs + doc/quick-start.org, + doc/plugins.org, + doc/compiling.org, + doc/using-haskell.org, + etc/padding-icon.sh, + etc/xmobar.config, + etc/xmobar.hs, + etc/xmonadpropwrite.hs source-repository head type: git |