home/doggo/doggo.nix

@@ -120,8 +120,6 @@ in
     # flatpak --user install org.freedesktop.Platform.GL.mesa-git
     # flatpak --user install org.freedesktop.Platform.GL32.mesa-git
     FLATPAK_GL_DRIVERS = "mesa-git";
-
-    NIXOS_OZONE_WL = "1"; # Makes electron apps (e.g discord & spotify) use wayland
   };
 
   programs = {

home/doggo/spicetify-config.nix

@@ -1,19 +1,11 @@
-{ spicetify-nix, nixtamal, ... }:
+{ spicetify-nix, ... }:
 
 {
   programs.spicetify = {
     enable = true;
 
-    theme = {
-      name = "spotneotify";
-      src = nixtamal.spotneotify;
-      injectCss      = true;
-      replaceColors  = true;
-      injectThemeJs  = false;
-      overwriteAssets = false;
-    };
-    colorScheme = "CatppuccinMocha";
-
+    theme = spicetify-nix.packages.themes.catppuccin; # TODO: Use https://github.com/0lswitcher/spotneotify
+    colorScheme = "mocha";
     enabledExtensions = with spicetify-nix.packages.extensions; [];
     enabledCustomApps = with spicetify-nix.packages.apps; [];
   };

modules/system-packages.nix

@@ -16,14 +16,6 @@ let
         patches = newPatches;
       });
     mkPatchedAuto = pkg: mkPatched pkg [ nixtamal.${pkg.pname + "-patch"} ];
