about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.lock104
-rw-r--r--flake.nix11
-rw-r--r--modules/common/common/nix/default.nix7
3 files changed, 7 insertions, 115 deletions
diff --git a/flake.lock b/flake.lock
index b41b4aa..8419e2f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -140,48 +140,6 @@
         "type": "gitlab"
       }
     },
-    "chaotic": {
-      "inputs": {
-        "compare-to": "compare-to",
-        "flake-schemas": "flake-schemas",
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems",
-        "yafas": "yafas"
-      },
-      "locked": {
-        "lastModified": 1698579684,
-        "narHash": "sha256-UCvgUGogz0CFdpxM6J10BmptO82fiapB6TR+uoeRdy4=",
-        "owner": "chaotic-cx",
-        "repo": "nyx",
-        "rev": "4934721bdcce4574f82449a0c669c907e701cc6b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chaotic-cx",
-        "ref": "main",
-        "repo": "nyx",
-        "type": "github"
-      }
-    },
-    "compare-to": {
-      "locked": {
-        "lastModified": 1695341185,
-        "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=",
-        "rev": "98b8e330823a3570d328720f87a1153f8a7f2224",
-        "revCount": 2,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/0.1.2.tar.gz"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -261,23 +219,9 @@
         "type": "github"
       }
     },
-    "flake-schemas": {
-      "locked": {
-        "lastModified": 1697467827,
-        "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=",
-        "rev": "764932025c817d4e500a8d2a4d8c565563923d29",
-        "revCount": 29,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.1.tar.gz"
-      }
-    },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -440,11 +384,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1698514468,
-        "narHash": "sha256-7+aObQOccWS5hQND/GKw2RXJo3XoYqC1Ep2gLBq7sYk=",
+        "lastModified": 1698614678,
+        "narHash": "sha256-gtwLWmybxUJyKjDTpp5ERPESHQg6ZCiOhz49cepEUbo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d59ba91d5a8687a8872ce4941ef23533fc2aa009",
+        "rev": "a905c3a544a422b92db99758489e20d84ed755cb",
         "type": "github"
       },
       "original": {
@@ -614,7 +558,6 @@
         "alertmanager-ntfy": "alertmanager-ntfy",
         "arkenfox-nixos": "arkenfox-nixos",
         "azahi-cc": "azahi-cc",
-        "chaotic": "chaotic",
         "darwin": "darwin",
         "dns-nix": "dns-nix",
         "flake-compat": "flake-compat",
@@ -674,21 +617,6 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
@@ -740,30 +668,6 @@
         "type": "git",
         "url": "https://git.azahi.cc/xmonad-ng"
       }
-    },
-    "yafas": {
-      "inputs": {
-        "flake-schemas": [
-          "chaotic",
-          "flake-schemas"
-        ],
-        "systems": [
-          "chaotic",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1695926485,
-        "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=",
-        "rev": "7772afd6686458ca0ddbc599a52cf5d337367653",
-        "revCount": 4,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.0.tar.gz"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 5aa98a9..8df7f19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,17 +49,6 @@
       ref = "master";
     };
 
-    chaotic = {
-      type = "github";
-      owner = "chaotic-cx";
-      repo = "nyx";
-      ref = "main";
-      inputs = {
-        home-manager.follows = "home-manager";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-
     darwin = {
       type = "github";
       owner = "LnL7";
diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix
index 8a684c5..a79a0c3 100644
--- a/modules/common/common/nix/default.nix
+++ b/modules/common/common/nix/default.nix
@@ -4,7 +4,7 @@
   lib,
   localUsername ? lib.my.username,
   pkgs,
-  pkgsPr,
+  pkgsMaster,
   this,
   ...
 }:
@@ -84,7 +84,6 @@ with lib; {
   nixpkgs.overlays = with inputs; [
     self.overlays.default
     nur.overlay
-    chaotic.overlays.default
     (
       _: super: {
         grc = super.grc.overrideAttrs (_: final: {
@@ -130,7 +129,7 @@ with lib; {
           });
 
         telegram-desktop =
-          (super.telegram-desktop_git.override (finalAttrs: {
+          (pkgsMaster.telegram-desktop.override (finalAttrs: {
             stdenv = pkgs.useMoldLinker finalAttrs.stdenv;
           }))
           .overrideAttrs (_: final: {
@@ -141,7 +140,7 @@ with lib; {
               ];
           });
 
-        vesktop = (pkgsPr 263752 "sha256-LAWBE8au4ajSPPksF9rr3ddYCMctzx1FA75r2TCGbXc=").vesktop.overrideAttrs (_: final: {
+        vesktop = pkgsMaster.vesktop.overrideAttrs (_: final: {
           nativeBuildInputs = final.nativeBuildInputs ++ [super.imagemagick];
           patches =
             final.patches

Consider giving Nix/NixOS a try! <3