modules/home/dank-material-shell.nix

@@ -1,28 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.sydnix.dank-material-shell;
-  json = pkgs.formats.json {};
-in {
-  options.sydnix.dank-material-shell = {
-    enable = lib.mkEnableOption "DMS";
-    settings = lib.mkOption {
-      type = json.type;
-      default = { };
-      description = ''
-        DankMaterialShell configuration settings as an attribute set,
-        to be written to ~/.config/DankMaterialShell/settings.json.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    stylix.targets.dank-material-shell.enable = true;
-    programs.dank-material-shell.enable = true;
-
-    # xdg.configFile = {
-    #   "DankMaterialShell/settings.json".source =
-    #     json.generate "settings.json" cfg.settings;
-    # };
-  };
-}

modules/home/users/crumb/firefox.nix

@@ -13,34 +13,16 @@ in {
     #
     # For an overview of important files in the profile directory, see
     # https://support.mozilla.org/en-US/kb/recovering-important-data-from-an-old-profile.
-    sydnix.impermanence =
-      { directories = [ ".mozilla/firefox/msyds" ]; };
-      # let p = ".mozilla/firefox/msyds";
-      # in {
-      #     files = [
-      #       # Passwords
-      #       "${p}/key4.db"
-      #       "${p}/logins.json"
-      #       "${p}/logins-backup.json"
-      #       # Site-specific permissions
-      #       "${p}/permissions.sqlite"
-      #       # Bookmarks, downloads and browsing history
-      #       "${p}/places.sqlite"
-      #       # Cached favicons for use in the history menu.
-      #       "${p}/favicons.sqlite"
-      #       # Cookies
-      #       "${p}/cookies.sqlite"
-      #       # Security certificate settings
-      #       "${p}/cert9.db"
-      #       # Form history (for completions)
-      #       "${p}/formhistory.sqlite"
-      #     ];
-      #   };
+    sydnix.impermanence.directories = [
+      "${config.xdg.configHome}/mozilla/firefox"
+      # "${config.xdg.configHome}/mozilla/firefox"
+    ];
 
     stylix.targets.firefox.profileNames = [ "msyds" ];
 
     programs.firefox = {
       enable = true;
+      configPath = "${config.xdg.configHome}/mozilla/firefox";
 
       # Available language codes can be found on the releases page:
       # https://releases.mozilla.org/pub/firefox/releases/134.0.2/linux-x86_64/xpi/.
@@ -177,6 +159,8 @@ in {
                 sidebery
                 adaptive-tab-bar-colour
                 adnauseam
+                yomitan
+                bitwarden
                 # tree-style-tab
                 # tab-unload-for-tree-style-tab
                 # tst-tab-search

modules/home/users/msyds/dank-material-shell.nix

@@ -36,6 +36,7 @@ in {
         }
       ];
     };
+    stylix.targets.dank-material-shell.enable = true;
     sydnix.users.crumb.niri = {
       polkit.enable = false;
       swaylock.enable = false;
@@ -83,17 +84,11 @@ in {
           };
         };
     };
-    sydnix.dank-material-shell = {
+    programs.dank-material-shell = {
       enable = true;
       settings = {
         theme = "dark";
         currentThemeName = "custom";
-        # customThemeFile =
-        #   pkgs.writeText
-        #     "dankMaterialShell-stylix-theme.json"
-        #     (builtins.toJSON theme);
-        popupTransparency = 1;
-        dockTransparency = 1;
         use24HourClock = true;
         showSeconds = false;
         useFahrenheit = false;
@@ -207,52 +202,25 @@ in {
         useAutoLocation = false;
         weatherEnabled = true;
         networkPreference = "auto";
-        vpnLastConnected = "";
         iconTheme = "System Default";
         launcherLogoMode = "apps";
         launcherLogoCustomPath = "";
-        launcherLogoColorOverride = "";
-        launcherLogoColorInvertOnMode = false;
         launcherLogoBrightness = 0.5;
         launcherLogoContrast = 1;
         launcherLogoSizeOffset = 0;
-        fontFamily = "Inter Variable";
-        monoFontFamily = "Fira Code";
         fontWeight = 400;
         fontScale = 1;
         notepadUseMonospace = true;
-        notepadFontFamily = "";
         notepadFontSize = 14;
         notepadShowLineNumbers = false;
-        notepadTransparencyOverride = -1;
-        notepadLastCustomTransparency = 0.7;
         soundsEnabled = true;
         useSystemSoundTheme = false;
         soundNewNotification = true;
         soundVolumeChanged = true;
         soundPluggedIn = true;
-        acMonitorTimeout = 0;
-        acLockTimeout = 0;
-        acSuspendTimeout = 0;
-        acSuspendBehavior = 0;
-        acProfileName = "";
-        batteryMonitorTimeout = 0;
-        batteryLockTimeout = 0;
-        batterySuspendTimeout = 0;
-        batterySuspendBehavior = 0;
-        batteryProfileName = "";
         lockBeforeSuspend = true;
         loginctlLockIntegration = true;
         fadeToLockEnabled = true;
-        fadeToLockGracePeriod = 5;
-        launchPrefix = "";
-        brightnessDevicePins = {};
-        wifiNetworkPins = {};
-        bluetoothDevicePins = {};
-        audioInputDevicePins.preferredInput =
-          "alsa_input.usb-Generic_Blue_Microphones_2041BAB03EZ8-00.analog-stereo";
-        audioOutputDevicePins.preferredOutput =
-          "alsa_output.usb-Jieli_Technology_CA-2890_USB_Speaker_Bar_4250315A3537380E-00.analog-stereo";
         gtkThemingEnabled = false;
         qtThemingEnabled = false;
         syncModeWithPortal = true;
@@ -268,7 +236,6 @@ in {
         dockIconSize = 40;
         dockIndicatorStyle = "circle";
         dockBorderEnabled = false;
-        dockBorderColor = "surfaceText";
         dockBorderOpacity = 1;
         dockBorderThickness = 1;
         notificationOverlayEnabled = false;
@@ -277,7 +244,6 @@ in {
         enableFprint = false;
         maxFprintTries = 15;
         lockScreenActiveMonitor = "all";
-        lockScreenInactiveColor = "#000000";
         hideBrightnessSlider = false;
         notificationTimeoutLow = 5000;
         notificationTimeoutNormal = 5000;
@@ -349,15 +315,12 @@ in {
             spacing = 4;
             innerPadding = 4;
             bottomGap = 0;
-            transparency = 1;
-            widgetTransparency = 1;
             squareCorners = false;
             noBackground = false;
             gothCornersEnabled = false;
             gothCornerRadiusOverride = false;
             gothCornerRadiusValue = 12;
             borderEnabled = false;
-            borderColor = "surfaceText";
             borderOpacity = 1;
             borderThickness = 1;
             fontScale = 1;

modules/nixos/dank-material-shell.nix

@@ -9,7 +9,7 @@ in {
   config = lib.mkIf cfg.enable {
     programs.dank-material-shell = {
       enable = true;
-      # enableDynamicTheming = false;
+      enableDynamicTheming = false;
       systemd = {
         enable = true;
         restartIfChanged = true;