From 649015b99721691b5ec092b23495a28dbbcfdf98 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Tue, 3 Dec 2024 19:43:42 -0600
Subject: [PATCH 1/3] oscar: Install imagemagick

---
 oscar/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index b68a0d9..13534ee 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -152,6 +152,7 @@
       dig
       file
       git-absorb
+      imagemagick
       killall
       pv
       wl-clipboard

From 4ccc14061e6a9fa7ad35af4716b9b6a27900efea Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Mon, 9 Dec 2024 18:25:10 -0600
Subject: [PATCH 2/3] oscar: Add to list of installed software

---
 oscar/configuration.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 13534ee..6f6bb61 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -134,14 +134,18 @@
       frescobaldi
       gimp
       gnome-sound-recorder
+      inkscape
       josm
       kate
+      krita
       # kicad # https://github.com/NixOS/nixpkgs/issues/335003
       (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/13456ccaf2874c921891b04fe0c39fc79aa7357f.tar.gz") {}).kicad
       libreoffice-qt
+      mumble
       prismlauncher
       prusa-slicer
       qgis
+      scummvm
 
       # command line applications
       iperf
@@ -151,17 +155,28 @@
       alsa-utils
       dig
       file
+      ffmpeg
       git-absorb
       imagemagick
       killall
       pv
       wl-clipboard
 
-      # a few basic compilers
-      clang
-      go
+      # compilers/language utils
+      cargo
       rustc
 
+      clang
+
+      go
+      go-tools
+      gopls
+
+      # audio tools
+      jacktrip
+      qjackctl
+      qsynth
+
       # Unfree:
       discord
       factorio-space-age

From 5388e4a9abc3f415c85e784276f8d2c570e1fe7e Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Mon, 9 Dec 2024 18:56:48 -0600
Subject: [PATCH 3/3] oscar: Add vscodium package and config

---
 oscar/configuration.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 6f6bb61..d9c2f0c 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -202,6 +202,38 @@
       ];
     };
 
+    programs.vscode = {
+      enable = true;
+      package = pkgs.vscodium;
+      mutableExtensionsDir = false;
+      extensions = with pkgs.vscode-extensions; [
+        eamodio.gitlens
+        editorconfig.editorconfig
+        golang.go
+        jeandeaual.lilypond-syntax
+        jeandeaual.scheme
+        jeanp413.open-remote-ssh
+        jnoortheen.nix-ide
+        llvm-vs-code-extensions.vscode-clangd
+        ms-azuretools.vscode-docker
+        ms-python.debugpy
+        ms-python.python
+        rust-lang.rust-analyzer
+        stkb.rewrap
+        xaver.clang-format
+      ];
+      userSettings = {
+          "files.autoSave" = "afterDelay";
+          "editor.renderWhitespace" = "boundary";
+          "files.insertFinalNewline" = true;
+          "files.trimFinalNewlines" = true;
+          "editor.rulers" = [80 120];
+          "[git-commit]" = {
+            "editor.inlineSuggest.enabled" = false;
+          };
+      };
+    };
+
     programs.git = {
       enable = true;
       userEmail = "chandler@chandlerswift.com";