From 1b99e1b09d01bcd912778a8002c34129dce06781 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 23 Feb 2025 12:38:57 +0700
Subject: [PATCH] :wastebasket: get rid of legacy packages
---
flake.lock | 34 ------------------------------
flake.nix | 10 ---------
homes/common/terminal.nix | 6 +-----
machines/chungus/service-atuin.nix | 4 ----
4 files changed, 1 insertion(+), 53 deletions(-)
diff --git a/flake.lock b/flake.lock
index 0eeeb1f..c077d42 100644
--- a/flake.lock
+++ b/flake.lock
@@ -822,38 +822,6 @@
"type": "github"
}
},
- "nixpkgs-legacy_2405": {
- "locked": {
- "lastModified": 1735563628,
- "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-legacy_2411": {
- "locked": {
- "lastModified": 1739758141,
- "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "c618e28f70257593de75a7044438efc1c1fc0791",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-24.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-lib": {
"locked": {
"lastModified": 1717284937,
@@ -1192,8 +1160,6 @@
"nixos-anywhere": "nixos-anywhere",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5",
- "nixpkgs-legacy_2405": "nixpkgs-legacy_2405",
- "nixpkgs-legacy_2411": "nixpkgs-legacy_2411",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"permown": "permown",
"polygon-art": "polygon-art",
diff --git a/flake.nix b/flake.nix
index 1dbc7b0..6544df5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,8 +22,6 @@
nix-topology.url = "github:oddlama/nix-topology";
nixos-anywhere.url = "github:nix-community/nixos-anywhere";
nixos-hardware.url = "github:nixos/nixos-hardware";
- nixpkgs-legacy_2405.url = "github:nixos/nixpkgs/nixos-24.05";
- nixpkgs-legacy_2411.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
permown.inputs.nixpkgs.follows = "nixpkgs";
@@ -70,8 +68,6 @@
nixos-anywhere,
nixos-hardware,
nixpkgs,
- nixpkgs-legacy_2405,
- nixpkgs-legacy_2411,
nixpkgs-unstable-small,
permown,
polygon-art,
@@ -120,12 +116,6 @@
inherit allowUnfree permittedInsecurePackages;
};
};
- legacy_2405 = import nixpkgs-legacy_2405 {
- inherit system;
- config = {
- inherit allowUnfree permittedInsecurePackages;
- };
- };
polygon-art = polygon-art.packages.${system};
landingpage = landingpage.packages.${system}.plain;
share-via-http = share-http.packages.${system}.default;
diff --git a/homes/common/terminal.nix b/homes/common/terminal.nix
index 5a571d5..642830b 100644
--- a/homes/common/terminal.nix
+++ b/homes/common/terminal.nix
@@ -42,11 +42,7 @@
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
- #package = pkgs.atuin;
- package = pkgs.legacy_2405.atuin.overrideAttrs (_old: {
- # as cursed as doing mitigations=off in the kernel command line
- patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ];
- });
+ daemon.enable = true;
settings = {
auto_sync = true;
sync_frequency = "5m";
diff --git a/machines/chungus/service-atuin.nix b/machines/chungus/service-atuin.nix
index 1524876..5aa20f9 100644
--- a/machines/chungus/service-atuin.nix
+++ b/machines/chungus/service-atuin.nix
@@ -10,10 +10,6 @@
services.atuin = {
enable = true;
- package = pkgs.legacy_2405.atuin.overrideAttrs (_old: {
- # as cursed as doing mitigations=off in the kernel command line
- patches = [ "${assets}/0001-make-atuin-on-zfs-fast-again.patch" ];
- });
host = "0.0.0.0";
maxHistoryLength = 999999;
openRegistration = false;