new good stuff and stuff for laptop

Author: afreakk

README.md

@@ -1,11 +1,11 @@
 # Xmonanza
 ##### XMonad and Xmobar monorepo for sharing code between them, build with stack
 
-1. Edit `src/AConfig.hs` (atleast iconpath (check xmobar/Main.hs for icons used))
-1. `stack install`
-    `xmonad-afreak` and `xmobar-afreak` will then be created in `~/.local/bin` or `local-bin-path`
+1. `stack install` (or `stack --nix install` if using nix)
+    `xmonad-afreak` and `xmobar-afreak` is then created in `~/.local/bin` (`local-bin-path`)
     (`~/.local/bin` needs to be in `$PATH`)
 1. Copy custom buildscript for xmonad `cp scripts/build ~/.xmonad/` and edit script to correct paths
+1. if using nix, run `echo 'STACK_COMMAND="stack --nix"' > ~/.xmonad/.env` 
 1. Link from `xmonad-afreak` -> `xmonad` somewhere in `$PATH` e.g. `ln -s ~/.local/bin/xmonad-afreak ~/.local/bin/xmonad`
     (not sure why, but `--restart` doesnt work properly if `xmonad` is not in `$PATH`)
 1. Append `xmonad` or `xmonad-afreak` to .xinitrc

package.yaml

@@ -20,7 +20,7 @@ dependencies:
 - base >= 4.7 && < 5
 
 library:
-  source-dirs: src
+  source-dirs: shared
   # dependencies:
   #   - directory
 

scripts/build

@@ -1,15 +1,34 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+set -e
+
+STACK_COMMAND=stack
+ENV_FILE=~/.xmonad/.env
+
+if [ -f $ENV_FILE ]; then
+    source $ENV_FILE
+fi
 # The directory holding your source code and stack.yaml file:
 SRC_DIR=~/coding/Xmonanza/
+
+#check if src has changed`
+sum_file="xmonanza_sum_file"
+sum=$(find $SRC_DIR -type f | xargs -d'\n' -P0 -n1 md5sum | sort -k 2 | md5sum)
+if [ -f "$1" ] && [ -f "$sum_file" ] && [ "${sum}" = "$(cat ${sum_file})" ]; then
+    echo "Skipping xmonanza build as content has not changed"
+    exit
+fi
+echo -n "${sum}" > ${sum_file}
+
 # The name of the executable produced by stack.  This comes from the
 # executable section of your *.cabal or package.yaml file.
 EXE_NAME=xmonad-afreak
+
+# Do the build.
 # Unset STACK_YAML, to ensure that $SRC_DIR/stack.yaml is used.
 unset STACK_YAML
-#
-# Do the build.
 cd $SRC_DIR
-stack build
+$STACK_COMMAND install
 
 # Create a hard link at the requested destination, replacing any existing one.
-ln -f -T $(stack exec -- which $EXE_NAME) $1
+EXE_LOCATION=$($STACK_COMMAND exec -- which $EXE_NAME)
+ln -f -T "$EXE_LOCATION" "$1"

shared/AConfig.hs

@@ -0,0 +1,36 @@
+module AConfig (getConfig, AConfig(..)) where
+
+data AConfig = AConfig
+  { cl_black :: String
+  , cl_current_line :: String
+  , cl_selection    :: String
+  , cl_comment      :: String
+  , cl_grey  :: String
+  , cl_red   :: String
+  , cl_orange:: String
+  , cl_yellow:: String
+  , cl_green :: String
+  , cl_aqua  :: String
+  , cl_blue  :: String
+  , cl_lilly :: String
+  , cl_font :: String
+  , cl_barHeight :: Int
+  } deriving (Show)
+
+getConfig :: AConfig
+getConfig = AConfig 
+  { cl_black = "#2D2D2D"
+  , cl_current_line = "#393939"
+  , cl_selection    = "#515151"
+  , cl_comment      = "#999999"
+  , cl_grey  = "#CCCCCC"
+  , cl_red   = "#F2777A"
+  , cl_orange= "#f99157"
+  , cl_yellow= "#ffcc66"
+  , cl_green = "#99cc99"
+  , cl_aqua  = "#66CCCC"
+  , cl_blue  = "#6699cc"
+  , cl_lilly = "#CC99CC"
+  , cl_font  = "xft:Hack Nerd Font:size=13:Regular:antialias=true"
+  , cl_barHeight=45
+  }

