config sync

7 files changed, 54 insertions, 34 deletions

diff --git a/modules/git.home.nix b/modules/git.home.nix
index a8b9b12..66cd793 100644
--- a/modules/git.home.nix
+++ b/modules/git.home.nix
@@ -15,10 +15,10 @@
       ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi";
     };
     extraConfig = {
-      "color" = {
-        "ui" = true;
+      color = {
+        ui = true;
       };
-      "init" = {
+      init = {
         defaultBranch = "main";
       };
       "color \"diff-highlight\"" = {
@@ -35,7 +35,7 @@
         new = "green bold";
         whitespace = "red reverse";
       };
-      #"pull" = { rebase = true; };
+      pull = { rebase = false; };
     };
     signing.key = "AAAB13AE8B82A5267C1A35D7E1B701723EA37849";
     signing.signByDefault = true;
diff --git a/modules/work.nix b/modules/work.nix
index 6266e64..a900b65 100644
--- a/modules/work.nix
+++ b/modules/work.nix
@@ -8,7 +8,7 @@ in
   ];
 
   services.vanta = {
-    enable = true;
+    enable = false;
     agentKey = vantaCreds.VANTA_KEY;
     email = vantaCreds.VANTA_OWNER_EMAIL;
   };
diff --git a/modules/xresources.home.nix b/modules/xresources.home.nix
index a570599..20d3ce1 100644
--- a/modules/xresources.home.nix
+++ b/modules/xresources.home.nix
@@ -2,28 +2,20 @@
 {
   xresources.properties =
     let
-      bg = "#0f0c19";
-      fg = "#d8dee9";
-      accent = "#4e3aA3";
-      ##A22F3E
-      ##A1313F
-      ##A82E3D
-      ##AE2E3D
-      ##EB4960
-      ##B22337
-      ##F32929
+      theme = import ./xresources/catcula.nix;
+      # theme = import ./xresources/tealicious.nix;
     in
     {
-      "*.foreground" = fg;
-      "*.background" = bg;
-      "*.cursorColor" = fg;
-      "*.accent" = accent;
+      "*.foreground" = theme.foreground;
+      "*.background" = theme.background;
+      "*.cursorColor" = theme.foreground;
+      "*.accent" = theme.accent;
 
       "*.color0" = "#15121f";
       "*.color8" = "#555555";
 
       "*.color1" = "#e06c75";
-      "*.color9" = "#bf616a";
+      "*.color9" = "#7c162e";
 
       "*.color2" = "#98C379";
       "*.color10" = "#a3be8c";
@@ -43,22 +35,22 @@
       "*.color7" = "#ABB2BF";
       "*.color15" = "#ebdbb2";
 
-      "dmenu.background" = bg;
-      "dmenu.foreground" = fg;
-      "dmenu.selbackground" = accent;
-      "dmenu.selforeground" = fg;
+      "dmenu.background" = theme.background;
+      "dmenu.foreground" = theme.foreground;
+      "dmenu.selbackground" = theme.accent;
+      "dmenu.selforeground" = theme.foreground;
 
-      "dmenu.highlightbg" = bg;
-      "dmenu.highlightfg" = accent;
-      "dmenu.highlightselbg" = accent;
-      "dmenu.highlightselfg" = bg;
+      "dmenu.highlightbg" = theme.background;
+      "dmenu.highlightfg" = theme.accent;
+      "dmenu.highlightselbg" = theme.accent;
+      "dmenu.highlightselfg" = theme.background;
 
-      "dwm.normbordercolor" = bg;
-      "dwm.normbgcolor" = bg;
-      "dwm.normfgcolor" = fg;
+      "dwm.normbordercolor" = theme.background;
+      "dwm.normbgcolor" = theme.background;
+      "dwm.normfgcolor" = theme.foreground;
 
-      "dwm.selbordercolor" = accent;
-      "dwm.selbgcolor" = accent;
-      "dwm.selfgcolor" = fg;
+      "dwm.selbordercolor" = theme.accent;
+      "dwm.selbgcolor" = theme.accent;
+      "dwm.selfgcolor" = theme.foreground;
     };
 }
diff --git a/modules/xresources/catcula.nix b/modules/xresources/catcula.nix
new file mode 100644
index 0000000..b2d5df3
--- /dev/null
+++ b/modules/xresources/catcula.nix
@@ -0,0 +1,5 @@
+{
+  background = "#0f0c19";
+  foreground = "#d8dee9";
+  accent = "#4e3aA3";
+}
diff --git a/modules/xresources/rediculous.nix b/modules/xresources/rediculous.nix
new file mode 100644
index 0000000..2f21130
--- /dev/null
+++ b/modules/xresources/rediculous.nix
@@ -0,0 +1,13 @@
+{
+  background = "#0f0c19";
+  foreground = "#e8ded9";
+  accent = "#7c162e";
+
+  #A22F3E
+  #A1313F
+  #A82E3D
+  #AE2E3D
+  #EB4960
+  #B22337
+  #F32929
+}
diff --git a/modules/xresources/tealicious.nix b/modules/xresources/tealicious.nix
new file mode 100644
index 0000000..782f6c2
--- /dev/null
+++ b/modules/xresources/tealicious.nix
@@ -0,0 +1,5 @@
+{
+  background = "#1c1d1f";
+  foreground = "#ddeeff";
+  accent = "#0597a4";
+}
diff --git a/modules/xresources/yelloutloud.nix b/modules/xresources/yelloutloud.nix
new file mode 100644
index 0000000..0baa950
--- /dev/null
+++ b/modules/xresources/yelloutloud.nix
@@ -0,0 +1,5 @@
+{
+  background = "#0e0e10";
+  foreground = "#d8dee9";
+  accent = "#ffdd59";
+}