From 44ee4eb0bb4ff4f57df741395c516e8a57d5e009 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 11 Dec 2023 06:29:24 +0000 Subject: [PATCH] Add rustybar local time --- flake.lock | 87 ++++++++++++++++++++++------------ flake.nix | 2 +- system/mistmane/default.nix | 10 ++-- system/rainbowdash/default.nix | 8 +++- system/spike/default.nix | 10 ++-- system/starlight/default.nix | 8 +++- 6 files changed, 83 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 0054a69..cc7c7cb 100644 --- a/flake.lock +++ b/flake.lock @@ -56,6 +56,30 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "rustybar", + "nixpkgs" + ], + "rust-analyzer-src": [ + "rustybar" + ] + }, + "locked": { + "lastModified": 1702189261, + "narHash": "sha256-TN6gE1eZddDhAoRrScV6Wji1Nk3uqMIDjGwN5ZesAZk=", + "owner": "nix-community", + "repo": "fenix", + "rev": "cae060dbaf53430bb2b549ced0affd54d40e6cee", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -201,11 +225,11 @@ ] }, "locked": { - "lastModified": 1701728041, - "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -222,11 +246,11 @@ ] }, "locked": { - "lastModified": 1701853617, - "narHash": "sha256-iyXpx1xNYeRgVQwBC1UlAsUi0I8BsinN5wCaar/Mq2Y=", + "lastModified": 1702214253, + "narHash": "sha256-2ltPtWUNNHnYaCK4E+py5+nXqNVccUTusidTdbT28Vw=", "owner": "jovian-experiments", "repo": "jovian-nixos", - "rev": "c2781460c89cbbc9baa7cc84aa617a9b7d17889e", + "rev": "ad708a479968eac4ed0aef9bc6dd7380cc6c15da", "type": "github" }, "original": { @@ -293,11 +317,11 @@ ] }, "locked": { - "lastModified": 1701572887, - "narHash": "sha256-oCPwQZT0Inis4zcYhtFHUp7Rym1zglKPLDcRird35q8=", + "lastModified": 1702177733, + "narHash": "sha256-lr3hkmmuqDFPj3i41cHpaALF3Txo3kxsJ3L6jZLujJ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "41afa8d1c061beda68502bcc67f2788f3a77042b", + "rev": "58ecd98e27e27fcbb27a51a588555c828b1ec56e", "type": "github" }, "original": { @@ -308,11 +332,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701656485, - "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", + "lastModified": 1702245580, + "narHash": "sha256-tTVRB42Ljo2uWGP7ei5h5/qQjOsdXoz0GHRy9hrVrdw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", + "rev": "030edbb68e69f2b97231479f98a9597024650df2", "type": "github" }, "original": { @@ -323,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { @@ -380,11 +404,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1701879058, - "narHash": "sha256-cOHIndHbXJ69DeYpa3srPBmAa+MuJhq1RgF1J1I3c3s=", + "lastModified": 1702228270, + "narHash": "sha256-pmhnEHGnP5n7UrWcOx/qEI0jjAhzbEianKdMqbI7gWg=", "owner": "nix-community", "repo": "nixvim", - "rev": "032f697da6ae830460095f881644da650f17a967", + "rev": "c1cbb0012685b69fc6391f93d279975032b37dcf", "type": "github" }, "original": { @@ -451,11 +475,11 @@ }, "private": { "locked": { - "lastModified": 1700983091, - "narHash": "sha256-qQt4Je2KsLVKAjZ2A6I/WAFf27d3iLORmf7/h47huJ0=", + "lastModified": 1702275325, + "narHash": "sha256-jtNF0M/+skOV+HyJaN0dR7fCqILVb31Ia4IAnMVt/zQ=", "ref": "unified", - "rev": "cea5114a42b231b8e3d1dd6158ad6f1f98756135", - "revCount": 39, + "rev": "cbdfef430755e9f49245fe80db1349511ac998f5", + "revCount": 40, "type": "git", "url": "ssh://forgejo@git.mildlyfunctional.gay/artemist/nixos-config-private" }, @@ -508,6 +532,7 @@ }, "rustybar": { "inputs": { + "fenix": "fenix", "nixpkgs": [ "nixpkgs" ], @@ -516,17 +541,17 @@ ] }, "locked": { - "lastModified": 1696963281, - "narHash": "sha256-gwLI5QDyw7Jj2d+W5t6UJOuHCTuCmm1B25UlO3eNvUQ=", - "owner": "mildlyfunctionalgays", - "repo": "rustybar", - "rev": "73886c37da6d3db8791fb6ed60dd370b5f3c8c5f", - "type": "github" + "lastModified": 1702271643, + "narHash": "sha256-DJlNHXUQcyyJFJpjla+HA47ss67h1FRoma0RPklxifg=", + "ref": "refs/heads/canon", + "rev": "d0ce8573653b81e4227ddb6d2db5d03fa05d8026", + "revCount": 45, + "type": "git", + "url": "https://git.mildlyfunctional.gay/mildlyfunctionalgays/rustybar.git" }, "original": { - "owner": "mildlyfunctionalgays", - "repo": "rustybar", - "type": "github" + "type": "git", + "url": "https://git.mildlyfunctional.gay/mildlyfunctionalgays/rustybar.git" } }, "systems": { diff --git a/flake.nix b/flake.nix index 13e3da4..96b7057 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; rustybar = { - url = "github:mildlyfunctionalgays/rustybar"; + url = "git+https://git.mildlyfunctional.gay/mildlyfunctionalgays/rustybar.git"; inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "utils"; }; diff --git a/system/mistmane/default.nix b/system/mistmane/default.nix index ff1b4ab..87fea86 100644 --- a/system/mistmane/default.nix +++ b/system/mistmane/default.nix @@ -1,4 +1,4 @@ -{ lib, inputs, ... }: +{ config, lib, inputs, ... }: { imports = [ @@ -32,8 +32,12 @@ type = "battery" battery = "cw2015-battery" [[tile]] - type = "time" - format = "%Y-%m-%dT%H:%M:%S" + type = "local_time" + format = "%Y-%m-%d %H:%M:%S %Z" + geoip_path = "${config.artemist.geoip}" + [[tile]] + type = "utc_time" + format = "%Y-%m-%d %H:%M:%S UTC" ''; }; services.logind = { diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix index ddfb088..3ff07aa 100644 --- a/system/rainbowdash/default.nix +++ b/system/rainbowdash/default.nix @@ -49,8 +49,12 @@ [[tile]] type = "battery" [[tile]] - type = "time" - format = "%Y-%m-%dT%H:%M:%S" + type = "local_time" + format = "%Y-%m-%d %H:%M:%S %Z" + geoip_path = "${config.artemist.geoip}" + [[tile]] + type = "utc_time" + format = "%Y-%m-%d %H:%M:%S UTC" ''; }; diff --git a/system/spike/default.nix b/system/spike/default.nix index 2797a47..fbae7fe 100644 --- a/system/spike/default.nix +++ b/system/spike/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, ... }: +{ config, inputs, ... }: { imports = [ @@ -27,8 +27,12 @@ [[tile]] type = "battery" [[tile]] - type = "time" - format = "%Y-%m-%dT%H:%M:%S" + type = "local_time" + format = "%Y-%m-%d %H:%M:%S %Z" + geoip_path = "${config.artemist.geoip}" + [[tile]] + type = "utc_time" + format = "%Y-%m-%d %H:%M:%S UTC" ''; wayland.windowManager.sway.config = { diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 6649cfb..82d95a1 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -118,8 +118,12 @@ [[tile]] type = "hostname" [[tile]] - type = "time" - format = "%Y-%m-%dT%H:%M:%S" + type = "local_time" + format = "%Y-%m-%d %H:%M:%S %Z" + geoip_path = "${config.artemist.geoip}" + [[tile]] + type = "utc_time" + format = "%Y-%m-%d %H:%M:%S UTC" ''; xdg.userDirs = { music = "/media/data/Musik";