src/AConfig.hs

@@ -47,7 +47,35 @@ flags:
   xmobar:
     with_xft: true
     with_alsa: true
+nix:
+  # enable: true
+  pure: true
+  # packages:
+  #   - haskellPackages.xmonad
+  #   - haskellPackages.xmonad-contrib
+  #   - haskellPackages.xmobar
+  #   - zlib
+  #   # need which for getting the executable for linking to it :)
+  #   - which
 
+  packages:
+    # - cairo
+    # - gcc
+    # - gnome2.pango
+    # - gtk2-x11
+    # - libxml2
+    # - pkgconfig
+    # - upower
+    - x11
+    - xorg.libX11
+    - xorg.libXext
+    - xorg.libXinerama
+    - xorg.libXrandr
+    - xorg.libXrender
+    - xorg.libXScrnSaver
+    - alsaLib
+    - which
+  
 # Override default flag values for local packages and extra-deps
 # flags: {}
 

stack.yaml

@@ -1,13 +1,49 @@
 import Xmobar
 import AConfig (getConfig, AConfig (..))
 
+-- fcClr :: [Char] -> [Char] -> [Char]
+-- fcClr clr str = "<fc="++clr++">"++str++"</fc>"
+
+cmds :: AConfig -> [Runnable]
+cmds cnf = 
+  [ Run $ Network "wlp58s0"
+    ["-L","0","-H","32000", "-m", "3",
+     "--normal",cl_grey cnf,"--high",cl_red cnf,
+     "-t", "<rx>KB /<tx>KB"] 50
+  , Run $ MultiCpu
+    ["--low", cl_aqua cnf, "--normal", cl_grey cnf,"--high",cl_red cnf,
+     "-t", "<total>%"] 50
+  , Run $ Memory
+    [ "--normal",cl_grey cnf,"--high",cl_red cnf,
+     "-m", "2", "-L", "0", "-H", "90",
+     "-t","<usedratio>%"] 50
+  , Run $ Date "%a %b %_d %H:%M" "date" 600
+  , Run $ Alsa "default" "Master"
+    [ "--low", cl_aqua cnf, "--normal",cl_grey cnf,"--high",cl_red cnf,
+     "-t", "<volume>%"]
+  , Run $ MultiCoreTemp
+    ["--low", cl_aqua cnf, "--normal",cl_grey cnf,"--high",cl_red cnf,
+     "-t", "<avg>°C"] 50
+  , Run $ UnsafeStdinReader
+  , Run $ BatteryP ["BAT0"]
+    ["-t", "<acstatus><left>% <timeleft> <watts>",
+     "-L", "10", "-H", "80", "-p", "3",
+     "--",
+     "-O", "\xf58e", "-o", "\xf58b", "-i", "",
+     "-L", "-20", "-H", "-10",
+     "-l", cl_grey cnf, "-m", cl_aqua cnf, "-h", cl_red cnf, "-p", cl_green cnf,
+     "-a", "notify-send -u critical 'Battery running out!!'",
+     "-A", "3"]
+    100
+  ]
+
 config :: AConfig -> Config
 config cnf =
   Config { verbose = False
          , wmClass = "xmobar"
          , wmName = "xmobar"
          , border = NoBorder
-         , borderColor = "#BFBFBF"
+         , borderColor = cl_orange cnf
          , borderWidth = 1
          , textOffsets = []
          , font = cl_font cnf
@@ -23,24 +59,14 @@ config cnf =
          , pickBroadest = False
          , persistent = False
          , hideOnStart = False
-         , iconRoot = cl_iconRoot cnf
+         , iconRoot = ""
          , allDesktops = True
          , overrideRedirect = True
-         , commands = [ Run $ Network "enp0s31f6" ["-L","0","-H","32000", "-m", "3", "--normal",cl_aqua cnf,"--high",cl_red cnf, "-t", "<rx>KB|<tx>KB"] 50
-                      , Run $ MultiCpu [ "--low", cl_aqua cnf, "--normal",cl_aqua cnf,"--high",cl_red cnf, "-t", "<total>%"] 50
-                      , Run $ Memory ["-t","<usedratio>%", "-L", "0", "-H", "90", "--normal",cl_aqua cnf,"--high",cl_red cnf, "-m", "2"] 50
-                      , Run $ Date "%a %b %_d %H:%M" "date" 600
-                      , Run $ Alsa "default" "Master" ["-t", "<volume>%",  "--low", cl_aqua cnf, "--normal",cl_aqua cnf,"--high",cl_red cnf]
-                      , Run $ Com "nvidia-settings" ["-t","-q","[gpu:0]/GPUCoreTemp" ] "gputemp" 50
-                      , Run $ MultiCoreTemp [ "--low", cl_aqua cnf, "--normal",cl_aqua cnf,"--high",cl_red cnf, "-t", "<avg>°C"] 50
-                      , Run $ CatInt 0 "/sys/devices/platform/nct6775.2592/hwmon/hwmon3/fan2_input" [
-                        "-L", "0", "-H", "1082", "--normal",cl_aqua cnf,"--high",cl_red cnf] 50
-                      , Run $ UnsafeStdinReader
-                      ]
+         , commands = cmds cnf
          , sepChar = "%"
          , alignSep = "}{"
          , template = "%UnsafeStdinReader%}\
-                      \{<icon=volume.xpm/> %alsa:default:Master% | %enp0s31f6% | <icon=memory.xpm/> %memory% | <icon=cpu.xpm/> %multicpu% %multicoretemp% %cat0% | <icon=gpu.xpm/> %gputemp%°C | <fc=" ++ cl_lilly cnf ++ ">%date%</fc>"
+                      \{奔 %alsa:default:Master% | ﯱ %wlp58s0% | %battery% | \xf85a %memory% | \xfb19 %multicpu% %multicoretemp% | %date%"
          }
 
 main :: IO ()

xmobar/Main.hs

@@ -0,0 +1,21 @@
+module BackAndForth (backAndForth) where
+
+import XMonad
+import qualified XMonad.Hooks.WorkspaceHistory as WH
+import XMonad.StackSet
+
+-- needs
+--  workspaceHistoryHook
+--  attatched to ur loghook
+
+backAndForth :: WorkspaceId -> X ()
+backAndForth toWS = do
+    cur <- gets (currentTag . windowset)
+    if toWS == cur
+       then WH.workspaceHistory >>= showPreviousWindow
+        else windows (greedyView toWS)
+
+showPreviousWindow :: [WorkspaceId] -> X ()
+showPreviousWindow (_:znd:_) = windows (greedyView znd)
+showPreviousWindow _         = return ()
+

xmonad/BackAndForth.hs

@@ -0,0 +1,20 @@
+module Calculator (calculatorPrompt) where
+import           XMonad (MonadIO, X)
+import           XMonad.Prompt (XPrompt, showXPrompt, completionToCommand, XPConfig, mkXPrompt)
+import           XMonad.Util.Run (runProcessWithInput)
+
+data CalculatorMode = CalculatorMode
+
+instance XPrompt CalculatorMode where
+    showXPrompt CalculatorMode     = "calc> "
+    completionToCommand _ = id
+
+calculatorPrompt :: XPConfig -> X ()
+calculatorPrompt c = mkXPrompt CalculatorMode c doCalc (\_ -> return ())
+
+doCalc :: MonadIO m => [Char] -> m [String]
+doCalc [] = return []
+doCalc s = fmap lines $ fmap stripTab $ runProcessWithInput "calc" [s] ""
+
+stripTab (_:xs) = xs
+stripTab [] = []