diff --git a/nix/configurations/vanadium/home/xmobar.nix b/nix/configurations/vanadium/home/xmobar.nix index 7dc65e8f..0da89245 100644 --- a/nix/configurations/vanadium/home/xmobar.nix +++ b/nix/configurations/vanadium/home/xmobar.nix @@ -18,6 +18,7 @@ lib.makeBinPath [ ghc pkgs.libnotify + pkgs.hrt-time ] }" ''; diff --git a/nix/configurations/vanadium/home/xmobar/xmobar.hs b/nix/configurations/vanadium/home/xmobar/xmobar.hs index 058bf24e..1b1bd923 100644 --- a/nix/configurations/vanadium/home/xmobar/xmobar.hs +++ b/nix/configurations/vanadium/home/xmobar/xmobar.hs @@ -61,10 +61,7 @@ config = , textOffset = 2 , commands = - [ Run $ DateZone "%a %d %H:%M:%S" "" "" "hereClock" (1 &second) - , Run $ DateZone "%H:%M" "" "Europe/Dublin" "dublinClock" (10 &second) - , Run $ DateZone "%H:%M" "" "Europe/Paris" "parisClock" (10 &second) - , Run $ DateZone "%H:%M" "" "Asia/Taipei" "tstClock" (10 &second) + [ Run $ DateZone "%a %d %H:%M:%S" "" "" "hereClock" (1 &second) , Run $ Com "tomorrow" @@ -103,6 +100,7 @@ config = ] (6 &second) , Run $ Com "powerprofilesctl" ["get"] "" (6 &second) + , Run $ Com "hrt-time" ["days"] "" (60 &minute) , Run XMonadLog , Run $ Weather @@ -123,15 +121,9 @@ config = " %XMonadLog% " <> alignSep config <> intercalate "|" - [ (unwords . map greyFg) - [ "[DUB: %dublinClock%]" - , "[CDG: %parisClock%]" - , "[TPE: %tstClock%]" - ] - <> " " - , " %RCSS% " + [ " %RCSS% " , " %battery%, %powerprofilesctl%) " - , " %hereClock% (%tomorrow%) " + , " %hereClock% (%tomorrow%, %hrt-time%) " ] } diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index 50724ef3..e2867807 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -117,6 +117,9 @@ isElement = isFirefox <&&> title ~? "Element" isFirefoxPip :: Query Bool isFirefoxPip = isFirefox <&&> title =? "Incrustation vidéo" +isPavucontrol :: Query Bool +isPavucontrol = className =? "pavucontrol" + isFeh :: Query Bool isFeh = className =? "feh" @@ -153,6 +156,7 @@ myManageHook :: ManageHook myManageHook = composeAll [ isNautilusPreviewer --> customFloating centeredFloat + , isPavucontrol --> customFloating centeredFloat , isFeh --> doF copyToAll <> customFloating buttomRightFloat , isMinder --> customFloating centeredFloat , isFirefoxPip --> doF copyToAll <> customFloating buttomRightFloat diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix index e2bf050a..2644cd27 100644 --- a/nix/configurations/vanadium/nixos/connectivity.nix +++ b/nix/configurations/vanadium/nixos/connectivity.nix @@ -61,11 +61,14 @@ # # This is the fascist one, just block it because I can't tell - nixos.wiki + 0.0.0.0 nixos.wiki # Gotta purify my smoos brain for a while 0.0.0.0 instagram.com 0.0.0.0 www.instagram.com + + 0.0.0.0 linkedin.com + 0.0.0.0 www.linkedin.com ''; }; diff --git a/nix/packages/by-name/hrt-time/my-day.patch b/nix/packages/by-name/hrt-time/my-day.patch new file mode 100644 index 00000000..0b951de0 --- /dev/null +++ b/nix/packages/by-name/hrt-time/my-day.patch @@ -0,0 +1,11 @@ +diff --git a/hrt-time.sh b/hrt-time.sh +index d9811dd..f37aa6f 100755 +--- a/hrt-time.sh ++++ b/hrt-time.sh +@@ -1,7 +1,7 @@ + #!/bin/bash + + secondsNow=$(date +%s) +-secondsThen=$(date -d "october 17 2024 19:00" +%s) ++secondsThen=$(date -d "november 12 2021" +%s) + seconds=$((secondsNow - secondsThen)) diff --git a/nix/packages/by-name/hrt-time/package.nix b/nix/packages/by-name/hrt-time/package.nix new file mode 100644 index 00000000..713bb8f1 --- /dev/null +++ b/nix/packages/by-name/hrt-time/package.nix @@ -0,0 +1,30 @@ +{ + fetchFromGitHub, + stdenvNoCC, + lib, +}: +let + rev = "b344ab770e4c08d0bb13c38ea61979b282e24db7"; +in +stdenvNoCC.mkDerivation { + pname = "hrt-time"; + version = "unstable-" + lib.substring 0 8 rev; + + src = fetchFromGitHub { + owner = "ariannelafraise"; + repo = "hrt-time"; + inherit rev; + hash = "sha256-+AhLkcCETVnF6S+ov1oKxhs3M9F6ghyyERoLN3aMMxw="; + }; + + installPhase = '' + mkdir -p $out/bin + cp hrt-time.sh $out/bin/hrt-time + ''; + + patches = [ + ./my-day.patch + ]; + + meta.mainProgram = "hrt-time"; +} diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index 535d9cba..5854849f 100644 --- a/nix/packages/by-name/ruler/package.nix +++ b/nix/packages/by-name/ruler/package.nix @@ -11,8 +11,8 @@ let domain = "git.confusedcompiler.org"; owner = "leana8959"; repo = "ruler"; - rev = "0cad6d87e2e607b39fe72fc292924c069e661293"; - hash = "sha256-AIjGG2FxMiojO1E8jJxBXs9ZaRy3OEAtEp5CwicllRE="; + rev = "adb153af8aab6e0350e396de1f26316d97df3add"; + hash = "sha256-8+at3h5udcLXqbsaPcQ5HMGZMd6brZ21d/VW3kSyMFw="; }) { }; cabalOverrides = o: {