tons of theme tweaks, +gruvbox

modules/software/distractions/discord.nix

@@ -17,8 +17,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    user.packages = [
-      finalPackage
-    ];
+    user.packages = [ finalPackage ];
   };
 }

modules/software/editors/micro.nix

@@ -28,7 +28,8 @@ in {
       };
     };
 
-    hm.xdg.configFile."micro/colorschemes/${schemeName}.micro".text = with config.colorScheme.palette; ''
+    # TODO: rework these..
+    hm.xdg.configFile."micro/colorschemes/${schemeName}.micro".text = with config.scheme; ''
       color-link default "#${base05},#${base00}"
       color-link comment "#${base03},#${base00}"
       color-link identifier "#${base0D},#${base00}"

modules/software/system/fish.nix

@@ -24,9 +24,7 @@ in {
 
     programs.fish.enable = true;
     users.defaultUserShell = pkgs.fish;
-    hm.programs.fish = let
-      colorScript = nix-colors-lib.shellThemeFromScheme { scheme = config.colorScheme; };
-    in {
+    hm.programs.fish = {
       enable = true;
       plugins = let
         mkPlugin = name: {
@@ -43,7 +41,6 @@ in {
       ];
       interactiveShellInit = ''
         ${lib.getExe pkgs.nix-your-shell} fish | source
-        sh ${colorScript}
       '';
       functions.fish_greeting = ''
         ${lib.getExe pkgs.fastfetch} --logo-type small --key-width 11 -s title:separator:os:host:kernel:uptime:memory:swap

modules/software/system/mpv.nix

@@ -24,10 +24,10 @@ in {
         visualizer = {
           mode = "noalbumart";
         };
-        modernz = with config.colorScheme.palette; {
+        modernz = with config.scheme.withHashtag; {
           bottomhover = "no";
           hover_effect = ""; # these are weird lookin
-          seekbarfg_color = "#${base0D}"; # blue is a sane default
+          seekbarfg_color = "${base0D}"; # blue is a sane default
         };
       };
 

modules/software/system/wezterm.nix

@@ -36,7 +36,7 @@ in {
         config.freetype_load_flags = 'MONOCHROME'
         config.enable_wayland = true
         config.use_fancy_tab_bar = false
-        config.use_resize_increments = true
+        config.use_resize_increments = false
         config.initial_cols = 120
         config.initial_rows = 40
         config.window_background_opacity = 0.8