From cec7ed381881a59d20c887679ecd421b60b0a475 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 27 Mar 2025 19:12:25 +0100 Subject: [PATCH] renaming nixpkgs-unstable to nixos-unstable --- flake.lock | 68 ++++++++++++++++++------------------- flake.nix | 6 ++-- hosts/crocoite/crocoite.nix | 51 ++++++++++++++-------------- overlays/default.nix | 2 +- 4 files changed, 64 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 51811bd..dccf4d2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "lastModified": 1741903049, + "narHash": "sha256-8Y8brH04JjSLrCLvBEbhK9vOu7lhQhqUBW4kI3tifdI=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "rev": "42c7fb2702219b86a8f5969c3475ce594c28f5d0", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -88,29 +88,13 @@ "type": "github" } }, - "nixpkgs": { + "nixos-unstable": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -120,14 +104,30 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixos-unstable": "nixos-unstable", + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index b3ed743..2dfe65a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; # NixOS unstable channel - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; # ready made hardware configurations. e.G.: Power saving nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -35,7 +35,7 @@ self, nixpkgs, nixos-hardware, - nixpkgs-unstable, + nixos-unstable, nix-flatpak, home-manager, nixos-generators, @@ -53,7 +53,7 @@ host_helper = hostname: { ${hostname} = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; + specialArgs = {inherit inputs;} // {inherit nixos-unstable;}; modules = [ ./hosts/${hostname}/${hostname}.nix ]; diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index 0ba6191..266b8c4 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -1,8 +1,8 @@ -{ - pkgs, - inputs, - modulesPath, - ... +{ pkgs +, inputs +, modulesPath +, nixos-unstable +, ... }: { networking.hostName = "crocoite"; # Define your hostname. @@ -41,7 +41,7 @@ }; nix = { - settings.experimental-features = ["nix-command" "flakes"]; + settings.experimental-features = [ "nix-command" "flakes" ]; # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, # focused on correctness, usability, and growth – @@ -52,33 +52,34 @@ }; imports = [ - # steam and other stuff seems to depend on perl - #"${modulesPath}/profiles/perlless.nix" + # steam and other stuff seems to depend on perl + #"${modulesPath}/profiles/perlless.nix" - inputs.nix-flatpak.nixosModules.nix-flatpak - #nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1 - ./hardware-configuration.nix - ./boot.nix + inputs.nix-flatpak.nixosModules.nix-flatpak - ../../modules + #nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1 + ./hardware-configuration.nix + ./boot.nix - ../../modules/users + ../../modules - ../../modules/hardware + ../../modules/users - ../../modules/sec_auth + ../../modules/hardware - ../../modules/software - ../../modules/software/browser - ../../modules/software/nix-helper - ../../modules/software/shells - ../../modules/software/office + ../../modules/sec_auth - ../../modules/wm_and_de + ../../modules/software + ../../modules/software/browser + ../../modules/software/nix-helper + ../../modules/software/shells + ../../modules/software/office - ../../modules/pkg_mgrmnt + ../../modules/wm_and_de - ../../tests/glitchtip-container.nix - ]; + ../../modules/pkg_mgrmnt + + # ../../tests + ]; } diff --git a/overlays/default.nix b/overlays/default.nix index 7bfcb4c..69e7d0e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -15,7 +15,7 @@ # 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 { + unstable = import inputs.nixos-unstable { system = final.system; config.allowUnfree = true; };