diff --git a/flake.nix b/flake.nix index 2dac4f91..f7a9e775 100644 --- a/flake.nix +++ b/flake.nix @@ -38,9 +38,9 @@ # There are many ways to reference flake inputs. The most widely used is github:owner/name/reference, # which represents the GitHub repository URL + branch/commit-id/tag. - # Official NixOS package source, using nixos-unstable branch here - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; + # Official NixOS package source, using nixos's stable branch by default + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # for macos nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin"; @@ -93,7 +93,8 @@ let x64_system = "x86_64-linux"; x64_specialArgs = { - pkgs-stable = import inputs.nixpkgs-stable { + # use unstable branch for some packages to get the latest updates + pkgs-unstable = import inputs.nixpkgs-unstable { system = x64_system; # refer the `system` parameter form outer scope recursively # To use chrome, we need to allow the installation of non-free software config.allowUnfree = true; diff --git a/home/linux/hyprland/wayland-apps.nix b/home/linux/hyprland/wayland-apps.nix index 11e17688..e6612ccb 100644 --- a/home/linux/hyprland/wayland-apps.nix +++ b/home/linux/hyprland/wayland-apps.nix @@ -1,5 +1,4 @@ { pkgs -, pkgs-stable , ... }: @@ -11,10 +10,6 @@ google-chrome = { enable = true; - # chrome wayland support was broken on nixos-unstable branch, so fallback to stable branch for now - # https://github.com/swaywm/sway/issues/7562 - package = pkgs-stable.google-chrome; - commandLineArgs = [ # make it use GTK_IM_MODULE if it runs with Gtk4, so fcitx5 can work with it. # (only supported by chromium/chrome at this time, not electron) @@ -30,18 +25,18 @@ firefox = { enable = true; enableGnomeExtensions = false; - package = pkgs-stable.firefox-wayland; # firefox with wayland support + # package = pkgs.firefox-wayland; # firefox with wayland support }; vscode = { enable = true; # use the stable version - package = pkgs-stable.vscode.override { - commandLineArgs = [ - # make it use text-input-v1, which works for kwin 5.27 and weston - # "--enable-wayland-ime" - ]; - }; + # package = pkgs.vscode.override { + # commandLineArgs = [ + # # make it use text-input-v1, which works for kwin 5.27 and weston + # # "--enable-wayland-ime" + # ]; + # }; # let vscode sync and update its configuration & extensions across devices, using github account. # userSettings = {};