diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix index 08f6422..e44d3d6 100644 --- a/nix/configuration/configuration.nix +++ b/nix/configuration/configuration.nix @@ -246,31 +246,8 @@ in glew = (final.glew.override { enableEGL = false; }); }; }) - (final: prev: { - fwupd = prev.fwupd.overrideAttrs ( - finalAttrs: prevAttrs: { - version = "2.1.5"; - src = final.fetchFromGitHub { - owner = "fwupd"; - repo = "fwupd"; - tag = finalAttrs.version; - hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc="; - }; - } - ); - }) (disableTests "onetbb") # oneTBB tests hang forever on machines with a single core (like my build virtual machine) https://github.com/uxlfoundation/oneTBB/issues/1557 (disableTests "aws-c-common") # aws-c-common tests time out on my build virtual machine but run fine on my laptop. - - # Works but probably sets python2's scipy to be python3: - # - # (final: prev: { - # pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ - # (python-final: python-prev: { - # scipy = final.unoptimized.python3Packages.scipy; - # }) - # ]; - # }) ]; # This option defines the first version of NixOS you have installed on this particular machine, diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock index 5ffafe5..d61004b 100644 --- a/nix/configuration/flake.lock +++ b/nix/configuration/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1780894562, - "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=", + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "owner": "nix-community", "repo": "disko", - "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1785318670, + "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5", "type": "github" }, "original": { @@ -199,22 +199,6 @@ "type": "github" } }, - "nixpkgs-google": { - "locked": { - "lastModified": 1779893571, - "narHash": "sha256-wiwMyVCtmjRjlFCe2zaumCE6LRV9GzzN0ZH25NQkbAU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -264,8 +248,7 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nix_builder": "nix_builder", - "nixpkgs": "nixpkgs", - "nixpkgs-google": "nixpkgs-google" + "nixpkgs": "nixpkgs" } }, "rust-overlay": { diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 63e4c02..4d55e90 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -20,7 +20,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-google.url = "github:NixOS/nixpkgs/45f6cfaa4605b706c870e75bd74bdb5e97eee11e"; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; inputs.nixpkgs.follows = "nixpkgs"; @@ -39,7 +38,6 @@ { self, nixpkgs, - nixpkgs-google, disko, impermanence, lanzaboote, @@ -99,9 +97,6 @@ hostPlatform.gcc.arch = "default"; hostPlatform.gcc.tune = "default"; }; - google = import nixpkgs-google { - system = prev.stdenv.hostPlatform.system; - }; }) ]; }; diff --git a/nix/configuration/roles/gcloud/default.nix b/nix/configuration/roles/gcloud/default.nix index cf60ca4..b89d278 100644 --- a/nix/configuration/roles/gcloud/default.nix +++ b/nix/configuration/roles/gcloud/default.nix @@ -18,7 +18,7 @@ }; config = lib.mkIf config.me.gcloud.enable { - environment.systemPackages = with pkgs.google; [ + environment.systemPackages = with pkgs; [ (google-cloud-sdk.withExtraComponents [ google-cloud-sdk.components.gke-gcloud-auth-plugin ]) ]; diff --git a/nix/configuration/roles/latex/default.nix b/nix/configuration/roles/latex/default.nix index 9c6cb9e..2765991 100644 --- a/nix/configuration/roles/latex/default.nix +++ b/nix/configuration/roles/latex/default.nix @@ -25,8 +25,8 @@ nixpkgs.overlays = [ (final: prev: { tex = ( - pkgs.texlive.combine { - inherit (pkgs.texlive) + pkgs.texliveSmall.withPackages ( + ps: with ps; [ scheme-basic dvisvgm dvipng # for preview and export as html in org-mode @@ -44,8 +44,8 @@ upquote # emacs org-mode pdf export lineno # emacs org-mode pdf export beamer # emacs org-mode presentation pdf export - ; - } + ] + ) ); }) ];