track nixos-unstable, update configs and overlays to match

This commit is contained in:
John Bowdre 2023-12-07 10:07:59 -06:00
parent 7d7bb64ffc
commit 4e6a2a373d
5 changed files with 10 additions and 15 deletions

View file

@ -6,15 +6,15 @@
# - https://github.com/Misterio77/nix-config/ # - https://github.com/Misterio77/nix-config/
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# You can access packages and modules from different nixpkgs revs # You can access packages and modules from different nixpkgs revs
# at the same time. Here's a working example: # at the same time. Here's a working example:
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
# Also see the 'unstable-packages' overlay at 'nix/overlays/default.nix'. # Also see the 'stable-packages' overlay at 'nix/overlays/default.nix'.
# Home manager # Home manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -2,11 +2,11 @@
# Common GUI apps # Common GUI apps
imports = [ imports = [
./firefox.nix ./firefox.nix
./obsidian.nix
./vscode.nix ./vscode.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
obsidian
qFlipper qFlipper
]; ];
} }

View file

@ -1,5 +0,0 @@
{ pkgs, inputs, outputs, lib, ... }: {
home.packages = with pkgs.unstable; [
obsidian
];
}

View file

@ -8,7 +8,7 @@
enable = true; enable = true;
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
enableUpdateCheck = false; enableUpdateCheck = false;
package = pkgs.unstable.vscode; package = pkgs.vscode;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
# extensions available as nix packages # extensions available as nix packages
bbenoist.nix bbenoist.nix

View file

@ -13,10 +13,10 @@
# }); # });
}; };
# When applied, the unstable nixpkgs set (declared in the flake inputs) will # When applied, the stable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.stable'
unstable-packages = final: _prev: { stable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable { stable = import inputs.nixpkgs-stable {
system = final.system; system = final.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };