From b85c34422a481420c9d325e22b6230efc33c81bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 Dec 2024 13:25:41 +0100 Subject: [PATCH 1/3] document installing nixos configuration variants --- src/nixos-anywhere.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/nixos-anywhere.sh b/src/nixos-anywhere.sh index 75572591..545a23f4 100755 --- a/src/nixos-anywhere.sh +++ b/src/nixos-anywhere.sh @@ -67,7 +67,10 @@ Usage: nixos-anywhere [options] [] Options: * -f, --flake - set the flake to install the system from. + set the flake to install the system from. i.e. + nixos-anywhere --flake .#mymachine + Also supports variants: + nixos-anywhere --flake .#nixosConfigurations.mymachine.config.virtualisation.vmVariant * --target-host specified the SSH target host to deploy onto. * -i From b9646592bfe5b784f65c8306c2d4175733c0bd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 Dec 2024 13:23:32 +0100 Subject: [PATCH 2/3] update to 24.11 nixos version --- docs/howtos/use-without-flakes.md | 6 ++--- flake.lock | 38 +++++++++++++++---------------- flake.nix | 2 +- src/nixos-anywhere.sh | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/howtos/use-without-flakes.md b/docs/howtos/use-without-flakes.md index 3f61bdc0..c23bede5 100644 --- a/docs/howtos/use-without-flakes.md +++ b/docs/howtos/use-without-flakes.md @@ -40,8 +40,8 @@ same directory as `disko-config.nix`. ```nix # default.nix let - # replace nixos-24.05 with your preferred nixos version or revision from here: https://status.nixos.org/ - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-24.05.tar.gz"; + # replace nixos-24.11 with your preferred nixos version or revision from here: https://status.nixos.org/ + nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-24.11.tar.gz"; in import (nixpkgs + "/nixos/lib/eval-config.nix") { modules = [ ./configuration.nix ]; @@ -63,7 +63,7 @@ import (nixpkgs + "/nixos/lib/eval-config.nix") { # Set this to the NixOS version that you have set in the previous step. # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; } ``` diff --git a/flake.lock b/flake.lock index e6b311ac..ec484370 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1727359191, - "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=", + "lastModified": 1734088167, + "narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=", "owner": "nix-community", "repo": "disko", - "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700", + "rev": "d32f2d1750d61a476a236526b725ec5a32e16342", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1727367213, - "narHash": "sha256-7O4pi8MmcJpA0nYUQkdolvKGyu6zNjf2gFYD1Q0xppc=", + "lastModified": 1734098258, + "narHash": "sha256-3mzGstXtPqt+zWzXqesgQ2haEI6LNCFhc/uU3Bcj6Ak=", "owner": "nix-community", "repo": "nixos-images", - "rev": "3e7978bab153f39f3fc329ad346d35a8871420f7", + "rev": "231f5f6370e78d04675c9fa8199be6c3b1b85773", "type": "github" }, "original": { @@ -66,27 +66,27 @@ }, "nixos-stable": { "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1727320268, - "narHash": "sha256-B4AK91+9frHerQ6mFAtaR46ECMRtZufrtXFj/b5NqYU=", + "lastModified": 1734057604, + "narHash": "sha256-EC3eHb8Mk54jnk+C8Mtq2sRAaPJzg6zPvRY6OdNHwSc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea2838e1ce0a9da2abf88275843aca29d9f82b30", + "rev": "403845c37839bd698e8c36587f0601e36f76d2a8", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1727252110, - "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 360aaf1d..eb5e32a5 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # used for testing disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-images.url = "github:nix-community/nixos-images"; nixos-images.inputs.nixos-unstable.follows = "nixpkgs"; nixos-images.inputs.nixos-stable.follows = "nixos-stable"; diff --git a/src/nixos-anywhere.sh b/src/nixos-anywhere.sh index 545a23f4..c557d87b 100755 --- a/src/nixos-anywhere.sh +++ b/src/nixos-anywhere.sh @@ -489,7 +489,7 @@ runKexec() { if [[ $kexecUrl == "" ]]; then case "${isArch}" in x86_64 | aarch64) - kexecUrl="https://github.com/nix-community/nixos-images/releases/download/nixos-24.05/nixos-kexec-installer-noninteractive-${isArch}-linux.tar.gz" + kexecUrl="https://github.com/nix-community/nixos-images/releases/download/nixos-24.11/nixos-kexec-installer-noninteractive-${isArch}-linux.tar.gz" ;; *) abort "Unsupported architecture: ${isArch}. Our default kexec images only support x86_64 and aarch64 cpus. Checkout https://github.com/nix-community/nixos-anywhere/#using-your-own-kexec-image for more information." From 041721587e292b35dcd1d75eab207c8f1b8383bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 Dec 2024 15:00:27 +0100 Subject: [PATCH 3/3] remove obsolete github settings app --- .github/settings.yml | 139 ------------------------------------------- 1 file changed, 139 deletions(-) delete mode 100644 .github/settings.yml diff --git a/.github/settings.yml b/.github/settings.yml deleted file mode 100644 index 08fe2150..00000000 --- a/.github/settings.yml +++ /dev/null @@ -1,139 +0,0 @@ -repository: - # See https://developer.github.com/v3/repos/#edit for all available settings. - - # The name of the repository. Changing this will rename the repository - name: nixos-anywhere - - # A short description of the repository that will show up on GitHub - description: install nixos everywhere via ssh - - # A URL with more information about the repository - homepage: https://numtide.github.io/nixos-anywhere - - # A comma-separated list of topics to set on the repository - topics: "" - - # Either `true` to make the repository private, or `false` to make it public. - private: false - - # Either `true` to enable issues for this repository, `false` to disable them. - has_issues: true - - # Either `true` to enable projects for this repository, or `false` to disable them. - # If projects are disabled for the organization, passing `true` will cause an API error. - has_projects: true - - # Either `true` to enable the wiki for this repository, `false` to disable it. - has_wiki: true - - # Either `true` to enable downloads for this repository, `false` to disable them. - has_downloads: false - - # Updates the default branch for this repository. - default_branch: main - - # Either `true` to allow squash-merging pull requests, or `false` to prevent - # squash-merging. - allow_squash_merge: true - - # Either `true` to allow merging pull requests with a merge commit, or `false` - # to prevent merging pull requests with merge commits. - allow_merge_commit: true - - # Either `true` to allow rebase-merging pull requests, or `false` to prevent - # rebase-merging. - allow_rebase_merge: true - - # Either `true` to enable automatic deletion of branches on merge, or `false` to disable - delete_branch_on_merge: true - - # Either `true` to enable automated security fixes, or `false` to disable - # automated security fixes. - enable_automated_security_fixes: true - - # Either `true` to enable vulnerability alerts, or `false` to disable - # vulnerability alerts. - enable_vulnerability_alerts: true - -# Labels: define labels for Issues and Pull Requests -# -labels: -# NOTE: leave that up to the https://github.com/numtide/.github repo -# - name: bug -# color: CC0000 -# description: An issue with the system 🐛. - -# - name: feature -# # If including a `#`, make sure to wrap it with quotes! -# color: '#336699' -# description: New functionality. - -# - name: Help Wanted -# # Provide a new name to rename an existing label -# new_name: first-timers-only - -# Milestones: define milestones for Issues and Pull Requests -milestones: -# - title: milestone-title -# description: milestone-description -# # The state of the milestone. Either `open` or `closed` -# state: open - -# Collaborators: give specific users access to this repository. -# See https://docs.github.com/en/rest/reference/repos#add-a-repository-collaborator for available options -collaborators: - # Note: `permission` is only valid on organization-owned repositories. - # The permission to grant the collaborator. Can be one of: - # * `pull` - can pull, but not push to or administer this repository. - # * `push` - can pull and push, but not administer this repository. - # * `admin` - can pull, push and administer this repository. - # * `maintain` - Recommended for project managers who need to manage the repository without access to sensitive or destructive actions. - # * `triage` - Recommended for contributors who need to proactively manage issues and pull requests without write access. - - username: phaer - permission: push - - username: pogobanane - permission: push - -# See https://docs.github.com/en/rest/reference/teams#add-or-update-team-repository-permissions for available options -teams: - - name: network - # The permission to grant the team. Can be one of: - # * `pull` - can pull, but not push to or administer this repository. - # * `push` - can pull and push, but not administer this repository. - # * `admin` - can pull, push and administer this repository. - # * `maintain` - Recommended for project managers who need to manage the repository without access to sensitive or destructive actions. - # * `triage` - Recommended for contributors who need to proactively manage issues and pull requests without write access. - permission: maintain - -branches: - - name: main - # https://docs.github.com/en/rest/reference/repos#update-branch-protection - # Branch Protection settings. Set to null to disable - protection: - # Required. Require at least one approving review on a pull request, before merging. Set to null to disable. - required_pull_request_reviews: - # # The number of approvals required. (1-6) - # required_approving_review_count: 1 - # # Dismiss approved reviews automatically when a new commit is pushed. - # dismiss_stale_reviews: true - # # Blocks merge until code owners have reviewed. - # require_code_owner_reviews: true - # # Specify which users and teams can dismiss pull request reviews. Pass an empty dismissal_restrictions object to disable. User and team dismissal_restrictions are only available for organization-owned repositories. Omit this parameter for personal repositories. - # dismissal_restrictions: - # users: [] - # teams: [] - # Required. Require status checks to pass before merging. Set to null to disable - required_status_checks: - # Required. Require branches to be up to date before merging. - strict: true - # Required. The list of status checks to require in order to merge into this branch - contexts: [ "bors" ] - # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable. - enforce_admins: false - # Disabled for bors to work - required_linear_history: false - # Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable. - restrictions: - apps: [ "bors" ] - users: [] - teams: []