From 85bff9044b07db5ba39d50607f272493b150641e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 3 Dec 2022 14:30:48 +0100 Subject: flake: 22.05 -> 22.11, use rycee-nur directly --- common/default.nix | 3 +- flake.lock | 67 +++++++++++++++++++++------------- flake.nix | 21 +++++++---- usecases/desktop/graphical/firefox.nix | 4 +- 4 files changed, 60 insertions(+), 35 deletions(-) diff --git a/common/default.nix b/common/default.nix index 50ae168..108853a 100644 --- a/common/default.nix +++ b/common/default.nix @@ -22,8 +22,9 @@ inputs: unstable = import inputs.nixpkgs-unstable { inherit (config.nixpkgs) system config; }; + + inherit (import inputs.rycee-nur { pkgs = final; }) firefox-addons; }) - inputs.nur.overlay ]; nix.registry = with lib; diff --git a/flake.lock b/flake.lock index 3f49835..2bb7ce5 100644 --- a/flake.lock +++ b/flake.lock @@ -19,19 +19,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1670059602, + "narHash": "sha256-mtgVnAjlYYjJr2wDnfz94kIefLl61Ww7cjCpLVhN/6Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "6b71989c0dc1c8d386086334290c094240d51798", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -54,16 +55,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669418739, - "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", + "lastModified": 1669919498, + "narHash": "sha256-cndPLdFj2V0OchIgz1sOVKZXOi+ETgSq/OqCCbWsRoo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "695b3515251873e0a7e2021add4bba643c56cde3", + "rev": "14c7bd44711b04c05cb78412451005415310b6bd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -84,21 +85,6 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 1669562715, - "narHash": "sha256-x4SOCkMcQ19g+LVD96o/01aRBW6x0hlw0wyMJ08QTZA=", - "owner": "nix-community", - "repo": "NUR", - "rev": "222f7c06142a675c305f863a489fb7147c5ccae1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -106,10 +92,26 @@ "musnix": "musnix", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "nur": "nur", + "rycee-nur": "rycee-nur", "shmart-prompt-dir": "shmart-prompt-dir" } }, + "rycee-nur": { + "flake": false, + "locked": { + "lastModified": 1670059673, + "narHash": "sha256-zHRpAOYfCOqH6s5fQL1OaM4BIWnNEaFmTX57OfvgxUc=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "8acf5467948e0839cf6cae58c0f1e13c748bfaf0", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "shmart-prompt-dir": { "flake": false, "locked": { @@ -125,6 +127,21 @@ "repo": "shmart-prompt-dir", "type": "github" } + }, + "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bd47154..4ca7cb2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,17 @@ { description = "My NixOS configurations"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - inputs.nur.url = "github:nix-community/NUR"; + inputs.rycee-nur = { + url = "gitlab:rycee/nur-expressions"; + flake = false; + }; inputs.musnix = { url = "github:musnix/musnix"; flake = false; @@ -33,8 +36,8 @@ test = { config, ... }: { imports = [ self.nixosModules.default ]; - home-manager.users.minijackson.home.stateVersion = "21.05"; - home-manager.users.root.home.stateVersion = "21.05"; + home-manager.users.minijackson.home.stateVersion = "22.11"; + home-manager.users.root.home.stateVersion = "22.11"; users.users.minijackson.initialHashedPassword = ""; users.users.root.initialHashedPassword = ""; @@ -141,6 +144,7 @@ { tests.testDefault = nixosTest { + name = "default"; nodes.machine = self.nixosModules.test; testScript = '' # TODO @@ -149,6 +153,7 @@ }; tests.testPlainDesktop = nixosTest { + name = "plainDesktop"; nodes.machine = { ... }: { imports = [ self.nixosModules.test @@ -163,6 +168,7 @@ }; tests.testFullDesktop = nixosTest { + name = "fullDesktop"; nodes.machine = { ... }: { imports = [ self.nixosModules.test @@ -187,6 +193,7 @@ }; tests.testServer = nixosTest { + name = "server"; nodes.machine = { ... }: { imports = [ self.nixosModules.test @@ -251,8 +258,8 @@ isoImage.makeEfiBootable = true; isoImage.makeUsbBootable = true; - home-manager.users.minijackson.home.stateVersion = "21.05"; - home-manager.users.root.home.stateVersion = "21.05"; + home-manager.users.minijackson.home.stateVersion = "22.11"; + home-manager.users.root.home.stateVersion = "22.11"; users.users.minijackson.initialHashedPassword = ""; users.users.root.initialHashedPassword = ""; diff --git a/usecases/desktop/graphical/firefox.nix b/usecases/desktop/graphical/firefox.nix index 8496ba3..bc3c507 100644 --- a/usecases/desktop/graphical/firefox.nix +++ b/usecases/desktop/graphical/firefox.nix @@ -11,7 +11,7 @@ inputs: { programs.firefox = { enable = true; - package = pkgs.firefox-wayland.override { + package = pkgs.firefox.override { cfg.enableBrowserpass = true; extraPolicies = { DisableAppUpdate = true; @@ -29,7 +29,7 @@ inputs: }; }; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions = with pkgs.firefox-addons; [ # Security https-everywhere browserpass -- cgit v1.2.3