From cfc5aff19d1fae06dee765cf25b076b1c1c71d33 Mon Sep 17 00:00:00 2001
From: Madeleine Holbrook <maddie@spyhoodle.me>
Date: Mon, 1 May 2023 18:26:25 +0100
Subject: [PATCH] text editors, newsboat & macos apps

---
 maddie/common/editor.nix     |  1 -
 maddie/common/helix.nix      | 21 +++++++++++++++++++++
 maddie/common/lsp.nix        | 14 ++++++++++++++
 maddie/common/neovim.nix     | 10 ----------
 maddie/common/newsboat.nix   | 19 +++++++++++++++++++
 systems/mmacbookpro/apps.nix |  3 +++
 6 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 maddie/common/helix.nix
 create mode 100644 maddie/common/lsp.nix
 create mode 100644 maddie/common/newsboat.nix

diff --git a/maddie/common/editor.nix b/maddie/common/editor.nix
index 0a254b8..2781118 100644
--- a/maddie/common/editor.nix
+++ b/maddie/common/editor.nix
@@ -3,7 +3,6 @@
 {
   # Misc editors
   home.packages = with pkgs; [
-    helix
     vis
   ];
 }
diff --git a/maddie/common/helix.nix b/maddie/common/helix.nix
new file mode 100644
index 0000000..0748c4c
--- /dev/null
+++ b/maddie/common/helix.nix
@@ -0,0 +1,21 @@
+{ config, ... }:
+
+{
+  programs.helix = {
+    enable = true;
+    languages = [
+      {
+        name = "rust";
+        auto-format = true;
+      }
+    ];
+    settings = {
+      theme = "onedark";
+      keys.normal = {
+        space.space = "file_picker";
+        space.w = ":w";
+        space.q = ":q";
+      };
+    };
+  };
+}
diff --git a/maddie/common/lsp.nix b/maddie/common/lsp.nix
new file mode 100644
index 0000000..ad5a437
--- /dev/null
+++ b/maddie/common/lsp.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    nodejs
+    sumneko-lua-language-server
+    nodePackages.bash-language-server
+    nodePackages.vim-language-server
+    nodePackages.pyright
+    rust-analyzer
+    rnix-lsp
+    universal-ctags
+  ];
+}
diff --git a/maddie/common/neovim.nix b/maddie/common/neovim.nix
index e9164ca..874f714 100644
--- a/maddie/common/neovim.nix
+++ b/maddie/common/neovim.nix
@@ -4,16 +4,6 @@
   programs.neovim = {
     enable = true;
     defaultEditor = true;
-    extraPackages = with pkgs; [
-      nodejs
-      sumneko-lua-language-server
-      nodePackages.bash-language-server
-      nodePackages.vim-language-server
-      nodePackages.pyright
-      rust-analyzer
-      rnix-lsp
-      universal-ctags
-    ];
   };
 
   home.packages = with pkgs; [
diff --git a/maddie/common/newsboat.nix b/maddie/common/newsboat.nix
new file mode 100644
index 0000000..55d3320
--- /dev/null
+++ b/maddie/common/newsboat.nix
@@ -0,0 +1,19 @@
+{ config, ...}:
+
+{
+  programs.newsboat = {
+    enable = true;
+    urls = [
+      {
+        title = "Gitea - Evelyne";
+        tags = [ "git" ];
+        url = "https://git.spyhoodle.me/evelyne.rss";
+      }
+      {
+        title = "Gitea - Maddie";
+        tags = [ "git" ];
+        url = "https://git.spyhoodle.me/maddie.rss";
+      }
+    ];
+  };
+}
diff --git a/systems/mmacbookpro/apps.nix b/systems/mmacbookpro/apps.nix
index 3361727..6750a8c 100644
--- a/systems/mmacbookpro/apps.nix
+++ b/systems/mmacbookpro/apps.nix
@@ -34,11 +34,13 @@
       "minecraft"
       "prismlauncher"
       "tetrio"
+      "osu"
 
       # Design
       "sketch"
 
       # Development
+      "lapce"
       "neovide"
       "pycharm"
       "webstorm"
@@ -46,6 +48,7 @@
       "goland"
       "appcode"
       "android-studio"
+      "fleet"
       "tower"
       "secretive"