Improve colors

home/desktop/default.nix

@@ -1,5 +1,7 @@
 { pkgs, lib, config, ... }:
-let inherit (import ../../pkgs) desktop-pkgs;
+let
+  inherit (import ../../pkgs) desktop-pkgs;
+  inherit (import ../../lib) colors;
 in {
   imports = [
     ./sway.nix
@@ -23,26 +25,7 @@ in {
       "config"
     ];
     terminal = "${desktop-pkgs.terminal}/bin/terminal";
-    colors = {
-      "foreground" = "#dddbff";
-      "background" = "#000000";
-      "black" = "#000000";
-      "brightBlack" = "#55508f";
-      "red" = "#e34b4f";
-      "brightRed" = "#e34b4f";
-      "green" = "#67b779";
-      "brightGreen" = "#45b75e";
-      "yellow" = "#ff9c00";
-      "brightYellow" = "#ff9c00";
-      "blue" = "#5c67ff";
-      "brightBlue" = "#5c67ff";
-      "magenta" = "#cb85ff";
-      "brightMagenta" = "#cb85ff";
-      "cyan" = "#17d0f4";
-      "brightCyan" = "#17d0f4";
-      "white" = "#dddbff";
-      "brightWhite" = "#ffffff";
-    };
+    colors = colors;
   };
   home = { packages = builtins.attrValues desktop-pkgs; };
   programs.browserpass.enable = true;

home/desktop/sway.config

@@ -1,5 +1,4 @@
 set $mod Mod4
-set $term ate
 set $lock swaylock -e -F -l -s fill -f -i ~/volatile/wallpaper.jpg
 
 exec systemctl --user set-environment SWAYSOCK="$SWAYSOCK"

home/desktop/sway.nix

@@ -86,7 +86,7 @@ in {
       "prior" = "focus parent";
       "next" = "focus child";
       "shift+q" =
-        "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
+        "exec ${pkgs.sway}/bin/swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
       "Return" = "exec ${terminal}";
       "q" = "kill";
       "space" = "exec hotkeys";
@@ -119,6 +119,7 @@ in {
           font monospace 9.5
           height 17
           strip_workspace_numbers yes
+          position top
 
           mode hide
 
@@ -158,6 +159,7 @@ in {
           }
       }
 
+      exec ${pkgs.mako}/bin/mako --background-color ${colors.background}cc --text-color ${colors.foreground} --border-size 0
       exec ${my-pkgs.my-ssh-add}/bin/my-ssh-add
       exec xrdb -load ${builtins.toFile "Xresources" "Xft.dpi: 96"}
     '';

home/modules/mail.nix

@@ -113,6 +113,7 @@ in {
           auto_view text/*
           auto_view message/*
           unset wait_key
+          color normal default default
 
           set query_format="%4c %t %-70.70a %-70.70n %?e?(%e)?"
           set query_command = "${pkgs.notmuch}/bin/notmuch address --output=recipients --deduplicate=address '%s' | grep -i '%s'"

lib/default.nix

@@ -1,7 +1,7 @@
 rec {
   colors = {
     "foreground" = "#dddbff";
-    "background" = "#000000";
+    "background" = "#000018";
     "black" = "#000000";
     "brightBlack" = "#55508f";
     "red" = "#e34b4f";

pkgs/nvim/default.nix

@@ -1,14 +1,17 @@
 n:
 n.override (let
   pkgs = import <nixpkgs> { };
-  tabnine = (import ../../lib).sources.tabnine-vim;
+  inherit (import ../../lib) sources colors;
+  tabnine = sources.tabnine-vim;
 in {
   vimAlias = true;
   withPython3 = true;
   configure = {
     customRC = ''
       set rtp+=${tabnine}
-      ${builtins.readFile ./vimrc}'';
+      ${builtins.readFile ./vimrc}
+      hi Normal ctermbg=NONE
+    '';
     packages.myVimPackage = {
       start = builtins.attrValues {
         inherit (pkgs.vimPlugins)

pkgs/nvim/vimrc

@@ -72,7 +72,6 @@ let g:autoformat_autoindent = 0
 let g:autoformat_retab = 0
 
 colorscheme PaperColor
-hi Normal ctermbg=black
 
 " if hidden is not set, TextEdit might fail.
 set hidden