Skip to content

Commit

Permalink
Update to NixOS 24.11 - Vicuna 🐫 (#943)
Browse files Browse the repository at this point in the history
---

* Resolves GH-757
* Closes GH-944
* Begins to use overlay to apply hotfix easy
* Roughly updated the commented URL, it should be checked in #947
* Go with `release-24.11` for now, because of `nixos-24.11` does not have crucial hotfix.

---

* Read and follow
  * https://github.com/NixOS/nixpkgs/blob/8e5e5a6add04c7f1e38e76f59ada6732947f1e55/nixos/doc/manual/release-notes/rl-2411.section.md
  * https://github.com/nix-community/home-manager/blob/a46e702093a5c46e192243edbd977d5749e7f294/docs/release-notes/rl-2411.md
* In NixOS, check the error log with `nixos-rebuild build`. Don't use `switch` first
* In home-manager, check the warnings in CI
* When found issues around packages, [attempt to fix and send PR to upstream](https://github.com/NixOS/nixpkgs/pulls?q=+is%3Apr+author%3Akachick+)

---

* Update NixOS and related channels to 24.11 as possible now

* Bump dprint-plugin-kdl with the new schema of dprint

* `git ls-files | xargs selfup run`

* Bump NixOS stateVersion as same as home-manager

* Update temporally copied cloudflare-warp NixOS module

* Remove depreceted sound option in NixOS

https://github.com/NixOS/nixpkgs/blob/8e5e5a6add04c7f1e38e76f59ada6732947f1e55/nixos/doc/manual/release-notes/rl-2411.section.md?plain=1#L883-L885

* Remove failing and ussing SKK dependencies

* Remove unused edge pkgs from configuration.nix

* Enable systemd.enableStrictShellChecks

* Replace edge-pkgs with pkgs as possible

* Use stable nixpkgs in xremap flake

* Bump NixOS-WSL channel

* Bump darwin channel to include kdl.vim

* Fix missing a bump for gpg-sq

* Replace edge-pkgs as possible in ssh context

* Adopt TODO comment around updating to NixOS 24.11

* Adopt xdg.stateFile since 24.11

* Add ignoring tag for 24.11 in goreleaser

* Simply bump nix related github URLs in comments # No tested

* Suppress nixf warning

* Install ox and jnv also in maOS

* Remove needless package replacement

* Update namespace of gnome packages which moved to toplevel

* Disable enableStrictShellChecks for now

* Follow NixOS/nixpkgs@bcc7eff

* Pin to correct stable NixOS 24.11 channel

Closes GH-944. The bot works is not enough

* flake.lock: Update

Flake lock file updates:

• Updated input 'edge-nixpkgs':
    'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
  → 'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15)
• Updated input 'nixos-wsl/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)

* Follow GH-911 and GH-913 with nix-init 0.3.2 failing in intel macOS

* Remove needless unstable in devshell

* Fix quotation in above commit

* Use release channel in Linux again to avoid fcitx5-mozc and bazel_7 problem

* Refactor edge and homemade with overlays

* Follow home-manaher kitty module changes

* Install lima with nixpkgs in macOS since it has been updated

* flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4637bf5b68943c5d694fdbd20652d496997f088d' (2024-11-18)
  → 'github:NixOS/nixpkgs/3b9b50532fb7712d3714cf25f4e61e8f71a04292' (2024-11-19)
• Updated input 'nixpkgs-darwin':
    'github:NixOS/nixpkgs/f4a0fbc120cd775346111246b453f8af94afc1d1' (2024-11-14)
  → 'github:NixOS/nixpkgs/8d48200ead5adea71485965f92405575c66dab04' (2024-11-19)

* Include fcitx5-mozc quick fix patch

* Backto NixOS 24.11 beta again

* Use latest for broken calibre and zed-editor

* Revert "Use latest for broken calibre and zed-editor"

This reverts commit 2520946.

* Revert "Backto NixOS 24.11 beta again"

This reverts commit 00f14fc.

* Clarify why I need release-24.11 instead of nixos-24.11

* Add comments about why I need nixpkgs-unstable for now
  • Loading branch information
kachick committed Nov 19, 2024
1 parent cf04bee commit 1e55fa4
Show file tree
Hide file tree
Showing 40 changed files with 359 additions and 497 deletions.
6 changes: 0 additions & 6 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
"matchPackageNames": [
"dprint{/,}**"
]
},
{
"matchPackageNames": [
"kachick/dprint-plugin-kdl"
],
"allowedVersions": "<0.2.0"
}
]
}
3 changes: 3 additions & 0 deletions .github/workflows/ci-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ jobs:
# https://github.com/kachick/dotfiles/pull/718#issuecomment-2266331003
if: runner.os == 'Linux'
- run: nix develop --command makers ci-dev
if: runner.os == 'Linux'
- run: nix develop --command makers ci-darwin
if: runner.os == 'macOS'
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
- uses: actions/checkout@v4
- uses: dprint/check@v2.2
with:
dprint-version: '0.45.1' # selfup {"extract":"\\d[^']+","replacer":["dprint", "--version"], "nth": 2}
dprint-version: '0.47.2' # selfup {"extract":"\\d[^']+","replacer":["dprint", "--version"], "nth": 2}

