From 25379669dd4e39506c098225b0b3db12e7aae8d9 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 28 Dec 2024 07:48:57 +0000 Subject: [PATCH] Adjust nyxt theme slightly and set as default browser Change papirus-icon-theme accent to violet Remove firefox --- system/desktop.nix | 3 +-- system/home/browser/nyxt.nix | 31 +++++++++++++++++++------------ system/home/hyprland.nix | 2 +- system/mimeapps.nix | 4 ++-- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/system/desktop.nix b/system/desktop.nix index e7e82ebc..81b067c8 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -138,7 +138,6 @@ imports = [ ./home/hyprland.nix ./home/terminal/default.nix - ./home/browser/firefox.nix ./home/browser/nyxt.nix ./home/emacs/default.nix ./home/email/default.nix @@ -158,7 +157,7 @@ enable = true; gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; iconTheme = { - package = (pkgs.papirus-icon-theme.override { color = "indigo"; }); + package = (pkgs.papirus-icon-theme.override { color = "violet"; }); name = if config.lib.stylix.scheme.variant == "light" then "Papirus-Light" else "Papirus-Dark"; }; }; diff --git a/system/home/browser/nyxt.nix b/system/home/browser/nyxt.nix index d38c4f22..1847a660 100644 --- a/system/home/browser/nyxt.nix +++ b/system/home/browser/nyxt.nix @@ -21,24 +21,31 @@ :dark-p ${if variant == "light" then "nil" else "t"} :font-family "${fonts.sansSerif.name}" :monospace-font-family "${fonts.monospace.name}" + :text-color "${scheme.base05}" + :contrast-text-color "${scheme.base01}" :background-color "${scheme.base00}" - :on-background-color "${scheme.base05}" :primary-color "${scheme.base02}" - :on-primary-color "${scheme.base05}" :secondary-color "${scheme.base03}" - :on-secondary-color "${scheme.base05}" - :accent-color "${accent}" - :on-accent-color "${scheme.base01}" + :tertiary-color "${scheme.base04}" + :quaternary-color "${scheme.base04}" + :accent-color "${scheme.base0E}" :action-color "${scheme.cyan}" - :on-action-color "${scheme.base01}" :success-color "${scheme.green}" - :on-success-color "${scheme.base01}" - :highlight-color "${scheme.magenta}" - :on-highlight-color "${scheme.base01}" :warning-color "${scheme.yellow}" - :on-warning-color "${scheme.base01}" - :codeblock-color "${scheme.base02}" - :on-codeblock-color "${scheme.base05}")))) + :highlight-color "${scheme.base01}" + :codeblock-color "${scheme.base01}" + ;; :on-background-color "${scheme.base05}" + ;; :on-primary-color "${scheme.base05}" + ;; :on-secondary-color "${scheme.base05}" + ;; :on-tertiary-color "${scheme.base05}" + ;; :on-quaternary-color "${scheme.base05}" + ;; :on-accent-color "${scheme.base01}" + ;; :on-action-color "${scheme.base01}" + ;; :on-success-color "${scheme.base01}" + ;; :on-warning-color "${scheme.base01}" + ;; :on-highlight-color "${scheme.base01}" + ;; :on-codeblock-color "${scheme.base05}" + )))) ''; }; dataFile."nyxt/bookmarks.lisp".text = diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix index d45d5d86..48f50161 100644 --- a/system/home/hyprland.nix +++ b/system/home/hyprland.nix @@ -334,7 +334,7 @@ "SUPER, Space, exec, ${config.programs.fuzzel.package}/bin/fuzzel" "SUPER, Return, exec, ${config.programs.alacritty.package}/bin/alacritty" "SUPER SHIFT, Return, exec, ${config.programs.emacs.finalPackage}/bin/emacsclient -c" - "SUPER, W, exec, ${config.programs.firefox.finalPackage}/bin/firefox" + "SUPER, W, exec, ${pkgs.nyxt}/bin/nyxt" "SUPER, F, exec, ${pkgs.nautilus}/bin/nautilus" # Misc useful binds diff --git a/system/mimeapps.nix b/system/mimeapps.nix index 64c06baa..670bdfd2 100644 --- a/system/mimeapps.nix +++ b/system/mimeapps.nix @@ -1,6 +1,6 @@ let emacs = [ "emacsclient.desktop" ]; - browser = [ "firefox.desktop" ]; + browser = [ "nyxt.desktop" ]; in { "inode/directory" = [ "org.gnome.Nautilus.desktop" ]; @@ -72,7 +72,7 @@ in "x-scheme-handler/ms-word" = [ "writer.desktop" ]; "x-scheme-handler/ms-powerpoint" = [ "impress.desktop" ]; "x-scheme-handler/ms-excel" = [ "calc.desktop" ]; - "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ] ++ browser; + "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ]; "x-scheme-handler/zoomus" = browser; "x-scheme-handler/zoommtg" = browser; }