Idk

modules/desktop/waybar.nix

@@ -314,9 +314,7 @@ in {
             format = "{}°";
             tooltip = true;
             on-click = "${lib.getExe pkgs.gnome-weather}";
-            interval = 3600;
-            # doxxing live stream
-            # edit: no longer doxxing, you will be remembered
+            interval = 600;
             exec = ''${lib.getExe pkgs.wttrbar} --location "$(${locationScript})" --hide-conditions --fahrenheit --mph'';
             return-type = "json";
           };

modules/software/dev/git.nix

@@ -23,7 +23,6 @@ in {
         user.email = "reidlab325@gmail.com";
 
         alias = {
-          graph = ''log --graph --color --pretty=format:"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%x20(%ce)%n%x20%s%n"'';
           amend = ''commit --amend --no-edit'';
           amendall = ''commit --amend --no-edit --all'';
         };
@@ -59,6 +58,8 @@ in {
       ];
 
     };
+    hm.programs.delta.enable = true;
+    hm.programs.delta.enableGitIntegration = true;
     hm.programs.gh.enable = true;
   };
 }

modules/software/system/fish.nix

@@ -28,12 +28,18 @@ in {
       colorScript = nix-colors-lib.shellThemeFromScheme { scheme = config.colorScheme; };
     in {
       enable = true;
-      plugins = with pkgs.fishPlugins; [
-        { name = "fzf-fish"; src = fzf-fish.src; }
-        { name = "grc"; src = grc.src; }
-        { name = "tide"; src = tide.src; }
-        { name = "done"; src = done.src; }
-        { name = "autopair"; src = autopair.src; }
+      plugins = let
+        mkPlugin = name: {
+          inherit name;
+          inherit (pkgs.fishPlugins.${name}) src;
+        };
+      in builtins.map (p: mkPlugin p) [
+        "autopair"
+        "done"
+        "forgit"
+        "fzf-fish"
+        "grc"
+        "tide"
       ];
       interactiveShellInit = ''
         ${lib.getExe pkgs.nix-your-shell} fish | source

modules/software/system/mpv.nix

@@ -18,7 +18,6 @@ in {
         no-keepaspect-window = ""; # tiling doesn't play nice..
         osc = "no";
         border = "no";
-        gpu-context = "wayland"; # TODO: remove, forced by a regression
       };
 
       scriptOpts = {

modules/software/system/syncthing.nix

@@ -9,16 +9,15 @@ in {
   };
 
   config = mkIf cfg.enable {
-    # declare sync folders & devices here
-    # edit: turns out you can't with hm??
     hm.services.syncthing = {
       enable = true;
       tray = {
         enable = true;
         package = pkgs.syncthingtray-minimal;
-
         command = "syncthingtray --wait";
       };
+
+      # TODO: add folders here
     };
   };
 }