WiP firefox changes

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;
-    profiles.quadradical = {
-      isDefault = true;
-      userChrome = ''
-        @import "firefox-gnome-theme/userChrome.css";
-        @import "nord.css"
-      '';
-      userContent = ''
-        @import "firefox-gnome-theme/userContent.css";
-      '';
-    };
   };
 }

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;
 

wrappers/common-desktop/vscode.nix

@@ -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
-   ];
- };
-}

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
+    ];
+  };
+}