Skip to content

Commit

Permalink
Upgrade to nixos-24.11
Browse files Browse the repository at this point in the history
* Fix deprecations

* Remove base16-tmux
  • Loading branch information
mcwitt committed Nov 17, 2024
1 parent b105859 commit d4ca664
Show file tree
Hide file tree
Showing 10 changed files with 120 additions and 131 deletions.
193 changes: 107 additions & 86 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-24.11";
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
12 changes: 3 additions & 9 deletions hosts/golem/configuration/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
hardware.keyboard.zsa.enable = true;

hardware.nvidia.modesetting.enable = true;
hardware.nvidia.open = false;

hardware.nvidia-container-toolkit.enable = true;

hardware.opengl = {
enable = true;
driSupport32Bit = true;
};
hardware.graphics.enable = true;
hardware.graphics.enable32Bit = true;

hardware.printers = rec {
ensureDefaultPrinter = "Brother_HL-L2340D_series";
Expand Down Expand Up @@ -83,11 +82,6 @@
];
};

sound = {
enable = true;
mediaKeys.enable = true;
};

system.stateVersion = "21.11";

time.timeZone = "America/Los_Angeles";
Expand Down
5 changes: 0 additions & 5 deletions hosts/karakuri/configuration/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@
xkb.layout = "us";
};

sound = {
enable = true;
mediaKeys.enable = true;
};

system.stateVersion = "21.11";

time.timeZone = "America/Los_Angeles";
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
Loading

0 comments on commit d4ca664

Please sign in to comment.