From 884590e97233194f8f17928bbc27fca410ccd4ee Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 14 Sep 2023 18:22:41 +0200 Subject: [PATCH 1/2] Flake: remove leftover nixPath setting --- flake.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/flake.nix b/flake.nix index 523799f..377040a 100755 --- a/flake.nix +++ b/flake.nix @@ -75,8 +75,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl Also has nice side effect of making it easier to add new systems :3 */ modules = [ - # Needed for nix-index - { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } agenix.nixosModules.default home-manager-unstable.nixosModule nix-index-db-unstable.nixosModules.nix-index @@ -92,8 +90,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl system = "x86_64-linux"; specialArgs = { systemPkgs = inputs.nixpkgs; }; modules = [ - # Needed for nix-index - { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } agenix.nixosModules.default home-manager.nixosModule nixos-hardware.nixosModules.microsoft-surface-go @@ -109,8 +105,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl system = "x86_64-linux"; specialArgs = { systemPkgs = inputs.nixpkgs-unstable; }; modules = [ - # Needed for nix-index - { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } agenix.nixosModules.default jovian.nixosModules.default home-manager-unstable.nixosModule @@ -127,8 +121,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl system = "x86_64-linux"; specialArgs = { systemPkgs = inputs.nixpkgs; }; modules = [ - # Needed for nix-index - { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } agenix.nixosModules.default home-manager.nixosModule nix-index-db.nixosModules.nix-index From da0bd779303547fb7031c27eed1cb011599d4fc7 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 14 Sep 2023 23:19:26 +0200 Subject: [PATCH 2/2] Common: set system.configurationRevision --- flake.nix | 10 +++++----- roles/common/configuration.nix | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 377040a..ef3b7fc 100755 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ inputs = { }; }; -outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, nix-index-db, nix-index-db-unstable, jovian, ... } @inputs: { +outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, nix-index-db, nix-index-db-unstable, jovian, ... } @inputs: { devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { name = "Environment for toast's nixos configurations"; @@ -67,7 +67,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl nixosConfigurations = { Archie = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { systemPkgs = inputs.nixpkgs-unstable; }; + specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; }; /* I used to set up nixpkgs in the flake, but doing that made defining overlays in modules impossible (or at least I could @@ -88,7 +88,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl SurfaceGo = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { systemPkgs = inputs.nixpkgs; }; + specialArgs = { systemPkgs = inputs.nixpkgs; flakeSelf = self; }; modules = [ agenix.nixosModules.default home-manager.nixosModule @@ -103,7 +103,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl SteamDeck = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { systemPkgs = inputs.nixpkgs-unstable; }; + specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; }; modules = [ agenix.nixosModules.default jovian.nixosModules.default @@ -119,7 +119,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl Everest = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { systemPkgs = inputs.nixpkgs; }; + specialArgs = { systemPkgs = inputs.nixpkgs; flakeSelf = self; }; modules = [ agenix.nixosModules.default home-manager.nixosModule diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index 495b4f3..9bf3d40 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, flakeSelf, ... }: { environment = { @@ -85,5 +85,8 @@ manually on everything else */ - system.stateVersion = "23.05"; + system = { + stateVersion = "23.05"; + configurationRevision = flakeSelf.sourceInfo.rev or flakeSelf.sourceInfo.dirtyRev; + }; }