various changes

4 files changed, 37 insertions, 26 deletions

diff --git a/flake.lock b/flake.lock
index e6be991..492805a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757508292,
-        "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=",
+        "lastModified": 1758287904,
+        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a",
+        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     "firefox-csshacks": {
       "flake": false,
       "locked": {
-        "lastModified": 1757991741,
-        "narHash": "sha256-O9SXRWmXdzJXu/BgmunVUV15EriheCkAb7VEdwTjemM=",
+        "lastModified": 1758204391,
+        "narHash": "sha256-0c1Iolty7NEC4bJmS7HmqgC76C0c8pTtUWP9JX4JrxY=",
         "owner": "MrOtherGuy",
         "repo": "firefox-csshacks",
-        "rev": "41e003708fb3cbd8fc9985447d267381ce8c6a26",
+        "rev": "9e39c99f50642d90f4bb783638e19408fcedbdde",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1758198701,
+        "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
         "type": "github"
       },
       "original": {
diff --git a/hosts/jupiter/nixos.nix b/hosts/jupiter/nixos.nix
index 268b2bc..86d5a6e 100644
--- a/hosts/jupiter/nixos.nix
+++ b/hosts/jupiter/nixos.nix
@@ -20,7 +20,7 @@
 
   # music stuff
   services.pipewire.jack.enable = true;
-  environment.systemPackages = with pkgs; [vital helvum];
+  environment.systemPackages = with pkgs; [vital helvum bambu-studio];
 
   fonts.packages = [pkgs.nerd-fonts.iosevka];
 
diff --git a/modules/desktop/hjem/programs/firefox.nix b/modules/desktop/hjem/programs/firefox.nix
index cb0794f..b5ea433 100644
--- a/modules/desktop/hjem/programs/firefox.nix
+++ b/modules/desktop/hjem/programs/firefox.nix
@@ -27,23 +27,30 @@ in
         };
       };
 
-      ".mozilla/firefox/collin/chrome/userChrome.css".text = mkCssHacks [
-        # Tabs
-        "hide_tabs_with_one_tab"
-        "tabs_on_bottom_v2"
-        "tab_close_button_always_on_hover"
-        "tabs_fill_available_width"
+      ".mozilla/firefox/collin/chrome/userChrome.css".text = mkCssHacks (
+        # (lib.optional (cfg.theme == "adwaita") "window_control_placeholder_support") ++
+        [
+          # Tabs
+          (
+            if cfg.theme == "catppuccin"
+            then "hide_tabs_with_one_tab"
+            else "hide_tabs_with_one_tab_w_window_controls"
+          )
+          "tabs_on_bottom_v2"
+          "tab_close_button_always_on_hover"
+          "tabs_fill_available_width"
 
-        # Icons!
-        "iconized_main_menu"
-        "iconized_menubar_items"
-        "iconized_places_context_menu"
-        "iconized_tabs_context_menu"
-        "icon_only_context_menu_text_controls"
+          # Icons!
+          "iconized_main_menu"
+          "iconized_menubar_items"
+          "iconized_places_context_menu"
+          "iconized_tabs_context_menu"
+          "icon_only_context_menu_text_controls"
 
-        # Other
-        "compact_extensions_panel"
-      ];
+          # Other
+          "compact_extensions_panel"
+        ]
+      );
     };
 
     packages = [pkgs.firefox];
diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix
index be5c2cf..29ef8cb 100644
--- a/modules/desktop/nixos/programs/firefox.nix
+++ b/modules/desktop/nixos/programs/firefox.nix
@@ -27,7 +27,11 @@ in
           };
         in {
           "toolkit.legacyUserProfileCustomizations.stylesheets" = opt true;
-          "browser.tabs.inTitlebar" = opt 0;
+          "browser.tabs.inTitlebar" = opt (
+            if cfg.theme == "catppuccin"
+            then 0
+            else 1
+          );
           "browser.tabs.hoverPreview.enabled" = opt 0;
 
           "browser.tabs.loadBookmarksInTabs" = opt true;