Skip to content

Commit

Permalink
Switch to nixos-unstable
Browse files Browse the repository at this point in the history
* Fix deprecations
  • Loading branch information
mcwitt committed Nov 17, 2024
1 parent b105859 commit 9d51c67
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 103 deletions.
187 changes: 104 additions & 83 deletions flake.lock

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

20 changes: 5 additions & 15 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@
emacs-overlay.url = "github:nix-community/emacs-overlay";
flake-utils.url = "github:numtide/flake-utils";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.url = "github:nix-community/home-manager";
nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
stylix.url = "github:danth/stylix/release-24.05";
stylix.url = "github:danth/stylix";
};

outputs =
{ self
, nixpkgs
, nixpkgs-unstable
, flake-utils
, home-manager
, emacs-overlay
Expand Down Expand Up @@ -49,11 +47,6 @@
pkgs = null;
nurpkgs = pkgs;
};

pkgsUnstable = mkPkgs {
nixpkgs = inputs.nixpkgs-unstable;
inherit (pkgs) system;
};
};
in
{
Expand All @@ -63,10 +56,7 @@
nixpkgs.lib.nixosSystem {
inherit system;

specialArgs = {
inherit inputs;
pkgsUnstable = import inputs.nixpkgs-unstable { inherit overlays system; };
};
specialArgs = { inherit inputs; };

modules = [
home-manager.nixosModules.home-manager
Expand Down Expand Up @@ -136,7 +126,7 @@
extraHmModules = [ ./hosts/golem/home ];
};

hal = nixpkgs.lib.makeOverridable nixpkgs-unstable.lib.nixosSystem {
hal = nixpkgs.lib.makeOverridable nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
nur.nixosModules.nur
Expand Down
4 changes: 2 additions & 2 deletions modules/common/home-manager/languages/python/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, config, pkgs, pkgsUnstable, ... }:
{ lib, config, pkgs, ... }:
with lib;
let cfg = config.languages.python;
in
Expand All @@ -24,7 +24,7 @@ in
[
pkgs.black
pkgs.isort
pkgsUnstable.basedpyright # not yet available in release channel
pkgs.basedpyright
pythonEnv
];

Expand Down
2 changes: 1 addition & 1 deletion modules/common/home-manager/languages/rust/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ in

programs.vscode = {
extensions = with pkgs.vscode-extensions; [
matklad.rust-analyzer
rust-lang.rust-analyzer
];
};
};
Expand Down
4 changes: 2 additions & 2 deletions modules/common/home-manager/profiles/base/emacs/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, nurNoPkgs, pkgs, pkgsUnstable, ... }: {
{ config, nurNoPkgs, pkgs, ... }: {

imports = [
nurNoPkgs.repos.rycee.hmModules.emacs-init
Expand All @@ -15,7 +15,7 @@

home.packages = [ pkgs.emacs-all-the-icons-fonts ];

programs.emacs.package = pkgsUnstable.emacs-unstable; # work around build failure with nixos-24.05 branch
programs.emacs.package = pkgs.emacs-unstable;

programs.emacs.extraPackages = epkgs: [ epkgs.treesit-grammars.with-all-grammars ];

Expand Down

0 comments on commit 9d51c67

Please sign in to comment.