From e6e176c54b21d7ee54c0f5dfb1c90be56c6cb3ac Mon Sep 17 00:00:00 2001 From: Jimbo 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 7d60b9e6..ea8cbd0d 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 45430c90..86a44dcb 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 ed6ed678..6cf9e4bd 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 c4d6f093..e70d63f6 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 54ad39da..0e8a058c 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 78a4bfc5..e7f98884 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 5ed34cdc..9c806b55 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 ff080f6d..84ff75dc 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 3e82852b..12496497 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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 Y>{)$3c|R0+R2dc5zi8^!XI~+W@YrG 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