From e26ecbc388546cf3950b3243955625176023a5e0 Mon Sep 17 00:00:00 2001
From: Madeleine <maddie@spyhoodle.me>
Date: Thu, 20 Apr 2023 17:25:53 +0100
Subject: [PATCH] reorganisation + more macos apps

---
 maddie/common/git/git-sync.sh                 |  2 +-
 maddie/common/kakoune.nix                     | 10 +++++++-
 maddie/common/yt-dlp.nix                      | 10 ++++++++
 .../audio => common/yt-dlp}/ytdlp-music.sh    |  0
 maddie/nixos/audio.nix                        |  6 -----
 systems/mmacbookpro/apps.nix                  | 23 +++++++++++++++++--
 6 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 maddie/common/yt-dlp.nix
 rename maddie/{nixos/audio => common/yt-dlp}/ytdlp-music.sh (100%)

diff --git a/maddie/common/git/git-sync.sh b/maddie/common/git/git-sync.sh
index b012d63..14e18d8 100644
--- a/maddie/common/git/git-sync.sh
+++ b/maddie/common/git/git-sync.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
 git add .
-git commit -am "$(date --iso-8601)"
+git commit -am "$(date -I)"
 git pull
 git push
diff --git a/maddie/common/kakoune.nix b/maddie/common/kakoune.nix
index 5e487d0..b2cacde 100644
--- a/maddie/common/kakoune.nix
+++ b/maddie/common/kakoune.nix
@@ -1,6 +1,9 @@
 { config, pkgs, ... }:
 
 {
+  home.packages = with pkgs; [
+    python310Packages.python-lsp-server
+  ];
   programs.kakoune = {
     enable = true;
     config = {
@@ -9,7 +12,7 @@
         relative = true;
       };
       scrollOff.lines = 3;
-      showWhitespace.enable = true;
+      showWhitespace.enable = false;
       tabStop = 4;
       ui = {
         assistant = "cat";
@@ -20,6 +23,11 @@
       kakoune-rainbow
       powerline-kak
       auto-pairs-kak
+      pkgs.kak-lsp
     ];
+    extraConfig = ''
+      eval %sh{kak-lsp --kakoune -s $kak_session}  # Not needed if you load it with plug.kak.
+      lsp-enable
+    '';
   };
 }
diff --git a/maddie/common/yt-dlp.nix b/maddie/common/yt-dlp.nix
new file mode 100644
index 0000000..6d95ddf
--- /dev/null
+++ b/maddie/common/yt-dlp.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  programs.yt-dlp.enable = true;
+
+  home.file.".local/bin/ytdlp-music" = {
+    source = ./yt-dlp/ytdlp-music.sh;
+    executable = true;
+  };
+}
diff --git a/maddie/nixos/audio/ytdlp-music.sh b/maddie/common/yt-dlp/ytdlp-music.sh
similarity index 100%
rename from maddie/nixos/audio/ytdlp-music.sh
rename to maddie/common/yt-dlp/ytdlp-music.sh
diff --git a/maddie/nixos/audio.nix b/maddie/nixos/audio.nix
index 3af07d2..733995a 100644
--- a/maddie/nixos/audio.nix
+++ b/maddie/nixos/audio.nix
@@ -5,15 +5,9 @@
     pulsemixer # TUI sound mixer
     playerctl # Manages media players
     pamixer # CLI sound mixer
-    yt-dlp # Media downloader
     cava # Music visualiser
   ];
 
-  home.file.".local/bin/ytdlp-music" = {
-    source = ./audio/ytdlp-music.sh;
-    executable = true;
-  };
-
   home.file.".local/bin/volume" = {
     source = ./audio/volume.sh;
     executable = true;
diff --git a/systems/mmacbookpro/apps.nix b/systems/mmacbookpro/apps.nix
index d3c33c3..b3285eb 100644
--- a/systems/mmacbookpro/apps.nix
+++ b/systems/mmacbookpro/apps.nix
@@ -9,16 +9,26 @@
         clone_target = "https://github.com/popcorn-official/popcorn-desktop.git";
         force_auto_update = true;
       }
+      {
+        name = "kde-mac/kde";
+        clone_target = "https://invent.kde.org/packaging/homebrew-kde.git";
+        force_auto_update = true;
+      }
     ];
     casks = [
       # Media
       /* "popcorn-time" */
       "syncplay"
       "deluge"
+      "mpv"
+
+      # Messaging
+      "signal"
+      "nheko"
 
       # Games
-      /* "minecraft" */
-      /* "prismlauncher" */
+      "minecraft"
+      "prismlauncher"
 
       # IDEs
       "neovide"
@@ -26,7 +36,16 @@
       "webstorm"
       "clion"
       "goland"
+      "appcode"
       "android-studio"
+
+      # Learning
+      "anki"
+
+      # Tools
+      "boop"
+      "haptickey"
+      "kdeconnect"
     ];
   };
 }