diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json index a934501..e8f0f69 100644 --- a/files/.config/configstore/update-notifier-npm.json +++ b/files/.config/configstore/update-notifier-npm.json @@ -1,4 +1,4 @@ { "optOut": false, - "lastUpdateCheck": 1584646411822 + "lastUpdateCheck": 1584733774631 } \ No newline at end of file diff --git a/files/.config/kitty/kitty.conf b/files/.config/kitty/kitty.conf index b83f40b..ba55a0b 100644 --- a/files/.config/kitty/kitty.conf +++ b/files/.config/kitty/kitty.conf @@ -1,8 +1,11 @@ include ./theme.conf -# font_family Iosevka Medium -font_family monospace -font_size 12 +font_family Iosevka +bold_font auto +italic_font auto +bold_italic_font auto +#font_family monospace +font_size 14 enable_audio_bell no @@ -11,6 +14,11 @@ tab_bar_style powerline map ctrl+shift+plus change_font_size all +2.0 +map ctrl+shift+left neighboring_window left +map ctrl+shift+down neighboring_window down +map ctrl+shift+right neighboring_window right +map ctrl+shift+up neighboring_window up clipboard_control write-clipboard write-primary read-primary read-clipboard +dynamic_background_opacity yes diff --git a/files/.config/polybar/config.ini b/files/.config/polybar/config.ini index 0e2774d..0dbc859 100644 --- a/files/.config/polybar/config.ini +++ b/files/.config/polybar/config.ini @@ -58,7 +58,7 @@ font-7 = NotoEmoji:size=7; modules-left = xmonad test -modules-center = mpd gitlab-pipeline player-mpv-tail +modules-center = timerDisplay mpd gitlab-pipeline player-mpv-tail modules-right = network-traffic info-pingrtt pulseaudio filesystem memory cpu date tray-position = right @@ -156,7 +156,7 @@ pseudo-transparency = true [global/wm] margin-top = 5 -margin-bottom = 5 +margin-bottom = 0 ; vim:ft=dosini @@ -166,6 +166,11 @@ exec = xmonad-log tail = true +[module/timerDisplay] +type = custom/script +exec = "[ -f ~/scripts/remainingTime.txt ] && head -n 1 scripts/remainingTime.txt" +interval = 1 + ;[module/gitlab-pipeline] ;type = custom/script diff --git a/files/.xmonad/.gitignore b/files/.xmonad/.gitignore new file mode 100644 index 0000000..336e959 --- /dev/null +++ b/files/.xmonad/.gitignore @@ -0,0 +1,16 @@ +# files produced by compiler +*.o +*.hi +*.errors + +# compiled xmonad executable +xmonad-* + +# files used by stack +.stack-work/ + +# directory created by `build` script +bin/ + +# files automatically created by xmonad +xmonad.state diff --git a/files/.xmonad/.stack-work/stack.sqlite3 b/files/.xmonad/.stack-work/stack.sqlite3 index 3bf12f9..09248ce 100644 Binary files a/files/.xmonad/.stack-work/stack.sqlite3 and b/files/.xmonad/.stack-work/stack.sqlite3 differ diff --git a/files/.xmonad/build b/files/.xmonad/build old mode 100755 new mode 100644 index 4402d43..e38eaff --- a/files/.xmonad/build +++ b/files/.xmonad/build @@ -1,9 +1,9 @@ #!/bin/sh -exec stack ghc -- \ - --make xmonad.hs \ - -i \ - -ilib \ - -fforce-recomp \ - -main-is main \ - -v0 \ - -o "$1" +# +# As of 0.13, xmonad --recompile will look for a custom build script. + +set -e + +stack build :my-xmonad --verbosity error +stack install :my-xmonad --local-bin-path bin/ --verbosity error +mv bin/my-xmonad "$1" diff --git a/files/.xmonad/lib/.gitignore b/files/.xmonad/lib/.gitignore new file mode 100644 index 0000000..04a4a5b --- /dev/null +++ b/files/.xmonad/lib/.gitignore @@ -0,0 +1 @@ +# This file is included so that a `lib/` directory will be created. diff --git a/files/.xmonad/my-xmonad.cabal b/files/.xmonad/my-xmonad.cabal new file mode 100644 index 0000000..c47bc60 --- /dev/null +++ b/files/.xmonad/my-xmonad.cabal @@ -0,0 +1,15 @@ +name: my-xmonad +version: 0.1.0.0 +build-type: Simple +cabal-version: >=1.10 + +executable my-xmonad + main-is: ../xmonad.hs + -- other-modules lists custom modules in my ~/.xmonad/lib/ directory + other-modules: + build-depends: base + , xmonad >= 0.13 + , xmonad-contrib >= 0.13 + hs-source-dirs: lib + default-language: Haskell2010 + ghc-options: -Wall -Werror -fno-warn-missing-signatures -threaded diff --git a/files/.xmonad/stack.yaml.lock b/files/.xmonad/stack.yaml.lock index 14e6268..72c2f59 100644 --- a/files/.xmonad/stack.yaml.lock +++ b/files/.xmonad/stack.yaml.lock @@ -27,7 +27,7 @@ packages: hackage: netlink-1.1.1.0 snapshots: - completed: - size: 491373 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/3.yaml - sha256: 29e9ff61b8bf4b4fcff55cde3ac106ebb971f0d21331dccac9eee63374fa6ca8 - original: lts-15.3 + size: 491372 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/5.yaml + sha256: 1b549cfff328040c382a70a84a2087aac8dab6d778bf92f32a93a771a1980dfc + original: lts-15.5 diff --git a/files/.xmonad/xmonad-x86_64-linux b/files/.xmonad/xmonad-x86_64-linux index f0c7f17..a87c5f2 100755 Binary files a/files/.xmonad/xmonad-x86_64-linux and b/files/.xmonad/xmonad-x86_64-linux differ diff --git a/files/.xmonad/xmonad.errors b/files/.xmonad/xmonad.errors index c254311..db78149 100644 --- a/files/.xmonad/xmonad.errors +++ b/files/.xmonad/xmonad.errors @@ -1,10 +1,10 @@ Stack has not been tested with GHC versions above 8.6, and using 8.8.3, this may fail Stack has not been tested with Cabal versions above 2.4, but version 3.0.1.0 was found, this may fail -xmonad.hs:207:109: warning: [-Wdeprecations] +xmonad.hs:208:109: warning: [-Wdeprecations] In the use of ‘defaultConfig’ (imported from XMonad, but defined in XMonad.Config): Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead." | -207 | , manageHook = manageDocks <+> myManageHook <+> (namedScratchpadManageHook scratchpads) <+> manageHook defaultConfig <+> (isFullscreen --> doF W.focusDown <+> doFullFloat) +208 | , manageHook = manageDocks <+> myManageHook <+> (namedScratchpadManageHook scratchpads) <+> manageHook defaultConfig <+> (isFullscreen --> doF W.focusDown <+> doFullFloat) | ^^^^^^^^^^^^^ diff --git a/files/.xmonad/xmonad.hs b/files/.xmonad/xmonad.hs index 5f2b9e0..ed8c710 100644 --- a/files/.xmonad/xmonad.hs +++ b/files/.xmonad/xmonad.hs @@ -52,7 +52,8 @@ import qualified XMonad.Layout.LayoutCombinators as LayoutCombinators myModMask = mod4Mask myLauncher = "rofi -show run" -myTerminal = "termite" +--myTerminal = "termite" +myTerminal = "kitty --single-instance" myBrowser = "google-chrome-stable" --yBar = "xmobar" --myXmobarPP= xmobarPP { ppCurrent = xmobarColor "#429942" "" . wrap "<" ">" } diff --git a/files/.xmonad/xmonad.o b/files/.xmonad/xmonad.o index 75f34ef..b170553 100644 Binary files a/files/.xmonad/xmonad.o and b/files/.xmonad/xmonad.o differ diff --git a/files/scripts/bookmarks b/files/scripts/bookmarks new file mode 100644 index 0000000..3465742 --- /dev/null +++ b/files/scripts/bookmarks @@ -0,0 +1,3 @@ +d coding ~/coding +f xmonad ~/.xmonad/xmonad.hs +f polybar ~/.config/polybar/config.ini diff --git a/files/scripts/timer.sh b/files/scripts/timer.sh new file mode 100755 index 0000000..ac7186b --- /dev/null +++ b/files/scripts/timer.sh @@ -0,0 +1,5 @@ +if [ -z "$1" ]; then + echo "timer.sh