From e88a424bb1f1681b45ae676f4aa563a901a1a057 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Fri, 24 Mar 2023 02:52:41 +0100
Subject: [PATCH] feat: various minor tweaks

---
 home/apps/newsboat.nix         | 48 +++++++++++++++++++++++++++++++---
 home/apps/vscode/settings.json | 20 ++++++++++++--
 justfile                       |  4 +++
 machines/sashimi/wm.nix        |  2 +-
 4 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/home/apps/newsboat.nix b/home/apps/newsboat.nix
index bf7f0f4..db64149 100644
--- a/home/apps/newsboat.nix
+++ b/home/apps/newsboat.nix
@@ -1,11 +1,51 @@
-{...}: {
+{
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (pkgs.stdenv.hostPlatform) isLinux;
+in {
   programs.newsboat = {
     enable = true;
     autoReload = true;
+    browser =
+      if isLinux
+      then (lib.getExe pkgs.xdg-utils)
+      else "open";
     urls = [
-      {url = "https://blog.gitea.io/index.xml";}
-      {url = "https://neomutt.org/feed.xml";}
-      {url = "https://this-week-in-neovim.org/rss";}
+      {
+        url = "https://blog.gitea.io/index.xml";
+        title = "Gitea Blog";
+      }
+      {
+        title = "Gitea Helm Chart";
+        url = "https://gitea.com/gitea/helm-chart/releases.rss";
+      }
+      {
+        title = "Neomutt";
+        url = "https://neomutt.org/feed.xml";
+      }
+      {
+        title = "This Week in Neovim";
+        url = "https://this-week-in-neovim.org/rss";
+      }
+      {
+        title = "XKCD";
+        url = "https://xkcd.com/rss.xml";
+      }
     ];
+    extraConfig = ''
+      bind-key j down feedlist
+      bind-key k up feedlist
+      bind-key j next articlelist
+      bind-key k prev articlelist
+      bind-key J next-feed articlelist
+      bind-key K prev-feed articlelist
+      bind-key j down article
+      bind-key k up article
+
+      unbind-key C feedlist
+      confirm-exit no
+    '';
   };
 }
diff --git a/home/apps/vscode/settings.json b/home/apps/vscode/settings.json
index ce74104..fecf7af 100644
--- a/home/apps/vscode/settings.json
+++ b/home/apps/vscode/settings.json
@@ -12,7 +12,6 @@
   "editor.inlineSuggest.enabled": true,
   "git.autofetch": true,
   "editor.lineNumbers": "relative",
-  "vim.easymotion": true,
   "vim.incsearch": true,
   "vim.replaceWithRegister": true,
   "vim.useSystemClipboard": false,
@@ -39,6 +38,22 @@
       "before": ["<leader>", "n", "f"],
       "commands": ["editor.action.formatDocument"]
     },
+    {
+      "before": ["[", "d"],
+      "commands": ["editor.action.marker.prevInFiles"]
+    },
+    {
+      "before": ["]", "d"],
+      "commands": ["editor.action.marker.nextInFiles"]
+    },
+    {
+      "before": ["[", "c"],
+      "commands": ["workbench.action.editor.previousChange"],
+    },
+    {
+      "before": ["]", "c"],
+      "commands": ["workbench.action.editor.nextChange"],
+    },
     {
       "before": ["<C-l>"],
       "after": ["<C-W>", "l"]
@@ -95,5 +110,6 @@
   "markdown.preview.fontFamily": "IBM Plex Sans, sans-serif",
   "workbench.preferredDarkColorTheme": "Catppuccin Mocha",
   "workbench.preferredHighContrastColorTheme": "Catppuccin Latte",
-  "window.autoDetectColorScheme": true
+  "window.autoDetectColorScheme": true,
+  "vim.smartRelativeLine": true,
 }
diff --git a/justfile b/justfile
index b7efe8c..d7d32cc 100644
--- a/justfile
+++ b/justfile
@@ -40,3 +40,7 @@ install-fonts:
   mkdir -p "{{fontdir}}"
   gpg --decrypt home/secrets/fonts.tgz.gpg | tar -xz -C "{{fontdir}}" --strip-components=1
 # }}}
+
+fetch:
+  @nix run nixpkgs\#onefetch -- --true-color never --no-bots -d lines-of-code
+  @nix run nixpkgs\#scc -- . --no-cocomo
diff --git a/machines/sashimi/wm.nix b/machines/sashimi/wm.nix
index d5f1b7e..f66aa39 100644
--- a/machines/sashimi/wm.nix
+++ b/machines/sashimi/wm.nix
@@ -15,7 +15,7 @@
       mouse_drop_action = "swap";
       mouse_follows_focus = "off";
       mouse_modifier = "off";
-      window_animation_duration = "0.1";
+      window_animation_duration = "0.0";
       window_border = "on";
       window_border_blur = "on";
       window_border_width = "2";