Frogarized!

hm/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ../common/frogarized
     ../options.nix
     ./brightness
     ./common.nix

hm/desktop/background/default.nix

@@ -1,11 +1,6 @@
 { pkgs, config, lib, ... }:
 {
   config = {
-    # On purpose also enable without a DE because stylix complains otherwise
-    stylix.image = builtins.fetchurl {
-      url = "https://get.wallhere.com/photo/sunlight-abstract-minimalism-green-simple-circle-light-leaf-wave-material-line-wing-computer-wallpaper-font-close-up-macro-photography-124350.png";
-      sha256 = "sha256:1zfq3f3v34i45mi72pkfqphm8kbhczsg260xjfl6dbydy91d7y93";
-    };
     # This correctly sets the background on some occasions, below does the rest
     programs.autorandr.hooks.postswitch = {
       background = "${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${config.stylix.image}";

hm/theme/default.nix

@@ -1,16 +1,7 @@
 { pkgs, config, lib, ... }:
-let
-  basetheme = "solarized";
-in
 {
   config = {
-    # Setting a custom base16 theme via nixvim is required so feline works, and
-    # because stylix makes a config that otherwise only works with dark
-    # polarity.
-    programs.nixvim.colorschemes.base16.colorscheme = "${basetheme}-${config.frogeye.polarity}";
-
     stylix = {
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/${basetheme}-${config.frogeye.polarity}.yaml";
       polarity = config.frogeye.polarity;
       fonts = {
         monospace = {

hm/vim/decoration.nix

@@ -43,6 +43,7 @@
         plugins = {
           # Tabline
           barbar.enable = true;
+          # TODO Reload make it use the preset colorscheme
           # Status line
           lualine = with config.lib.stylix.colors.withHashtag; let
             normal = { fg = base05; bg = base01; };

hm/vim/default.nix

@@ -12,6 +12,9 @@
       vim = "nvim";
     };
     programs.nixvim = {
+      # Required, otherwise light mode becomes a default dark theme.
+      colorschemes.base16.colorscheme = "solarized-${config.stylix.polarity}";
+
       options = {
         ignorecase = true;
         smartcase = true;