From bae27118f123150df0a013b3fefe9c29ce1e4248 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 16 Dec 2023 00:40:57 +0100 Subject: [PATCH] chore: flake updates, default to new lts kernel 6.6 --- flake.lock | 72 +++++++++++++++++++------------ flake.nix | 2 +- hosts/dumpyourvms/dumpyourvms.nix | 1 - modules/core/boot.nix | 2 +- modules/graphical/default.nix | 2 +- 5 files changed, 48 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index b68fbd9f..2cbbbfed 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1698921442, - "narHash": "sha256-7KmvhQ7FuXlT/wG4zjTssap6maVqeAMBdtel+VjClSM=", + "lastModified": 1702460489, + "narHash": "sha256-H6s6oVLvx7PCjUcvfkB89Bb+kbaiJxTAgWfMjiQTjA0=", "owner": "serokell", "repo": "deploy-rs", - "rev": "660180bbbeae7d60dad5a92b30858306945fd427", + "rev": "915327515f5fd1b7719c06e2f1eb304ee0bdd803", "type": "github" }, "original": { @@ -53,7 +53,7 @@ "devshell": { "inputs": { "nixpkgs": "nixpkgs_2", - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1695973661, @@ -120,7 +120,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -138,16 +138,16 @@ }, "fork": { "locked": { - "lastModified": 1692960587, - "narHash": "sha256-39SKGdhn8jKKkdqhULbCvQOpdUPE9NNJpy5HTB++Jvg=", + "lastModified": 1702682961, + "narHash": "sha256-7kMYxggXgGgGcAY2Nqb0Ydk3hXXfgEqPwI7OezuxdnU=", "owner": "teutat3s", "repo": "nixpkgs", - "rev": "312709dd70684f52496580e533d58645526b1c90", + "rev": "8347def627f8a5a7405adf9f477f7092c62ac356", "type": "github" }, "original": { "owner": "teutat3s", - "ref": "nvfetcher-fix", + "ref": "signal-desktop-6.42", "repo": "nixpkgs", "type": "github" } @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1700814205, - "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", + "lastModified": 1702676849, + "narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=", "owner": "nix-community", "repo": "home-manager", - "rev": "aeb2232d7a32530d3448318790534d196bf9427a", + "rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "master": { "locked": { - "lastModified": 1701878738, - "narHash": "sha256-8of03Bfupe901Gu36QbWEth6R8Hkrg1fQSgEy6SABEk=", + "lastModified": 1702681572, + "narHash": "sha256-DYgw0mBT34Ko51U1FfHpS4yDFuWeGoz+rarAKNnsH8A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21ed02377ca075ee099d7b189f6cc47dc8f40c9a", + "rev": "386647bebf6b1430c783790a513a51769f478252", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-flake": { "locked": { - "lastModified": 1701201086, - "narHash": "sha256-GU2A+dI5Kp2+4g2dWixeTkp6yKhaW9BZ1uE9Z5cC82w=", + "lastModified": 1702145288, + "narHash": "sha256-apVeRT0kOnDejwwBwbwNccm+qq1l6+qUOiRKE0vK5qk=", "owner": "srid", "repo": "nixos-flake", - "rev": "7c9168884128ed4634751b3e2f5553b09d7b8cb0", + "rev": "4e422edf6b511f8e214b392cf1a0d4707a0399a4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701656485, - "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { @@ -355,6 +355,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "triton-vmtools": { "inputs": { "flake-utils": "flake-utils", @@ -419,12 +434,15 @@ } }, "utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7f21e9c2..62356068 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ unstable.url = "github:nixos/nixpkgs/nixos-unstable"; master.url = "github:nixos/nixpkgs/master"; - fork.url = "github:teutat3s/nixpkgs/nvfetcher-fix"; + fork.url = "github:teutat3s/nixpkgs/signal-desktop-6.42"; flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; diff --git a/hosts/dumpyourvms/dumpyourvms.nix b/hosts/dumpyourvms/dumpyourvms.nix index e6c456a3..f5df5ac8 100644 --- a/hosts/dumpyourvms/dumpyourvms.nix +++ b/hosts/dumpyourvms/dumpyourvms.nix @@ -16,7 +16,6 @@ in { resumeOffset = 47366144; }; }; - boot.kernelPackages = pkgs.linuxPackages_6_6; # Fix backlight for keyboard and brightness, adjust function key binding, # intel_pstate for cpu schedutil diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 58057285..ab45fe44 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -26,7 +26,7 @@ in { loader.systemd-boot.enable = lib.mkDefault true; # Use latest LTS linux kernel by default - kernelPackages = lib.mkDefault pkgs.linuxPackages_6_1; + kernelPackages = lib.mkDefault pkgs.linuxPackages_6_6; # Support ntfs drives supportedFilesystems = ["ntfs"]; diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index e0159378..89119705 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -94,7 +94,7 @@ in { gnome.yelp hicolor-icon-theme keepassxc - qMasterPassword + qMasterPassword-wayland libnotify vlc ];