From c78025c034de0d9037cad613a03e70b184246d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20H=C3=A9mono?= Date: Tue, 27 Aug 2024 15:37:28 +0200 Subject: [PATCH] switch to unstable --- flake.lock | 29 ++++++----------------------- flake.nix | 1 - hosts/gwiad/configuration.nix | 3 +-- overlays/default.nix | 11 ----------- 4 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 overlays/default.nix diff --git a/flake.lock b/flake.lock index 75be683..d81a632 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1724117347, - "narHash": "sha256-/nfm6P0owPtCRjT8ktq/8OChtg2HpkrvNaDJGm9N1Lk=", + "lastModified": 1724722238, + "narHash": "sha256-DLtiPBpKBIL4+lxu7H8e6gPZvZ3Rb7D8mMh8OieBURM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2ef60116ef361d988317cbe52a09acfeda7d3416", + "rev": "ad07ef4512e976b9537d05b7d2e4a5d7a2965ff7", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1724531977, + "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32", "type": "github" }, "original": { @@ -90,28 +90,11 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "mysecrets": "mysecrets", "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, diff --git a/flake.nix b/flake.nix index 1e6bfa6..094e9d8 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Secrets management sops-nix = { diff --git a/hosts/gwiad/configuration.nix b/hosts/gwiad/configuration.nix index 587a022..3f080a4 100644 --- a/hosts/gwiad/configuration.nix +++ b/hosts/gwiad/configuration.nix @@ -43,7 +43,6 @@ config.allowUnfree = true; overlays = [ inputs.nix-vscode-extensions.overlays.default - outputs.overlays.unstable-packages ]; }; @@ -62,7 +61,7 @@ multirow arydshln; }; - my-vscode = unstable.vscode-with-extensions.override { + my-vscode = vscode-with-extensions.override { vscodeExtensions = with vscode-marketplace; [ ms-python.python ms-python.vscode-pylance diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index 1d0fb57..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -# This file defines overlays -{inputs, ...}: { - # When applied, the unstable nixpkgs set (declared in the flake inputs) will - # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - }; - }; -}