From 0bee5a9c649a8fcb7dbf1b90d41605987aa16e42 Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Sun, 26 Nov 2023 09:54:34 -0800 Subject: [PATCH] Updated lockfile and some housekeeping --- flake.lock | 18 +++++++++--------- modules/nixos/apps/neovim/default.nix | 2 +- modules/nixos/system/monitoring/default.nix | 1 - systems/x86_64-linux/gospel/default.nix | 1 + .../gospel/hardware-configuration.nix | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8d236ca..1af227b 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1700900274, + "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1699701045, - "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=", + "lastModified": 1700559156, + "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad", + "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { diff --git a/modules/nixos/apps/neovim/default.nix b/modules/nixos/apps/neovim/default.nix index 00f15c8..d9cc7ad 100644 --- a/modules/nixos/apps/neovim/default.nix +++ b/modules/nixos/apps/neovim/default.nix @@ -33,7 +33,7 @@ in { #extraPackages = with pkgs; []; plugins = with pkgs.vimPlugins; [ # tree-sitter (code parser) - (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) + nvim-treesitter.withAllGrammars # git integration gitgutter diff --git a/modules/nixos/system/monitoring/default.nix b/modules/nixos/system/monitoring/default.nix index 2fc91f9..bc851ff 100644 --- a/modules/nixos/system/monitoring/default.nix +++ b/modules/nixos/system/monitoring/default.nix @@ -17,7 +17,6 @@ in { htop lm_sensors powertop - zenith ]; powerManagement.powertop.enable = true; diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix index 9db4025..4baf751 100644 --- a/systems/x86_64-linux/gospel/default.nix +++ b/systems/x86_64-linux/gospel/default.nix @@ -71,6 +71,7 @@ virtualisation.docker = { enable = true; + storageDriver = "overlay2"; rootless = { enable = true; setSocketVariable = true; diff --git a/systems/x86_64-linux/gospel/hardware-configuration.nix b/systems/x86_64-linux/gospel/hardware-configuration.nix index c08d8de..79a3448 100644 --- a/systems/x86_64-linux/gospel/hardware-configuration.nix +++ b/systems/x86_64-linux/gospel/hardware-configuration.nix @@ -15,7 +15,7 @@ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.extraModulePackages = with config.boot.kernelPackages; [rtl88x2bu]; fileSystems."/" = { device = "rpool/nixos/root";