From 772af12ffef7885ea9f0e3ef182599b61d0e72db Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Wed, 1 Jan 2025 16:37:23 +0100 Subject: [PATCH] bump lock --- flake.lock | 17 +++++++++++++++++ flake.nix | 6 +++++- hosts/toaster/default.nix | 2 +- hosts/toaster/hardware-configuration.nix | 2 +- modules/devtools.nix | 1 + 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e32a137..5a1c2bb 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1735531152, @@ -53,6 +69,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", + "nixos-hardware": "nixos-hardware", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 7c2c830..288dcf3 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,8 @@ inputs.nixpkgs.follows = "nixpkgs-stable"; }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + # microvm = { # url = "github:astro/microvm.nix/v0.4.0"; # inputs = { @@ -31,6 +33,7 @@ , nixpkgs-stable , nixpkgs-unstable , sops-nix + , nixos-hardware , ... }: @@ -57,6 +60,7 @@ modules = [ # sops-nix.nixosModules.sops # lanzaboote.nixosModules.lanzaboote + nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3 ./hosts/toaster @@ -69,7 +73,7 @@ ./modules/radio.nix ./modules/science.nix ./modules/tlp.nix - ./modules/virtualization.nix + # ./modules/virtualization.nix ]; }; diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix index c21086d..aa6531c 100644 --- a/hosts/toaster/default.nix +++ b/hosts/toaster/default.nix @@ -49,7 +49,7 @@ programs.steam.enable = true; environment.systemPackages = with pkgs; [ - factorio + # factorio ]; services.emacs.defaultEditor = false; diff --git a/hosts/toaster/hardware-configuration.nix b/hosts/toaster/hardware-configuration.nix index f8bc0bb..c49eb32 100644 --- a/hosts/toaster/hardware-configuration.nix +++ b/hosts/toaster/hardware-configuration.nix @@ -46,7 +46,7 @@ options = [ "zfsutil" ]; }; swapDevices = - [ { device = "/dev/disk/by-partuuid/8a544c8b-1a49-481b-a685-253ef7478b2c"; + [ { device = "/dev/disk/by-partuuid/037518f2-9fa0-44f0-9550-745e27bf1c1f"; randomEncryption = true;} ]; diff --git a/modules/devtools.nix b/modules/devtools.nix index eec05e7..4a97bc7 100644 --- a/modules/devtools.nix +++ b/modules/devtools.nix @@ -23,6 +23,7 @@ julia # hardware kicad + freecad-wayland ]; # Wireshark