feat: p i n k

rubyowo · Dec 26, 2022 · fdf9adc · fdf9adc
1 parent 7e923d3
commit fdf9adc
Show file tree

Hide file tree

Showing 44 changed files with 1,653 additions and 1,470 deletions.
diff --git a/users/rei/apps/bat.nix b/users/rei/apps/bat.nix
@@ -1,4 +1,4 @@
 { config, pkgs, lib, ... }:
 {
-    xdg.configFile."bat/themes/frappe.tmTheme".text = builtins.readFile ../confs/bat/frappe.tmTheme;
+    xdg.configFile."bat/themes/macchiato.tmTheme".text = builtins.readFile ../confs/bat/macchiato.tmTheme;
 }
diff --git a/users/rei/apps/foot.nix b/users/rei/apps/foot.nix
@@ -8,7 +8,7 @@
     enable = true;
     settings = {
       main = {
-        include = "${config.xdg.configHome}/foot/frappe.ini";
+        include = "${config.xdg.configHome}/foot/macchiato.ini";
         font = "FantasqueSansMono Nerd Font Mono:size=10";
         font-bold = "FantasqueSansMono Nerd Font Mono:size=10:style=Bold";
         font-italic = "FantasqueSansMono Nerd Font Mono:size=10:style=Italic";
@@ -17,6 +17,6 @@
       mouse.hide-when-typing = "yes";
     };
   };
-  xdg.configFile."foot/frappe.ini".text =
-    builtins.readFile ../confs/foot/frappe.ini;
+  xdg.configFile."foot/macchiato.ini".text =
+    builtins.readFile ../confs/foot/macchiato.ini;
 }
diff --git a/users/rei/apps/gtk.nix b/users/rei/apps/gtk.nix
@@ -6,11 +6,11 @@
   config.gtk = {
     enable = true;
     theme = {
-      name = "Catppuccin-Frappe-Standard-Sky-Dark";
+      name = "Catppuccin-Macchiato-Standard-Pink-Dark";
       package = pkgs.callPackage ../packages/catppuccin-gtk {};
     };
     iconTheme = {
-      package = pkgs.rubyowo.catppuccin-papirus-folders.override {flavor = "frappe"; accent = "sky";};
+      package = pkgs.rubyowo.catppuccin-papirus-folders.override {flavor = "macchiato"; accent = "pink";};
       name = "Papirus";
     };
     font = {
@@ -32,5 +32,5 @@
   };
 
   # cursor theme
-  config.home.file.".icons/default".source = "${(pkgs.callPackage ../packages/catppuccin-cursors {}).frappeSky}/share/icons/Catppuccin-Frappe-Sky-Cursors";
+  config.home.file.".icons/default".source = "${(pkgs.callPackage ../packages/catppuccin-cursors {}).macchiatoPink}/share/icons/Catppuccin-Macchiato-Pink-Cursors";
 }
diff --git a/users/rei/apps/hyprland.nix b/users/rei/apps/hyprland.nix
@@ -22,8 +22,8 @@
 
   xdg.configFile."hypr/hyprpaper.conf".text =
     builtins.readFile ../confs/hypr/hyprpaper.conf;
-  xdg.configFile."hypr/frappe.conf".text =
-    builtins.readFile ../confs/hypr/frappe.conf;
+  xdg.configFile."hypr/macchiato.conf".text =
+    builtins.readFile ../confs/hypr/macchiato.conf;
 
   systemd.user.targets.hyprland-session = {
     Unit = {

diff --git a/users/rei/apps/mako.nix b/users/rei/apps/mako.nix
@@ -11,9 +11,9 @@
     defaultTimeout = 10000;
     groupBy = "summary";
 
-    backgroundColor = "#303446";
-    textColor = "#c6d0f5";
-    borderColor = "#99d1db";
-    progressColor = "#414559";
+    backgroundColor = "#24273a";
+    textColor = "#cad3f5";
+    borderColor = "#f5bde6";
+    progressColor = "#363a4f";
   };
 }
diff --git a/users/rei/apps/rofi.nix b/users/rei/apps/rofi.nix
@@ -23,20 +23,20 @@ in
       hide-scrollbar = true;
       sidebar-mode = true;
       font = "FantasqueSansMono Nerd Font 14";
