From 73db3f9699c9b7846de7f802e20886d84bae4f1d Mon Sep 17 00:00:00 2001 From: Leonardo Santiago Date: Thu, 16 Jan 2025 15:54:13 -0300 Subject: update nixpkgs and home-manager --- flake.lock | 26 +++++++++++++------------- modules/basic.nix | 2 +- modules/desktop-environment.nix | 2 +- modules/emacs/default.nix | 2 +- modules/fonts.nix | 3 ++- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 64c8b60..2f2df73 100644 --- a/flake.lock +++ b/flake.lock @@ -144,11 +144,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1736883540, + "narHash": "sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "0dfec9deb275854a56c97c356c40ef72e3a2e632", "type": "github" }, "original": { @@ -163,11 +163,11 @@ "nixpkgs_old": "nixpkgs_old" }, "locked": { - "lastModified": 1732822990, - "narHash": "sha256-Wr8gzDD2O6jIDwa74BM2gwx8zKqbFiX05NAq71QVGyw=", + "lastModified": 1737051665, + "narHash": "sha256-Ms8QfAOPPt3WV03Y+BOm2bg/XxxgEocLP6WkX83/z8k=", "ref": "refs/heads/master", - "rev": "67bb2ba2a800bccc2323404aa9297b02ca836142", - "revCount": 68535, + "rev": "38179df5bc93d1f22726e2f2ce7a7d321dc64497", + "revCount": 69567, "type": "git", "url": "ssh://git@gitlab.com/mixrank/mixrank" }, @@ -225,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -241,11 +241,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { diff --git a/modules/basic.nix b/modules/basic.nix index 71404a8..7698c7a 100644 --- a/modules/basic.nix +++ b/modules/basic.nix @@ -6,7 +6,7 @@ }; config = mkIf config.santi-modules.basic.enable { nix = { - package = pkgs.lib.mkForce pkgs.nixVersions.nix_2_20; + package = pkgs.lib.mkForce pkgs.nixVersions.nix_2_25; settings = { trusted-users = [ "root" "leonardo" ]; auto-optimise-store = true; diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix index 14dd7d6..8df3ea8 100644 --- a/modules/desktop-environment.nix +++ b/modules/desktop-environment.nix @@ -13,7 +13,7 @@ }; services.printing.enable = false; # disabled until CUPS CVE is fixed - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 37b8951..9081014 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -47,7 +47,7 @@ in with lib; { emacs ] ++ outside-emacs; fonts.packages = with pkgs; [ - (nerdfonts.override { fonts = ["Iosevka"]; }) + nerd-fonts.iosevka ]; }; } diff --git a/modules/fonts.nix b/modules/fonts.nix index 286f670..f1cad22 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -14,7 +14,8 @@ }; }; packages = with pkgs; [ - (nerdfonts.override { fonts = [ "Iosevka" "FiraCode" ]; }) + nerd-fonts.iosevka + nerd-fonts.fira-code ipafont kochi-substitute dejavu_fonts -- cgit v1.2.3