diff --git a/README.md b/README.md index 958c2e58..0bb4b952 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Stargazers - + diff --git a/flake.lock b/flake.lock index e807825b..eee0bad9 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1743762088, - "narHash": "sha256-f+oXT9b3xuBDmm4v4nDqJvlHabxxZRB6+pay4Ub/NvA=", + "lastModified": 1747684088, + "narHash": "sha256-7VcdMOgQ/PRLr0bnJwNWZX7asrWbRJlLFw21xffm6g8=", "owner": "Kirottu", "repo": "anyrun", - "rev": "786f539d69d5abcefa68978dbaa964ac14536a00", + "rev": "54b462b87129cf059a348fc3a6cc170b9714e0e7", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "locked": { "dir": "blender", - "lastModified": 1742939360, - "narHash": "sha256-YeM/A4SWHlz2trSNjriPi4QR5zsYMC8vkQawSlRw2+w=", + "lastModified": 1746378999, + "narHash": "sha256-aF+uC/aYR4I7VxN9s0gQG1WRDTE0Re3jAMd0qBkWjV4=", "owner": "edolstra", "repo": "nix-warez", - "rev": "c9d2d5c61a37f2217e9241ccfa6c394ed2f3e52b", + "rev": "85d76721132cc6631bbaa8c950d4d0f3aa4003fd", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1744406261, - "narHash": "sha256-Wh7pdOAZk0aQnA9agLjf+NUaXQrwLCFNT9Ai/YtQpAo=", + "lastModified": 1747748847, + "narHash": "sha256-0sJTOuoqVJEloAJDPq5vQaYVbmRffVqNbkVpI1hFKRA=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "66636195f18d21bd65f8e7ced461f6b6770be189", + "rev": "4c50a4d487ab14b5f5cc6ed569c2b75e945d137f", "type": "github" }, "original": { @@ -696,11 +696,11 @@ ] }, "locked": { - "lastModified": 1742014779, - "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", + "lastModified": 1744693102, + "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "524637ef84c177661690b924bf64a1ce18072a2c", + "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", "type": "github" }, "original": { @@ -737,11 +737,11 @@ ] }, "locked": { - "lastModified": 1744498625, - "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", + "lastModified": 1747793476, + "narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=", "owner": "nix-community", "repo": "home-manager", - "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", + "rev": "2468b2d35512d093aeb04972a1d8c20a0735793f", "type": "github" }, "original": { @@ -811,10 +811,10 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1747114916, - "narHash": "sha256-xrrY4XKcKO6QNISJ5BWJvHZ+Rwc5NZah+Nyie9yjuaE=", + "lastModified": 1747448205, + "narHash": "sha256-zhxt20XsHHrzQxBoFK/vDtXwSMUbMv/S4RilUGBXCBo=", "ref": "refs/heads/main", - "rev": "cf42f385cfcdded990749c7e1c95368a2a166f81", + "rev": "50cff14e04e8782e74c04c7cfac2523017d52c02", "shallow": true, "type": "git", "url": "ssh://git@github.com/ryan4yin/nix-secrets.git" @@ -861,11 +861,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1747752313, + "narHash": "sha256-Z5OnPIZ3/ijo5xLCOpWoVbUE5JNnGxSHGhnJ3u9f2GE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "9ed53ae9abb5b125e453f37e475da5b8c368e676", "type": "github" }, "original": { @@ -880,11 +880,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1744513856, - "narHash": "sha256-4e1Q81PxVooO+dkFtpDLKqVwxvBhdWmd1N8pgzqF0Zo=", + "lastModified": 1747787704, + "narHash": "sha256-/4lsR5fZq5vqTenm4IpkETFl2wRuXGfAlN3Io6foTuc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "c78f02655006afbbcb4ce6a6256162004ca47332", + "rev": "9898d505d78552400b3cf44a162344664d1a7806", "type": "github" }, "original": { @@ -1005,11 +1005,11 @@ ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -1020,11 +1020,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744366945, - "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", + "lastModified": 1747723695, + "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", + "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ ] }, "locked": { - "lastModified": 1744251635, - "narHash": "sha256-tvpWXDKHdeXMqFjwi5Ot8o5PoV18zdbOEnZ/037Z7CE=", + "lastModified": 1747276388, + "narHash": "sha256-+jgSt/rniQU2bH5rNLcGVWhFV+HNbo/6YFTbOza+6XE=", "owner": "nixpak", "repo": "nixpak", - "rev": "1974dfbf1027f0b239355fb3d9fa589dc4f7c390", + "rev": "7696752fc3a231823039256cfffe7390e9effdfe", "type": "github" }, "original": { @@ -1089,11 +1089,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1747728033, + "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", "type": "github" }, "original": { @@ -1132,11 +1132,11 @@ }, "nixpkgs-ollama": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -1228,16 +1228,16 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -1276,11 +1276,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -1292,11 +1292,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1747426788, + "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", "type": "github" }, "original": { @@ -1308,11 +1308,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -1386,11 +1386,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -1443,11 +1443,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1742205455, - "narHash": "sha256-mAxK0G/pqq4d8ADdGUpY9sBdrstzHjz/7MxQxnD2qH8=", + "lastModified": 1746289378, + "narHash": "sha256-n2dJHEGEIqaYsfIFVM/VQMnLFRTlty/bRBq23MltOeI=", "owner": "AtaraxiaSjel", "repo": "nur", - "rev": "0281ee4c5528f7200ecd2ad58d90d724133739fb", + "rev": "762be05b1b02eb9c091b167de2c35ae42ed6b7f4", "type": "github" }, "original": { @@ -1505,11 +1505,11 @@ "polybar-themes": { "flake": false, "locked": { - "lastModified": 1744297258, - "narHash": "sha256-RaMSDYm6pao+bIukWDhGuOx3C40/clL0mwy3VUTpBiA=", + "lastModified": 1744988472, + "narHash": "sha256-TxsO28Rd0U/FgA9v5M6426rFW0wNVdN1AVOazxsbMNo=", "owner": "adi1090x", "repo": "polybar-themes", - "rev": "b7a6687f213fb699d95b2c4d6ba3a4076b01469f", + "rev": "03e542779448dd9fdb1e3451858cf66cf13b31bd", "type": "github" }, "original": { @@ -1623,11 +1623,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dc0fa721..5137f397 100644 --- a/flake.nix +++ b/flake.nix @@ -37,12 +37,12 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-ollama.url = "github:nixos/nixpkgs/nixos-unstable"; # for macos - # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.11-darwin"; + # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nix-darwin = { url = "github:lnl7/nix-darwin"; @@ -53,7 +53,7 @@ # home-manager, used for managing user configuration home-manager = { url = "github:nix-community/home-manager/master"; - # url = "github:nix-community/home-manager/release-24.11"; + # url = "github:nix-community/home-manager/release-25.05"; # The `follows` keyword in inputs is used for inheritance. # Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake, diff --git a/home/base/gui/terminal/README.md b/home/base/gui/terminal/README.md index c32ab2fb..63d88aef 100644 --- a/home/base/gui/terminal/README.md +++ b/home/base/gui/terminal/README.md @@ -52,7 +52,7 @@ Error opening terminal: xterm-kitty. NixOS preserve the `TERMINFO` and `TERMINFO_DIRS` environment variables, for `root` and the `wheel` group: -[nixpkgs/nixos/modules/config/terminfo.nix](https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/config/terminfo.nix#L18) +[nixpkgs/nixos/modules/config/terminfo.nix](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/config/terminfo.nix#L18) For nix-darwin, take a look at diff --git a/home/darwin/shell.nix b/home/darwin/shell.nix index dc84256b..7c5b65f1 100644 --- a/home/darwin/shell.nix +++ b/home/darwin/shell.nix @@ -3,7 +3,7 @@ export PATH="$PATH:/opt/homebrew/bin:/usr/local/bin" ''; # copied from the content generated by `conda init bash` - initExtra = '' + initContent = '' arch=$(uname -m) if [ "aarch64" = "$arch" ] || [ "arm64" = "$arch" ]; then @@ -28,10 +28,10 @@ in { # in /opt/homebrew for Apple Silicon and /usr/local for Rosetta 2 to coexist and use bottles. programs.bash = { enable = true; - bashrcExtra = lib.mkAfter (envExtra + initExtra); + bashrcExtra = lib.mkAfter (envExtra + initContent); }; programs.zsh = { enable = true; - inherit envExtra initExtra; + inherit envExtra initContent; }; } diff --git a/home/linux/base/tools.nix b/home/linux/base/tools.nix index cf9ce5ea..534a3d71 100644 --- a/home/linux/base/tools.nix +++ b/home/linux/base/tools.nix @@ -5,7 +5,6 @@ libnotify wireguard-tools # manage wireguard vpn manually, via wg-quick - ventoy # create bootable usb virt-viewer # vnc connect to VM, used by kubevirt ]; diff --git a/home/linux/gui/base/creative.nix b/home/linux/gui/base/creative.nix index d6454c83..e86821ce 100644 --- a/home/linux/gui/base/creative.nix +++ b/home/linux/gui/base/creative.nix @@ -19,7 +19,7 @@ # 2d game design ldtk # A modern, versatile 2D level editor - aseprite # Animated sprite editor & pixel art tool + # aseprite # Animated sprite editor & pixel art tool # this app consumes a lot of storage, so do not install it currently # kicad # 3d printing, eletrical engineering diff --git a/home/linux/gui/base/fcitx5/default.nix b/home/linux/gui/base/fcitx5/default.nix index 6f744e5d..88686553 100644 --- a/home/linux/gui/base/fcitx5/default.nix +++ b/home/linux/gui/base/fcitx5/default.nix @@ -16,7 +16,8 @@ }; i18n.inputMethod = { - enabled = "fcitx5"; + enable = true; + type = "fcitx5"; fcitx5.addons = with pkgs; [ # for flypy chinese input method fcitx5-rime diff --git a/home/linux/gui/base/misc.nix b/home/linux/gui/base/misc.nix index ee70f0ae..c5438736 100644 --- a/home/linux/gui/base/misc.nix +++ b/home/linux/gui/base/misc.nix @@ -19,7 +19,6 @@ # misc flameshot - ventoy # multi-boot usb creator # my custom hardened packages pkgs.nixpaks.qq diff --git a/home/linux/gui/hyprland/values/wayland-apps.nix b/home/linux/gui/hyprland/values/wayland-apps.nix index 24cd8609..3f22bfcd 100644 --- a/home/linux/gui/hyprland/values/wayland-apps.nix +++ b/home/linux/gui/hyprland/values/wayland-apps.nix @@ -63,8 +63,6 @@ vscode = { enable = true; - # let vscode sync and update its configuration & extensions across devices, using github account. - userSettings = {}; package = pkgs.vscode.override { diff --git a/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock b/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock index 280bbc6e..6fff9dd3 100644 --- a/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock +++ b/hosts/12kingdoms-shoukei/brcm-firmware/flake.lock @@ -11,7 +11,7 @@ }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix b/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix index 96e08acf..93fc4d86 100644 --- a/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix +++ b/hosts/12kingdoms-shoukei/brcm-firmware/flake.nix @@ -1,6 +1,6 @@ { # a flake for testing - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; outputs = {nixpkgs, ...}: let system = "x86_64-linux"; pkgs = import nixpkgs {inherit system;}; diff --git a/hosts/12kingdoms-shoukei/default.nix b/hosts/12kingdoms-shoukei/default.nix index d3909dab..5f0b9779 100644 --- a/hosts/12kingdoms-shoukei/default.nix +++ b/hosts/12kingdoms-shoukei/default.nix @@ -38,5 +38,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.11"; # Did you read the comment? + system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/hosts/idols-ai/default.nix b/hosts/idols-ai/default.nix index a7f77545..2573d29a 100644 --- a/hosts/idols-ai/default.nix +++ b/hosts/idols-ai/default.nix @@ -35,5 +35,5 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.11"; # Did you read the comment? + system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/hosts/idols-aquamarine/gitea.nix b/hosts/idols-aquamarine/gitea.nix index 16e7a02a..366b7eb4 100644 --- a/hosts/idols-aquamarine/gitea.nix +++ b/hosts/idols-aquamarine/gitea.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/misc/gitea.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/misc/gitea.nix services.gitea = { enable = true; user = "gitea"; diff --git a/hosts/idols-aquamarine/minio.nix b/hosts/idols-aquamarine/minio.nix index 4b345145..fee9a367 100644 --- a/hosts/idols-aquamarine/minio.nix +++ b/hosts/idols-aquamarine/minio.nix @@ -2,7 +2,7 @@ dataDir = ["/data/apps/minio/data"]; configDir = "/data/apps/minio/config"; in { - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/web-servers/minio.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/web-servers/minio.nix services.minio = { enable = true; browser = true; # Enable or disable access to web UI. diff --git a/hosts/idols-aquamarine/oci-containers/homepage/default.nix b/hosts/idols-aquamarine/oci-containers/homepage/default.nix index 6aaae60b..cc909403 100644 --- a/hosts/idols-aquamarine/oci-containers/homepage/default.nix +++ b/hosts/idols-aquamarine/oci-containers/homepage/default.nix @@ -20,7 +20,7 @@ in { chown -R ${user}:${user} ${configDir} ''; - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/virtualisation/oci-containers.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/virtualisation/oci-containers.nix virtualisation.oci-containers.containers = { # check its logs via `journalctl -u podman-homepage` homepage = { diff --git a/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix b/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix index eea7d8a6..f0f68ab6 100644 --- a/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix +++ b/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix @@ -15,7 +15,7 @@ in { "d ${dataDir} 0755 ${user} ${user}" ]; - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/virtualisation/oci-containers.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/virtualisation/oci-containers.nix virtualisation.oci-containers.containers = { # check its logs via `journalctl -u podman-homepage` uptime-kuma = { diff --git a/hosts/idols-aquamarine/proxy.nix b/hosts/idols-aquamarine/proxy.nix index 197ed9f1..6fcac9c8 100644 --- a/hosts/idols-aquamarine/proxy.nix +++ b/hosts/idols-aquamarine/proxy.nix @@ -78,7 +78,7 @@ }; }; - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix # https://github.com/wi1dcard/v2ray-exporter services.prometheus.exporters.v2ray = { enable = true; diff --git a/hosts/idols-aquamarine/restic.nix b/hosts/idols-aquamarine/restic.nix index 9f6a0186..b4f5610a 100644 --- a/hosts/idols-aquamarine/restic.nix +++ b/hosts/idols-aquamarine/restic.nix @@ -3,7 +3,7 @@ sshKeyPath = "/etc/agenix/ssh-key-for-restic-backup"; rcloneConfigFile = "/etc/agenix/rclone-conf-for-restic-backup"; in { - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/backup/restic.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/backup/restic.nix services.restic.backups = { homelab-backup = { inherit passwordFile; diff --git a/hosts/idols-aquamarine/transmission.nix b/hosts/idols-aquamarine/transmission.nix index 9830c387..8a89bf44 100644 --- a/hosts/idols-aquamarine/transmission.nix +++ b/hosts/idols-aquamarine/transmission.nix @@ -7,7 +7,7 @@ name = "transmission"; in { # the headless Transmission BitTorrent daemon - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/torrent/transmission.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/torrent/transmission.nix # https://wiki.archlinux.org/title/transmission services.transmission = { enable = true; diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index cdb9d9a3..56ccf85b 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: +{pkgs, myvars, ...}: ################################################################################### # # macOS's System configuration @@ -22,12 +22,7 @@ time.timeZone = "Asia/Shanghai"; system = { - # activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. - activationScripts.postUserActivation.text = '' - # activateSettings -u will reload the settings from the database and apply them to the current session, - # so we do not need to logout and login again to make the changes take effect. - /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u - ''; + primaryUser = myvars.username; defaults = { menuExtraClock.Show24Hour = true; # show 24 hour clock diff --git a/modules/nixos/base/monitoring.nix b/modules/nixos/base/monitoring.nix index 20ab582e..ee791ced 100644 --- a/modules/nixos/base/monitoring.nix +++ b/modules/nixos/base/monitoring.nix @@ -1,6 +1,6 @@ { # enable the node exporter on all nixos hosts - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/monitoring/prometheus/exporters/node.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/monitoring/prometheus/exporters/node.nix services.prometheus.exporters.node = { enable = true; listenAddress = "0.0.0.0"; diff --git a/modules/nixos/base/ssh.nix b/modules/nixos/base/ssh.nix index ea77050c..0c2ccb9c 100644 --- a/modules/nixos/base/ssh.nix +++ b/modules/nixos/base/ssh.nix @@ -16,6 +16,6 @@ }; # Add terminfo database of all known terminals to the system profile. - # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/config/terminfo.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/config/terminfo.nix environment.enableAllTerminfo = true; } diff --git a/modules/nixos/desktop/fhs.nix b/modules/nixos/desktop/fhs.nix index c3e0b715..b14cfdb0 100644 --- a/modules/nixos/desktop/fhs.nix +++ b/modules/nixos/desktop/fhs.nix @@ -32,7 +32,7 @@ # nix-ld's nixos module will set default values for `NIX_LD` and `NIX_LD_LIBRARY_PATH` environment variables, so # it can work out of the box: # - # - https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/programs/nix-ld.nix#L37-L40 + # - https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/programs/nix-ld.nix#L37-L40 # # You can overwrite `NIX_LD_LIBRARY_PATH` in the environment where you run the non-NixOS binaries to customize the # search path for shared libraries. diff --git a/modules/nixos/desktop/remote-desktop/sunshine.nix b/modules/nixos/desktop/remote-desktop/sunshine.nix index 097d0a98..c90b15e6 100644 --- a/modules/nixos/desktop/remote-desktop/sunshine.nix +++ b/modules/nixos/desktop/remote-desktop/sunshine.nix @@ -12,7 +12,7 @@ # journalctl --user -u sunshine --since "2 minutes ago" # # References: -# https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/networking/sunshine.nix +# https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/networking/sunshine.nix # # =============================================================================== { diff --git a/modules/nixos/desktop/remote-desktop/tailscale.nix b/modules/nixos/desktop/remote-desktop/tailscale.nix index b0618434..318c457e 100644 --- a/modules/nixos/desktop/remote-desktop/tailscale.nix +++ b/modules/nixos/desktop/remote-desktop/tailscale.nix @@ -25,7 +25,7 @@ # which is already persistent across reboots(via impermanence.nix) # # References: -# https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/services/networking/tailscale.nix +# https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/networking/tailscale.nix # # ============================================================= { diff --git a/nixos-installer/configuration.nix b/nixos-installer/configuration.nix index e6925bab..6ab67a8d 100644 --- a/nixos-installer/configuration.nix +++ b/nixos-installer/configuration.nix @@ -18,5 +18,5 @@ networkmanager.enable = true; defaultGateway = "192.168.5.101"; }; - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; } diff --git a/nixos-installer/flake.lock b/nixos-installer/flake.lock index cfbfbd5d..6d6f6876 100644 --- a/nixos-installer/flake.lock +++ b/nixos-installer/flake.lock @@ -40,7 +40,7 @@ }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/nixos-installer/flake.nix b/nixos-installer/flake.nix index 4f864c4a..7f8afae5 100644 --- a/nixos-installer/flake.nix +++ b/nixos-installer/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration of Ryan Yin"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; impermanence.url = "github:nix-community/impermanence"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nuenv.url = "github:DeterminateSystems/nuenv"; diff --git a/utils.nu b/utils.nu index 84564dbf..8ce1a9f4 100644 --- a/utils.nu +++ b/utils.nu @@ -44,9 +44,9 @@ export def darwin-switch [ mode: string ] { if "debug" == $mode { - ./result/sw/bin/darwin-rebuild switch --flake $".#($name)" --show-trace --verbose + sudo -E ./result/sw/bin/darwin-rebuild switch --flake $".#($name)" --show-trace --verbose } else { - ./result/sw/bin/darwin-rebuild switch --flake $".#($name)" + sudo -E ./result/sw/bin/darwin-rebuild switch --flake $".#($name)" } }