From 000003034b2f4ab656fee44de130b427f4993475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Jun 2023 20:28:00 +0200 Subject: [PATCH] Cleanup --- flake.lock | 17 ----------------- flake.nix | 4 ---- hosts/glotzbert/default.nix | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 6a238318..dbfbd408 100644 --- a/flake.lock +++ b/flake.lock @@ -377,22 +377,6 @@ "type": "github" } }, - "nixos-22-11": { - "locked": { - "lastModified": 1686561852, - "narHash": "sha256-gMXLhJHtE8F+lySUGZhGWJfVxvfpV1uOTekjQG0rM6o=", - "owner": "SuperSandro2000", - "repo": "nixpkgs", - "rev": "9af59c6f7db5d24cec056ae8171196abf6aaf5fb", - "type": "github" - }, - "original": { - "owner": "SuperSandro2000", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1686452266, @@ -500,7 +484,6 @@ "naersk": "naersk", "nix-cache-cut": "nix-cache-cut", "nixos": "nixos", - "nixos-22-11": "nixos-22-11", "nixos-hardware": "nixos-hardware", "nixos-modules": "nixos-modules", "oparl-scraper": "oparl-scraper", diff --git a/flake.nix b/flake.nix index c97ef4a8..6cb487b2 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ inputs = { # use sandro's fork full with cherry-picked fixes - nixos-22-11.url = "github:SuperSandro2000/nixpkgs/nixos-22.11"; nixos.url = "github:SuperSandro2000/nixpkgs/nixos-23.05"; nixos-hardware.url = "github:nixos/nixos-hardware"; @@ -496,9 +495,6 @@ }; mobilizon = nixosSystem' { - # TODO: pending https://github.com/NixOS/nixpkgs/pull/119132 - # cherry-picked by sandro into his 22.11 fork - # nixpkgs = inputs.nixos-mobilizon; modules = [ self.nixosModules.microvm ./hosts/mobilizon diff --git a/hosts/glotzbert/default.nix b/hosts/glotzbert/default.nix index 7a9129b6..d8d93e33 100644 --- a/hosts/glotzbert/default.nix +++ b/hosts/glotzbert/default.nix @@ -136,5 +136,5 @@ extraGroups = [ "networkmanager" ]; }; - system.stateVersion = "22.11"; # Did you read the comment? + system.stateVersion = "22.11"; }