Add nyxt back with temporary (and working) theme

Add teams-for-linux back now that it seems to work with teams v2

home/desktop.nix

@@ -18,6 +18,7 @@
     ./avizo/default.nix
     ./alacritty/default.nix
     ./emacs/default.nix
+    ./nyxt/default.nix
     ./obs/default.nix
     ./cava/default.nix
     ./prog/default.nix

home/nyxt/default.nix

@@ -8,55 +8,11 @@
   home.packages = [pkgs.nyxt];
   xdg = {
     configFile = {
-      "nyxt/config.lisp".text = with scheme.withHashtag; let
+      "nyxt/config.lisp".text = ''
-        accent = scheme.withHashtag.${accentColour};
-      in ''
         ;; Import custom configuration
         (nyxt::load-lisp "${./config.lisp}")
-        ;; Custom theme using stylix
+        ;; Define and load custom theme
-        (define-configuration
+        (nyxt::load-lisp "${./theme.lisp}")
-         browser
-         ((theme (make-instance
-                  'theme:theme
-                  :dark-p t
-                  :font-family "${fonts.sansSerif.name}"
-                  :monospace-font-family "${fonts.monospace.name}"
-                  :text-color "${base05}"
-                  :text-color+ "${base05}"
-                  :text-color- "${base05}"
-                  :contrast-text-color "${base00}"
-                  :background-color "${base00}"
-                  :background-color+ "${base00}"
-                  :background-color- "${base00}"
-                  :on-background-color "${base05}"
-                  :accent-color "${accent}"
-                  :accent-color+ "${accent}"
-                  :accent-color- "${accent}"
-                  :on-accent-color "${base00}"
-                  :primary-color "${accent}"
-                  :primary-color+ "${accent}"
-                  :primary-color- "${accent}"
-                  :on-primary-color "${base00}"
-                  :secondary-color "${base03}"
-                  :secondary-color+ "${base03}"
-                  :secondary-color- "${base03}"
-                  :on-secondary-color "${base05}"
-                  :warning-color "${base08}"
-                  :warning-color+ "${base08}"
-                  :warning-color- "${base08}"
-                  :on-warning-color "${base00}"
-                  :highlight-color "${base0A}"
-                  :highlight-color+ "${base0A}"
-                  :highlight-color- "${base0A}"
-                  :on-highlight-color "${base00}"
-                  :action-color "${base0D}"
-                  :action-color+ "${base0D}"
-                  :action-color- "${base0D}"
-                  :on-action-color "${base00}"
-                  :codeblock-color "${base01}"
-                  :codeblock-color+ "${base01}"
-                  :codeblock-color- "${base01}"
-                  :on-codeblock-color "${base05}"))))
       '';
     };
     dataFile."nyxt/bookmarks.lisp".source = ./bookmarks.lisp;

home/nyxt/theme.lisp

@@ -0,0 +1,90 @@
+(defvar custom-theme
+  (make-instance 'theme:theme
+                 :dark-p t
+                 :background-color- "#303240"
+                 :background-color "#282A36"
+                 :background-color+ "#1E2029"
+                 :on-background-color "#F7FBFC"
+
+                 :primary-color- "#679BCF"
+                 :primary-color "#789FE8"
+                 :primary-color+ "#7FABD7"
+                 :on-primary-color "#0C0C0D"
+
+                 :secondary-color- "#44475A"
+                 :secondary-color "#44475A"
+                 :secondary-color+ "#535A6E"
+                 :on-secondary-color "#F7FBFC"
+
+                 :action-color- "#6BE194"
+                 :action-color "#4FDB71"
+                 :action-color+ "#27BF4C"
+                 :on-action-color "#0C0C0D"
+
+                 :success-color- "#86D58E"
+                 :success-color "#8AEA92"
+                 :success-color+ "#71FE7D"
+                 :on-success-color "#0C0C0D"
+
+                 :highlight-color- "#EA43DD"
+                 :highlight-color "#F45DE8"
+                 :highlight-color+ "#FC83F2"
+                 :on-highlight-color "#0C0C0D"
+
+                 :warning-color- "#FCA904"
+                 :warning-color "#FCBA04"
+                 :warning-color+ "#FFD152"
+                 :on-warning-color "#0C0C0D"
+
+                 :codeblock-color- "#3C5FAA"
+                 :codeblock-color "#355496"
+                 :codeblock-color+ "#2D4880"
+                 :on-codeblock-color "#F7FBFC"))
+
+(define-configuration browser
+    ((theme custom-theme)))
+
+;; Old stylix-based theme, to re-implement at some point
+;; (define-configuration
+;;     browser
+;;     ((theme (make-instance
+;;              'theme:theme
+;;              :dark-p t
+;;              :font-family "${fonts.sansSerif.name}"
+;;              :monospace-font-family "${fonts.monospace.name}"
+;;              :text-color "${base05}"
+;;              :text-color+ "${base05}"
+;;              :text-color- "${base05}"
+;;              :contrast-text-color "${base00}"
+;;              :background-color "${base00}"
+;;              :background-color+ "${base00}"
+;;              :background-color- "${base00}"
+;;              :on-background-color "${base05}"
+;;              :accent-color "${accent}"
+;;              :accent-color+ "${accent}"
+;;              :accent-color- "${accent}"
+;;              :on-accent-color "${base00}"
+;;              :primary-color "${accent}"
+;;              :primary-color+ "${accent}"
+;;              :primary-color- "${accent}"
+;;              :on-primary-color "${base00}"
+;;              :secondary-color "${base03}"
+;;              :secondary-color+ "${base03}"
+;;              :secondary-color- "${base03}"
+;;              :on-secondary-color "${base05}"
+;;              :warning-color "${base08}"
+;;              :warning-color+ "${base08}"
+;;              :warning-color- "${base08}"
+;;              :on-warning-color "${base00}"
+;;              :highlight-color "${base0A}"
+;;              :highlight-color+ "${base0A}"
+;;              :highlight-color- "${base0A}"
+;;              :on-highlight-color "${base00}"
+;;              :action-color "${base0D}"
+;;              :action-color+ "${base0D}"
+;;              :action-color- "${base0D}"
+;;              :on-action-color "${base00}"
+;;              :codeblock-color "${base01}"
+;;              :codeblock-color+ "${base01}"
+;;              :codeblock-color- "${base01}"
+;;              :on-codeblock-color "${base05}"))))

system/desktop.nix

@@ -31,6 +31,7 @@
       brightnessctl
       mpv
       xarchiver
+      nyxt
       libreoffice-fresh
       zathura
       inkscape
@@ -39,6 +40,7 @@
       webcord
       signal-desktop
       whatsapp-for-linux
+      teams-for-linux
       remmina
       nomachine-client
     ];
@@ -180,6 +182,7 @@
         "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"];
       };
     in {
       enable = true;