fetch more sources from github

3 files changed, 24 insertions, 185 deletions

diff --git a/users/seth/desktop/gnome/default.nix b/users/seth/desktop/gnome/default.nix
index 5dc0030..59198a2 100644
--- a/users/seth/desktop/gnome/default.nix
+++ b/users/seth/desktop/gnome/default.nix
@@ -64,43 +64,12 @@
     };
   };
 
-  xdg.dataFile."blackbox/schemes/Catppuccin-Mocha.json" = {
-    text = ''
-      {
-        "name": "Catppuccin-Mocha",
-        "comment": "Soothing pastel theme for the high-spirited!",
-        "background-color": "#1E1E2E",
-        "foreground-color": "#CDD6F4",
-        "badge-color": "#585B70",
-        "bold-color": "#585B70",
-        "cursor-background-color": "#F5E0DC",
-        "cursor-foreground-color": "#1E1E2E",
-        "highlight-background-color": "#F5E0DC",
-        "highlight-foreground-color": "#1E1E2E",
-        "palette": [
-          "#45475A",
-          "#F38BA8",
-          "#A6E3A1",
-          "#F9E2AF",
-          "#89B4FA",
-          "#F5C2E7",
-          "#94E2D5",
-          "#BAC2DE",
-          "#585B70",
-          "#F38BA8",
-          "#A6E3A1",
-          "#F9E2AF",
-          "#89B4FA",
-          "#F5C2E7",
-          "#94E2D5",
-          "#A6ADC8"
-        ],
-        "use-badge-color": false,
-        "use-bold-color": false,
-        "use-cursor-color": true,
-        "use-highlight-color": true,
-        "use-theme-colors": false
-      }
-    '';
-  };
+  xdg.dataFile."blackbox/schemes/Catppuccin-Mocha.json".source =
+    pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "tilix";
+      rev = "3fd05e03419321f2f2a6aad6da733b28be1765ef";
+      sha256 = "sha256-SI7QxQ+WBHzeuXbTye+s8pi4tDVZOV4Aa33mRYO276k=";
+    }
+    + "/src/Catppuccin-Mocha.json";
 }
diff --git a/users/seth/desktop/plasma/default.nix b/users/seth/desktop/plasma/default.nix
index 24e26a7..7863f44 100644
--- a/users/seth/desktop/plasma/default.nix
+++ b/users/seth/desktop/plasma/default.nix
@@ -10,104 +10,12 @@
     papirus-icon-theme
   ];
 
-  xdg.dataFile."konsole/catppuccin-mocha.colorscheme" = {
-    text = ''
-      [Background]
-      Color=30,30,46
-
-      [BackgroundFaint]
-      Color=30,30,46
-
-      [BackgroundIntense]
-      Color=30,30,46
-
-      [Color0]
-      Color=108,112,134
-
-      [Color0Faint]
-      Color=108,112,134
-
-      [Color0Intense]
-      Color=108,112,134
-
-      [Color1]
-      Color=243,139,168
-
-      [Color1Faint]
-      Color=243,139,168
-
-      [Color1Intense]
-      Color=243,139,168
-
-      [Color2]
-      Color=166,227,161
-
-      [Color2Faint]
-      Color=166,227,161
-
-      [Color2Intense]
-      Color=166,227,161
-
-      [Color3]
-      Color=249,226,175
-
-      [Color3Faint]
-      Color=249,226,175
-
-      [Color3Intense]
-      Color=249,226,175
-
-      [Color4]
-      Color=137,180,250
-
-      [Color4Faint]
-      Color=137,180,250
-
-      [Color4Intense]
-      Color=137,180,250
-
-      [Color5]
-      Color=203,166,247
-
-      [Color5Faint]
-      Color=203,166,247
-
-      [Color5Intense]
-      Color=203,166,247
-
-      [Color6]
-      Color=137,220,235
-
-      [Color6Faint]
-      Color=137,220,235
-
-      [Color6Intense]
-      Color=137,220,235
-
-      [Color7]
-      Color=205,214,244
-
-      [Color7Faint]
-      Color=205,214,244
-
-      [Color7Intense]
-      Color=205,214,244
-
-      [Foreground]
-      Color=205,214,244
-
-      [ForegroundFaint]
-      Color=205,214,244
-
-      [ForegroundIntense]
-      Color=205,214,244
-
-      [General]
-      Blur=false
-      ColorRandomization=false
-      Description=Catppuccin Mocha
-      Opacity=1
-      Wallpaper=
-    '';
-  };
+  xdg.dataFile."konsole/catppuccin-mocha.colorscheme".source =
+    pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "konsole";
+      rev = "7d86b8a1e56e58f6b5649cdaac543a573ac194ca";
+      sha256 = "EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
+    }
+    + "/Catppuccin-Mocha.colorscheme";
 }
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index ce7e7a0..072e630 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -28,51 +28,13 @@
 
   xdg = {
     enable = true;
-    configFile."btop/themes/catppuccin_mocha.theme" = {
-      text = ''
-        theme[main_bg]="#1E1E2E"
-        theme[main_fg]="#CDD6F4"
-        theme[title]="#CDD6F4"
-        theme[hi_fg]="#89B4FA"
-        theme[selected_bg]="#45475A"
-        theme[selected_fg]="#89B4FA"
-        theme[inactive_fg]="#7F849C"
-        theme[graph_text]="#F5E0DC"
-        theme[meter_bg]="#45475A"
-        theme[proc_misc]="#F5E0DC"
-        theme[cpu_box]="#74C7EC"
-        theme[mem_box]="#A6E3A1"
-        theme[net_box]="#CBA6F7"
-        theme[proc_box]="#F2CDCD"
-        theme[div_line]="#6C7086"
-        theme[temp_start]="#F9E2AF"
-        theme[temp_mid]="#FAB387"
-        theme[temp_end]="#F38BA8"
-        theme[cpu_start]="#74C7EC"
-        theme[cpu_mid]="#89DCEB"
-        theme[cpu_end]="#94E2D5"
-        theme[free_start]="#94E2D5"
-        theme[free_mid]="#94E2D5"
-        theme[free_end]="#A6E3A1"
-        theme[cached_start]="#F5C2E7"
-        theme[cached_mid]="#F5C2E7"
-        theme[cached_end]="#CBA6F7"
-        theme[available_start]="#F5E0DC"
-        theme[available_mid]="#F2CDCD"
-        theme[available_end]="#F2CDCD"
-        theme[used_start]="#FAB387"
-        theme[used_mid]="#FAB387"
-        theme[used_end]="#F38BA8"
-        theme[download_start]="#B4BEFE"
-        theme[download_mid]="#B4BEFE"
-        theme[download_end]="#CBA6F7"
-        theme[upload_start]="#B4BEFE"
-        theme[upload_mid]="#B4BEFE"
-        theme[upload_end]="#CBA6F7"
-        theme[process_start]="#74C7EC"
-        theme[process_mid]="#89DCEB"
-        theme[process_end]="#94E2D5"
-      '';
-    };
+    configFile."btop/themes/catppuccin_mocha.theme".source =
+      pkgs.fetchFromGitHub {
+        owner = "catppuccin";
+        repo = "btop";
+        rev = "ecb8562bb6181bb9f2285c360bbafeb383249ec3";
+        sha256 = "sha256-ovVtupO5jWUw6cwA3xEzRe1juUB8ykfarMRVTglx3mk=";
+      }
+      + "/catppuccin_mocha.theme";
   };
 }