-
-    importFlake = flakeRef:
-      let
-        src = nixtamal.${flakeRef};
-      in
-        ((import nixtamal.flake-compat { inherit pkgs; }) {
-          inherit src;
-        }).defaultNix.packages.${pkgs.system}.default;
   };
 in
 {

tamal/lock.json

@@ -5,7 +5,6 @@
 ,"catppuccin":{"sn":"catppuccin-src","kd":[1,{"ft":0,"ur":"https://github.com/catppuccin/nix/archive/f2c7dd14ecce785c206a39466cbe227ff62e3803.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-2/Fs6S8wK0GSJvEx1rPMW6KWORM8TZCleAmBxQDs5oA="},"fv":"f2c7dd14ecce785c206a39466cbe227ff62e3803","ps":[]}
 ,"catppuccin-godot":{"sn":"catppuccin-godot-src","kd":[0,{"ft":0,"ur":"https://raw.githubusercontent.com/catppuccin/godot/d8b72b679078f0103a5e5c1ef793c1d698a563b1/themes/Catppuccin%20Mocha.tet","ms":[]}],"ha":{"al":2,"vl":"blake3-WVY58qsBKJlGvir08RYlS+RcjdhFvXz+7YHVfEr6tes="},"fv":"d8b72b679078f0103a5e5c1ef793c1d698a563b1","ps":[]}
 ,"dolphin-overlay":{"sn":"dolphin-overlay-src","kd":[1,{"ft":0,"ur":"https://github.com/rumboon/dolphin-overlay/archive/65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-PCS3mMGsTYXadc/DDU/EQv2T/0YORMigwUP6NEeOJW4="},"fv":"65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd","ps":["kservice_fix"]}
-,"flake-compat":{"sn":"flake-compat-src","kd":[1,{"ft":0,"ur":"https://github.com/NixOS/flake-compat/archive/5edf11c44bc78a0d334f6334cdaf7d60d732daab.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-MmtcMfj5QuWGiFGGOdUMcaS0MSNzyV8dNCcsrPQq+Gk="},"fv":"5edf11c44bc78a0d334f6334cdaf7d60d732daab","ps":[]}
 ,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/4ad9aaae70c9aaab504127f926c0fa9cfbc2b365.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-20slOYEZOXjsi48ytBvFJMxsthykNS1mSzHRjiIBnWE="},"fv":"4ad9aaae70c9aaab504127f926c0fa9cfbc2b365","ps":[]}
 ,"lact-patch":{"sn":"lact-patch-src","kd":[0,{"ft":0,"ur":"https://patch-diff.githubusercontent.com/raw/ilya-zlobintsev/LACT/pull/1080.patch","ms":[]}],"ha":{"al":2,"vl":"blake3-x+HU/32454H6ZHu2i3AkdPECt9Jj4vW0Ac2jTzjpUvk="},"fv":"W/735aa2b881ef2024d0d6fcb4d2d48dd4","ps":[]}
 ,"low_latency_layer-git":{"sn":"low_latency_layer-git-src","kd":[1,{"ft":0,"ur":"https://github.com/Korthos-Software/low_latency_layer/archive/3138b14ebd059cd540444771dd184fbf7ead2a12.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-eaek3w60syOHOmRNdCDBTQ+MZw4O9fDGbpirlyuUnoQ="},"fv":"3138b14ebd059cd540444771dd184fbf7ead2a12","ps":[]}
@@ -17,7 +16,6 @@
 ,"nix-citizen":{"sn":"nix-citizen-src","kd":[1,{"ft":0,"ur":"https://github.com/LovingMelody/nix-citizen/archive/9d93df2ace0c1c2f83b7d03bfee81441d63ec5e0.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-DzYwUEREkRuu14DGa5YO57HXDg7wHjP7rglmG4sAYkU="},"fv":"9d93df2ace0c1c2f83b7d03bfee81441d63ec5e0","ps":[]}
 ,"nix-gaming":{"sn":"nix-gaming-src","kd":[1,{"ft":0,"ur":"https://github.com/fufexan/nix-gaming/archive/f95c6acda72f71f1bc0dbf4391f731e0f03ab4af.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-AhaJ7UIsLU+raCGCP9L4Rns5TSgewpHJ9c7zAwj1QLs="},"fv":"f95c6acda72f71f1bc0dbf4391f731e0f03ab4af","ps":[]}
 ,"nix-spicetify":{"sn":"nix-spicetify-src","kd":[1,{"ft":0,"ur":"https://github.com/Gerg-L/spicetify-nix/archive/5ff9a6ca9dcbad7cccea2c97d30237468b16feda.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-lQKQP7nTCJ4Y+QHuMPDlLE9snuIOSKZ8kTpFt6vKJkM="},"fv":"5ff9a6ca9dcbad7cccea2c97d30237468b16feda","ps":[]}
-,"spotneotify":{"sn":"spotneotify-src","kd":[1,{"ft":0,"ur":"https://github.com/0lswitcher/spotneotify/archive/42a296482e28e6549baa5c31850ffafb7890a1a8.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-OgtK8Vh6JI2Y/iINgWU6URPPtpbGaNGSPXEoNWWH0lo="},"fv":"42a296482e28e6549baa5c31850ffafb7890a1a8","ps":[]}
 }
 ,"p":{
 "mpv_buffers_fix":{"ur":"https://patch-diff.githubusercontent.com/raw/mpv-player/mpv/pull/17303.patch","ha":{"al":2,"vl":"blake3-/y4M5tEZmuhh6q5zvg1lbf/jjdnRulPEoycCBcZm/cQ="}}

tamal/manifest.kdl

@@ -71,16 +71,6 @@ inputs {
     }
   }
 
-  flake-compat {
-    archive {
-      url "https://github.com/NixOS/flake-compat/archive/{{fresh_value}}.tar.gz"
-    }
-    fresh-cmd {
-      $ git ls-remote --branches "https://github.com/NixOS/flake-compat.git" --refs "refs/heads/master"
-      | cut -f1
-    }
-  }
-
   nix-citizen {
     archive {
       url "https://github.com/LovingMelody/nix-citizen/archive/{{fresh_value}}.tar.gz"
@@ -110,15 +100,6 @@ inputs {
       | cut -f1
     }
   }
-  spotneotify {
-    archive {
-      url "https://github.com/0lswitcher/spotneotify/archive/{{fresh_value}}.tar.gz"
-    }
-    fresh-cmd {
-      $ git ls-remote --branches "https://github.com/0lswitcher/spotneotify.git" --refs "refs/heads/main"
-      | cut -f1
-    }
-  }
 /*
   odysseus {
     archive {