...

3 files changed, 17 insertions, 6 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index ca1ed77a..7df0235e 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -236,7 +236,7 @@ in {
           enable = true;
           font = {
             package = pkgs.fira;
-            name = "FiraMono Nerd Font";
+            name = "Fira Mono";
             size = 10;
           };
           settings = {
@@ -278,7 +278,7 @@ in {
               output = "eDP-1";
               modules-left = [ "hyprland/workspaces" ];
               modules-center = [ "hyprland/window" ];
-              modules-right = [ "custom/weather" "custom/keymap" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
+              modules-right = [ "custom/worktime" "custom/worktime-today" "custom/weather" "custom/keymap" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
 
               "custom/weather" = {
                 format = "{}";
@@ -323,6 +323,16 @@ in {
                 '';
                 on-click = "hyprctl switchxkblayout at-translated-set-2-keyboard next";
               };
+              "custom/worktime" = {
+                interval = 60;
+                exec = getExe pkgs.worktime;
+                tooltip = false;
+              };
+              "custom/worktime-today" = {
+                interval = 60;
+                exec = "${getExe pkgs.worktime} today";
+                tooltip = false;
+              };
               "hyprland/workspaces" = {
                 all-outputs = true;
               };
@@ -473,14 +483,14 @@ in {
               color: @red;
             }
 
-            #custom-weather, #custom-keymap {
+            #custom-weather, #custom-keymap, #custom-worktime, #custom-worktime-today {
               color: @grey;
               margin: 0 5px;
             }
-            #custom-weather {
+            #custom-weather, #custom-worktime-today {
               margin-right: 3px;
             }
-            #custom-keymap {
+            #custom-keymap, #custom-weather {
               margin-left: 3px;
             }
 
diff --git a/modules/machine-id/default.nix b/modules/machine-id/default.nix
index 2c33db26..b3183da8 100644
--- a/modules/machine-id/default.nix
+++ b/modules/machine-id/default.nix
@@ -30,7 +30,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.etc."machine-id".text = mkDefault machine-id;
+    environment.etc."machine-id".text = mkDefault (machine-id + "\n");
     networking.hostId = mkDefault (substring 0 8 machine-id);
   };
 }
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
index 550d6a78..e6c28c60 100644
--- a/user-profiles/yt-dlp.nix
+++ b/user-profiles/yt-dlp.nix
@@ -28,6 +28,7 @@
         #   "youtube:formats=dashy"
         # ];
         remux-video = "mp4>mkv";
+        output = "\"%(title)s [%(uploader)s %(webpage_url)s].%(ext)s\"";
       };
     };
   };