From e06971a6a88b16d009b145ae958c5e5829bca733 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 25 Feb 2025 21:39:13 +0000
Subject: [PATCH] WiP firefox changes

---
 home-manager/firefox/default.nix              | 17 ++------------
 .../{firefox.nix => firefox/default.nix}      | 13 ++++++++++-
 .../common-desktop}/firefox/nord.css          |  0
 wrappers/common-desktop/vscode.nix            | 22 -------------------
 wrappers/common-desktop/vscodium.nix          | 22 +++++++++++++++++++
 5 files changed, 36 insertions(+), 38 deletions(-)
 rename modules/common-desktop/{firefox.nix => firefox/default.nix} (90%)
 rename {home-manager => modules/common-desktop}/firefox/nord.css (100%)
 delete mode 100644 wrappers/common-desktop/vscode.nix
 create mode 100644 wrappers/common-desktop/vscodium.nix

diff --git a/home-manager/firefox/default.nix b/home-manager/firefox/default.nix
index 3ceed03..b73ff0c 100644
--- a/home-manager/firefox/default.nix
+++ b/home-manager/firefox/default.nix
@@ -1,19 +1,6 @@
-{inputs, ...}: {
-  home.file.".mozilla/firefox/quadradical/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
-  home.file.".mozilla/firefox/quadradical/chrome/nord.css".source = ./nord.css;
-
+{
   programs.firefox = {
     enable = true;
-
-    profiles.quadradical = {
-      isDefault = true;
-      userChrome = ''
-        @import "firefox-gnome-theme/userChrome.css";
-        @import "nord.css"
-      '';
-      userContent = ''
-        @import "firefox-gnome-theme/userContent.css";
-      '';
-    };
+    profiles.quadradical.isDefault = true;
   };
 }
diff --git a/modules/common-desktop/firefox.nix b/modules/common-desktop/firefox/default.nix
similarity index 90%
rename from modules/common-desktop/firefox.nix
rename to modules/common-desktop/firefox/default.nix
index 540535e..31f3aa9 100644
--- a/modules/common-desktop/firefox.nix
+++ b/modules/common-desktop/firefox/default.nix
@@ -1,4 +1,9 @@
-{lib, ...}: {
+{
+  lib,
+  inputs,
+  self,
+  ...
+}: {
   # From https://hedgedoc.grimmauld.de/s/rVnTq0-Rs
   nixpkgs.overlays = lib.singleton (final: prev: {
     firefox = prev.firefox.overrideAttrs (old: {
@@ -24,6 +29,12 @@
     });
   });
 
+  systemd.tmpfiles.settings.firefox = {
+    "/home/quadradical/.mozilla/firefox/quadradical/chrome"."D".user = "quadradical";
+    "/home/quadradical/.mozilla/firefox/quadradical/chrome/userChrome.css"."f+".argument = "@import '${self}/nord.css';@import '${inputs.firefox-gnome-theme}/userChrome.css';";
+    "/home/quadradical/.mozilla/firefox/quadradical/chrome/userContent.css"."f+".argument = "@import '${inputs.firefox-gnome-theme}/userContent.css'";
+  };
+
   programs.firefox = {
     enable = true;
 
diff --git a/home-manager/firefox/nord.css b/modules/common-desktop/firefox/nord.css
similarity index 100%
rename from home-manager/firefox/nord.css
rename to modules/common-desktop/firefox/nord.css
diff --git a/wrappers/common-desktop/vscode.nix b/wrappers/common-desktop/vscode.nix
deleted file mode 100644
index 64a4873..0000000
--- a/wrappers/common-desktop/vscode.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{pkgs, ...}: {
- wrappers.vscode = {
-   basePackage = pkgs.vscodium;
-
-   pathAdd = with pkgs.vscode-extensions; [
-     mkhl.direnv
-     eamodio.gitlens
-     dart-code.flutter
-     jnoortheen.nix-ide
-     timonwong.shellcheck
-     usernamehw.errorlens
-     ritwickdey.liveserver
-     dbaeumer.vscode-eslint
-     esbenp.prettier-vscode
-     oderwat.indent-rainbow
-     astro-build.astro-vscode
-     pkief.material-icon-theme
-     streetsidesoftware.code-spell-checker
-     arcticicestudio.nord-visual-studio-code
-   ];
- };
-}
diff --git a/wrappers/common-desktop/vscodium.nix b/wrappers/common-desktop/vscodium.nix
new file mode 100644
index 0000000..74a374b
--- /dev/null
+++ b/wrappers/common-desktop/vscodium.nix
@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+  wrappers.vscodium = {
+    basePackage = pkgs.vscodium;
+
+    pathAdd = with pkgs.vscode-extensions; [
+      mkhl.direnv
+      eamodio.gitlens
+      dart-code.flutter
+      jnoortheen.nix-ide
+      timonwong.shellcheck
+      usernamehw.errorlens
+      ritwickdey.liveserver
+      dbaeumer.vscode-eslint
+      esbenp.prettier-vscode
+      oderwat.indent-rainbow
+      astro-build.astro-vscode
+      pkief.material-icon-theme
+      streetsidesoftware.code-spell-checker
+      arcticicestudio.nord-visual-studio-code
+    ];
+  };
+}