Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to NixOS 24.11 - Vicuna 🐫 #943

Merged
merged 45 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4bc1213
Update NixOS and related channels to 24.11 as possible now
kachick Nov 16, 2024
d711932
Bump dprint-plugin-kdl with the new schema of dprint
kachick Nov 16, 2024
dfec762
`git ls-files | xargs selfup run`
kachick Nov 16, 2024
5bd92c4
Bump NixOS stateVersion as same as home-manager
kachick Nov 16, 2024
70e7359
Update temporally copied cloudflare-warp NixOS module
kachick Nov 16, 2024
dd43e0a
Remove depreceted sound option in NixOS
kachick Nov 16, 2024
6f31eb6
Remove failing and ussing SKK dependencies
kachick Nov 16, 2024
59b9d79
Remove unused edge pkgs from configuration.nix
kachick Nov 16, 2024
9f4b73a
Enable systemd.enableStrictShellChecks
kachick Nov 16, 2024
79480c4
Replace edge-pkgs with pkgs as possible
kachick Nov 16, 2024
4471614
Use stable nixpkgs in xremap flake
kachick Nov 16, 2024
ca4d091
Bump NixOS-WSL channel
kachick Nov 16, 2024
24f9874
Bump darwin channel to include kdl.vim
kachick Nov 16, 2024
e9a6e13
Fix missing a bump for gpg-sq
kachick Nov 16, 2024
1bfda7d
Replace edge-pkgs as possible in ssh context
kachick Nov 16, 2024
66a7e44
Adopt TODO comment around updating to NixOS 24.11
kachick Nov 16, 2024
9d018ca
Adopt xdg.stateFile since 24.11
kachick Nov 16, 2024
263c335
Add ignoring tag for 24.11 in goreleaser
kachick Nov 16, 2024
ec25817
Simply bump nix related github URLs in comments # No tested
kachick Nov 16, 2024
47b8379
Suppress nixf warning
kachick Nov 16, 2024
f87dc3c
Install ox and jnv also in maOS
kachick Nov 16, 2024
cd338d4
Remove needless package replacement
kachick Nov 16, 2024
3839b61
Fix a typo [ci skip]
kachick Nov 16, 2024
be128e3
Update namespace of gnome packages whcih moved to toplevel
kachick Nov 16, 2024
a82a9d5
Dsiable enableStrictShellChecks for now
kachick Nov 16, 2024
c903229
Follow https://github.com/NixOS/nixpkgs/commit/bcc7eff2c580649de8f8c9…
kachick Nov 16, 2024
caba3b8
Pin to correct stable NixOS 24.11 channel
kachick Nov 18, 2024
3fede7c
Merge branch 'main' into nixos-24.11-staging
kachick Nov 18, 2024
eb9d9de
flake.lock: Update
kachick Nov 18, 2024
9855e11
Using in macOS is much pain
kachick Nov 18, 2024
3093b7e
Remove needless unstable in devshell
kachick Nov 18, 2024
21a63d0
Fix quotation in above commit
kachick Nov 18, 2024
97970d4
Use release channel in Linux again to avoid fcitx5-mozc and bazel_7 p…
kachick Nov 18, 2024
b56bb2e
Refactor edge and homemade with overlays
kachick Nov 19, 2024
da0a7c5
Follow home-manaher kitty module changes
kachick Nov 19, 2024
d8357d7
Install lima with nixpkgs in macOS since it has been udpated
kachick Nov 19, 2024
a4b68dc
Merge branch 'main' into nixos-24.11-staging
kachick Nov 19, 2024
c8340d8
flake.lock: Update
kachick Nov 19, 2024
a199f37
Include fcitx5-mozc quick fix patch
kachick Nov 19, 2024
00f14fc
Backto NixOS 24.11 beta again
kachick Nov 19, 2024
2520946
Use latest for broken calibre and zed-editor
kachick Nov 19, 2024
1093575
Revert "Use latest for broken calibre and zed-editor"
kachick Nov 19, 2024
8bff93c
Revert "Backto NixOS 24.11 beta again"
kachick Nov 19, 2024
d586b42
Clarify why I need release-24.11 instead of nixos-24.11
kachick Nov 19, 2024
89c7235
Add comments about why I need nixpkgs-unstable for now
kachick Nov 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/[email protected]
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