aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock128
-rw-r--r--flake.nix4
-rw-r--r--systems/cobalt/default.nix2
3 files changed, 21 insertions, 113 deletions
diff --git a/flake.lock b/flake.lock
index 81ed847..c678a50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
"stable": "stable"
},
"locked": {
- "lastModified": 1706509311,
- "narHash": "sha256-QQKQ6r3CID8aXn2ZXZ79ZJxdCOeVP+JTnOctDALErOw=",
+ "lastModified": 1711386353,
+ "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=",
"owner": "zhaofengli",
"repo": "colmena",
- "rev": "c84ccd0a7a712475e861c2b111574472b1a8d0cd",
+ "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db",
"type": "github"
},
"original": {
@@ -147,22 +147,6 @@
"type": "github"
}
},
- "flake-compat_5": {
- "flake": false,
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@@ -181,24 +165,6 @@
"type": "github"
}
},
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib_2"
- },
- "locked": {
- "lastModified": 1706830856,
- "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -334,15 +300,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1708373374,
- "narHash": "sha256-yEyDvDj/YQc4GOZa/cXx6YUzexD8uv1rUvD6SJVr6UI=",
+ "lastModified": 1673606088,
+ "narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "93e1c2d08467d1117ebac45689469613a9fe8453",
+ "rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d",
"type": "github"
},
"original": {
"owner": "NixOS",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -379,26 +346,6 @@
"type": "github"
}
},
- "nixpkgs-exotic": {
- "inputs": {
- "flake-compat": "flake-compat_5",
- "flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs"
- },
- "locked": {
- "lastModified": 1708376958,
- "narHash": "sha256-v65WxAyGtwXLB3fOdIApbM47USSPTsKqfbqEzIndBZ0=",
- "ref": "refs/heads/main",
- "rev": "7fe334c0f881b27db617aedaf233f6ae58d72278",
- "revCount": 1,
- "type": "git",
- "url": "https://git.exotic.sh/nixpkgs-exotic"
- },
- "original": {
- "type": "git",
- "url": "https://git.exotic.sh/nixpkgs-exotic"
- }
- },
"nixpkgs-lib": {
"locked": {
"dir": "lib",
@@ -417,31 +364,13 @@
"type": "github"
}
},
- "nixpkgs-lib_2": {
- "locked": {
- "dir": "lib",
- "lastModified": 1706550542,
- "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
- "type": "github"
- },
- "original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-stable": {
"locked": {
- "lastModified": 1710628718,
- "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
+ "lastModified": 1711819797,
+ "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
+ "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"type": "github"
},
"original": {
@@ -451,22 +380,6 @@
"type": "github"
}
},
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1673606088,
- "narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"poetry2nix": {
"inputs": {
"flake-utils": [
@@ -503,7 +416,6 @@
"impermanence": "impermanence",
"nixos-mailserver": "nixos-mailserver",
"nixpkgs-2111": "nixpkgs-2111",
- "nixpkgs-exotic": "nixpkgs-exotic",
"sefidel-web": "sefidel-web",
"sops-nix": "sops-nix",
"unstable": "unstable",
@@ -513,7 +425,7 @@
"sefidel-web": {
"inputs": {
"flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1708115165,
@@ -537,11 +449,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1710644594,
- "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
+ "lastModified": 1711855048,
+ "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
+ "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
"type": "github"
},
"original": {
@@ -634,11 +546,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1710631334,
- "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
+ "lastModified": 1712163089,
+ "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
+ "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github"
},
"original": {
@@ -650,11 +562,11 @@
},
"unstable-small": {
"locked": {
- "lastModified": 1710817074,
- "narHash": "sha256-LeYqqFOre7AoHgGtAV6/7OSdaqu3S3sOFZtfsEQoA+o=",
+ "lastModified": 1712341566,
+ "narHash": "sha256-DCnzhy3Gip9xRp+4wHvGTLqKSoKI0ayR+WHvXpIz78g=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "afa65506cb0b4bed7191223bc693e6779c690a5b",
+ "rev": "ca565875d82f8cf26b0f26477705757937067993",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index e9f1a01..3ef69b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,6 @@
unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-2111.url = "github:nixos/nixpkgs/nixos-21.11";
- nixpkgs-exotic.url = "git+https://git.exotic.sh/nixpkgs-exotic";
-
colmena.url = "github:zhaofengli/colmena";
colmena.inputs.nixpkgs.follows = "unstable";
@@ -34,7 +32,7 @@
system = "x86_64-linux";
- pkgs = import unstable { inherit system; overlays = [ inputs.nixpkgs-exotic.overlays.default ]; };
+ pkgs = import unstable { inherit system; };
lib = unstable.lib.extend
(self: super: { my = import ./lib { inherit pkgs inputs; lib = self; }; });
diff --git a/systems/cobalt/default.nix b/systems/cobalt/default.nix
index 285fe61..22e4049 100644
--- a/systems/cobalt/default.nix
+++ b/systems/cobalt/default.nix
@@ -321,8 +321,6 @@ in
};
services.akkoma = {
enable = true;
- # v3.10.4 with OAuth fixes backported
- package = pkgs.exoticPackages.akkoma;
domain = "exotic.sh";
realHost = "social.exotic.sh";
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-06 17:55:47 +0000