From ae74049bbd8a8f7fb79885c221965a7d85ca5c97 Mon Sep 17 00:00:00 2001
From: jasmine <its.jassy@pm.me>
Date: Thu, 6 Mar 2025 16:41:45 +0800
Subject: [PATCH] chore: refactor

---
 home-manager/sajenim/features/cli/ssh.nix     |  6 ----
 .../sajenim/features/university/default.nix   | 35 +++++++++++++++++++
 home-manager/sajenim/fuchsia.nix              | 17 +++++----
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 home-manager/sajenim/features/university/default.nix

diff --git a/home-manager/sajenim/features/cli/ssh.nix b/home-manager/sajenim/features/cli/ssh.nix
index de91753..acb6ee1 100644
--- a/home-manager/sajenim/features/cli/ssh.nix
+++ b/home-manager/sajenim/features/cli/ssh.nix
@@ -25,12 +25,6 @@
         user = "forgejo";
         identityFile = "/home/sajenim/.ssh/jasmine-forgejo_sk";
       };
-
-      "turing" = {
-        hostname = "turing.une.edu.au";
-        user = "jwils254";
-        identityFile = "/home/sajenim/.ssh/jwils254_sk";
-      };
     };
   };
 }
diff --git a/home-manager/sajenim/features/university/default.nix b/home-manager/sajenim/features/university/default.nix
new file mode 100644
index 0000000..4abf3e2
--- /dev/null
+++ b/home-manager/sajenim/features/university/default.nix
@@ -0,0 +1,35 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  home.packages = with pkgs;
+    [
+      libreoffice
+      obsidian
+      x2goclient
+      zoom-us
+    ]
+    ++ (with unstable.pkgs; [
+      # Allows access to the ReMarkable Cloud API
+      rmapi
+      # Design and simulate digital logic circuits
+      logisim-evolution
+    ])
+    ++ [
+      # Extract annotations (text highlights and scribbles)
+      # and convert them to Markdown, PDF, PNG, and SVG
+      inputs.remarks.packages.${pkgs.system}.default
+    ];
+  
+  # Use our yubikey to login to university servers
+  programs.ssh = {
+    matchBlocks = {
+      "turing" = {
+        hostname = "turing.une.edu.au";
+        user = "jwils254";
+        identityFile = "/home/sajenim/.ssh/jwils254_sk";
+      };
+    };
+  };
+}
diff --git a/home-manager/sajenim/fuchsia.nix b/home-manager/sajenim/fuchsia.nix
index 58502c4..6ff1602 100644
--- a/home-manager/sajenim/fuchsia.nix
+++ b/home-manager/sajenim/fuchsia.nix
@@ -6,22 +6,21 @@
     ./features/editors
     ./features/games
     ./features/printing
+    ./features/university
   ];
 
   home = {
     packages = with pkgs; [
       # Graphics
-      gimp inkscape krita
+      gimp
       # Hardware
-      libratbag piper pulsemixer
-      # Media
-      mpc-cli ncmpcpp jellyfin-media-player
+      piper
+      pulsemixer
+      # Multimedia
+      mpc-cli
+      ncmpcpp
       # Browsers
-      firefox google-chrome
-      # Remarkabl
-      unstable.rmapi
-      # University
-      libreoffice obsidian x2goclient zoom-us
+      firefox
     ];
   };
 }