typos:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: crate-ci/typos@v1.21.0 # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["typos", "--version"], "nth": 2}
- uses: crate-ci/typos@v1.27.3 # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["typos", "--version"], "nth": 2}
with:
# https://github.com/crate-ci/typos/issues/779#issuecomment-1635761199
files: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
uses: goreleaser/goreleaser-action@v6
with:
install-only: true
version: 'v1.26.1' # selfup { "extract": "\\d[^']+", "replacer": ["bash", "-c", "goreleaser --version | grep 'GitVersion:'"], "nth": 2 }
version: 'v2.4.4' # selfup { "extract": "\\d[^']+", "replacer": ["bash", "-c", "goreleaser --version | grep 'GitVersion:'"], "nth": 2 }
- name: List files - before build
run: Get-ChildItem
- name: Build winit-*
Expand Down
1 change: 1 addition & 0 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,6 @@ git:
# Templates: allowed
ignore_tags:
- nixos-24.05-release
- nixos-24.11-release

# I can't use ignore_tag_prefixes, it is GoReleaser Pro only feature :<
7 changes: 7 additions & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ dependencies = [
'fmt',
]

# Basically giveup to develop on macOS. However I need to use task-runner for minimum use.
[tasks.ci-darwin]
command = 'makers'
args = [
'--version',
]

[tasks.build-container]
command = './containers/build.bash'

Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ block-beta
end
block:vm:3
lima("Lima") wsl2("WSL2")
lima("Lima") wsl2("WSL2")
end
block:container:3
Expand Down Expand Up @@ -173,13 +173,15 @@ Check [traps](./windows/Multi-booting.md)

## macOS

Apply home-manager with `kachick@macbook` for minimum packages.
I basically [give up to maintain macOS environment](https://github.com/kachick/dotfiles/issues/911).

I basically [give up to maintain macOS environment](https://github.com/kachick/dotfiles/issues/911). Use [Lima](#lima) for development tasks.
1. Apply home-manager with `kachick@macbook` for minimum packages.
1. Install [some packages](https://github.com/kachick/dotfiles/wiki/macOS) without Nix
1. Use [Lima](#lima) for development tasks.

## [Lima](https://github.com/lima-vm/lima)
## Lima

1. Manually setup [lima](https://github.com/kachick/dotfiles/issues/146#issuecomment-2453430154)(default Ubuntu guest) and [some packages](https://github.com/kachick/dotfiles/wiki/macOS) without Nix
1. Setup [Lima](https://github.com/lima-vm/lima) with default Ubuntu guest
1. In the lima as `limactl start`, apply home-manager with `kachick@lima`
1. You can run containers as `lima nerdctl run --rm hello-world`. You can also use podman after above `Podman on Ubuntu` setups

Expand Down
2 changes: 1 addition & 1 deletion config/firefox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ And <https://github.com/yokoffing/Betterfox/blob/> helps to know the overview.

## How to change finder in page position from bottom to top?

In Nix, we can define this step with <https://github.com/nix-community/home-manager/blob/release-24.05/modules/programs/firefox.nix>
In Nix, we can define this step with <https://github.com/nix-community/home-manager/blob/release-24.11/modules/programs/firefox.nix>

1. `about:config`
1. Enable `toolkit.legacyUserProfileCustomizations.stylesheets`
Expand Down
2 changes: 1 addition & 1 deletion dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"https://plugins.dprint.dev/markdown-0.17.8.wasm",
"https://plugins.dprint.dev/toml-0.6.3.wasm",
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm",
"https://plugins.dprint.dev/kachick/kdl-0.1.0.wasm"
"https://plugins.dprint.dev/kachick/kdl-0.2.1.wasm"
]
}
56 changes: 28 additions & 28 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1e55fa4

Please sign in to comment.