configuration.nix

@@ -35,7 +35,6 @@ let
 in
 {
   nixpkgs.pkgs = pkgs; # Uses the nixtamal nixpkgs
-  _module.args.nixtamal = nixtamal;
 
   imports =
     [
@@ -49,9 +48,7 @@ in
       ./modules/fonts.nix
       ./modules/hyprland.nix
       ./modules/kernel.nix
-      ./modules/ccache.nix
       ./modules/networking.nix
-      ./modules/mesa.nix
     ];
   
   home-manager.useUserPackages = true; # Puts user packages in /etc/profiles

home/doggo/doggo.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, nixtamal, functions, ... }:
+{ config, pkgs, nixtamal, ... }:
 
 {
   home.username = "doggo";
@@ -38,7 +38,6 @@
     kdePackages.kio-extras
     kdePackages.gwenview
     kdePackages.filelight
-    qalculate-qt
     mission-center
     (pkgs.wrapOBS {
       plugins = with pkgs.obs-studio-plugins; [
@@ -50,7 +49,7 @@
         obs-vkcapture
       ];
     })
-    (functions.mkUnstable ani-cli)
+    (ani-cli.overrideAttrs (old: { version = "unstable"; src = nixtamal.ani-cli; }))
     anime4k
     spotify
     jetbrains.idea

modules/ccache.nix

@@ -1,14 +0,0 @@
-{ config, ... }:
-
-{
-  programs.ccache = {
-    enable = true;
-    packageNames = [
-      # Packages here
-      "mesa"
-      "pkgsi686Linux.mesa"
-    ];
-  };
-
-  nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
-}

modules/mesa.nix

@@ -1,19 +0,0 @@
-{ lib, pkgs, functions, isLaptop, ... }:
-
-let
-  selected_vkDrivers = [ "amd" /* Needed by steam => */ "microsoft-experimental" ] ++ lib.optional (!isLaptop) "intel";
-  selected_glDrivers = [ "radeonsi" "zink" ] ++ lib.optional (!isLaptop) "i915";
-in
-{
-  hardware.graphics = {
-    # Mesa-git because why not
-    package = (functions.mkUnstable pkgs.mesa).override {
-      vulkanDrivers = selected_vkDrivers;
-      galliumDrivers = selected_glDrivers;
-    };
-    package32 = (functions.mkUnstable pkgs.pkgsi686Linux.mesa).override {
-      vulkanDrivers = selected_vkDrivers;
-      galliumDrivers = selected_glDrivers;
-    };
-  };
-}

modules/system-packages.nix

@@ -1,20 +1,6 @@
-{ pkgs, lib, nixtamal, ... }:
+{ pkgs, ... }:
 
-let
-  functions = rec {
-    mkSpecial = pkg: version: suffix:
-      pkg.overrideAttrs (old: {
-        inherit version;
-        src = nixtamal.${pkg.pname + suffix};
-      });
-    mkSpecialVersion = pkg: version: mkSpecial pkg version "";
-    mkUnstable = pkg: mkSpecial pkg "unstable" "-git";
-  };
-in
 {
-  _module.args.functions = functions;
-  home-manager.extraSpecialArgs = { inherit functions; };
-
   environment.systemPackages = with pkgs; [
     git
     curl
@@ -26,9 +12,10 @@ in
     file
     e2fsprogs
     cpu-x
+    lact
     steam-run
     exfatprogs
-    pkgs.nixtamal # Important
+    nixtamal # Important
     android-tools
     kdePackages.kleopatra # Needed to add keys easily
     nload
@@ -36,7 +23,6 @@ in
     clang gcc mold
     cmake
     sbctl # For secure boot with Limine
-    jq # I use it somewhere in my nixtamal manifest
   ];
 
   programs.steam = {

tamal/lock.json

@@ -1,12 +1,11 @@
 {"v":"1.2.0"
 ,"i":{
 "nixpkgs":{"sn":"nixpkgs-src","kd":[1,{"ft":0,"ur":"https://github.com/NixOS/nixpkgs/archive/3e41b24abd260e8f71dbe2f5737d24122f972158.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-BSTBNVIizq+HVWhxRQidoUSBhRS3DYrbbW3IOF4ZMqo="},"fv":"3e41b24abd260e8f71dbe2f5737d24122f972158","ps":[]}
-,"ani-cli-git":{"sn":"ani-cli-git-src","kd":[1,{"ft":0,"ur":"https://github.com/pystardust/ani-cli/archive/b8032b72901721a1ce859ca2816e8e2c914bc616.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-vmoD/YCoSBHABOYyYNxqY5+W4YMSZ5yBoIRA6msHaHA="},"fv":"b8032b72901721a1ce859ca2816e8e2c914bc616","ps":[]}
+,"ani-cli":{"sn":"ani-cli-src","kd":[1,{"ft":0,"ur":"https://github.com/pystardust/ani-cli/archive/b8032b72901721a1ce859ca2816e8e2c914bc616.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-vmoD/YCoSBHABOYyYNxqY5+W4YMSZ5yBoIRA6msHaHA="},"fv":"b8032b72901721a1ce859ca2816e8e2c914bc616","ps":[]}
 ,"catppuccin":{"sn":"catppuccin-src","kd":[1,{"ft":0,"ur":"https://github.com/catppuccin/nix/archive/8b943da8a0f8628f3446d2517ea39babcfaf27f3.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-Ok/y9/GHp/WOe3zR1DShlSBQMoa9WOM1Fk07HJ98c0o="},"fv":"8b943da8a0f8628f3446d2517ea39babcfaf27f3","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"]}
-,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/d8dac1f668fd861369571be3678ec75b1573e7e3.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-FuhCg7veOS/u+vo7uB8y8wO/vpB8X/Es9DgbyCcSZ1o="},"fv":"d8dac1f668fd861369571be3678ec75b1573e7e3","ps":[]}
+,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/d1ccd0721ec599866622665f3651e19e6e2d4c6a.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-5OMdQbr6CYz61i1qGRI6uW/f2cSh0hFjKDdaVcHYq3Y="},"fv":"d1ccd0721ec599866622665f3651e19e6e2d4c6a","ps":[]}
-,"mesa-git":{"sn":"mesa-git-src","kd":[1,{"ft":0,"ur":"https://gitlab.freedesktop.org/mesa/mesa/-/archive/364ae9647756d9045a632c32370181fd1606fd82/mesa-364ae9647756d9045a632c32370181fd1606fd82.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-VgJgh2pD8fsGL3zil0r71AbvfRm1QbRekrddsNOvMdo="},"fv":"364ae9647756d9045a632c32370181fd1606fd82","ps":[]}
 ,"mpv":{"sn":"mpv-src","kd":[1,{"ft":0,"ur":"https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-4u9KCKKEvSoOSO/7oZGIpnuSGcFc2rVmcJfdpFzwc5w="},"fv":"e04638a4b4eac258e679673d2a4171bde3f6c41eacb7e3d860c9a435f07eb9da","ps":["mpv_buffers_fix"]}
 ,"nix-cachyos-kernel":{"sn":"nix-cachyos-kernel-src","kd":[1,{"ft":0,"ur":"https://github.com/xddxdd/nix-cachyos-kernel/archive/756ed060ca6adcdf3e65371e3725b89c58a1354d.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-Fe0eyieRpR2wg5mSTU+1rWBLuDMbAFlBaq2ZyRLDrLU="},"fv":"756ed060ca6adcdf3e65371e3725b89c58a1354d","ps":[]}
 ,"nix-cachyos-settings":{"sn":"nix-cachyos-settings-src","kd":[1,{"ft":0,"ur":"https://github.com/Daaboulex/cachyos-settings-nix/archive/b10930df067b3774ea2a1a79a4cc31480d8471ab.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-tz6jBM/WrxbxBnNB2v7P/jW1A066j0a+kMgallqOKtM="},"fv":"b10930df067b3774ea2a1a79a4cc31480d8471ab","ps":["adios"]}

tamal/manifest.kdl

@@ -81,7 +81,7 @@ inputs {
   }
 
   // Packages
-  ani-cli-git {
+  ani-cli {
     archive {
       url "https://github.com/pystardust/ani-cli/archive/{{fresh_value}}.tar.gz"
     }
@@ -96,19 +96,6 @@ inputs {
     }
     patches mpv_buffers_fix
   }
-  mesa-git {
-    archive {
-      url "https://gitlab.freedesktop.org/mesa/mesa/-/archive/{{fresh_value}}/mesa-{{fresh_value}}.tar.gz"
-    }
-    // This uses the last commit of last month
-    fresh-cmd {
-      $ curl -s "https://gitlab.freedesktop.org/api/v4/projects/mesa%2Fmesa/repository/commits" \
-      -G --data-urlencode "ref_name=main" \
-      --data-urlencode "until=$(date -d \"$(date +%Y-%m-01)\" +%Y-%m-%dT%H:%M:%S%z)" \
-      --data-urlencode "per_page=1"
-      | jq -r ".[0].id"
-    }
-  }
 
   // Others
   catppuccin-godot {