merging some changes

modules/programs/alacritty.nix

@@ -0,0 +1,57 @@
+{ pkgs, config, ... }:
+
+{
+  programs.alacritty.enable = true;
+  programs.alacritty.settings = {
+    colors = with config.colorScheme.colors; {
+      bright = {
+        black = "0x${base03}";
+        blue = "0x${base0D}";
+        cyan = "0x${base0C}";
+        green = "0x${base0B}";
+        magenta = "0x${base0E}";
+        red = "0x${base08}";
+        white = "0x${base07}";
+        yellow = "0x${base0A}";
+      };
+      cursor = {
+        cursor = "0x${base06}";
+        text = "0x${base05}";
+      };
+      normal = {
+        black = "0x${base00}";
+        blue = "0x${base0D}";
+        cyan = "0x${base0C}";
+        green = "0x${base0B}";
+        magenta = "0x${base0E}";
+        red = "0x${base08}";
+        white = "0x${base05}";
+        yellow = "0x${base0A}";
+      };
+      primary = {
+        background = "0x${base00}";
+        foreground = "0x${base05}";
+      };
+    };
+    font = {
+      normal = {
+        family = "MonoLisa";
+        style = "Regular";
+      };
+      bold = {
+        family = "MonoLisa";
+        style = "Bold";
+      };
+      italic = {
+        family = "MonoLisa";
+        style = "Italic";
+      };
+      bold_italic = {
+        family = "MonoLisa";
+        style = "Bold Italic";
+      };
+      size = 14;
+      #bold_italic = {};
+    };
+  };
+}

modules/programs/devenv/home.nix

@@ -1,8 +1,8 @@
-{ config, lib, pkgs, user, devenv, ... }: {
+{ config, lib, pkgs, user, devenv, inputs, ... }: {
 
   home.packages = with pkgs; [
     cachix
-    devenv.packages.${system}.devenv
+    inputs.devenv.packages.${system}.devenv
   ];
 
   programs.direnv.enable = true;

modules/programs/kitty.nix

@@ -0,0 +1,77 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home = {
+    packages = with pkgs; [
+      kitty
+    ];
+  };
+
+  home.file = {
+    ".config/kitty/kitty.conf" = {
+      text = ''
+        include ./theme.conf
+        font_family     SauceCodePro Nerd Font
+        font_size 14.0
+
+        background_opacity 1.0
+
+        show_hyperlink_targets yes
+
+        allow_hyperlinks yes
+
+        #term xterm-kitty
+        term xterm-256color
+
+        confirm_os_window_close 0
+      '';
+    };
+  };
+
+  home.file = {
+    ".config/kitty/theme.conf" = {
+      text = ''
+
+        # Kitty window border colors
+        active_border_color     #${config.colorScheme.colors.base07}
+        inactive_border_color   #${config.colorScheme.colors.base02}
+        bell_border_color       #${config.colorScheme.colors.base0A}
+
+        # URL underline color when hovering with mouse
+        url_color               #${config.colorScheme.colors.base06}
+
+        # Colors for marks (marked text in the terminal)
+        mark1_foreground #${config.colorScheme.colors.base00}
+        mark1_background #${config.colorScheme.colors.base07}
+        mark2_foreground #${config.colorScheme.colors.base00}
+        mark2_background #${config.colorScheme.colors.base0E}
+        mark3_foreground #${config.colorScheme.colors.base00}
+        mark3_background #${config.colorScheme.colors.base0D}
+
+        background #${config.colorScheme.colors.base00}
+        foreground #${config.colorScheme.colors.base05}
+        cursor #${config.colorScheme.colors.base06}
+        cursor_text_color #${config.colorScheme.colors.base00}
+        color0 #${config.colorScheme.colors.base03}
+        color1 #${config.colorScheme.colors.base08}
+        color2 #${config.colorScheme.colors.base0B}
+        color3 #${config.colorScheme.colors.base0A}
+        color4 #${config.colorScheme.colors.base0D}
+        color5 #${config.colorScheme.colors.base0F}
+        color6 #${config.colorScheme.colors.base0C}
+        color7 #${config.colorScheme.colors.base03}
+        color8 #${config.colorScheme.colors.base04}
+        color9 #${config.colorScheme.colors.base08}
+        color10 #${config.colorScheme.colors.base0B}
+        color11 #${config.colorScheme.colors.base0A}
+        color12 #${config.colorScheme.colors.base0D}
+        color13 #${config.colorScheme.colors.base0F}
+        color14 #${config.colorScheme.colors.base0C}
+        color15 #${config.colorScheme.colors.base04}
+        selection_foreground #${config.colorScheme.colors.base00}
+        selection_background #${config.colorScheme.colors.base06}
+      '';
+    };
+  };
+}
+

modules/programs/mako.nix

@@ -0,0 +1,15 @@
+{ pkgs, config, ... }:
+
+{
+
+  services.mako = with config.colorScheme.colors; {
+    enable = true;
+    backgroundColor = "#${base01}";
+    borderColor = "#${base0E}";
+    borderRadius = 5;
+    borderSize = 2;
+    textColor = "#${base04}";
+    layer = "overlay";
+  };
+
+}

modules/programs/wofi.nix

@@ -32,11 +32,11 @@ in
         hide_scroll=true
       '';
     };
-    ".config/wofi/style.css" = with colors.scheme.doom; {
+    ".config/wofi/style.css" = {
       text = ''
         window {
           margin: 0px;
-          background-color: #${bg};
+          background-color: #${config.colorScheme.colors.base00};
         }
 
         #input {
@@ -45,10 +45,10 @@ in
           padding: 4px 10px;
           margin: 4px;
           border: none;
-          color: #dfdfdf;
+          color: #${config.colorScheme.colors.base08};
           font-weight: bold;
-          background-color: #${bg};
-          outline: #dfdfdf;
+          background-color: #${config.colorScheme.colors.base00};
+          outline: #fff;
         }
 
         #inner-box {
@@ -61,20 +61,24 @@ in
           padding: 3px;
           border: none;
           border-radius: 10px;
-          border: 3px solid #${text};
+          border: 3px solid #${config.colorScheme.colors.base05};
         }
 
+         #text {
+            color: #${config.colorScheme.colors.base09};
+         }
+
         #text:selected {
-          color: #282c34;
+          color: #${config.colorScheme.colors.base08};
           background-color: transparent;
         }
 
         #entry:selected {
-          background-color: #${text};
+          background-color: #${config.colorScheme.colors.base05};
         }
       '';
     };
-    ".config/wofi/power.sh" = with colors.scheme.doom; {
+    ".config/wofi/power.sh" = {
       executable = true;
       text = ''
         #!/bin/sh