From e6e176c54b21d7ee54c0f5dfb1c90be56c6cb3ac Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Mon, 28 Oct 2024 04:55:29 -0400
Subject: [PATCH] Generalize main browser profile and edit some syntax stuff

---
 hosts/cyberspark/system/hardware/default.nix  |   2 +-
 hosts/firefly/system/boot/default.nix         |   2 +-
 .../home/programs/gui/librewolf/default.nix   |   2 +-
 .../home/programs/misc/avtools/default.nix    |   1 +
 modules/home/settings/dconf/default.nix       |   4 ++--
 modules/home/settings/gtk/default.nix         |  16 ++++++++--------
 modules/home/sway/hotkeys/default.nix         |   2 +-
 modules/home/sway/rules/default.nix           |   2 +-
 modules/home/sway/swayshot/swappy/default.nix |   4 +---
 variables/secrets/default.nix                 | Bin 2497 -> 2237 bytes
 10 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix
index 7d60b9e..ea8cbd0 100644
--- a/hosts/cyberspark/system/hardware/default.nix
+++ b/hosts/cyberspark/system/hardware/default.nix
@@ -24,7 +24,7 @@
     };
     swraid = {
       enable = true;
-      mdadmConf = "MAILADDR jimbo@jimbosfiles.com";
+      mdadmConf = "MAILADDR jimbo@${config.domains.jim2}";
     };
   };
 
diff --git a/hosts/firefly/system/boot/default.nix b/hosts/firefly/system/boot/default.nix
index 45430c9..86a44dc 100644
--- a/hosts/firefly/system/boot/default.nix
+++ b/hosts/firefly/system/boot/default.nix
@@ -19,7 +19,7 @@ let
   ];              
 in {
   boot = {
-    kernelPackages = pkgs.linuxPackages_cachyos;
+    kernelPackages = pkgs.unstable.linuxPackages_zen;
     blacklistedKernelModules = [
       "pcspkr"
     ];               
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index ed6ed67..6cf9e4b 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -368,7 +368,7 @@ in {
     enable = true;
     package = pkgs.librewolf;
     profiles = {
-      Jimbo = {
+      Main = {
         id = 0;
         extensions = commonExtensions;
         search = commonSearch;
diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix
index c4d6f09..e70d63f 100644
--- a/modules/home/programs/misc/avtools/default.nix
+++ b/modules/home/programs/misc/avtools/default.nix
@@ -5,6 +5,7 @@
     spotdl
     playerctl
     ffmpeg
+    puddletag
     pulsemixer
   ];
 }
diff --git a/modules/home/settings/dconf/default.nix b/modules/home/settings/dconf/default.nix
index 54ad39d..0e8a058 100644
--- a/modules/home/settings/dconf/default.nix
+++ b/modules/home/settings/dconf/default.nix
@@ -5,8 +5,8 @@
       color-scheme = "prefer-dark";
     };
     "org/virt-manager/virt-manager/connections" = {
-      autoconnect = ["qemu:///system"];
-      uris = ["qemu:///system"];
+      autoconnect = [ "qemu:///system" ];
+      uris = [ "qemu:///system" ];
     };
   };
 }
diff --git a/modules/home/settings/gtk/default.nix b/modules/home/settings/gtk/default.nix
index 78a4bfc..e7f9888 100644
--- a/modules/home/settings/gtk/default.nix
+++ b/modules/home/settings/gtk/default.nix
@@ -9,10 +9,14 @@
     theme = {
       name = "Colloid-Dark";
       package = pkgs.colloid-gtk-theme.override {
-        themeVariants = ["default"];
-        colorVariants = ["dark"];
-        sizeVariants = ["standard"];
-        tweaks = ["black" "rimless" "normal"];
+        themeVariants = [ "default" ];
+        colorVariants = [ "dark" ];
+        sizeVariants = [ "standard" ];
+        tweaks = [
+          "black"
+          "rimless"
+          "normal"
+        ];
       };
     };
     iconTheme = {
@@ -26,14 +30,10 @@
 
     gtk3 = {
       bookmarks = [
-        # Local
         "file:///home/jimbo/Downloads"
         "file:///home/jimbo/Documents"
         "file:///home/jimbo/Videos"
         "file:///home/jimbo/Pictures/Screenshots"
-        "file:///home/jimbo/VMs"
-
-        # More important stuff
         "file:///etc/nixos"
       ];
 
diff --git a/modules/home/sway/hotkeys/default.nix b/modules/home/sway/hotkeys/default.nix
index 5ed34cd..9c806b5 100644
--- a/modules/home/sway/hotkeys/default.nix
+++ b/modules/home/sway/hotkeys/default.nix
@@ -56,7 +56,7 @@
         ## Launcher keys
 
         # LibreWolf profiles
-        "${primeMod}+F1" = ''exec librewolf -P Jimbo --name=JimBrowser | ${sendNotif} "Main Browser"'';
+        "${primeMod}+F1" = ''exec librewolf -P Main --name=MainBrowser | ${sendNotif} "Main Browser"'';
         "${primeMod}+F2" = ''exec librewolf -P Alt --name=AltBrowser | ${sendNotif} "Alternate Browser"'';
         "${primeMod}+F3" = ''exec librewolf -P Misc --name=MiscBrowser | ${sendNotif} "Miscellaneous Browser"'';
 
diff --git a/modules/home/sway/rules/default.nix b/modules/home/sway/rules/default.nix
index ff080f6..84ff75d 100644
--- a/modules/home/sway/rules/default.nix
+++ b/modules/home/sway/rules/default.nix
@@ -112,7 +112,7 @@
       };
       assigns = {
         # Broconfig.wsers
-        "${config.ws.w1}" = [{app_id = "JimBrowser";}];
+        "${config.ws.w1}" = [{app_id = "MainBrowser";}];
         "${config.ws.w1a}" = [{app_id = "AltBrowser";}];
 
         # Communication
diff --git a/modules/home/sway/swayshot/swappy/default.nix b/modules/home/sway/swayshot/swappy/default.nix
index 3e82852..1249649 100644
--- a/modules/home/sway/swayshot/swappy/default.nix
+++ b/modules/home/sway/swayshot/swappy/default.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }:
 {
   home = {
-    packages = with pkgs; [
-      swappy
-    ];
+    packages = with pkgs; [ swappy ];
     file = {
       ".config/swappy/config".text = ''
         [Default]
diff --git a/variables/secrets/default.nix b/variables/secrets/default.nix
index 0cbd023f7a04ac7ef1ef3441fce5ee46316b423d..7452a13fe40fa6f183e408f23ad2c563cc59859e 100644
GIT binary patch
literal 2237
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
Lf9QgZF9o4aMl(x0

literal 2497
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
LN#hQf5Z!9_x}@Av