From 59503e0dee76c025e091d3386d50438795db1cd1 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Fri, 9 Aug 2024 14:40:26 -0400
Subject: [PATCH] return to old defaults

---
 homeManagerModules/apps/kitty/default.nix | 56 +----------------------
 homeManagerModules/theme.nix              | 21 +--------
 homes/aly/default.nix                     |  2 +
 3 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/homeManagerModules/apps/kitty/default.nix b/homeManagerModules/apps/kitty/default.nix
index 9a1a015f..55905574 100644
--- a/homeManagerModules/apps/kitty/default.nix
+++ b/homeManagerModules/apps/kitty/default.nix
@@ -22,61 +22,7 @@ in {
         tab_bar_style = "powerline";
       };
 
-      extraConfig = ''
-        # vim:ft=kitty
-
-        ## name: Adwaita dark
-        ## license: MIT
-        ## author: Emil Löfquist (https://github.com/ewal)
-        ## upstream: https://github.com/ewal/kitty-adwaita/blob/main/adwaita_dark.conf
-        ## blurb: Adwaita dark - based on https://github.com/Mofiqul/adwaita.nvim
-
-        background                ${cfg.theme.colors.background}
-        foreground                ${cfg.theme.colors.text}
-
-        selection_background      ${cfg.theme.colors.primary}
-        selection_foreground      ${cfg.theme.colors.text}
-
-        url_color                 ${cfg.theme.colors.primary}
-
-        wayland_titlebar_color    system
-        macos_titlebar_color      system
-
-        cursor                    ${cfg.theme.colors.text}
-        cursor_text_color         ${cfg.theme.colors.background}
-
-        active_border_color       ${cfg.theme.colors.primary}
-        inactive_border_color     ${cfg.theme.colors.inactive}
-        bell_border_color         ${cfg.theme.colors.secondary}
-        visual_bell_color         none
-
-        active_tab_background     ${cfg.theme.colors.background}
-        active_tab_foreground     ${cfg.theme.colors.text}
-        inactive_tab_background   ${cfg.theme.colors.background}
-        inactive_tab_foreground   ${cfg.theme.colors.inactive}
-        tab_bar_background        none
-        tab_bar_margin_color      none
-
-        color0                    ${cfg.theme.colors.background}
-        color1                    #ed333b
-        color2                    #57e389
-        color3                    #ff7800
-        color4                    #62a0ea
-        color5                    #9141ac
-        color6                    #5bc8af
-        color7                    ${cfg.theme.colors.text}
-
-        color8                    #9a9996
-        color9                    #f66151
-        color10                   #8ff0a4
-        color11                   #ffa348
-        color12                   #99c1f1
-        color13                   #dc8add
-        color14                   #93ddc2
-        color15                   #f6f5f4
-      '';
-
-      # theme = "Adwaita dark";
+      theme = lib.mkDefault "Adwaita dark";
     };
   };
 }
diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix
index 683775fd..23421685 100644
--- a/homeManagerModules/theme.nix
+++ b/homeManagerModules/theme.nix
@@ -12,25 +12,6 @@
     extraCss = ''
       @define-color accent_bg_color ${cfg.colors.primary};
       @define-color accent_color @accent_bg_color;
-      @define-color accent_fg_color ${cfg.colors.text};
-      @define-color window_bg_color ${cfg.colors.background};
-      @define-color window_fg_color ${cfg.colors.text};
-      @define-color view_bg_color ${cfg.colors.background};
-      @define-color view_fg_color @window_fg_color;
-      @define-color headerbar_bg_color ${cfg.colors.background};
-      @define-color headerbar_backdrop_color @window_bg_color;
-      @define-color headerbar_fg_color @window_fg_color;
-
-      @define-color popover_bg_color ${cfg.colors.background};
-      @define-color popover_fg_color @view_fg_color;
-      @define-color dialog_bg_color @popover_bg_color;
-      @define-color dialog_fg_color @popover_fg_color;
-      @define-color card_bg_color @popover_bg_color;
-      @define-color card_fg_color @window_fg_color;
-      @define-color sidebar_bg_color @headerbar_bg_color;
-      @define-color sidebar_fg_color @window_fg_color;
-      @define-color sidebar_backdrop_color @window_bg_color;
-      @define-color sidebar_shade_color rgba(0,0,0,0.25);
 
       ${
         lib.strings.optionalString
@@ -114,7 +95,7 @@ in {
           then "Papirus-Dark"
           else "Papirus";
 
-        package = pkgs.papirus-nord;
+        package = pkgs.papirus-icon-theme.override {color = "adwaita";};
       };
 
       gtk3 = {inherit (gtk) extraConfig extraCss;};
diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index 42c40276..747a8bdc 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -63,6 +63,7 @@ in {
     gitui.enable = true;
     helix.settings.theme = "rose-pine-moon";
     home-manager.enable = true;
+    kitty.theme = "Rosé Pine Moon";
 
     rbw = {
       enable = true;
@@ -116,6 +117,7 @@ in {
     defaultApps = {
       enable = true;
       editor = config.ar.home.apps.zed.package;
+      fileManager = pkgs.xfce.thunar;
     };
 
     services = {