diff --git a/nixos/flake.lock b/nixos/flake.lock index 83ad7e27..d88f16cb 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -839,11 +839,11 @@ ] }, "locked": { - "lastModified": 1733951607, - "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1733971070, - "narHash": "sha256-utvFUHV1jRMKn9Fx8eH+7sDNSu6jggfdVHxwme485UI=", + "lastModified": 1734472415, + "narHash": "sha256-IT/mQWd1pWSpljxCi8nJ1PpTt8SPDcQ0TPEmkNLXcwY=", "owner": "NixOS", "repo": "nix", - "rev": "f1187cb696584739884687d788a6fbb4dd36c61c", + "rev": "3f3feae33e3381a2ea5928febe03329f0a578b20", "type": "github" }, "original": { @@ -1054,16 +1054,16 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730255866, - "narHash": "sha256-u5pwidCs6jqyfsc7y4dCmlU1p5Bwhb3Msg/KIcADyN8=", + "lastModified": 1734508109, + "narHash": "sha256-5eA0euvSNf1mBTC2tYC8+JHOorwYGTnkHtoOt5hF3Pk=", "owner": "colonelpanic8", "repo": "nixos-hardware", - "rev": "c20ddcaeb8e9d0e4aee0d4d551c6682d3de8c5a5", + "rev": "cbd5f7ace8696d74e602aa0797f9f0cc0433ada3", "type": "github" }, "original": { "owner": "colonelpanic8", - "ref": "add-g834jzr", + "ref": "my-master", "repo": "nixos-hardware", "type": "github" } @@ -1234,11 +1234,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -1320,11 +1320,11 @@ "osx-kvm": "osx-kvm" }, "locked": { - "lastModified": 1732478008, - "narHash": "sha256-Axdo+bDlmFU19lBWIkhbAeV7RMO1JD9T1t51sfcWCTA=", + "lastModified": 1734291592, + "narHash": "sha256-6jc7RzRLAnoUjgqJizWdOBmYbp49UBpOlqZeDw8SCjc=", "owner": "matthewcroughan", "repo": "nixtheplanet", - "rev": "00d07c86548805eab1bc0dac2f95fce8d7e9aac6", + "rev": "b70d951ab433806e44a6b366367af55c469da52d", "type": "github" }, "original": { @@ -1725,11 +1725,11 @@ }, "unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index f7193421..02dc5e05 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -1,4 +1,3 @@ - { inputs = { nixpkgs = { @@ -22,7 +21,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-hardware = { url = "github:colonelpanic8/nixos-hardware/add-g834jzr"; }; + nixos-hardware = { url = "github:colonelpanic8/nixos-hardware/my-master"; }; nixos-wsl = { url = "github:nix-community/NixOS-WSL"; }; diff --git a/nixos/machines/adell.nix b/nixos/machines/adell.nix index fa3bd7d4..4c681c05 100644 --- a/nixos/machines/adell.nix +++ b/nixos/machines/adell.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, inputs, forEachUser, ... }: +{ lib, pkgs, inputs, forEachUser, ... }: { imports = [ @@ -16,6 +16,7 @@ myModules.fonts.enable = true; myModules.nixified-ai.enable = false; myModules.gitea-runner.enable = false; + hardware.nvidia.open = true; hardware.enableRedistributableFirmware = true; @@ -33,7 +34,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - services.xserver.libinput = { + services.libinput = { enable = true; touchpad.tapping = true; };