-      display-drun = " Apps";
+      display-drun = "Apps";
       drun-display-format = "{name}";
     };
     theme = let inherit (config.lib.formats.rasi) mkLiteral;
     in {
       "*" = {
-        bg-col = mkLiteral "#303446";
-        bg-col-light = mkLiteral "#303446";
-        border-col = mkLiteral "#414559";
-        selected-col = mkLiteral "#303446";
-        sky = mkLiteral "#99d1db";
-        fg-col = mkLiteral "#c6d0f5";
-        fg-col2 = mkLiteral "@sky";
-        grey = mkLiteral "#737994";
+        bg-col = mkLiteral "#24273a";
+        bg-col-light = mkLiteral "#24273a";
+        border-col = mkLiteral "#363a4f";
+        selected-col = mkLiteral "#24273a";
+        pink = mkLiteral "#f5bde6";
+        fg-col = mkLiteral "#cad3f5";
+        fg-col2 = mkLiteral "@pink";
+        grey = mkLiteral "#6e738d";
 
         width = mkLiteral "450px";
       };
@@ -64,7 +64,7 @@ in
       };
 
       prompt = {
-        background-color = mkLiteral "@sky";
+        background-color = mkLiteral "@pink";
         padding = mkLiteral "6px";
         text-color = mkLiteral "@bg-col";
         border-radius = mkLiteral "15px";
@@ -117,7 +117,7 @@ in
 
       "button selected" = {
         background-color = mkLiteral "@bg-col";
-        text-color = mkLiteral "@sky";
+        text-color = mkLiteral "@pink";
       };
     };
   };

diff --git a/users/rei/apps/waybar.nix b/users/rei/apps/waybar.nix
@@ -24,7 +24,7 @@
           disable-scroll = true;
           sort-by-name = true;
           format = "{icon}";
-          format-icons = {default = "";};
+          format-icons = {default = "";};
         };
 
         pulseaudio = {
@@ -93,6 +93,6 @@
 
   xdg.configFile."waybar/style.css".text =
     builtins.readFile ../confs/waybar/style.css;
-  xdg.configFile."waybar/frappe.css".text =
-    builtins.readFile ../confs/waybar/frappe.css;
+  xdg.configFile."waybar/macchiato.css".text =
+    builtins.readFile ../confs/waybar/macchiato.css;
 }
diff --git a/users/rei/apps/xdg.nix b/users/rei/apps/xdg.nix
@@ -11,16 +11,16 @@
       enable = true;
       createDirectories = true;
 
-      download = "~/downloads";
-      desktop = "~/desktop";
-      documents = "~/documents";
+      download = "${config.home.homeDirectory}/downloads";
+      desktop = "${config.home.homeDirectory}/desktop";
+      documents = "${config.home.homeDirectory}/documents";
 
-      publicShare = "~/.local/public";
-      templates = "~/.local/templates";
+      publicShare = "${config.home.homeDirectory}/.local/public";
+      templates = "${config.home.homeDirectory}/.local/templates";
 
-      music = "~/media/music";
-      pictures = "~/media/pictures";
-      videos = "~/media/videos";
+      music = "${config.home.homeDirectory}/media/music";
+      pictures = "${config.home.homeDirectory}/media/pictures";
+      videos = "${config.home.homeDirectory}/media/videos";
     };
 
     mimeApps = {

diff --git a/users/rei/apps/zsh.nix b/users/rei/apps/zsh.nix
@@ -27,7 +27,7 @@
     envExtra = ''
       export MCFLY_KEY_SCHEME=vim
       export MCFLY_DISABLE_MENU=TRUE
-      export BAT_THEME="frappe"
+      export BAT_THEME="macchiato"
     '';
 
     initExtra = ''
@@ -73,7 +73,7 @@
             rev = "dbb1ec93b30dbe8cd728cffe0974aa7fa1ac3298";
             sha256 = "0B7g0J6+ZCoe1eErsSEmqO0aNOBi+FB+///vXnuiels=";
         };
-        file = "themes/catppuccin_frappe-zsh-syntax-highlighting.zsh";
+        file = "themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh";
       }
       {
         name = "zsh-syntax-highlighting";