From 5b6d9a064c179235b8cbf04c87300d15fee129f6 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 2 Dec 2022 15:19:40 -0300 Subject: [PATCH] update to nixos 22.11, add a couple comments --- minimal/flake.lock | 30 +++++++----------------------- minimal/flake.nix | 8 ++++++-- minimal/home-manager/home.nix | 2 +- minimal/nixos/configuration.nix | 4 ++-- standard/flake.lock | 30 +++++++----------------------- standard/flake.nix | 8 ++++++-- standard/home-manager/home.nix | 2 +- standard/nixos/configuration.nix | 4 ++-- 8 files changed, 32 insertions(+), 56 deletions(-) diff --git a/minimal/flake.lock b/minimal/flake.lock index 0fbb0a5..6b8c59c 100644 --- a/minimal/flake.lock +++ b/minimal/flake.lock @@ -1,20 +1,5 @@ { "nodes": { - "hardware": { - "locked": { - "lastModified": 1667768008, - "narHash": "sha256-PGbX0s2hhXGnZDFVE6UIhPSOf5YegpWs5dUXpT/14F0=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "f6483e0def85efb9c1e884efbaff45a5e7aabb34", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1667898954, - "narHash": "sha256-VqHVeoxcOl9M6yQ+LV3yTWMb0h5Rl5yixn9PCY/MJJo=", + "lastModified": 1669978198, + "narHash": "sha256-U8sZFwIIDFm9w/Kx58sYrIsWpuQUKmkcQmdBkuQ+gkE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d20e3d070c78271356a2d5d73c01f1de94586087", + "rev": "71fa4cdf9cd89a3e0d452439b6a2f7f01d6292e9", "type": "github" }, "original": { @@ -38,23 +23,22 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667811565, - "narHash": "sha256-HYml7RdQPQ7X13VNe2CoDMqmifsXbt4ACTKxHRKQE3Q=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "667e5581d16745bcda791300ae7e2d73f49fff25", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "hardware": "hardware", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/minimal/flake.nix b/minimal/flake.nix index 7d98891..5a4d31e 100644 --- a/minimal/flake.nix +++ b/minimal/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; # Home manager home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # TODO: Add any other flake you might need - hardware.url = "github:nixos/nixos-hardware"; + # hardware.url = "github:nixos/nixos-hardware"; # Shameless plug: looking for a way to nixify your themes and make # everything match nicely? Try nix-colors! @@ -18,6 +18,8 @@ }; outputs = { nixpkgs, home-manager, ... }@inputs: { + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { # FIXME replace with your hostname your-hostname = nixpkgs.lib.nixosSystem { @@ -27,6 +29,8 @@ }; }; + # Standalone home-manager configuration entrypoint + # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { # FIXME replace with your username@hostname "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { diff --git a/minimal/home-manager/home.nix b/minimal/home-manager/home.nix index a3645b4..ea28c5e 100644 --- a/minimal/home-manager/home.nix +++ b/minimal/home-manager/home.nix @@ -51,5 +51,5 @@ systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "22.05"; + home.stateVersion = "22.11"; } diff --git a/minimal/nixos/configuration.nix b/minimal/nixos/configuration.nix index f4f824c..bd8fd26 100644 --- a/minimal/nixos/configuration.nix +++ b/minimal/nixos/configuration.nix @@ -77,7 +77,7 @@ }; }; - # This sets up a SSH server. Very important if you're setting up a headless system. + # This setups a SSH server. Very important if you're setting up a headless system. # Feel free to remove if you don't need it. services.openssh = { enable = true; @@ -88,5 +88,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "22.05"; + system.stateVersion = "22.11"; } diff --git a/standard/flake.lock b/standard/flake.lock index 0fbb0a5..6b8c59c 100644 --- a/standard/flake.lock +++ b/standard/flake.lock @@ -1,20 +1,5 @@ { "nodes": { - "hardware": { - "locked": { - "lastModified": 1667768008, - "narHash": "sha256-PGbX0s2hhXGnZDFVE6UIhPSOf5YegpWs5dUXpT/14F0=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "f6483e0def85efb9c1e884efbaff45a5e7aabb34", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1667898954, - "narHash": "sha256-VqHVeoxcOl9M6yQ+LV3yTWMb0h5Rl5yixn9PCY/MJJo=", + "lastModified": 1669978198, + "narHash": "sha256-U8sZFwIIDFm9w/Kx58sYrIsWpuQUKmkcQmdBkuQ+gkE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d20e3d070c78271356a2d5d73c01f1de94586087", + "rev": "71fa4cdf9cd89a3e0d452439b6a2f7f01d6292e9", "type": "github" }, "original": { @@ -38,23 +23,22 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667811565, - "narHash": "sha256-HYml7RdQPQ7X13VNe2CoDMqmifsXbt4ACTKxHRKQE3Q=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "667e5581d16745bcda791300ae7e2d73f49fff25", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "hardware": "hardware", "home-manager": "home-manager", "nixpkgs": "nixpkgs" } diff --git a/standard/flake.nix b/standard/flake.nix index 4cf1842..b19bf5f 100644 --- a/standard/flake.nix +++ b/standard/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; # Home manager home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # TODO: Add any other flake you might need - hardware.url = "github:nixos/nixos-hardware"; + # hardware.url = "github:nixos/nixos-hardware"; # Shameless plug: looking for a way to nixify your themes and make # everything match nicely? Try nix-colors! @@ -51,6 +51,8 @@ # These are usually stuff you would upstream into home-manager homeManagerModules = import ./modules/home-manager; + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { # FIXME replace with your hostname your-hostname = nixpkgs.lib.nixosSystem { @@ -62,6 +64,8 @@ }; }; + # Standalone home-manager configuration entrypoint + # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { # FIXME replace with your username@hostname "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { diff --git a/standard/home-manager/home.nix b/standard/home-manager/home.nix index 6b2d124..dcce49e 100644 --- a/standard/home-manager/home.nix +++ b/standard/home-manager/home.nix @@ -58,5 +58,5 @@ systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "22.05"; + home.stateVersion = "22.11"; } diff --git a/standard/nixos/configuration.nix b/standard/nixos/configuration.nix index 7db9279..f73db0e 100644 --- a/standard/nixos/configuration.nix +++ b/standard/nixos/configuration.nix @@ -74,7 +74,7 @@ # TODO: You can set an initial password for your user. # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install. # Be sure to change it (using passwd) after rebooting! - # initialPassword = "correcthorsebatterystaple"; + initialPassword = "correcthorsebatterystaple"; isNormalUser = true; openssh.authorizedKeys.keys = [ # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect @@ -95,5 +95,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "22.05"; + system.stateVersion = "22.11"; }